From 916fe2874f23ab254f1a69fa0a9eed3c54549cca Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 11 Jun 2012 18:06:27 +0000 Subject: [PATCH 1/1] [STDOLE32.TLB] * Fix MSVC build and add the module to our build. svn path=/trunk/; revision=56720 --- reactos/dll/win32/CMakeLists.txt | 6 ++---- reactos/dll/win32/stdole32.tlb/std_ole_v1.idl | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/dll/win32/CMakeLists.txt b/reactos/dll/win32/CMakeLists.txt index b1ce6204475..d4dc2657d87 100644 --- a/reactos/dll/win32/CMakeLists.txt +++ b/reactos/dll/win32/CMakeLists.txt @@ -44,7 +44,7 @@ add_subdirectory(getuname) add_subdirectory(glu32) add_subdirectory(hhctrl.ocx) add_subdirectory(hid) -add_subdirectory(hlink) # FIXME: msvc build. +add_subdirectory(hlink) add_subdirectory(hnetcfg) add_subdirectory(httpapi) add_subdirectory(iccvid) @@ -180,9 +180,7 @@ add_subdirectory(softpub) add_subdirectory(spoolss) add_subdirectory(srclient) add_subdirectory(stdole2.tlb) -if(NOT MSVC) - add_subdirectory(stdole32.tlb) # FIXME: msvc build. -endif() +add_subdirectory(stdole32.tlb) add_subdirectory(sti) add_subdirectory(sxs) add_subdirectory(syssetup) diff --git a/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl b/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl index 45fb3d50aed..952f5472943 100644 --- a/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl +++ b/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl @@ -61,6 +61,7 @@ library stdole SCODE scode; } EXCEPINFO; +#ifdef __WIDL__ [ odl, uuid(00000000-0000-0000-C000-000000000046) @@ -135,4 +136,5 @@ library stdole HRESULT Clone( [out] IEnumVARIANT **ppenum); } +#endif }; -- 2.17.1