[mjansen] 74976: [CALC] Explicitly link against comctl32. Patch by Carlo Bramini. CORE-10727

Author: mjansen
Date: Fri Jun  9 18:21:54 2017
New Revision: 74976

URL: http://svn.reactos.org/svn/reactos?rev=74976&view=rev
Log:
[CALC] Explicitly link against comctl32. Patch by Carlo Bramini. CORE-10727

Modified:
    trunk/reactos/base/applications/calc/CMakeLists.txt
    trunk/reactos/base/applications/calc/winmain.c

Modified: trunk/reactos/base/applications/calc/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/CMak...
==============================================================================
--- trunk/reactos/base/applications/calc/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/CMakeLists.txt	[iso-8859-1] Fri Jun  9 18:21:54 2017
@@ -13,7 +13,7 @@
 add_rc_deps(resource.rc ${calc_rc_deps})
 add_executable(calc ${SOURCE} resource.rc)
 set_module_type(calc win32gui UNICODE)
-add_importlibs(calc advapi32 user32 shell32 gdi32 msvcrt kernel32)
+add_importlibs(calc advapi32 comctl32 user32 shell32 gdi32 msvcrt kernel32)

if(MSVC)
     add_importlibs(calc ntdll)

Modified: trunk/reactos/base/applications/calc/winmain.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/winm...
==============================================================================
--- trunk/reactos/base/applications/calc/winmain.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/winmain.c	[iso-8859-1] Fri Jun  9 18:21:54 2017
@@ -4,6 +4,7 @@
 #include <wingdi.h>
 #include <winreg.h>
 #include <shellapi.h>
+#include <commctrl.h>

#define HTMLHELP_PATH(_pt)  TEXT("%systemroot%\Help\calc.chm::") TEXT(_pt)

@@ -1785,6 +1786,8 @@
     MSG msg;
     DWORD dwLayout;

+    InitCommonControls();
+
     calc.hInstance = hInstance;

calc.x_coord = -1;