[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

Author: cgutman

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>