system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 11:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

devenum: Don't register quartz from devenum.

Browse source
This commit is contained in:
Alexandre Julliard 2011-08-02 22:53:40 +02:00
parent c90a79a728
commit dc1dad6a72
2 changed files with 1 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
dlls/devenum/devenum_main.c
View file

@ -35,8 +35,6 @@ typedef struct
BOOL instance; BOOL instance;
} register_info; } register_info;
static void DEVENUM_RegisterQuartz(void);
/*********************************************************************** /***********************************************************************
* Global string constant definitions * Global string constant definitions
*/ */
@ -102,9 +100,6 @@ HRESULT WINAPI DllRegisterServer(void)
res = __wine_register_resources( DEVENUM_hInstance ); res = __wine_register_resources( DEVENUM_hInstance );
/* Quartz is needed for IFilterMapper2 */
DEVENUM_RegisterQuartz();
/*** ActiveMovieFilter Categories ***/ /*** ActiveMovieFilter Categories ***/
CoInitialize(NULL); CoInitialize(NULL);
@ -151,20 +146,3 @@ HRESULT WINAPI DllUnregisterServer(void)
FIXME("stub!\n"); FIXME("stub!\n");
return __wine_unregister_resources( DEVENUM_hInstance ); return __wine_unregister_resources( DEVENUM_hInstance );
} }
typedef HRESULT (WINAPI *DllRegisterServer_func)(void);
/* calls DllRegisterServer() for the Quartz DLL */
static void DEVENUM_RegisterQuartz(void)
{
HANDLE hDLL = LoadLibraryA("quartz.dll");
DllRegisterServer_func pDllRegisterServer = NULL;
if (hDLL)
pDllRegisterServer = (DllRegisterServer_func)GetProcAddress(hDLL, "DllRegisterServer");
if (pDllRegisterServer)
{
HRESULT hr = pDllRegisterServer();
if (FAILED(hr))
ERR("Failed to register Quartz. Error was 0x%x)\n", hr);
}
}

2
tools/wine.inf.in
View file

@ -2493,6 +2493,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
[RegisterDllsSection] [RegisterDllsSection]
;;some dlls have to be registered first ;;some dlls have to be registered first
11,,shell32.dll,1 11,,shell32.dll,1
11,,quartz.dll,1
11,,comctl32.dll,2 11,,comctl32.dll,2
11,,cryptdlg.dll,1 11,,cryptdlg.dll,1
@ -2502,7 +2503,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,msiexec.exe,1 11,,msiexec.exe,1
11,,msisip.dll,1 11,,msisip.dll,1
11,,qcap.dll,1 11,,qcap.dll,1
11,,quartz.dll,1
11,,urlmon.dll,1 11,,urlmon.dll,1
11,,windowscodecs.dll,1 11,,windowscodecs.dll,1
11,,winegstreamer.dll,1 11,,winegstreamer.dll,1