[ros-diffs] [cwittich] 67147: [MSPAINT] enable the call to HtmlHelp (not working yet because of missing help file) CORE-8738

Author: cwittich
Date: Sat Apr 11 06:21:09 2015
New Revision: 67147

URL: http://svn.reactos.org/svn/reactos?rev=67147&view=rev
Log:
[MSPAINT]
enable the call to HtmlHelp (not working yet because of missing help file)
CORE-8738
 

Modified:
    trunk/reactos/base/applications/mspaint/CMakeLists.txt
    trunk/reactos/base/applications/mspaint/precomp.h
    trunk/reactos/base/applications/mspaint/winproc.c
    trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt

Modified: trunk/reactos/base/applications/mspaint/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/…
==============================================================================
--- trunk/reactos/base/applications/mspaint/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint/CMakeLists.txt	[iso-8859-1] Sat Apr 11
06:21:09 2015
@@ -18,6 +18,6 @@
 
 add_executable(mspaint ${SOURCE} rsrc.rc)
 set_module_type(mspaint win32gui UNICODE)
-add_importlibs(mspaint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32)
+add_importlibs(mspaint hhctrl comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt
kernel32)
 add_pch(mspaint precomp.h SOURCE)
 add_cd_file(TARGET mspaint DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/base/applications/mspaint/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/…
==============================================================================
--- trunk/reactos/base/applications/mspaint/precomp.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint/precomp.h	[iso-8859-1] Sat Apr 11 06:21:09
2015
@@ -13,6 +13,7 @@
 #include <tchar.h>
 #include <stdlib.h>
 #include <shellapi.h>
+#include <htmlhelp.h>
 
 #include "definitions.h"
 #include "drawing.h"

Modified: trunk/reactos/base/applications/mspaint/winproc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/…
==============================================================================
--- trunk/reactos/base/applications/mspaint/winproc.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint/winproc.c	[iso-8859-1] Sat Apr 11 06:21:09
2015
@@ -700,7 +700,7 @@
                     break;
                 }
                 case IDM_HELPHELPTOPICS:
-                    //HtmlHelp(hMainWnd, "help\\Paint.chm", 0, 0);
+                    HtmlHelp(hMainWnd, _T("help\\Paint.chm"), 0, 0);
                     break;
                 case IDM_FILEEXIT:
                     SendMessage(hwnd, WM_CLOSE, wParam, lParam);

Modified: trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/CMake…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt	[iso-8859-1] Sat Apr 11 06:21:09
2015
@@ -4,7 +4,7 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-spec2def(hhctrl.ocx hhctrl.ocx.spec)
+spec2def(hhctrl.ocx hhctrl.ocx.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
     chm.c