[PSDK]

- Replace WINE's commctrl.h with mingw-w64's commctrl.h
- Move WINE-specific hacks to reactos/wine/commctrl.h
- Patch by Timo Kreuzer
- Fixes bug 4958

svn path=/trunk/; revision=47123

reactos/base/applications/wordpad/wordpad.rbuild

@@ -2,7 +2,8 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="wordpad" type="win32gui" installbase="system32" installname="wordpad.exe" allowwarnings="true">
 	<include base="wordpad">.</include>
-    <define name="__ROS_LONG64__" />
+	<include base="ReactOS">include/reactos/wine</include>
+	<define name="__ROS_LONG64__" />
 	<library>comdlg32</library>
 	<library>shell32</library>
 	<library>user32</library>

reactos/dll/cpl/usrmgr/usrmgr.rbuild

@@ -3,6 +3,7 @@
 <module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl" unicode="yes" crt="msvcrt">
 	<importlibrary definition="usrmgr.spec" />
 	<include base="usrmgr">.</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>gdi32</library>

reactos/dll/win32/comctl32/comctl32.rbuild

@@ -8,6 +8,8 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
 	<define name="_WINE" />
+	<define name="_COMCTL32_" />
+	<redefine name="_WIN32_WINNT">0x600</redefine>
 	<file>animate.c</file>
 	<file>comboex.c</file>
 	<file>comctl32undoc.c</file>

reactos/dll/win32/netcfgx/netcfgx.rbuild

@@ -1,6 +1,7 @@
 <module name="netcfgx" type="win32dll" baseaddress="${BASEADDRESS_NETCFGX}" installbase="system32" installname="netcfgx.dll">
 	<importlibrary definition="netcfgx.spec" />
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
+	<redefine name="_WIN32_WINNT">0x0600</redefine>
 	<library>ntdll</library>
 	<library>rpcrt4</library>
 	<library>setupapi</library>

reactos/dll/win32/netshell/netshell.rbuild

@@ -3,6 +3,7 @@
 	<importlibrary definition="netshell.spec" />
 	<include base="netshell">.</include>
 	<define name="_NETSHELL_" />
+	<redefine name="_WIN32_WINNT">0x600</redefine>
 	<library>shlwapi</library>
 	<library>shell32</library>
 	<library>version</library>

reactos/dll/win32/user32/user32.rbuild

@@ -3,6 +3,7 @@
 	<include base="user32">.</include>
 	<include base="user32">include</include>
 	<include base="ReactOS">include/reactos/subsys</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<library>wine</library>
 	<library>gdi32</library>
 	<library>advapi32</library>

reactos/include/reactos/wine/commctrl.h

@@ -0,0 +1,72 @@
+
+#ifndef _INC_COMMCTRL_WINE
+#define _INC_COMMCTRL_WINE
+
+#define DPA_GetPtr DPA_GetPtr_wine_hack
+#define FlatSB_SetScrollProp FlatSB_SetScrollProp_wine_hack
+
+#if (_WIN32_IE < 0x501)
+#undef _WIN32_IE
+#define _WIN32_IE 0x0501
+#endif
+
+#include_next <commctrl.h>
+
+#undef DPA_GetPtr
+LPVOID WINAPI DPA_GetPtr(HDPA, INT);
+
+#undef FlatSB_SetScrollProp
+BOOL  WINAPI FlatSB_SetScrollProp(HWND, UINT, INT, BOOL);
+
+#define DRAGLISTMSGSTRINGA      "commctrl_DragListMsg"
+#if defined(__GNUC__)
+# define DRAGLISTMSGSTRINGW (const WCHAR []){ 'c','o','m','m','c','t','r','l', \
+  '_','D','r','a','g','L','i','s','t','M','s','g',0 }
+#elif defined(_MSC_VER)
+# define DRAGLISTMSGSTRINGW     L"commctrl_DragListMsg"
+#else
+static const WCHAR DRAGLISTMSGSTRINGW[] = { 'c','o','m','m','c','t','r','l',
+  '_','D','r','a','g','L','i','s','t','M','s','g',0 };
+#endif
+
+#define FLATSB_CLASSA         "flatsb_class32"
+#if defined(__GNUC__)
+# define FLATSB_CLASSW (const WCHAR []){ 'f','l','a','t','s','b','_', \
+  'c','l','a','s','s','3','2',0 }
+#elif defined(_MSC_VER)
+# define FLATSB_CLASSW        L"flatsb_class32"
+#else
+static const WCHAR FLATSB_CLASSW[] = { 'f','l','a','t','s','b','_',
+  'c','l','a','s','s','3','2',0 };
+#endif
+
+typedef TBSAVEPARAMSW *LPTBSAVEPARAMSW;
+
+typedef LVFINDINFOA *LPLVFINDINFOA;
+typedef LVFINDINFOW *LPLVFINDINFOW;
+
+#define SB_SETBORDERS (WM_USER+5)
+#define TBSTYLE_EX_UNDOC1 0x00000004 /* similar to TBSTYLE_WRAPABLE */
+
+/* these are undocumented and the names are guesses */
+typedef struct
+{
+    NMHDR hdr;
+    HWND hwndDialog;
+} NMTBINITCUSTOMIZE;
+
+typedef struct
+{
+    NMHDR hdr;
+    INT idNew;
+    INT iDirection; /* left is -1, right is 1 */
+    DWORD dwReason; /* HICF_* */
+} NMTBWRAPHOTITEM;
+
+#define LPNMLVDISPINFO WINELIB_NAME_AW(LPNMLVDISPINFO)
+
+/* undocumented messages in Toolbar */
+#define TB_UNKWN45D              (WM_USER+93)
+#define TB_UNKWN464              (WM_USER+100)
+
+#endif /* _INC_COMMCTRL_WINE */