[ros-diffs] [dgorbachev] 53800: [Desk|User32|UXTheme] Silence GCC 4.6 "variable 'foo' set but not used [-Werror=unused-but-set-variable]" warnings/errors.

Author: dgorbachev
Date: Thu Sep 22 06:09:11 2011
New Revision: 53800

URL: http://svn.reactos.org/svn/reactos?rev=53800&view=rev
Log:
[Desk|User32|UXTheme]
Silence GCC 4.6 "variable 'foo' set but not used
[-Werror=unused-but-set-variable]" warnings/errors.

Modified:
    trunk/reactos/dll/cpl/desk/advmon.c
    trunk/reactos/dll/cpl/desk/appearance.c
    trunk/reactos/dll/cpl/desk/draw.c
    trunk/reactos/dll/cpl/desk/monslctl.c
    trunk/reactos/dll/win32/user32/windows/hook.c
    trunk/reactos/dll/win32/uxtheme/draw.c
    trunk/reactos/dll/win32/uxtheme/nonclient.c

Modified: trunk/reactos/dll/cpl/desk/advmon.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advmon.c?rev=…
==============================================================================
--- trunk/reactos/dll/cpl/desk/advmon.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/advmon.c [iso-8859-1] Thu Sep 22 06:09:11 2011
@@ -88,11 +88,8 @@
     IDataObject *pdo;
 #ifdef _MSC_VER
     HMODULE hShell32 = NULL;
+    CPSEAE msvc_SHCreatePropSheetExtArrayEx;
 #endif
-    CPSEAE msvc_SHCreatePropSheetExtArrayEx;
-
-    /* silence gcc warning */
-    msvc_SHCreatePropSheetExtArrayEx = NULL;
 
     /* FIXME: Build the "%s and %s" caption string for the monitor and adapter
name */
     szCaption[0] = _T('\0');

