diff --git a/reactos/dll/win32/msxml3/CMakeLists.txt b/reactos/dll/win32/msxml3/CMakeLists.txt index 0959e4a2ddb..bfa9239cd82 100644 --- a/reactos/dll/win32/msxml3/CMakeLists.txt +++ b/reactos/dll/win32/msxml3/CMakeLists.txt @@ -11,7 +11,7 @@ add_definitions( -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 @@ list(APPEND SOURCE ${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) @@ -61,6 +65,10 @@ target_link_libraries(msxml3 wine wineldr) +if(MSVC) + target_link_libraries(msxml3 xml_uuids) +endif() + add_importlibs(msxml3 msvcrt urlmon diff --git a/reactos/dll/win32/msxml3/msvc.h b/reactos/dll/win32/msxml3/msvc.h new file mode 100644 index 00000000000..275df16088a --- /dev/null +++ b/reactos/dll/win32/msxml3/msvc.h @@ -0,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; diff --git a/reactos/dll/win32/msxml3/msvc_uuid.c b/reactos/dll/win32/msxml3/msvc_uuid.c new file mode 100644 index 00000000000..b2c502719b7 --- /dev/null +++ b/reactos/dll/win32/msxml3/msvc_uuid.c @@ -0,0 +1,7 @@ + +#define INITGUID +#include + +// 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); + diff --git a/reactos/include/psdk/CMakeLists.txt b/reactos/include/psdk/CMakeLists.txt index e1200c2694f..3c4eac9448a 100644 --- a/reactos/include/psdk/CMakeLists.txt +++ b/reactos/include/psdk/CMakeLists.txt @@ -1,4 +1,6 @@ +add_definitions(-D_MIDL_USE_GUIDDEF_) + list(APPEND SOURCE # access.idl activaut.idl @@ -113,5 +115,6 @@ add_idl_headers(psdk ${SOURCE}) add_typelib(stdole2 stdole2.idl) add_iid_library(wuguid wuapi.idl) +add_iid_library(xml_uuids msxml2.idl) generate_idl_iids(wincodec.idl)