From 24cd3eb4cbc710f7b4bfe2523d622d6d4da524c2 Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Mon, 18 Jan 2010 16:53:59 +0000 Subject: [PATCH] [MSXML3] update msxml3 to wine 1.1.36 svn path=/trunk/; revision=45135 --- reactos/dll/win32/msxml3/main.c | 1 - reactos/dll/win32/msxml3/node.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/msxml3/main.c b/reactos/dll/win32/msxml3/main.c index c31a53a8873..9b1eb823fbe 100644 --- a/reactos/dll/win32/msxml3/main.c +++ b/reactos/dll/win32/msxml3/main.c @@ -104,7 +104,6 @@ static int wineXmlFileCloseCallback (void * context) HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("\n"); return S_FALSE; } diff --git a/reactos/dll/win32/msxml3/node.c b/reactos/dll/win32/msxml3/node.c index ed6c8c6c0aa..82f4c5678f2 100644 --- a/reactos/dll/win32/msxml3/node.c +++ b/reactos/dll/win32/msxml3/node.c @@ -1118,7 +1118,8 @@ static inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) if(!V_BSTR(&src)) return E_OUTOFMEMORY; - hres = VariantChangeType(v, &src, 0, V_VT(v)); + hres = VariantChangeTypeEx(v, &src, MAKELCID(MAKELANGID( + LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT),0, V_VT(v)); VariantClear(&src); return hres; }