From dc1dad6a72e3e2ae023f857ef1e556f3ed609f77 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 2 Aug 2011 22:53:40 +0200
Subject: [PATCH] devenum: Don't register quartz from devenum.

---
 dlls/devenum/devenum_main.c | 22 ----------------------
 tools/wine.inf.in           |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c
index c4bec2efc74..576e3ea1618 100644
--- a/dlls/devenum/devenum_main.c
+++ b/dlls/devenum/devenum_main.c
@@ -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);
-    }
-}
diff --git a/tools/wine.inf.in b/tools/wine.inf.in
index 86d00e46868..f3a569a5c84 100644
--- a/tools/wine.inf.in
+++ b/tools/wine.inf.in
@@ -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