mirror of
git://source.winehq.org/git/wine.git
synced 2024-08-31 15:05:59 +00:00
devenum: Don't register quartz from devenum.
This commit is contained in:
parent
c90a79a728
commit
dc1dad6a72
|
@ -35,8 +35,6 @@ typedef struct
|
|||
BOOL instance;
|
||||
} register_info;
|
||||
|
||||
static void DEVENUM_RegisterQuartz(void);
|
||||
|
||||
/***********************************************************************
|
||||
* Global string constant definitions
|
||||
*/
|
||||
|
@ -102,9 +100,6 @@ HRESULT WINAPI DllRegisterServer(void)
|
|||
|
||||
res = __wine_register_resources( DEVENUM_hInstance );
|
||||
|
||||
/* Quartz is needed for IFilterMapper2 */
|
||||
DEVENUM_RegisterQuartz();
|
||||
|
||||
/*** ActiveMovieFilter Categories ***/
|
||||
|
||||
CoInitialize(NULL);
|
||||
|
@ -151,20 +146,3 @@ HRESULT WINAPI DllUnregisterServer(void)
|
|||
FIXME("stub!\n");
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2493,6 +2493,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
|
|||
[RegisterDllsSection]
|
||||
;;some dlls have to be registered first
|
||||
11,,shell32.dll,1
|
||||
11,,quartz.dll,1
|
||||
|
||||
11,,comctl32.dll,2
|
||||
11,,cryptdlg.dll,1
|
||||
|
@ -2502,7 +2503,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
|
|||
11,,msiexec.exe,1
|
||||
11,,msisip.dll,1
|
||||
11,,qcap.dll,1
|
||||
11,,quartz.dll,1
|
||||
11,,urlmon.dll,1
|
||||
11,,windowscodecs.dll,1
|
||||
11,,winegstreamer.dll,1
|
||||
|
|
Loading…
Reference in a new issue