Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Use the previously implemented Typelib registration from ATL to register shell32. ROSTESTS-209

Browse source 
svn path=/trunk/; revision=71142
This commit is contained in:
Mark Jansen 2016-04-10 21:32:27 +00:00
parent 4d3121a2c1
commit 60cf559dc6
4 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/shell32/CMakeLists.txt
View file

@ -91,6 +91,10 @@ add_library(shell32 SHARED
${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)

4
reactos/dll/win32/shell32/shell32.cpp
View file

@ -350,7 +350,7 @@ STDAPI DllRegisterServer()
{
HRESULT hr;
hr = gModule.DllRegisterServer(FALSE);
hr = gModule.DllRegisterServer(TRUE);
if (FAILED(hr))
return hr;
@ -372,7 +372,7 @@ STDAPI DllUnregisterServer()
{
HRESULT hr;
hr = gModule.DllUnregisterServer(FALSE);
hr = gModule.DllUnregisterServer(TRUE);
if (FAILED(hr))
return hr;

2
reactos/dll/win32/shell32/shell32.rc
View file

@ -79,6 +79,8 @@ END
#include <reactos/manifest_dll.rc>
1 TYPELIB "shell32_shldisp.tlb"
/*
* Everything specific to any language goes
* in one of the specific files.

25
reactos/dll/win32/shell32/shell32_shldisp.idl Normal file
View file

@ -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"