Modified: trunk/reactos/dll/cpl/desk/appearance.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?…
==============================================================================
--- trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] Thu Sep 22 06:09:11 2011
@@ -53,7 +53,7 @@
 static INT_PTR
 AppearancePage_OnInit(HWND hwndDlg)
 {
-	INT i, TemplateCount, iListIndex;
+	INT i, /*TemplateCount,*/ iListIndex;
 	HWND hwndColor, hwndTheme;
 	GLOBALS *g;
 
@@ -74,7 +74,7 @@
 
 	LoadThemes(g);
 
-	TemplateCount = LoadSchemePresetEntries(g->strSelectedStyle);
+	/*TemplateCount = */ LoadSchemePresetEntries(g->strSelectedStyle);
 
 	hwndColor = GetDlgItem(hwndDlg, IDC_APPEARANCE_COLORSCHEME);
 	g->SchemeId = -1;

Modified: trunk/reactos/dll/cpl/desk/draw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/draw.c?rev=53…
==============================================================================
--- trunk/reactos/dll/cpl/desk/draw.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/draw.c [iso-8859-1] Thu Sep 22 06:09:11 2011
@@ -437,18 +437,18 @@
 BOOL
 MyDrawCaptionTemp(HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, HICON hIcon, LPCWSTR
str, UINT uFlags, COLOR_SCHEME *scheme)
 {
-	ULONG Height;
-	UINT VCenter, Padding;
-	LONG ButtonWidth;
+	//ULONG Height;
+	//UINT VCenter, Padding;
+	//LONG ButtonWidth;
 	HBRUSH hbr;
 	HGDIOBJ hFontOld;
-    RECT rc;
-
-	Height = scheme->Size[SIZE_CAPTION_Y] - 1;
-	VCenter = (rect->bottom - rect->top) / 2;
-	Padding = VCenter - (Height / 2);
-
-	ButtonWidth = scheme->Size[SIZE_SIZE_X] - 2;
+	RECT rc;
+
+	//Height = scheme->Size[SIZE_CAPTION_Y] - 1;
+	//VCenter = (rect->bottom - rect->top) / 2;
+	//Padding = VCenter - (Height / 2);
+
+	//ButtonWidth = scheme->Size[SIZE_SIZE_X] - 2;
 
 	if (uFlags & DC_GRADIENT)
 	{

Modified: trunk/reactos/dll/cpl/desk/monslctl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.c?re…
==============================================================================
--- trunk/reactos/dll/cpl/desk/monslctl.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/monslctl.c [iso-8859-1] Thu Sep 22 06:09:11 2011
@@ -684,7 +684,7 @@
     SIZE rcsize;
     LOGFONT lf;
     HFONT hPrevFont, hFont;
-    INT len;
+    //INT len;
 
     hFont = infoPtr->Monitors[Index].hFont;
     if (hFont == NULL &&
@@ -698,7 +698,7 @@
                     (2 * infoPtr->SelectionFrame.cy) - 2;
         rcsize.cy = (rcsize.cy * 60) / 100;
 
-        len = _tcslen(infoPtr->Monitors[Index].szCaption);
+        //len = _tcslen(infoPtr->Monitors[Index].szCaption);
 
         hPrevFont = SelectObject(hDC,
                                  infoPtr->hFont);

Modified: trunk/reactos/dll/win32/user32/windows/hook.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Thu Sep 22 06:09:11 2011
@@ -434,7 +434,7 @@
 {
     HINSTANCE hLibrary;
     PVOID pInitFunction;
-    NTSTATUS Status;
+    //NTSTATUS Status;
     ANSI_STRING InitFuncName;
     BOOL Result = FALSE;
 
@@ -467,7 +467,7 @@
         /* Initialize the user api hook */
         ASSERT(pstrInitFunc->Buffer);
 
-        Status = RtlUnicodeStringToAnsiString(&InitFuncName, 
+        /*Status = */ RtlUnicodeStringToAnsiString(&InitFuncName, 
                                               pstrInitFunc,
                                               TRUE);
 

Modified: trunk/reactos/dll/win32/uxtheme/draw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Thu Sep 22 06:09:11 2011
@@ -1756,8 +1756,8 @@
 static HRGN UXTHEME_RegionFromDibBits(RGBQUAD* pBuffer, RGBQUAD* pclrTransparent, LPCRECT
pRect)
 {
     int x, y, xstart;
+#ifdef EXTCREATEREGION_WORKS
     int cMaxRgnRects, cRgnDataSize, cRgnRects;
-#ifdef EXTCREATEREGION_WORKS
     RECT* prcCurrent;
     PRGNDATA prgnData;
 #else
@@ -1769,12 +1769,12 @@
     pclrCurrent = (PULONG)pBuffer;
     clrTransparent = *(PULONG)pclrTransparent;
 
+#ifdef EXTCREATEREGION_WORKS
     /* Create a region and pre-allocate memory enough for 3 spaces in one row*/
     cRgnRects = 0;
     cMaxRgnRects = 4* (pRect->bottom-pRect->top);
     cRgnDataSize = sizeof(RGNDATA) + cMaxRgnRects * sizeof(RECT);
 
-#ifdef EXTCREATEREGION_WORKS
     /* Allocate the region data */
     prgnData = (PRGNDATA)HeapAlloc(GetProcessHeap(), 0, cRgnDataSize);
 

Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Thu Sep 22 06:09:11 2011
@@ -736,7 +736,7 @@
 ThemeHandleButton(HWND hWnd, WPARAM wParam)
 {
     MSG Msg;
-    BOOL Pressed = TRUE, OldState;
+    BOOL Pressed = TRUE; // , OldState;
     WPARAM SCMsg, ht;
     ULONG Style;
     DRAW_CONTEXT context;
@@ -779,7 +779,7 @@
         if (Msg.message != WM_MOUSEMOVE)
             continue;
 
-        OldState = Pressed;
+        //OldState = Pressed;
         ht = SendMessage(hWnd, WM_NCHITTEST, 0, MAKELPARAM(Msg.pt.x, Msg.pt.y));
         Pressed = (ht == wParam);