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

Author: winesync
Date: Fri Jul 21 17:05:00 2006
New Revision: 23207

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

Added:
    trunk/reactos/dll/win32/objsel/objsel_ros.diff
Modified:
    trunk/reactos/dll/win32/objsel/factory.c
    trunk/reactos/dll/win32/objsel/objsel.c
    trunk/reactos/dll/win32/objsel/objsel.rbuild
    trunk/reactos/dll/win32/objsel/objsel.rc
    trunk/reactos/dll/win32/objsel/objsel_private.h
    trunk/reactos/dll/win32/objsel/regsvr.c

Modified: trunk/reactos/dll/win32/objsel/factory.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/factory.c…
==============================================================================
--- trunk/reactos/dll/win32/objsel/factory.c (original)
+++ trunk/reactos/dll/win32/objsel/factory.c Fri Jul 21 17:05:00 2006
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "objsel_private.h"

Modified: trunk/reactos/dll/win32/objsel/objsel.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel.c?…
==============================================================================
--- trunk/reactos/dll/win32/objsel/objsel.c (original)
+++ trunk/reactos/dll/win32/objsel/objsel.c Fri Jul 21 17:05:00 2006
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "objsel_private.h"

Modified: trunk/reactos/dll/win32/objsel/objsel.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel.rb…
==============================================================================
--- trunk/reactos/dll/win32/objsel/objsel.rbuild (original)
+++ trunk/reactos/dll/win32/objsel/objsel.rbuild Fri Jul 21 17:05:00 2006
@@ -1,19 +1,21 @@
-<module name="objsel" type="win32dll"
baseaddress="${BASEADDRESS_OBJSEL}" installbase="system32"
installname="objsel.dll">
+<module name="objsel" type="win32dll"
baseaddress="${BASEADDRESS_OBJSEL}" installbase="system32"
installname="objsel.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls"
type="DllRegisterServer" />
 	<importlibrary definition="objsel.spec.def" />
 	<include base="objsel">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
+	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
 	<library>wine</library>
+	<library>ole32</library>
+	<library>oleaut32</library>
+	<library>user32</library>
+	<library>advapi32</library>
+	<library>kernel32</library>
 	<library>uuid</library>
-	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>advapi32</library>
-	<library>user32</library>
-	<library>ole32</library>
 	<library>ntdll</library>
 	<file>factory.c</file>
 	<file>objsel.c</file>

Modified: trunk/reactos/dll/win32/objsel/objsel.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel.rc…
==============================================================================
--- trunk/reactos/dll/win32/objsel/objsel.rc (original)
+++ trunk/reactos/dll/win32/objsel/objsel.rc Fri Jul 21 17:05:00 2006
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "windef.h"

Modified: trunk/reactos/dll/win32/objsel/objsel_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel_pr…
==============================================================================
--- trunk/reactos/dll/win32/objsel/objsel_private.h (original)
+++ trunk/reactos/dll/win32/objsel/objsel_private.h Fri Jul 21 17:05:00 2006
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <string.h>

Added: trunk/reactos/dll/win32/objsel/objsel_ros.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel_ro…
==============================================================================
--- trunk/reactos/dll/win32/objsel/objsel_ros.diff (added)
+++ trunk/reactos/dll/win32/objsel/objsel_ros.diff Fri Jul 21 17:05:00 2006
@@ -1,0 +1,10 @@
+Index: objsel.rbuild
+===================================================================
+--- objsel.rbuild	(revision 23122)
++++ objsel.rbuild	(working copy)
+@@ -1,4 +1,5 @@
+ <module name="objsel" type="win32dll"
baseaddress="${BASEADDRESS_OBJSEL}" installbase="system32"
installname="objsel.dll" allowwarnings="true">
++	<autoregister infsection="OleControlDlls"
type="DllRegisterServer" />
+ 	<importlibrary definition="objsel.spec.def" />
+ 	<include base="objsel">.</include>
+ 	<include base="ReactOS">include/reactos/wine</include>

Modified: trunk/reactos/dll/win32/objsel/regsvr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/regsvr.c?…
==============================================================================
--- trunk/reactos/dll/win32/objsel/regsvr.c (original)
+++ trunk/reactos/dll/win32/objsel/regsvr.c Fri Jul 21 17:05:00 2006
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "config.h"
@@ -159,7 +159,7 @@
 	}
 
 	if (list->base_iid) {
-	    register_key_guid(iid_key, base_ifa_keyname, list->base_iid);
+	    res = register_key_guid(iid_key, base_ifa_keyname, list->base_iid);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 	}
 
@@ -181,12 +181,12 @@
 	}
 
 	if (list->ps_clsid) {
-	    register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid);
+	    res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 	}
 
 	if (list->ps_clsid32) {
-	    register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32);
+	    res = register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 	}