Alexandre Julliard : msxml3: Don't use libxslt without libxml.
Alexandre Julliard
julliard at winehq.org
Mon Sep 16 16:57:22 CDT 2013
Module: wine
Branch: master
Commit: b618910b845f33688016c3508df79b7306499532
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b618910b845f33688016c3508df79b7306499532
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Sep 16 10:20:50 2013 +0200
msxml3: Don't use libxslt without libxml.
---
dlls/msxml3/main.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c
index 46742ef..ae93ec9 100644
--- a/dlls/msxml3/main.c
+++ b/dlls/msxml3/main.c
@@ -161,15 +161,6 @@ static int wineXmlFileCloseCallback (void * context)
return CloseHandle(context) ? 0 : -1;
}
-#endif
-
-
-HRESULT WINAPI DllCanUnloadNow(void)
-{
- return S_FALSE;
-}
-
-
void* libxslt_handle = NULL;
#ifdef SONAME_LIBXSLT
# define DECL_FUNCPTR(f) typeof(f) * p##f = NULL
@@ -209,6 +200,15 @@ static void init_libxslt(void)
#endif
}
+#endif /* HAVE_LIBXML2 */
+
+
+HRESULT WINAPI DllCanUnloadNow(void)
+{
+ return S_FALSE;
+}
+
+
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved)
{
MSXML_hInstance = hInstDLL;
@@ -230,12 +230,13 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved)
WARN("Failed to register callbacks\n");
schemasInit();
-#endif
init_libxslt();
+#endif
DisableThreadLibraryCalls(hInstDLL);
break;
case DLL_PROCESS_DETACH:
if (reserved) break;
+#ifdef HAVE_LIBXML2
#ifdef SONAME_LIBXSLT
if (libxslt_handle)
{
@@ -243,7 +244,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved)
wine_dlclose(libxslt_handle, NULL, 0);
}
#endif
-#ifdef HAVE_LIBXML2
/* Restore default Callbacks */
xmlCleanupInputCallbacks();
xmlRegisterDefaultInputCallbacks();
More information about the wine-cvs
mailing list