From 59fa94bbb52abce6ede6b20cd2bb0d6c6ba1cf78 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 22 Jun 2011 15:18:05 +0000
Subject: [PATCH] [SHELL32] * Fix msvc build.

svn path=/trunk/; revision=52423
---
 reactos/dll/win32/CMakeLists.txt         | 4 +---
 reactos/dll/win32/shell32/CMakeLists.txt | 5 +----
 reactos/dll/win32/shell32/regsvr.c       | 4 ++++
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/reactos/dll/win32/CMakeLists.txt b/reactos/dll/win32/CMakeLists.txt
index 149a1ca9204..c0729149734 100644
--- a/reactos/dll/win32/CMakeLists.txt
+++ b/reactos/dll/win32/CMakeLists.txt
@@ -167,9 +167,7 @@ add_subdirectory(sfc)
 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)
diff --git a/reactos/dll/win32/shell32/CMakeLists.txt b/reactos/dll/win32/shell32/CMakeLists.txt
index 980d4777b8f..3180e9f745c 100644
--- a/reactos/dll/win32/shell32/CMakeLists.txt
+++ b/reactos/dll/win32/shell32/CMakeLists.txt
@@ -12,8 +12,6 @@ include_directories(
     ${REACTOS_SOURCE_DIR}/lib/recyclebin
     ${REACTOS_SOURCE_DIR})
 
-generate_idl_iids(shobjidl_local.idl)
-
 spec2def(shell32.dll shell32.spec)
 
 list(APPEND SOURCE
@@ -71,7 +69,6 @@ list(APPEND SOURCE
     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 @@ add_importlibs(shell32
     kernel32
     msvcrt
     ntdll)
-	
+
 add_pch(shell32 precomp.h)
 
 add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/shell32/regsvr.c b/reactos/dll/win32/shell32/regsvr.c
index 7e230a1b8bb..5ba35f562b4 100644
--- a/reactos/dll/win32/shell32/regsvr.c
+++ b/reactos/dll/win32/shell32/regsvr.c
@@ -29,6 +29,10 @@ const GUID CLSID_FontsFolderShortcut     = {0xD20EA4E1, 0x3957, 0x11D2, {0xA4, 0
 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);