[ros-diffs] [winesync] 27900: Autosyncing with Wine HEAD

Author: winesync
Date: Fri Jul 27 13:17:03 2007
New Revision: 27900

URL: http://svn.reactos.org/svn/reactos?rev=27900&view=rev
Log:
Autosyncing with Wine HEAD

Added:
    trunk/reactos/dll/win32/comcat/comcat_ros.diff   (with props)
Modified:
    trunk/reactos/dll/win32/comcat/information.c

Added: trunk/reactos/dll/win32/comcat/comcat_ros.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/comcat_ro…
==============================================================================
--- trunk/reactos/dll/win32/comcat/comcat_ros.diff (added)
+++ trunk/reactos/dll/win32/comcat/comcat_ros.diff Fri Jul 27 13:17:03 2007
@@ -1,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" />
+

Propchange: trunk/reactos/dll/win32/comcat/comcat_ros.diff
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/comcat/information.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/informati…
==============================================================================
--- trunk/reactos/dll/win32/comcat/information.c (original)
+++ trunk/reactos/dll/win32/comcat/information.c Fri Jul 27 13:17:03 2007
@@ -39,7 +39,7 @@
 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 @@
 {
     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 @@
     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;