From c90a79a728f24ba09c7c89e218578d35d04ad336 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 2 Aug 2011 22:08:49 +0200
Subject: [PATCH] qmgr: Convert the remaining registrations to IRegistrar
 format.

---
 dlls/qmgr/qmgr.inf | 16 ----------------
 dlls/qmgr/qmgr.rgs | 15 +++++++++++++++
 dlls/qmgr/rsrc.rc  |  4 ++--
 tools/wine.inf.in  |  1 -
 4 files changed, 17 insertions(+), 19 deletions(-)
 delete mode 100644 dlls/qmgr/qmgr.inf
 create mode 100644 dlls/qmgr/qmgr.rgs

diff --git a/dlls/qmgr/qmgr.inf b/dlls/qmgr/qmgr.inf
deleted file mode 100644
index ef51f9b3d99..00000000000
--- a/dlls/qmgr/qmgr.inf
+++ /dev/null
@@ -1,16 +0,0 @@
-[version]
-Signature="$CHICAGO$"
-
-[RegisterDll]
-AddReg = Qmgr.Reg
-
-[UnregisterDll]
-DelReg = Qmgr.Reg
-
-[Qmgr.Reg]
-HKCR,"AppID\BITS","AppID",,"%CLSID_BackgroundCopyQMgr%"
-HKCR,"AppID\%CLSID_BackgroundCopyQMgr%","LocalService",,"BITS"
-HKCR,"CLSID\%CLSID_BackgroundCopyManager%","AppID",,"%CLSID_BackgroundCopyQMgr%"
-
-HKLM,"Software\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"BITS"
-HKLM,"System\CurrentControlSet\Services\BITS\Parameters","ServiceDll",0x00020000,"qmgr.dll"
diff --git a/dlls/qmgr/qmgr.rgs b/dlls/qmgr/qmgr.rgs
new file mode 100644
index 00000000000..675505ed6a1
--- /dev/null
+++ b/dlls/qmgr/qmgr.rgs
@@ -0,0 +1,15 @@
+HKCR
+{
+    NoRemove AppID
+    {
+        '{69AD4AEE-51BE-439B-A92C-86AE490E8B30}' { val LocalService = s 'BITS' }
+        BITS { val AppID = s '{69AD4AEE-51BE-439B-A92C-86AE490E8B30}' }
+    }
+    NoRemove CLSID
+    {
+        '{4991D34B-80A1-4291-83B6-3328366B9097}'
+        {
+            val AppID = s '{69AD4AEE-51BE-439B-A92C-86AE490E8B30}'
+        }
+    }
+}
diff --git a/dlls/qmgr/rsrc.rc b/dlls/qmgr/rsrc.rc
index dfc64d05b11..66fd2a599b1 100644
--- a/dlls/qmgr/rsrc.rc
+++ b/dlls/qmgr/rsrc.rc
@@ -16,5 +16,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* @makedep: qmgr.inf */
-REGINST REGINST qmgr.inf
+/* @makedep: qmgr.rgs */
+1 WINE_REGISTRY qmgr.rgs
diff --git a/tools/wine.inf.in b/tools/wine.inf.in
index d9e987ba477..86d00e46868 100644
--- a/tools/wine.inf.in
+++ b/tools/wine.inf.in
@@ -2502,7 +2502,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
 11,,msiexec.exe,1
 11,,msisip.dll,1
 11,,qcap.dll,1
-11,,qmgr.dll,1
 11,,quartz.dll,1
 11,,urlmon.dll,1
 11,,windowscodecs.dll,1