From fbabfef54dd43b4d77dbadd75324ef919e406be3 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 23 Jan 2012 20:59:35 +0000
Subject: [PATCH] [MSI/BOOTDATA] * Improve and correct registering the CLISDs
 for MSI (they match Wine and Windows now). This reverts r55052.

svn path=/trunk/; revision=55131
---
 reactos/boot/bootdata/hivecls_i386.inf | 4 ----
 reactos/dll/win32/msi/msi.rc           | 3 +++
 reactos/dll/win32/msi/msiserver.rgs    | 8 ++++++++
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 reactos/dll/win32/msi/msiserver.rgs

diff --git a/reactos/boot/bootdata/hivecls_i386.inf b/reactos/boot/bootdata/hivecls_i386.inf
index ece32a86ad8..db2a2d2384c 100644
--- a/reactos/boot/bootdata/hivecls_i386.inf
+++ b/reactos/boot/bootdata/hivecls_i386.inf
@@ -281,10 +281,6 @@ HKCR,"AVIFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.e
 
 HKCR,"CLSID",,0x00000012
 
-; For msi.dll
-HKCR, "CLSID\{000C101D-0000-0000-C000-000000000046}", "DllVersion", "3.1.4000"
-HKCR, "CLSID\{000C1090-0000-0000-C000-000000000046}", "InProcHandler32", "ole32.dll"
-
 ; For Shell32.dll
 HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}","",0x00000000,"Computer Search Results Folder"
 HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}","LocalizedString",0x00020000,"@%SystemRoot%\system32\shell32.dll,-30521"
diff --git a/reactos/dll/win32/msi/msi.rc b/reactos/dll/win32/msi/msi.rc
index 019e3ad35c7..365891d22c7 100644
--- a/reactos/dll/win32/msi/msi.rc
+++ b/reactos/dll/win32/msi/msi.rc
@@ -66,6 +66,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 /* @makedep: msiserver.tlb */
 1 TYPELIB msiserver.tlb
 
+/* @makedep: msiserver.rgs */
+2 WINE_REGISTRY msiserver.rgs
+
 /* @makedep: instadvert.bmp */
 0x1001 BITMAP instadvert.bmp
 
diff --git a/reactos/dll/win32/msi/msiserver.rgs b/reactos/dll/win32/msi/msiserver.rgs
new file mode 100644
index 00000000000..9f408db4264
--- /dev/null
+++ b/reactos/dll/win32/msi/msiserver.rgs
@@ -0,0 +1,8 @@
+HKCR
+{
+    NoRemove CLSID
+    {
+        '{000C101D-0000-0000-C000-000000000046}' { DllVersion = s '3.1.4000' }
+        '{000C1090-0000-0000-C000-000000000046}' { InProcHandler32 = s 'ole32.dll' }
+    }
+}