From c2a1063940a1c3ef9b393328c38955976af456db Mon Sep 17 00:00:00 2001 From: James Juran Date: Thu, 28 Jan 1999 16:33:44 +0000 Subject: [PATCH] Commented out unused variables to prevent needless compiler warnings. --- dlls/comctl32/animate.c | 4 ++-- dlls/comctl32/comboex.c | 4 ++-- dlls/comctl32/comctl32undoc.c | 18 +++++++++--------- dlls/comctl32/hotkey.c | 10 +++++----- dlls/comctl32/ipaddress.c | 4 ++-- dlls/comctl32/listview.c | 10 +++++----- dlls/comctl32/pager.c | 4 ++-- dlls/comctl32/propsheet.c | 2 +- dlls/comctl32/rebar.c | 13 +++++++------ dlls/comctl32/tab.c | 2 +- dlls/comctl32/toolbar.c | 6 ++++-- dlls/comctl32/treeview.c | 2 +- graphics/vga.c | 3 ++- msdos/dpmi.c | 6 ++++-- multimedia/dplay.c | 2 +- multimedia/mmio.c | 12 ++++++------ 16 files changed, 54 insertions(+), 48 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index 2e23a95c03b..fc501592588 100644 --- a/dlls/comctl32/animate.c +++ b/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 */ diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index bc0a2d13436..b04951a78ad 100644 --- a/dlls/comctl32/comboex.c +++ b/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); diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index bd259b95e62..cd1759937d1 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/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; diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index 63c582d4365..be2c3296f0d 100644 --- a/dlls/comctl32/hotkey.c +++ b/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); diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 1946a376555..0e83d0291d8 100644 --- a/dlls/comctl32/ipaddress.c +++ b/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; diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ddb002a1873..6e2319946be 100644 --- a/dlls/comctl32/listview.c +++ b/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"); diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index acd53b6565a..979eca1b705 100644 --- a/dlls/comctl32/pager.c +++ b/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"); diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index d4bd829b478..8e9c767a282 100644 --- a/dlls/comctl32/propsheet.c +++ b/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: diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 271271a0146..006f92c8c70 100644 --- a/dlls/comctl32/rebar.c +++ b/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) { diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 3013065f3e2..128d41b6eb1 100644 --- a/dlls/comctl32/tab.c +++ b/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; diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 7ccf5b31fc9..816e3b04aea 100644 --- a/dlls/comctl32/toolbar.c +++ b/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; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 24049821d21..dd982b8fa36 100644 --- a/dlls/comctl32/treeview.c +++ b/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) ); diff --git a/graphics/vga.c b/graphics/vga.c index a194af913c4..687ffdccdaa 100644 --- a/graphics/vga.c +++ b/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) { diff --git a/msdos/dpmi.c b/msdos/dpmi.c index 1d0c223a971..7ec8e2e70cd 100644 --- a/msdos/dpmi.c +++ b/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() ); diff --git a/multimedia/dplay.c b/multimedia/dplay.c index f460f8ad43a..ce887db6f3e 100644 --- a/multimedia/dplay.c +++ b/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 ); diff --git a/multimedia/mmio.c b/multimedia/mmio.c index 2c37428480c..eda159ba691 100644 --- a/multimedia/mmio.c +++ b/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; -- 2.11.4.GIT