[ros-diffs] [mjansen] 71142: [SHELL32] Use the previously implemented Typelib registration from ATL to register shell32. ROSTESTS-209

Author: mjansen
Date: Sun Apr 10 21:32:27 2016
New Revision: 71142

URL: http://svn.reactos.org/svn/reactos?rev=71142&view=rev
Log:
[SHELL32] Use the previously implemented Typelib registration from ATL to register
shell32. ROSTESTS-209

Added:
    trunk/reactos/dll/win32/shell32/shell32_shldisp.idl
Modified:
    trunk/reactos/dll/win32/shell32/CMakeLists.txt
    trunk/reactos/dll/win32/shell32/shell32.cpp
    trunk/reactos/dll/win32/shell32/shell32.rc

Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/shell32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/CMakeLists.txt	[iso-8859-1] Sun Apr 10 21:32:27 2016
@@ -91,6 +91,10 @@
     ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/shell32.def)
 
+
+add_typelib(shell32_shldisp.idl)
+set_source_files_properties(shell32.rc PROPERTIES OBJECT_DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/shell32_shldisp.tlb)
+
 set_module_type(shell32 win32dll UNICODE)
 target_link_libraries(shell32 shellmenu shelldesktop atlnew wine uuid recyclebin)
 add_delay_importlibs(shell32 uxtheme ole32 oleaut32 userenv version fmifs)

Modified: trunk/reactos/dll/win32/shell32/shell32.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shell32.cpp	[iso-8859-1] Sun Apr 10 21:32:27 2016
@@ -350,7 +350,7 @@
 {
     HRESULT hr;
 
-    hr = gModule.DllRegisterServer(FALSE);
+    hr = gModule.DllRegisterServer(TRUE);
     if (FAILED(hr))
         return hr;
 
@@ -372,7 +372,7 @@
 {
     HRESULT hr;
 
-    hr = gModule.DllUnregisterServer(FALSE);
+    hr = gModule.DllUnregisterServer(TRUE);
     if (FAILED(hr))
         return hr;
 

Modified: trunk/reactos/dll/win32/shell32/shell32.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shell32.rc	[iso-8859-1] Sun Apr 10 21:32:27 2016
@@ -78,6 +78,8 @@
 #include "rgs_res.rc"
 
 #include <reactos/manifest_dll.rc>
+
+1 TYPELIB "shell32_shldisp.tlb"
 
 /*
  * Everything specific to any language goes

Added: trunk/reactos/dll/win32/shell32/shell32_shldisp.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32_shldisp.idl	(added)
+++ trunk/reactos/dll/win32/shell32/shell32_shldisp.idl	[iso-8859-1] Sun Apr 10 21:32:27
2016
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2011 Alexandre Julliard
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* just a wrapper for shldisp.idl */
+
+#pragma makedep proxy
+#pragma makedep register
+
+#include "shldisp.idl"
+