Autosyncing with Wine HEAD

svn path=/trunk/; revision=27900

diff --git a/reactos/dll/win32/comcat/comcat_ros.diff b/reactos/dll/win32/comcat/comcat_ros.diff
new file mode 100644 (file)
index 0000000..4d52c7e
--- /dev/null
+++ b/reactos/dll/win32/comcat/comcat_ros.diff
@@ -0,0 +1,10 @@
+Index: comcat.rbuild
+===================================================================
+--- comcat.rbuild      (revision 23782)
++++ comcat.rbuild      (working copy)
+@@ -1,3 +1,3 @@
++<module name="comcat" type="win32dll" baseaddress="${BASEADDRESS_COMCAT}" installbase="system32" entrypoint="0" installname="comcat.dll" allowwarnings="true">
+-<module name="comcat" type="win32dll" baseaddress="${BASEADDRESS_COMCAT}" installbase="system32" installname="comcat.dll" allowwarnings="true">
+       <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
+       <importlibrary definition="comcat.spec.def" />
+

diff --git a/reactos/dll/win32/comcat/information.c b/reactos/dll/win32/comcat/information.c
index 51032ac..cd5a9ea 100644 (file)
--- a/reactos/dll/win32/comcat/information.c
+++ b/reactos/dll/win32/comcat/information.c
@@ -39,7 +39,7 @@ static struct class_categories *COMCAT_PrepareClassCategories(
 static HRESULT COMCAT_IsClassOfCategories(
     HKEY key, struct class_categories const* class_categories);
 static LPENUMGUID COMCAT_CLSID_IEnumGUID_Construct(
-    struct class_categories const* class_categories);
+    struct class_categories *class_categories);
 static LPENUMGUID COMCAT_CATID_IEnumGUID_Construct(
     REFCLSID rclsid, LPCWSTR impl_req);
 
@@ -608,7 +608,7 @@ typedef struct
 {
     const IEnumGUIDVtbl *lpVtbl;
     LONG  ref;
-    const struct class_categories *categories;
+    struct class_categories *categories;
     HKEY  key;
     DWORD next_index;
 } CLSID_IEnumGUIDImpl;
@@ -775,8 +775,7 @@ static const IEnumGUIDVtbl COMCAT_CLSID_IEnumGUID_Vtbl =
     COMCAT_CLSID_IEnumGUID_Clone
 };
 
-static LPENUMGUID COMCAT_CLSID_IEnumGUID_Construct(
-    struct class_categories const* categories)
+static LPENUMGUID COMCAT_CLSID_IEnumGUID_Construct(struct class_categories *categories)
 {
     CLSID_IEnumGUIDImpl *This;