From ce59643e60e91c48e0ff9e0d9d1e21e3d7322a2c Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 18 Jun 2011 23:04:39 +0000 Subject: [PATCH] [XMLLITE_WINETEST] * Fix msvc build. svn path=/trunk/; revision=52354 --- rostests/winetests/xmllite/CMakeLists.txt | 9 ++++++--- rostests/winetests/xmllite/reader.c | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/rostests/winetests/xmllite/CMakeLists.txt b/rostests/winetests/xmllite/CMakeLists.txt index ed2827c983c..b7ffe09da0f 100644 --- a/rostests/winetests/xmllite/CMakeLists.txt +++ b/rostests/winetests/xmllite/CMakeLists.txt @@ -1,10 +1,13 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) add_executable(xmllite_winetest reader.c testlist.c) target_link_libraries(xmllite_winetest wine) + +if(MSVC) + target_link_libraries(xmllite_winetest uuid) +endif() + set_module_type(xmllite_winetest win32cui) add_importlibs(xmllite_winetest xmllite ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET xmllite_winetest DESTINATION reactos/bin FOR all) diff --git a/rostests/winetests/xmllite/reader.c b/rostests/winetests/xmllite/reader.c index 9bf18ac7f8d..035fc4f4ac9 100644 --- a/rostests/winetests/xmllite/reader.c +++ b/rostests/winetests/xmllite/reader.c @@ -32,8 +32,8 @@ DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); -HRESULT WINAPI (*pCreateXmlReader)(REFIID riid, void **ppvObject, IMalloc *pMalloc); -HRESULT WINAPI (*pCreateXmlReaderInputWithEncodingName)(IUnknown *stream, +HRESULT (WINAPI *pCreateXmlReader)(REFIID riid, void **ppvObject, IMalloc *pMalloc); +HRESULT (WINAPI *pCreateXmlReaderInputWithEncodingName)(IUnknown *stream, IMalloc *pMalloc, LPCWSTR encoding, BOOL hint,