Commit b618910b authored by Alexandre Julliard's avatar Alexandre Julliard

msxml3: Don't use libxslt without libxml.

parent e12c8c0c
...@@ -161,15 +161,6 @@ static int wineXmlFileCloseCallback (void * context) ...@@ -161,15 +161,6 @@ static int wineXmlFileCloseCallback (void * context)
return CloseHandle(context) ? 0 : -1; return CloseHandle(context) ? 0 : -1;
} }
#endif
HRESULT WINAPI DllCanUnloadNow(void)
{
return S_FALSE;
}
void* libxslt_handle = NULL; void* libxslt_handle = NULL;
#ifdef SONAME_LIBXSLT #ifdef SONAME_LIBXSLT
# define DECL_FUNCPTR(f) typeof(f) * p##f = NULL # define DECL_FUNCPTR(f) typeof(f) * p##f = NULL
...@@ -209,6 +200,15 @@ static void init_libxslt(void) ...@@ -209,6 +200,15 @@ static void init_libxslt(void)
#endif #endif
} }
#endif /* HAVE_LIBXML2 */
HRESULT WINAPI DllCanUnloadNow(void)
{
return S_FALSE;
}
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved)
{ {
MSXML_hInstance = hInstDLL; MSXML_hInstance = hInstDLL;
...@@ -230,12 +230,13 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) ...@@ -230,12 +230,13 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved)
WARN("Failed to register callbacks\n"); WARN("Failed to register callbacks\n");
schemasInit(); schemasInit();
#endif
init_libxslt(); init_libxslt();
#endif
DisableThreadLibraryCalls(hInstDLL); DisableThreadLibraryCalls(hInstDLL);
break; break;
case DLL_PROCESS_DETACH: case DLL_PROCESS_DETACH:
if (reserved) break; if (reserved) break;
#ifdef HAVE_LIBXML2
#ifdef SONAME_LIBXSLT #ifdef SONAME_LIBXSLT
if (libxslt_handle) if (libxslt_handle)
{ {
...@@ -243,7 +244,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) ...@@ -243,7 +244,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved)
wine_dlclose(libxslt_handle, NULL, 0); wine_dlclose(libxslt_handle, NULL, 0);
} }
#endif #endif
#ifdef HAVE_LIBXML2
/* Restore default Callbacks */ /* Restore default Callbacks */
xmlCleanupInputCallbacks(); xmlCleanupInputCallbacks();
xmlRegisterDefaultInputCallbacks(); xmlRegisterDefaultInputCallbacks();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment