[ros-kernel] patch for fixing warnings in comctl32

[Jonathan Wilson]

This patch makes comctl32 build with -Wall -Werror
-------------- next part --------------
Index: apps/tests/rpcrt4/makefile
===================================================================
RCS file: /CVS/ReactOS/reactos/apps/tests/rpcrt4/makefile,v
retrieving revision 1.1
diff -u -w -r1.1 makefile
--- apps/tests/rpcrt4/makefile	18 Nov 2003 22:08:11 -0000	1.1
+++ apps/tests/rpcrt4/makefile	30 Nov 2003 23:18:58 -0000
@@ -9,7 +9,7 @@
 TARGET_APPTYPE = console
 
 # require os code to explicitly request A/W version of structs/functions
-TARGET_CFLAGS += -D_DISABLE_TIDENTS -D__USE_W32API
+TARGET_CFLAGS += -D_DISABLE_TIDENTS -D__USE_W32API -Wall -Werror
 
 TARGET_NAME = rpcrt4_test
 
Index: apps/tests/user32/makefile
===================================================================
RCS file: /CVS/ReactOS/reactos/apps/tests/user32/makefile,v
retrieving revision 1.1
diff -u -w -r1.1 makefile
--- apps/tests/user32/makefile	18 Nov 2003 22:24:42 -0000	1.1
+++ apps/tests/user32/makefile	30 Nov 2003 23:19:00 -0000
@@ -9,7 +9,7 @@
 TARGET_APPTYPE = console
 
 # require os code to explicitly request A/W version of structs/functions
-TARGET_CFLAGS += -D_DISABLE_TIDENTS -D__USE_W32API
+TARGET_CFLAGS += -D_DISABLE_TIDENTS -D__USE_W32API -Wall -Werror
 
 TARGET_NAME = user32_test
 
Index: include/wine/prsht.h
===================================================================
RCS file: /CVS/ReactOS/reactos/include/wine/prsht.h,v
retrieving revision 1.1
diff -u -w -r1.1 prsht.h
--- include/wine/prsht.h	5 Oct 2003 21:26:59 -0000	1.1
+++ include/wine/prsht.h	30 Nov 2003 23:19:19 -0000
@@ -168,7 +168,7 @@
 	LPCWSTR pszHeaderSubTitle;
 #endif
 } PROPSHEETPAGEW,*LPPROPSHEETPAGEW;
-typedef const PROPSHEETPAGEA *LPCPROPSHEETPAGEW;
+typedef const PROPSHEETPAGEW *LPCPROPSHEETPAGEW;
 typedef UINT(CALLBACK *LPFNPSPCALLBACKA)(HWND,UINT,LPPROPSHEETPAGEA);
 typedef UINT(CALLBACK *LPFNPSPCALLBACKW)(HWND,UINT,LPPROPSHEETPAGEW);
 typedef int(CALLBACK *PFNPROPSHEETCALLBACK)(HWND,UINT,LPARAM);
Index: lib/comctl32/animate.c
===================================================================
RCS file: /CVS/ReactOS/reactos/lib/comctl32/animate.c,v
retrieving revision 1.2
diff -u -w -r1.2 animate.c
--- lib/comctl32/animate.c	6 Oct 2003 16:13:26 -0000	1.2
+++ lib/comctl32/animate.c	30 Nov 2003 23:19:26 -0000
@@ -540,7 +540,7 @@
     TRACE("ash.dwSuggestedBufferSize=%ld\n", 	infoPtr->ash.dwSuggestedBufferSize);
     TRACE("ash.dwQuality=%ld\n", 		infoPtr->ash.dwQuality);
     TRACE("ash.dwSampleSize=%ld\n", 		infoPtr->ash.dwSampleSize);
-    TRACE("ash.rcFrame=(%d,%d,%d,%d)\n", 	infoPtr->ash.rcFrame.top, infoPtr->ash.rcFrame.left,
+    TRACE("ash.rcFrame=(%ld,%ld,%ld,%ld)\n", 	infoPtr->ash.rcFrame.top, infoPtr->ash.rcFrame.left,
 	  infoPtr->ash.rcFrame.bottom, infoPtr->ash.rcFrame.right);
 
     mmioAscend(infoPtr->hMMio, &mmckInfo, 0);
Index: lib/comctl32/comboex.c
===================================================================
RCS file: /CVS/ReactOS/reactos/lib/comctl32/comboex.c,v
retrieving revision 1.2
diff -u -w -r1.2 comboex.c
--- lib/comctl32/comboex.c	6 Oct 2003 16:13:26 -0000	1.2
+++ lib/comctl32/comboex.c	30 Nov 2003 23:19:40 -0000
@@ -1239,7 +1239,7 @@
     NMCOMBOBOXEXW nmcit;
     UINT i;
 
-    TRACE("CtlType=%08x, CtlID=%08x, itemID=%08x, hwnd=%p, data=%08lx\n",
+    TRACE("CtlType=%08x, CtlID=%08x, itemID=%08x, hwnd=%p, data=%08x\n",
 	  dis->CtlType, dis->CtlID, dis->itemID, dis->hwndItem, dis->itemData);
 
     if (dis->itemID >= infoPtr->nb_items) return FALSE;
Index: lib/comctl32/makefile
===================================================================
RCS file: /CVS/ReactOS/reactos/lib/comctl32/makefile,v
retrieving revision 1.2
diff -u -w -r1.2 makefile
--- lib/comctl32/makefile	6 Oct 2003 15:54:29 -0000	1.2
+++ lib/comctl32/makefile	30 Nov 2003 23:19:40 -0000
@@ -23,7 +23,9 @@
 	-D_WIN32_WINNT=0x501 \
 	-DWINVER=0x501 \
 	-DCOBJMACROS \
-	-D__need_offsetof
+        -D__need_offsetof \
+        -Wall \
+        -Werror
 	
 TARGET_CFLAGS += \
 	$(DEFINES) \
Index: lib/comctl32/tab.c
===================================================================
RCS file: /CVS/ReactOS/reactos/lib/comctl32/tab.c,v
retrieving revision 1.3
diff -u -w -r1.3 tab.c
--- lib/comctl32/tab.c	21 Nov 2003 21:14:56 -0000	1.3
+++ lib/comctl32/tab.c	30 Nov 2003 23:19:59 -0000
@@ -149,7 +149,7 @@
 TAB_DumpItemExternalA(TCITEMA *pti, UINT iItem)
 {
     if (TRACE_ON(tab)) {
-	TRACE("external tab %d, mask=0x%08x, dwState=0x%08x, dwStateMask=0x%08x, cchTextMax=0x%08x\n",
+	TRACE("external tab %d, mask=0x%08x, dwState=0x%08lx, dwStateMask=0x%08lx, cchTextMax=0x%08x\n",
 	      iItem, pti->mask, pti->dwState, pti->dwStateMask, pti->cchTextMax);
 	TRACE("external tab %d,   iImage=%d, lParam=0x%08lx, pszTextA=%s\n",
 	      iItem, pti->iImage, pti->lParam, debugstr_a(pti->pszText));