[UUID]

Fix build with MSVC. We ignore warnings about duplicated symbols. MS uuid also contains them. svn path=/branches/cmake-bringup/; revision=50572
2025-04-06 05:34:22 +00:00 · 2011-01-30 20:05:05 +00:00 · 2011-01-30 20:05:05 +00:00 · 1b18ef5578
commit 1b18ef5578
parent c2e1cbdff3
4 changed files with 126 additions and 51 deletions
--- a/lib/sdk/uuid/CMakeLists.txt
+++ b/lib/sdk/uuid/CMakeLists.txt
@ -1,7 +1,7 @@

 list(APPEND IDL_SOURCES
 # These are the ones that MS uuid contains:
-    activaut.idl
+#    activaut.idl
    activdbg.idl
    activscp.idl
 #    alg.idl
@ -162,7 +162,6 @@ list(APPEND IDL_SOURCES
    propsys.idl
    pstore.idl
    richole.idl
-    stdole2.idl
    strmif.idl
    tom.idl
    tuner.idl
@ -212,5 +211,11 @@ list(APPEND SOURCE
    otherguids.c
    undoc.c)

+if(MSVC)
+    # Disable warning about duplicate symbols. MS uuid lib contains them as well.
+    # Cmake doesn't handle LINK_FLAGS here
+    set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_LINKER> /lib ${CMAKE_CL_NOLOGO} <LINK_FLAGS> /ignore:4006 /out:<TARGET> <OBJECTS> ")
+endif()
+
 add_library(uuid ${SOURCE})
 add_dependencies(uuid psdk)
--- a/lib/sdk/uuid/ieguids.c
+++ b/lib/sdk/uuid/ieguids.c
@ -7,6 +7,8 @@ DEFINE_GUID(CGID_MSHTML, 0xde4ba900,0x59ca,0x11cf,0x95,0x92,0x44,0x45,0x53,0x54,
 DEFINE_GUID(CATID_SafeForScripting, 0x7dd95801,0x9882,0x11cf,0x9f,0xa9,0x00,0xaa,0x00,0x6c,0x42,0xc4);
 DEFINE_GUID(CLSID_StdComponentCategoriesMgr, 0x0002e005, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
 DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b);
+DEFINE_GUID(CLSID_StdHlink, 0x79eac9d0, 0xbaf9, 0x11ce, 0x8c, 0x82, 0x00, 0xaa,0x00,0x4b,0xa9,0x0b);
+DEFINE_GUID(CLSID_StdHlinkBrowseContext, 0x79eac9d1, 0xbaf9, 0x11ce, 0x8c, 0x82, 0x00, 0xaa,0x00,0x4b,0xa9,0x0b);

 //SID_SVersionHost
 //CGID_InternetExplorer
@ -95,8 +97,6 @@ DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x0
 //OLE_DATAPATH_WMF
 //OLE_DATAPATH_DIB
 //OLE_DATAPATH_BMP
-//CLSID_StdHlinkBrowseContext
-//CLSID_StdHlink
 //GUID_HasPathProperties
 //GUID_PathProperty
 //SID_SDataPathBrowser
--- a/lib/sdk/uuid/otherguids.c
+++ b/lib/sdk/uuid/otherguids.c
@ -1,14 +1,12 @@


 #include <initguid.h>
-#include <hlguids.h>
 #include <oleauto.h>

 DEFINE_GUID(IID_IDirectPlaySP,            0xc9f6360, 0xcc61, 0x11cf, 0xac, 0xec, 0x0, 0xaa, 0x0, 0x68, 0x86, 0xe3);
 DEFINE_GUID(IID_ISFHelper,                0x1fe68efb,0x1874,0x9812,0x56,0xdc,0x00,0x00,0x00,0x00,0x00,0x00);
 DEFINE_GUID(IID_IDPLobbySP,               0x5a4e5a20,0x2ced,0x11d0,0xa8,0x89,0x00,0xa0,0xc9,0x05,0x43,0x3c);
 DEFINE_GUID(IID_IEnumNetConnection,       0xC08956A0,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E);
-DEFINE_GUID(IID_INetConnection,           0xC08956A1,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E);
 DEFINE_GUID(IID_INetConnectionManager,    0xC08956A2,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E);
 DEFINE_GUID(IID_INetConnectionConnectUi,  0xC08956A3,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E);
 DEFINE_GUID(IID_INetConnectionPropertyUi, 0xC08956A4,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E);
@ -50,3 +48,8 @@ DEFINE_GUID(GUID_COMPARTMENT_TIPUISTATUS,           0x148ca3ec,0x0366,0x401c,0x8

 DEFINE_GUID(IID_IDsObjectPicker, 0x0c87e64e, 0x3b7a, 0x11d2, 0x00b9, 0xe0,0x00,0xc0,0x4f,0xd8,0xdb,0xf7);
 DEFINE_GUID(CLSID_DsObjectPicker, 0x17d6ccd8, 0x3b7b, 0x11d2, 0x00b9, 0xe0,0x00,0xc0,0x4f,0xd8,0xdb,0xf7);
+DEFINE_GUID(IID_IDeskBarClient, 0xEB0FE175, 0x1A3A, 0x11D0, 0x89,0xB3, 0x00,0xA0,0xC9,0x0A,0x90,0xAC);
+DEFINE_GUID(CLSID_StdPicture, 0x0BE35204, 0x8F91, 0x11CE, 0x9D,0xE3, 0x00,0xAA,0x00,0x4B,0xB8,0x51);
+DEFINE_GUID(CLSID_StdFont,    0x0BE35203, 0x8F91, 0x11CE, 0x9D,0xE3, 0x00,0xAA,0x00,0x4B,0xB8,0x51);
+
+DEFINE_GUID(CLSID_ShellItem,      0x2fe352ea, 0xfd1f, 0x11d2, 0xb1, 0xf4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e);
--- a/lib/sdk/uuid/shguids.c
+++ b/lib/sdk/uuid/shguids.c
@ -4,48 +4,115 @@
 #include <shlguid.h>
 #include <isguids.h>

-#if 0
-IID_IDsQueryColumnHandler
-CLSID_DsFindFrsMembers
-CLSID_DsFindDomainController
-CLSID_DsFindAdvanced
-CLSID_DsFindContainer
-CLSID_DsFindVolume
-CLSID_DsFindComputer
-CLSID_DsFindPrinter
-CLSID_DsFindPeople
-CLSID_DsFindObjects
-CLSID_DsQuery
-IID_IQueryHandler
-IID_IQueryFrame
-IID_ICommonQuery
-CLSID_CommonQuery
-IID_IPersistQuery
-IID_IQueryForm
-CLSID_DsFolderProperties
-CLSID_DsDisplaySpecifier
-IID_IDsBrowseDomainTree
-CLSID_DsDomainTreeBrowser
-CLSID_DsPropertyPages
-CLSID_MicrosoftDS
-IID_IPrintDialogServices
-IID_IPrintDialogCallback
-CLSID_FolderItemsFDF
-IID_IDragSourceHelper in shobjidl
-IID_IDropTargetHelper
-IID_IMountedVolume
-CLSID_MountedVolume
-IID_INamedPropertyBag
-CLSID_FileSysColumnProvider
-CLSID_DocFileColumnProvider
-IID_IShellDetails3
-IID_IAutoCompList
-IID_IEnumShellImageStore
-IID_IRunnableTask in shobjidl
-IID_IPersistFolder3 in shobjidl
-CLSID_StgFolder
-IID_IShellTaskScheduler
-CLSID_ShellTaskScheduler
-IID_IResolveShellLink
-IID_IShellLinkDataList in shobjidl
-#endif
+//BHID_LinkTargetItem
+//BHID_SFObject
+//BHID_SFUIObject
+//BHID_SFViewObject
+//BHID_Storage
+//BHID_StorageEnum
+//BHID_Stream
+//CGID_MENUDESKBAR
+//CGID_ShortCut
+//CLSID_ACLCustomMRU
+//CLSID_ACLHistory
+//CLSID_ACLMRU
+//CLSID_ActiveDesktop
+//CLSID_CFSIconOverlayManager
+//CLSID_CommonQuery
+//CLSID_DarwinAppPublisher
+//CLSID_DocFileColumnProvider
+//CLSID_DocHostUIHandler
+//CLSID_DsDisplaySpecifier
+//CLSID_DsDomainTreeBrowser
+//CLSID_DsFindAdvanced
+//CLSID_DsFindComputer
+//CLSID_DsFindContainer
+//CLSID_DsFindDomainController
+//CLSID_DsFindObjects
+//CLSID_DsFindPeople
+//CLSID_DsFindPrinter
+//CLSID_DsFindVolume
+//CLSID_DsFolderProperties
+//CLSID_DsPropertyPages
+//CLSID_DsQuery
+//CLSID_FileSysColumnProvider
+//CLSID_FileTypes
+//CLSID_FolderItem
+//CLSID_FolderItemsFDF
+//CLSID_HWShellExecute
+//CLSID_ISFBand
+//CLSID_LinkColumnProvider
+//CLSID_MSOButtons
+//CLSID_MenuBandSite
+//CLSID_MenuToolbarBase
+//CLSID_MicrosoftDS
+//CLSID_MountedVolume
+//CLSID_QuickLinks
+//CLSID_ShellTaskScheduler
+//CLSID_ShellThumbnailDiskCache
+//CLSID_StgFolder
+//CLSID_ToolbarExtButtons
+//FMTID_Briefcase
+//FMTID_DRM
+//FMTID_ImageProperties
+//FMTID_MUSIC
+//FMTID_Misc
+//FMTID_Query
+//FMTID_Volume
+//FMTID_WebView
+//IID_CDefView
+//IID_IADesktopP2
+//IID_IActiveDesktop
+//IID_IActiveDesktopP
+//IID_IAutoCompList
+//IID_IBanneredBar
+//IID_IBriefcaseStg
+//IID_IColumnProvider
+//IID_ICommDlgBrowser2
+//IID_ICommonQuery
+//IID_IContextMenu3
+//IID_ICurrentWorkingDirectory
+//IID_IDefViewFrame
+//IID_IDefViewID
+//IID_IDiscardableBrowserProperty
+//IID_IDocViewSite
+//IID_IDockingWindowFrame
+//IID_IDragSourceHelper
+//IID_IDropTargetHelper
+//IID_IDsBrowseDomainTree
+//IID_IEnumExtraSearch
+//IID_IEnumShellImageStore
+//IID_IFileSystemBindData
+//IID_IMountedVolume
+//IID_INamedPropertyBag
+//IID_IPersistFolder3
+//IID_IPersistQuery
+//IID_IPrintDialogCallback
+//IID_IPrintDialogServices
+//IID_IQueryForm
+//IID_IQueryFrame
+//IID_IQueryHandler
+//IID_IResolveShellLink
+//IID_IRunnableTask
+//IID_ISearchContext
+//IID_IShellChangeNotify
+//IID_IShellDetails3
+//IID_IShellFolder2 in shobjidl
+//IID_IShellFolderBand
+//IID_IShellIcon shlguid.h
+//IID_IShellIconOverlay
+//IID_IShellIconOverlayIdentifier in shlobj.h
+//IID_IShellIconOverlayManager
+//IID_IShellImageStore
+//IID_IShellLinkDataList in shobjidl
+//IID_IShellTaskScheduler
+//IID_IShellView2
+//IID_ISynchronizedCallBack
+//IID_IThumbnailCapture
+//IID_IURLSearchHook
+//IID_IURLSearchHook2
+//SID_CtxQueryAssociations
+//SID_DefView
+//SID_MenuShellFolder
+//SID_SGetViewFromViewDual
+//SID_SMenuBandTop