merge Wine commit:

Modified files:
	dlls/shell32   : shellole.c shell32_main.h pidl.h pidl.c
	                 folders.c enumidlist.c control.c Makefile.in
Added files:
	dlls/shell32   : cpanelfolder.c cpanel.h

Log message:
	Martin Fuchs <martin-fuchs@gmx.net>
	Implementation of the control panel folder in shell namespace.

Patch: http://cvs.winehq.org/patch.py?id=11721

svn path=/trunk/; revision=8883

diff --git a/reactos/lib/shell32/Makefile.in b/reactos/lib/shell32/Makefile.in
index bcb64c4..d74b193 100644 (file)
--- a/reactos/lib/shell32/Makefile.in
+++ b/reactos/lib/shell32/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shell32.dll
 # fixme: avoid ole32.dll import
-IMPORTS   = ole32 shlwapi comctl32 user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = ole32 shlwapi comctl32 user32 gdi32 advapi32 kernel32
 ALTNAMES  = shell.dll
 EXTRALIBS = $(LIBUUID) $(LIBUNICODE)
 
@@ -18,6 +18,7 @@ C_SRCS = \
        classes.c \
        clipboard.c \
        control.c \
+       cpanelfolder.c \
        dataobject.c \
        debughlp.c \
        dialogs.c \
@@ -47,8 +48,7 @@ C_SRCS = \
        shpolicy.c \
        shv_bg_cmenu.c \
        shv_item_cmenu.c \
-       ros-systray.c \
-       shlcpanel.c
+       ros-systray.c
 
 RC_SRCS = shres.rc version.rc
 RC_BINSRC = shres.rc
@@ -73,10 +73,10 @@ version16.res: version16.rc
        $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc
 
 shell.spec.c: shell.spec version16.res
-       $(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --main-module $(MODULE) --res version16.res --spec $(SRCDIR)/shell.spec
+       $(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --main-module $(MODULE) --res version16.res --dll $(SRCDIR)/shell.spec
 
 authors.c: $(TOPSRCDIR)/AUTHORS
-       (LANG=C; echo 'const char * const SHELL_Authors[] = {' && \
+       (LC_ALL=C; export LC_ALL; echo 'const char * const SHELL_Authors[] = {' && \
         sed -e '1,2d' -e 's/\(.*\)/  \"\1\",/' $(TOPSRCDIR)/AUTHORS && \
         echo '  0 };') >$@ || ($(RM) $@ && false)
 

diff --git a/reactos/lib/shell32/control.c b/reactos/lib/shell32/control.c
index d040273..72c6977 100644 (file)
--- a/reactos/lib/shell32/control.c
+++ b/reactos/lib/shell32/control.c
@@ -36,8 +36,7 @@
 #define NO_SHLWAPI_REG
 #include "shlwapi.h"
 
-#include "control.h"
-
+#include "cpanel.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shlctrl);
 

diff --git a/reactos/lib/shell32/control.h b/reactos/lib/shell32/cpanel.h
similarity index 93%
rename from reactos/lib/shell32/control.h
rename to reactos/lib/shell32/cpanel.h
index 7b6341f..1d37d98 100644 (file)
--- a/reactos/lib/shell32/control.h
+++ b/reactos/lib/shell32/cpanel.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifndef __WINE_SHELL_CPANEL_H
+#define __WINE_SHELL_CPANEL_H
+
 typedef struct CPlApplet {
     struct CPlApplet*   next;          /* linked list */
     HWND               hWnd;
@@ -39,3 +42,4 @@ typedef struct CPanel {
 CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel);
 CPlApplet* Control_UnloadApplet(CPlApplet* applet);
 
+#endif /* __WINE_SHELL_CPANEL_H */

diff --git a/reactos/lib/shell32/shlcpanel.c b/reactos/lib/shell32/cpanelfolder.c
similarity index 99%
rename from reactos/lib/shell32/shlcpanel.c
rename to reactos/lib/shell32/cpanelfolder.c
index 7baee8d..0bf054b 100644 (file)
--- a/reactos/lib/shell32/shlcpanel.c
+++ b/reactos/lib/shell32/cpanelfolder.c
@@ -1,8 +1,7 @@
-
 /*
- *     control panel folder
+ * Control panel folder
  *
- *     Copyright 2003          Martin Fuchs
+ * Copyright 2003 Martin Fuchs
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/reactos/lib/shell32/enumidlist.c b/reactos/lib/shell32/enumidlist.c
index 4fbc0e2..cb129f4 100644 (file)
--- a/reactos/lib/shell32/enumidlist.c
+++ b/reactos/lib/shell32/enumidlist.c
@@ -35,7 +35,7 @@
 #include "pidl.h"
 #include "shlguid.h"
 #include "shell32_main.h"
-#include "control.h"
+#include "cpanel.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 

diff --git a/reactos/lib/shell32/iconcache.c b/reactos/lib/shell32/iconcache.c
index 3be5f0f..75bd3af 100644 (file)
--- a/reactos/lib/shell32/iconcache.c
+++ b/reactos/lib/shell32/iconcache.c
@@ -317,7 +317,7 @@ void SIC_Destroy(void)
  * Shell_GetImageList                  [SHELL32.71]
  *
  * PARAMETERS
- *  imglist[1|2] [OUT] pointer which recive imagelist handles
+ *  imglist[1|2] [OUT] pointer which receives imagelist handles
  *
  */
 BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList)