[ros-diffs] [tkreuzer] 52391: [PSDK] - define _MIDL_USE_GUIDDEF_ when building iid libraries, so that the guids have declspec(selectany) - add xml_uuids library [MSXML3] - Add an include for MSVC to define mis...

Author: tkreuzer
Date: Mon Jun 20 18:34:57 2011
New Revision: 52391

URL: http://svn.reactos.org/svn/reactos?rev=52391&view=rev
Log:
[PSDK]
- define _MIDL_USE_GUIDDEF_ when building iid libraries, so that the guids have
declspec(selectany)
- add xml_uuids library
[MSXML3]
- Add an include for MSVC to define missing IIDs
- add CLSID_DOMDocument2
fixes build of msxml3 with MSVC

Added:
    trunk/reactos/dll/win32/msxml3/msvc.h   (with props)
    trunk/reactos/dll/win32/msxml3/msvc_uuid.c   (with props)
Modified:
    trunk/reactos/dll/win32/msxml3/CMakeLists.txt
    trunk/reactos/include/psdk/CMakeLists.txt

Modified: trunk/reactos/dll/win32/msxml3/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/CMakeList…
==============================================================================
--- trunk/reactos/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] Mon Jun 20 18:34:57 2011
@@ -11,7 +11,7 @@
     -DLIBXML_STATIC)
 
 if(MSVC)
-    add_compiler_flags(/FIwine/typeof.h)
+    add_compiler_flags(/FIwine/typeof.h /FImsvc.h)
 endif(MSVC)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -51,6 +51,10 @@
     ${CMAKE_CURRENT_BINARY_DIR}/msxml3_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/msxml3.def)
 
+if(MSVC)
+    list(APPEND SOURCE msvc_uuid.c)
+endif()
+
 add_library(msxml3 SHARED ${SOURCE})
 
 set_module_type(msxml3 win32dll)
@@ -60,6 +64,10 @@
     uuid
     wine
     wineldr)
+
+if(MSVC)
+    target_link_libraries(msxml3 xml_uuids)
+endif()
 
 add_importlibs(msxml3
     msvcrt

Added: trunk/reactos/dll/win32/msxml3/msvc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msvc.h?re…
==============================================================================
--- trunk/reactos/dll/win32/msxml3/msvc.h (added)
+++ trunk/reactos/dll/win32/msxml3/msvc.h [iso-8859-1] Mon Jun 20 18:34:57 2011
@@ -1,0 +1,6 @@
+
+extern const struct _GUID CLSID_DOMDocument;
+extern const struct _GUID CLSID_XMLDocument;
+extern const struct _GUID CLSID_DOMFreeThreadedDocument;
+extern const struct _GUID CLSID_XMLHTTPRequest;
+extern const struct _GUID CLSID_XMLDSOControl;

Propchange: trunk/reactos/dll/win32/msxml3/msvc.h
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/msxml3/msvc_uuid.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msvc_uuid…
==============================================================================
--- trunk/reactos/dll/win32/msxml3/msvc_uuid.c (added)
+++ trunk/reactos/dll/win32/msxml3/msvc_uuid.c [iso-8859-1] Mon Jun 20 18:34:57 2011
@@ -1,0 +1,7 @@
+
+#define INITGUID
+#include <guiddef.h>
+
+// This is actually CLSID_DOMDocument, but on gcc builds its defined to be like this
+DEFINE_GUID(CLSID_DOMDocument2, 0x2933bf90, 0x7b36, 0x11d2, 0xb2,0x0e,
0x00,0xc0,0x4f,0x98,0x3e,0x60);
+

Propchange: trunk/reactos/dll/win32/msxml3/msvc_uuid.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/include/psdk/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx…
==============================================================================
--- trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] Mon Jun 20 18:34:57 2011
@@ -1,3 +1,5 @@
+
+add_definitions(-D_MIDL_USE_GUIDDEF_)
 
 list(APPEND SOURCE
 #   access.idl
@@ -113,5 +115,6 @@
 add_typelib(stdole2 stdole2.idl)
 
 add_iid_library(wuguid wuapi.idl)
+add_iid_library(xml_uuids msxml2.idl)
 
 generate_idl_iids(wincodec.idl)