Skip to content

W
wine-cw
Commit ab7af137 authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard
Browse files
Options

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.
parent ada760f0
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
dlls/shell32/control.c
View file @ ab7af137
...@@ -171,7 +171,7 @@ static BOOL Control_Localize(const CPanel* panel, unsigned cx, unsigned cy, ...@@ -171,7 +171,7 @@ static BOOL Control_Localize(const CPanel* panel, unsigned cx, unsigned cy,
RECT rc; RECT rc;
GetClientRect(panel->hWnd, &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++) { for (i = 0; i < applet->count; i++) {
if (!applet->info[i].dwSize) continue; if (!applet->info[i].dwSize) continue;
if (x + XSTEP >= rc.right - rc.left) { if (x + XSTEP >= rc.right - rc.left) {
...@@ -201,7 +201,7 @@ static LRESULT Control_WndProc_Paint(const CPanel* panel, WPARAM wParam) ...@@ -201,7 +201,7 @@ static LRESULT Control_WndProc_Paint(const CPanel* panel, WPARAM wParam)
hdc = (wParam) ? (HDC)wParam : BeginPaint(panel->hWnd, &ps); hdc = (wParam) ? (HDC)wParam : BeginPaint(panel->hWnd, &ps);
hOldFont = SelectObject(hdc, GetStockObject(ANSI_VAR_FONT)); hOldFont = SelectObject(hdc, GetStockObject(ANSI_VAR_FONT));
GetClientRect(panel->hWnd, &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++) { for (i = 0; i < applet->count; i++) {
if (x + XSTEP >= rc.right - rc.left) { if (x + XSTEP >= rc.right - rc.left) {
x = 0; x = 0;
......
dlls/shell32/shell32_main.h
View file @ ab7af137
...@@ -44,7 +44,6 @@ extern HMODULE huser32; ...@@ -44,7 +44,6 @@ extern HMODULE huser32;
extern HINSTANCE shell32_hInstance; extern HINSTANCE shell32_hInstance;
extern HIMAGELIST ShellSmallIconList; extern HIMAGELIST ShellSmallIconList;
extern HIMAGELIST ShellBigIconList; extern HIMAGELIST ShellBigIconList;
extern HDPA sic_hdpa;
BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList); BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList);
......
dlls/shell32/shellole.c
View file @ ab7af137
...@@ -274,7 +274,7 @@ DWORD WINAPI SHCLSIDFromStringAW (LPVOID clsid, CLSID *id) ...@@ -274,7 +274,7 @@ DWORD WINAPI SHCLSIDFromStringAW (LPVOID clsid, CLSID *id)
*/ */
/* set the vtable later */ /* set the vtable later */
extern ICOM_VTABLE(IMalloc) VT_Shell_IMalloc32; static ICOM_VTABLE(IMalloc) VT_Shell_IMalloc32;
/* this is the static object instance */ /* this is the static object instance */
typedef struct { typedef struct {
...@@ -282,10 +282,10 @@ typedef struct { ...@@ -282,10 +282,10 @@ typedef struct {
DWORD dummy; DWORD dummy;
} _ShellMalloc; } _ShellMalloc;
_ShellMalloc Shell_Malloc = { &VT_Shell_IMalloc32,1}; static _ShellMalloc Shell_Malloc = { &VT_Shell_IMalloc32,1};
/* this is the global allocator of shell32 */ /* this is the global allocator of shell32 */
IMalloc * ShellTaskAllocator = NULL; static IMalloc * ShellTaskAllocator = NULL;
/****************************************************************************** /******************************************************************************
* IShellMalloc_QueryInterface [VTABLE] * IShellMalloc_QueryInterface [VTABLE]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment