system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 18:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

msxml3: Don't use libxslt without libxml.

Browse source
This commit is contained in:
Alexandre Julliard 2013-09-16 10:20:50 +02:00
parent e12c8c0ce9
commit b618910b84
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
dlls/msxml3/main.c
View file

@ -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();