Commented out unused variables to prevent needless compiler warnings.

dlls/comctl32/animate.c

@@ -158,7 +158,7 @@ ANIMATE_Open32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 static LRESULT
 ANIMATE_Play (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-    ANIMATE_INFO *infoPtr = ANIMATE_GetInfoPtr(wndPtr);
+    /* ANIMATE_INFO *infoPtr = ANIMATE_GetInfoPtr(wndPtr); */
     INT32 nFrom   = (INT32)LOWORD(lParam);
     INT32 nTo     = (INT32)HIWORD(lParam);
     INT32 nRepeat = (INT32)wParam;
@@ -190,7 +190,7 @@ ANIMATE_Play (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 static LRESULT
 ANIMATE_Stop (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-    ANIMATE_INFO *infoPtr = ANIMATE_GetInfoPtr(wndPtr);
+    /* ANIMATE_INFO *infoPtr = ANIMATE_GetInfoPtr(wndPtr); */
 
 #if 0
     /* nothing opened */

dlls/comctl32/comboex.c

@@ -80,7 +80,7 @@ COMBOEX_GetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 static LRESULT
 COMBOEX_InsertItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr(wndPtr);
+    /* COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr(wndPtr); */
 
     FIXME (comboex, "(0x%08x 0x%08lx)\n", wParam, lParam);
 
@@ -129,7 +129,7 @@ COMBOEX_SetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 static LRESULT
 COMBOEX_SetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr(wndPtr);
+    /* COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr(wndPtr); */
 
     FIXME (comboex, "(%p): stub\n", (LPVOID)lParam);
 

dlls/comctl32/comctl32undoc.c

@@ -54,7 +54,7 @@ BOOL32 WINAPI
 DPA_Merge (const HDPA hdpa1, const HDPA hdpa2, DWORD dwFlags,
 	   PFNDPACOMPARE pfnCompare, LPVOID pfnParam5, LPARAM lParam)
 {
-    LPVOID *pWork1, *pWork2;
+    /* LPVOID *pWork1, *pWork2; */
     INT32  nCount1, nCount2;
 
     TRACE (commctrl, "(%p %p %08lx %p %p %08lx): stub!\n",
@@ -318,14 +318,14 @@ FindMRUData (DWORD dwParam1, DWORD dwParam2, DWORD dwParam3, DWORD dwParam4)
 LPVOID WINAPI
 CreateMRUListLazy32A (LPMRUINFO lpmi, DWORD dwParam2, DWORD dwParam3, DWORD dwParam4)
 {
-    DWORD  dwLocal1;
-    HKEY   hkeyResult;
-    DWORD  dwLocal3;
-    LPVOID lMRU;
-    DWORD  dwLocal5;
-    DWORD  dwLocal6;
-    DWORD  dwLocal7;
-    DWORD  dwDisposition;
+    /* DWORD  dwLocal1;   *
+     * HKEY   hkeyResult; *
+     * DWORD  dwLocal3;   *
+     * LPVOID lMRU;       *
+     * DWORD  dwLocal5;   *
+     * DWORD  dwLocal6;   *
+     * DWORD  dwLocal7;   *
+     * DWORD  dwDisposition; */
 
     /* internal variables */
     LPVOID ptr;

dlls/comctl32/hotkey.c

@@ -83,7 +83,7 @@ HOTKEY_Destroy (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 static LRESULT
 HOTKEY_EraseBackground (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-    HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr);
+    /* HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr); */
     HBRUSH32 hBrush;
     RECT32   rc;
 
@@ -112,7 +112,7 @@ HOTKEY_GetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 static LRESULT
 HOTKEY_KeyDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-    HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr);
+    /* HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr); */
 
     switch (wParam) {
 	case VK_RETURN:
@@ -141,7 +141,7 @@ HOTKEY_KeyDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 static LRESULT
 HOTKEY_KeyUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-    HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr);
+    /* HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr); */
 
     FIXME (hotkey, " %d\n", wParam);
 
@@ -237,7 +237,7 @@ HOTKEY_SetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 static LRESULT
 HOTKEY_SysKeyDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-    HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr);
+    /* HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr); */
 
     switch (wParam) {
 	case VK_RETURN:
@@ -266,7 +266,7 @@ HOTKEY_SysKeyDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 static LRESULT
 HOTKEY_SysKeyUp (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-    HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr);
+    /* HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr); */
 
     FIXME (hotkey, " %d\n", wParam);
 

dlls/comctl32/ipaddress.c

@@ -207,7 +207,7 @@ IPADDRESS_SetFocus (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 static LRESULT
 IPADDRESS_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-    IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr(wndPtr);
+    /* IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr(wndPtr); */
 	TRACE (ipaddress,"\n");
     return 0;
 }
@@ -371,7 +371,7 @@ IPADDRESS_SetAddress (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 static LRESULT
 IPADDRESS_SetFocusToField (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-    IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr(wndPtr);
+    /* IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr(wndPtr); */
 	LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO)
             GetProp32A ((HWND32)wndPtr->hwndSelf,IP_SUBCLASS_PROP);
 	INT32 index;

dlls/comctl32/listview.c

@@ -96,7 +96,7 @@ static LRESULT
 LISTVIEW_DeleteColumn (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
     LISTVIEW_INFO *infoPtr = LISTVIEW_GetInfoPtr(wndPtr);
-    INT32 nColumn = (INT32)wParam;
+    /* INT32 nColumn = (INT32)wParam; */
 
     /* FIXME ??? */
     if (infoPtr->nItemCount > 0)
@@ -445,7 +445,7 @@ LISTVIEW_GetNextItem (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 static LRESULT
 LISTVIEW_GetSelectedCount (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-    LISTVIEW_INFO *infoPtr = LISTVIEW_GetInfoPtr(wndPtr);
+    /* LISTVIEW_INFO *infoPtr = LISTVIEW_GetInfoPtr(wndPtr); */
 
     TRACE (listview, ": empty stub (returns 0)!\n");
 
@@ -1116,7 +1116,7 @@ LISTVIEW_KillFocus (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 static LRESULT
 LISTVIEW_LButtonDblClk (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-    LISTVIEW_INFO *infoPtr = LISTVIEW_GetInfoPtr(wndPtr);
+    /* LISTVIEW_INFO *infoPtr = LISTVIEW_GetInfoPtr(wndPtr); */
     NMLISTVIEW nmlv;
 
     FIXME (listview, "semi stub!\n");
@@ -1238,7 +1238,7 @@ LISTVIEW_Paint (WND *wndPtr, WPARAM32 wParam)
 static LRESULT
 LISTVIEW_RButtonDblClk (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-    LISTVIEW_INFO *infoPtr = LISTVIEW_GetInfoPtr(wndPtr);
+    /* LISTVIEW_INFO *infoPtr = LISTVIEW_GetInfoPtr(wndPtr); */
     NMLISTVIEW nmlv;
 
     FIXME (listview, "semi stub!\n");
@@ -1262,7 +1262,7 @@ LISTVIEW_RButtonDblClk (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 static LRESULT
 LISTVIEW_RButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-    LISTVIEW_INFO *infoPtr = LISTVIEW_GetInfoPtr(wndPtr);
+    /* LISTVIEW_INFO *infoPtr = LISTVIEW_GetInfoPtr(wndPtr); */
     NMLISTVIEW nmlv;
 
     FIXME (listview, "semi stub!\n");

dlls/comctl32/pager.c

@@ -64,7 +64,7 @@ PAGER_GetButtonSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 static LRESULT
 PAGER_GetButtonState (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-    PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr);
+    /* PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr); */
 
     FIXME (pager, "empty stub!\n");
 
@@ -259,7 +259,7 @@ PAGER_EraseBackground (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 static LRESULT
 PAGER_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-    PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr);
+    /* PAGER_INFO *infoPtr = PAGER_GetInfoPtr(wndPtr); */
 
     TRACE (pager, "stub!\n");
 

dlls/comctl32/propsheet.c

@@ -94,7 +94,7 @@ BOOL32 WINAPI DestroyPropertySheetPage32(HPROPSHEETPAGE hPropPage)
 LRESULT WINAPI
 PROPSHEET_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
 {
-    WND *wndPtr = WIN_FindWndPtr(hwnd);
+    /* WND *wndPtr = WIN_FindWndPtr(hwnd); */
 
     switch (uMsg) {
        case PSM_SETCURSEL:

dlls/comctl32/rebar.c

@@ -571,7 +571,7 @@ static LRESULT
 REBAR_GetBandBorders (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
-    LPRECT32 lpRect = (LPRECT32)lParam;
+    /* LPRECT32 lpRect = (LPRECT32)lParam; */
     REBAR_BAND *lpBand;
 
     if (!lParam)
@@ -889,7 +889,7 @@ REBAR_GetUnicodeFormat (WND *wndPtr)
 static LRESULT
 REBAR_HitTest (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-    REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr);
+    /* REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr); */
     LPRBHITTESTINFO lprbht = (LPRBHITTESTINFO)lParam; 
 
     if (!lprbht)
@@ -1761,9 +1761,10 @@ static LRESULT
 REBAR_SetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr(wndPtr);
-    TEXTMETRIC32A tm;
-    HFONT32 hFont, hOldFont;
-    HDC32 hdc;
+    
+    /* TEXTMETRIC32A tm; */
+    HFONT32 hFont /*, hOldFont */;
+    /* HDC32 hdc; */
 
     infoPtr->hFont = (HFONT32)wParam;
 
@@ -1793,7 +1794,7 @@ REBAR_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr(wndPtr);
     RECT32 rcParent;
-    INT32 x, y, cx, cy;
+    /* INT32 x, y, cx, cy; */
 
     /* auto resize deadlock check */
     if (infoPtr->bAutoResize) {

dlls/comctl32/tab.c

@@ -404,7 +404,7 @@ TAB_GetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 static LRESULT 
 TAB_DeleteItem (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
 {
-   TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr);
+    /* TAB_INFO *infoPtr = TAB_GetInfoPtr(wndPtr); */
 
 	FIXME (tab,"stub \n");
 	return TRUE;

dlls/comctl32/toolbar.c

@@ -885,7 +885,8 @@ TOOLBAR_AutoSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     RECT32 parent_rect;
     HWND32 parent;
-    INT32  x, y, cx, cy;
+    /* INT32  x, y; */
+    INT32  cx, cy;
     UINT32 uPosFlags = 0;
 
     TRACE (toolbar, "resize forced!\n");
@@ -2534,7 +2535,8 @@ TOOLBAR_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(wndPtr);
     RECT32 parent_rect;
     HWND32 parent;
-    INT32  x, y, cx, cy;
+    /* INT32  x, y; */
+    INT32  cx, cy;
     INT32  flags;
     UINT32 uPosFlags = 0;
 

dlls/comctl32/treeview.c

@@ -348,7 +348,7 @@ TREEVIEW_DrawItem (WND *wndPtr, HDC32 hdc, TREEVIEW_ITEM *wineItem,
   INT32  oldBkMode,center,xpos;
   COLORREF oldBkColor;
   UINT32 uTextJustify = DT_LEFT;
-  HPEN32 hOldPen, hnewPen,hRootPen;
+  HPEN32 hOldPen, hnewPen /* ,hRootPen */ ;
   RECT32 r,upper;
   
   hnewPen = CreatePen32(PS_DOT, 0, GetSysColor32(COLOR_WINDOWTEXT) );

graphics/vga.c

@@ -129,7 +129,8 @@ void VGA_Poll( WORD timer )
     char *dat;
     unsigned Pitch,Height,Width;
     char *surf;
-    int Y,X;
+    int Y;
+    /* int X; */
 
     EnterCriticalSection(&vga_crit);
     if (!vga_polling) {

msdos/dpmi.c

@@ -260,14 +260,16 @@ static void DPMI_CallRMCBProc( CONTEXT *context, RMCB *rmcb, WORD flag )
 int DPMI_CallRMProc( CONTEXT *context, LPWORD stack, int args, int iret )
 {
     LPWORD stack16;
+#ifndef MZ_SUPPORTED
     THDB *thdb = THREAD_Current();
+    WORD sel;
+    SEGPTR seg_addr;
+#endif /* !MZ_SUPPORTED */
     LPVOID addr = NULL; /* avoid gcc warning */
     TDB *pTask = (TDB *)GlobalLock16( GetCurrentTask() );
     NE_MODULE *pModule = pTask ? NE_GetPtr( pTask->hModule ) : NULL;
     RMCB *CurrRMCB;
     int alloc = 0, already = 0;
-    WORD sel;
-    SEGPTR seg_addr;
 
     GlobalUnlock16( GetCurrentTask() );
 

multimedia/dplay.c

@@ -1278,7 +1278,7 @@ HRESULT WINAPI DirectPlayEnumerateA( LPDPENUMDPCALLBACKA lpEnumCallback,
     GUID     serviceProviderGUID;
     DWORD    returnTypeGUID, returnTypeReserved1, sizeOfReturnBuffer=50;
     char     returnBuffer[51];
-    DWORD    majVersionNum, minVersionNum;
+    DWORD    majVersionNum /*, minVersionNum */;
     LPWSTR   lpWGUIDString; 
 
     TRACE( dplay, " this time through: %s\n", subKeyName );

multimedia/mmio.c

@@ -197,8 +197,8 @@ static LRESULT mmioMemIOProc(LPMMIOINFO16 lpmmioinfo, UINT16 uMessage, LPARAM lP
 			 * NOTE: lDiskOffset should be updated
 			 */
 
-			HPSTR pch = (HPSTR) lParam1;
-			LONG cch = (LONG) lParam2;
+			/* HPSTR pch = (HPSTR) lParam1; */
+			/* LONG cch = (LONG) lParam2; */
 
 			FIXME(mmio,"MMIOM_READ on memory files should not occur, buffer may be lost!\n");
 			return 0;
@@ -216,8 +216,8 @@ static LRESULT mmioMemIOProc(LPMMIOINFO16 lpmmioinfo, UINT16 uMessage, LPARAM lP
 			 * NOTE: lDiskOffset should be updated
 			 */
 
-			HPSTR pch = (HPSTR) lParam1;
-			LONG cch = (LONG) lParam2;
+			/* HPSTR pch = (HPSTR) lParam1; */
+			/* LONG cch = (LONG) lParam2; */
 
 			FIXME(mmio,"MMIOM_WRITE on memory files should not occur, buffer may be lost!\n");
 			return 0;
@@ -231,8 +231,8 @@ static LRESULT mmioMemIOProc(LPMMIOINFO16 lpmmioinfo, UINT16 uMessage, LPARAM lP
 			 * NOTE: lDiskOffset should be updated
 			 */
 
-			LONG Offset = (LONG) lParam1; 
-			LONG Whence = (LONG) lParam2; 
+			/* LONG Offset = (LONG) lParam1; */
+			/* LONG Whence = (LONG) lParam2; */
 
 			FIXME(mmio,"MMIOM_SEEK on memory files should not occur, buffer may be lost!\n");
 			return -1;