Commit in reactos/lib/shell32 on MAIN
control.c+2-21.3 -> 1.4
shell32_main.h-11.18 -> 1.19
shellole.c+3-31.4 -> 1.5
+5-6
3 modified files
Marcus Meissner <marcus@jet.franken.de>
- 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.

reactos/lib/shell32
control.c 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- control.c	27 Mar 2004 09:08:10 -0000	1.3
+++ control.c	12 Jul 2004 20:32:16 -0000	1.4
@@ -171,7 +171,7 @@
     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 @@
     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.18 -> 1.19
diff -u -r1.18 -r1.19
--- shell32_main.h	29 Jun 2004 13:47:27 -0000	1.18
+++ shell32_main.h	12 Jul 2004 20:32:16 -0000	1.19
@@ -44,7 +44,6 @@
 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 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- shellole.c	29 Jun 2004 13:40:40 -0000	1.4
+++ shellole.c	12 Jul 2004 20:32:16 -0000	1.5
@@ -297,7 +297,7 @@
  */
 
 /* 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 @@
 	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]
CVSspam 0.2.8