[SHELL32]

* Use the previous registration mechanism. Fixes several shell32 regressions.
* Dedicated to Claudiu Mihail and Johannes Anderwald.

svn path=/trunk/; revision=54053

reactos/dll/win32/shell32/CMakeLists.txt

@@ -69,6 +69,7 @@ list(APPEND SOURCE
     she_ocmenu.cpp
     shv_item_new.cpp
     folder_options.cpp
+    regsvr.c
     shell32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/shell32.def)

reactos/dll/win32/shell32/shell32.rbuild

@@ -76,6 +76,7 @@
 	<file>startmenu.cpp</file>
 	<file>stubs.cpp</file>
 	<file>ros-systray.cpp</file>
+	<file>regsvr.c</file>
 	<file>fprop.cpp</file>
 	<file>drive.cpp</file>
 	<file>she_ocmenu.cpp</file>

reactos/dll/win32/shell32/shell32_main.cpp

@@ -1445,7 +1445,7 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
     TRACE("-- pointer to class factory: %p\n", *ppv);
     return hResult;
 }
-
+#if 0
 /***********************************************************************
  *              DllRegisterServer (BROWSEUI.@)
  */
@@ -1461,7 +1461,7 @@ STDAPI DllUnregisterServer()
 {
     return gModule.DllUnregisterServer(FALSE);
 }
-
+#endif
 /*************************************************************************
  * DllInstall         [SHELL32.@]
  *

reactos/dll/win32/shell32/shell32_main.h

@@ -205,7 +205,7 @@ extern const GUID CLSID_UnixFolder;
 extern const GUID CLSID_UnixDosFolder;
 
 /* Default shell folder value registration */
-HRESULT SHELL_RegisterShellFolders(void);
+EXTERN_C HRESULT SHELL_RegisterShellFolders(void);
 
 /* Detect Shell Links */
 BOOL SHELL_IsShortcut(LPCITEMIDLIST);

reactos/dll/win32/shell32/shellpath.cpp

@@ -1848,7 +1848,7 @@ static void _SHCreateSymbolicLinks(void)
 /* Register the default values in the registry, as some apps seem to depend
  * on their presence.  The set registered was taken from Windows XP.
  */
-HRESULT SHELL_RegisterShellFolders(void)
+EXTERN_C HRESULT SHELL_RegisterShellFolders(void)
 {
     HRESULT hr;