From ab7af13705d77b5af2510545bd13c693ffb61c31 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 12 Jul 2004 19:50:56 +0000 Subject: [PATCH] Fixed double applet = applet = assignment. Removed sic_hdpa only used in 1 C file as static var. Make VT_Shell_IMalloc32 and related variables static. --- dlls/shell32/control.c | 4 ++-- dlls/shell32/shell32_main.h | 1 - dlls/shell32/shellole.c | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 2a482419274..3f7a9404ad0 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -171,7 +171,7 @@ static BOOL Control_Localize(const CPanel* panel, unsigned cx, unsigned cy, RECT rc; GetClientRect(panel->hWnd, &rc); - for (applet = panel->first; applet; applet = applet = applet->next) { + for (applet = panel->first; applet; applet = applet->next) { for (i = 0; i < applet->count; i++) { if (!applet->info[i].dwSize) continue; if (x + XSTEP >= rc.right - rc.left) { @@ -201,7 +201,7 @@ static LRESULT Control_WndProc_Paint(const CPanel* panel, WPARAM wParam) hdc = (wParam) ? (HDC)wParam : BeginPaint(panel->hWnd, &ps); hOldFont = SelectObject(hdc, GetStockObject(ANSI_VAR_FONT)); GetClientRect(panel->hWnd, &rc); - for (applet = panel->first; applet; applet = applet = applet->next) { + for (applet = panel->first; applet; applet = applet->next) { for (i = 0; i < applet->count; i++) { if (x + XSTEP >= rc.right - rc.left) { x = 0; diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 3a44fee2688..d468eb18524 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -44,7 +44,6 @@ extern HMODULE huser32; extern HINSTANCE shell32_hInstance; extern HIMAGELIST ShellSmallIconList; extern HIMAGELIST ShellBigIconList; -extern HDPA sic_hdpa; BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList); diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 365504a9e4d..85b482d27cc 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -274,7 +274,7 @@ DWORD WINAPI SHCLSIDFromStringAW (LPVOID clsid, CLSID *id) */ /* set the vtable later */ -extern ICOM_VTABLE(IMalloc) VT_Shell_IMalloc32; +static ICOM_VTABLE(IMalloc) VT_Shell_IMalloc32; /* this is the static object instance */ typedef struct { @@ -282,10 +282,10 @@ typedef struct { DWORD dummy; } _ShellMalloc; -_ShellMalloc Shell_Malloc = { &VT_Shell_IMalloc32,1}; +static _ShellMalloc Shell_Malloc = { &VT_Shell_IMalloc32,1}; /* this is the global allocator of shell32 */ -IMalloc * ShellTaskAllocator = NULL; +static IMalloc * ShellTaskAllocator = NULL; /****************************************************************************** * IShellMalloc_QueryInterface [VTABLE]