[ros-diffs] [akhaldi] 52423: [SHELL32] * Fix msvc build.

Author: akhaldi
Date: Wed Jun 22 15:18:05 2011
New Revision: 52423

URL: http://svn.reactos.org/svn/reactos?rev=52423&view=rev
Log:
[SHELL32]
* Fix msvc build.

Modified:
    trunk/reactos/dll/win32/CMakeLists.txt
    trunk/reactos/dll/win32/shell32/CMakeLists.txt
    trunk/reactos/dll/win32/shell32/regsvr.c

Modified: trunk/reactos/dll/win32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r…
==============================================================================
--- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Wed Jun 22 15:18:05 2011
@@ -167,9 +167,7 @@
 add_subdirectory(sfc_os)
 add_subdirectory(shdoclc)
 add_subdirectory(shdocvw)
-if(NOT MSVC)
-    add_subdirectory(shell32) # FIXME: msvc build.
-endif()
+add_subdirectory(shell32)
 add_subdirectory(shfolder)
 add_subdirectory(shimgvw)
 add_subdirectory(shlwapi)

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] Wed Jun 22 15:18:05 2011
@@ -11,8 +11,6 @@
     ${REACTOS_SOURCE_DIR}/include/reactos/wine
     ${REACTOS_SOURCE_DIR}/lib/recyclebin
     ${REACTOS_SOURCE_DIR})
-
-generate_idl_iids(shobjidl_local.idl)
 
 spec2def(shell32.dll shell32.spec)
 
@@ -71,7 +69,6 @@
     shv_item_new.c
     folder_options.c
     shell32.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/shobjidl_local_i.c
     ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/shell32.def)
 
@@ -99,7 +96,7 @@
     kernel32
     msvcrt
     ntdll)
-	
+
 add_pch(shell32 precomp.h)
 
 add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/shell32/regsvr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c…
==============================================================================
--- trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] Wed Jun 22 15:18:05 2011
@@ -28,6 +28,10 @@
 const GUID CLSID_FontsFolderShortcut     = {0xD20EA4E1, 0x3957, 0x11D2, {0xA4, 0x0B,
0x0C, 0x50, 0x20, 0x52, 0x41,0x52}};
 const GUID SHELL32_AdvtShortcutProduct   = {0x9db1186f, 0x40df, 0x11d1, {0xaa, 0x8c,
0x00, 0xc0, 0x4f, 0xb6, 0x78, 0x63}};
 const GUID SHELL32_AdvtShortcutComponent = {0x9db1186e, 0x40df, 0x11d1, {0xaa, 0x8c,
0x00, 0xc0, 0x4f, 0xb6, 0x78, 0x63}};
+
+#ifdef _MSC_VER
+extern const GUID CLSID_ShellFolderViewOC;
+#endif
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);