[ros-diffs] [reactos] 01/01: [CALC] Enable support for HTMLHELP (#1877)

[Carlo Bramini]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=055c5a9bb7c54b05233aa4f5612d975a38b41208

commit 055c5a9bb7c54b05233aa4f5612d975a38b41208
Author:     Carlo Bramini <30959007+carlo-bram...@users.noreply.github.com>
AuthorDate: Mon Aug 26 16:14:01 2019 +0200
Commit:     Hermès BÉLUSCA - MAÏTO <hermes.belusca-ma...@reactos.org>
CommitDate: Mon Aug 26 16:14:01 2019 +0200

    [CALC] Enable support for HTMLHELP (#1877)
    
    Nowadays ReactOS includes support for htmlhelp.h and a working 
implementation of HHCTRL.OCX. Although current imported HHCTRL.OCX suffers of 
this issue:
    
    https://bugs.winehq.org/show_bug.cgi?id=47379
    See also CORE-15019
    
    + Revert 'intptr_t' to 'size_t'.
---
 base/applications/calc/CMakeLists.txt | 2 --
 base/applications/calc/htmlhelp.c     | 2 +-
 base/applications/calc/winmain.c      | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/base/applications/calc/CMakeLists.txt 
b/base/applications/calc/CMakeLists.txt
index d273f10250e..07104ff7095 100644
--- a/base/applications/calc/CMakeLists.txt
+++ b/base/applications/calc/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1)
-
 list(APPEND SOURCE
     convert.c
     fun_ieee.c
diff --git a/base/applications/calc/htmlhelp.c 
b/base/applications/calc/htmlhelp.c
index a306ae441b0..38f3ea3080a 100644
--- a/base/applications/calc/htmlhelp.c
+++ b/base/applications/calc/htmlhelp.c
@@ -49,7 +49,7 @@ dummy_HtmlHelpW(HWND hWnd, LPCWSTR pszFile, UINT uCommand, 
DWORD dwData)
 
 void HtmlHelp_Start(HINSTANCE hInstance)
 {
-    hHtmlHelp = LoadLibrary(_T("HTMLHELP"));
+    hHtmlHelp = LoadLibrary(_T("HHCTRL.OCX"));
     if (hHtmlHelp == NULL)
         return;
 
diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c
index 222dff44faf..6bf11a3c246 100644
--- a/base/applications/calc/winmain.c
+++ b/base/applications/calc/winmain.c
@@ -894,7 +894,7 @@ static void delete_stat_item(int n)
 
 static char *ReadConversion(const char *formula)
 {
-    intptr_t len = strlen(formula);
+    size_t len = strlen(formula);
     char *str = (char *)malloc(len+3);
 
     if (str == NULL)