With the patch appended to this email We can now build most of comctl32 with MS_VC6 and Native headers of SP3
Changelog: Add includes when building on MS_VC with native headers. Change IDC_ARROWA to IDC_ARROW
We still get these warnings after the changes:
G:\src\wine-dev\wine\dlls\comctl32\animate.c(435) : warning C4018: '>=' : signed/unsigned mismatch
G:\src\wine-dev\wine\dlls\comctl32\animate.c(666) : warning C4018: '!=' : signed/unsigned mismatch
G:\src\wine-dev\wine\dlls\comctl32\animate.c(784) : warning C4013: 'COMCTL32_Alloc' undefined; assuming extern returning int
G:\src\wine-dev\wine\dlls\comctl32\animate.c(813) : warning C4013: 'COMCTL32_Free' undefined; assuming extern returning int
G:\src\wine-dev\wine\dlls\comctl32\comboex.c(184) : warning C4550: expression evaluates to a function which is missing an argument list
G:\src\wine-dev\wine\dlls\comctl32\comboex.c(215) : warning C4013: 'COMCTL32_Alloc' undefined; assuming extern returning int
G:\src\wine-dev\wine\dlls\comctl32\comboex.c(231) : warning C4013: 'COMCTL32_Free' undefined; assuming extern returning int
G:\src\wine-dev\wine\dlls\comctl32\comboex.c(410) : warning C4018: '>' : signed/unsigned mismatch
G:\src\wine-dev\wine\dlls\comctl32\comboex.c(1245) : warning C4018: '>=' : signed/unsigned mismatch
G:\src\wine-dev\wine\dlls\comctl32\comboex.c(1644) : warning C4018: '<' : signed/unsigned mismatch
G:\src\wine-dev\wine\dlls\comctl32\comboex.c(2284) : warning C4133: 'function' : incompatible types - from 'char *' to 'const unsigned short *'
G:\src\wine-dev\wine\dlls\comctl32\datetime.c(268) : warning C4018: '<' : signed/unsigned mismatch
G:\src\wine-dev\wine\dlls\comctl32\datetime.c(359) : warning C4013: 'COMCTL32_Alloc' undefined; assuming extern returning int
G:\src\wine-dev\wine\dlls\comctl32\datetime.c(362) : warning C4013: 'COMCTL32_Free' undefined; assuming extern returning int
G:\src\wine-dev\wine\dlls\comctl32\ipaddress.c(163) : warning C4013: 'COMCTL32_Alloc' undefined; assuming extern returning int
G:\src\wine-dev\wine\dlls\comctl32\ipaddress.c(210) : warning C4013: 'COMCTL32_Free' undefined; assuming extern returning int
G:\src\wine-dev\wine\dlls\comctl32\ipaddress.c(567) : warning C4133: 'function' : incompatible types - from 'char *' to 'const unsigned short *'
G:\src\wine-dev\wine\dlls\comctl32\nativefont.c(57) : warning C4013: 'COMCTL32_Alloc' undefined; assuming extern returning int
G:\src\wine-dev\wine\dlls\comctl32\nativefont.c(77) : warning C4013: 'COMCTL32_Free' undefined; assuming extern returning int
G:\src\wine-dev\wine\dlls\comctl32\progress.c(297) : warning C4013: 'COMCTL32_Alloc' undefined; assuming extern returning int
G:\src\wine-dev\wine\dlls\comctl32\progress.c(316) : warning C4013: 'COMCTL32_Free' undefined; assuming extern returning int
G:\src\wine-dev\wine\dlls\comctl32\progress.c(426) : warning C4133: 'function' : incompatible types - from 'char *' to 'const unsigned short *'
Index: animate.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/animate.c,v retrieving revision 1.47 diff -u -r1.47 animate.c --- animate.c 30 Apr 2003 23:59:46 -0000 1.47 +++ animate.c 23 Aug 2003 00:36:54 -0000 @@ -30,7 +30,13 @@
#define COM_NO_WINDOWS_H
#include <string.h>
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
#include "commctrl.h"
#include "vfw.h"
#include "mmsystem.h"
@@ -942,7 +948,7 @@
wndClass.lpfnWndProc = (WNDPROC)ANIMATE_WindowProc;
wndClass.cbClsExtra = 0;
wndClass.cbWndExtra = sizeof(ANIMATE_INFO *);
- wndClass.hCursor = LoadCursorA(0, IDC_ARROWA);
+ wndClass.hCursor = LoadCursorA(0, IDC_ARROW);
wndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
wndClass.lpszClassName = ANIMATE_CLASSA;Index: comboex.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/comboex.c,v retrieving revision 1.63 diff -u -r1.63 comboex.c --- comboex.c 8 Jan 2003 21:09:28 -0000 1.63 +++ comboex.c 23 Aug 2003 00:53:42 -0000 @@ -31,7 +31,13 @@ */
#include <string.h>
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
#include "commctrl.h"
#include "wine/debug.h"
#include "wine/unicode.h"
@@ -2275,7 +2281,7 @@
wndClass.lpfnWndProc = (WNDPROC)COMBOEX_WindowProc;
wndClass.cbClsExtra = 0;
wndClass.cbWndExtra = sizeof(COMBOEX_INFO *);
- wndClass.hCursor = LoadCursorW (0, IDC_ARROWW);
+ wndClass.hCursor = LoadCursorW (0, IDC_ARROW);
wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
wndClass.lpszClassName = WC_COMBOBOXEXW;Index: datetime.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/datetime.c,v retrieving revision 1.37 diff -u -r1.37 datetime.c --- datetime.c 13 May 2003 22:04:40 -0000 1.37 +++ datetime.c 23 Aug 2003 00:55:52 -0000 @@ -28,9 +28,14 @@ #include <math.h> #include <string.h> #include <stdio.h> +#include <stdarg.h>
+#include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "winnls.h" #include "commctrl.h" #include "wine/debug.h"
@@ -1352,7 +1357,7 @@
wndClass.lpfnWndProc = (WNDPROC)DATETIME_WindowProc;
wndClass.cbClsExtra = 0;
wndClass.cbWndExtra = sizeof(DATETIME_INFO *);
- wndClass.hCursor = LoadCursorA (0, IDC_ARROWA);
+ wndClass.hCursor = LoadCursorA (0, IDC_ARROW);
wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
wndClass.lpszClassName = DATETIMEPICK_CLASSA;Index: ipaddress.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/ipaddress.c,v retrieving revision 1.30 diff -u -r1.30 ipaddress.c --- ipaddress.c 2 Dec 2002 18:11:00 -0000 1.30 +++ ipaddress.c 23 Aug 2003 01:01:05 -0000 @@ -36,8 +36,13 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <stdarg.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
#include "commctrl.h"
#include "wine/unicode.h"
#include "wine/debug.h"
@@ -559,7 +564,7 @@
wndClass.lpfnWndProc = (WNDPROC)IPADDRESS_WindowProc;
wndClass.cbClsExtra = 0;
wndClass.cbWndExtra = sizeof(IPADDRESS_INFO *);
- wndClass.hCursor = LoadCursorW (0, IDC_IBEAMW);
+ wndClass.hCursor = LoadCursorW (0, IDC_IBEAM);
wndClass.hbrBackground = GetStockObject(WHITE_BRUSH);
wndClass.lpszClassName = WC_IPADDRESSW;Index: nativefont.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/nativefont.c,v retrieving revision 1.17 diff -u -r1.17 nativefont.c --- nativefont.c 2 Dec 2002 18:10:59 -0000 1.17 +++ nativefont.c 23 Aug 2003 01:04:26 -0000 @@ -28,7 +28,13 @@ */
#include <string.h> +#include <stdarg.h> + +#include "windef.h" #include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" #include "commctrl.h" #include "wine/debug.h"
@@ -120,7 +126,7 @@
wndClass.lpfnWndProc = (WNDPROC)NATIVEFONT_WindowProc;
wndClass.cbClsExtra = 0;
wndClass.cbWndExtra = sizeof(NATIVEFONT_INFO *);
- wndClass.hCursor = LoadCursorA (0, IDC_ARROWA);
+ wndClass.hCursor = LoadCursorA (0, IDC_ARROW);
wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
wndClass.lpszClassName = WC_NATIVEFONTCTLA;Index: progress.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/progress.c,v retrieving revision 1.31 diff -u -r1.31 progress.c --- progress.c 11 May 2003 02:38:05 -0000 1.31 +++ progress.c 23 Aug 2003 01:11:22 -0000 @@ -33,7 +33,13 @@ */
#include <string.h> +#include <stdarg.h> + +#include "windef.h" #include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" #include "commctrl.h" #include "wine/debug.h"
@@ -417,7 +423,7 @@
wndClass.lpfnWndProc = (WNDPROC)ProgressWindowProc;
wndClass.cbClsExtra = 0;
wndClass.cbWndExtra = sizeof (PROGRESS_INFO *);
- wndClass.hCursor = LoadCursorW (0, IDC_ARROWW);
+ wndClass.hCursor = LoadCursorW (0, IDC_ARROW);
wndClass.lpszClassName = PROGRESS_CLASSW;RegisterClassW (&wndClass);
