ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-29 19:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Marcus Meissner <[email protected]>

Browse Source 
- 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.

svn path=/trunk/; revision=10096
This commit is contained in:
Gé van Geldorp
2004-07-12 20:32:16 +00:00
parent a1f4820c31
commit aa38cd0cd1
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/lib/shell32/control.c
+2 -2
View File
@@ -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;
reactos/lib/shell32/shell32_main.h
-1
View File
@@ -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);
reactos/lib/shell32/shellole.c
+3 -3
View File
@@ -297,7 +297,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 {
@@ -305,10 +305,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]