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

Author: winesync
Date: Thu Nov 29 14:06:46 2007
New Revision: 30879

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

Modified:
    trunk/reactos/dll/win32/olepro32/olepro32.rbuild
    trunk/reactos/dll/win32/olepro32/olepro32stubs.c

Modified: trunk/reactos/dll/win32/olepro32/olepro32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/olepro3…
==============================================================================
--- trunk/reactos/dll/win32/olepro32/olepro32.rbuild (original)
+++ trunk/reactos/dll/win32/olepro32/olepro32.rbuild Thu Nov 29 14:06:46 2007
@@ -1,14 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="olepro32" type="win32dll" entrypoint="0"
baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32"
installname="olepro32.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls"
type="DllRegisterServer" />
 	<importlibrary definition="olepro32.spec.def" />
 	<include base="olepro32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<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>
+	<define name="WINVER">0x600</define>
+	<define name="_WIN32_WINNT">0x600</define>
 	<library>wine</library>
 	<library>oleaut32</library>
 	<library>kernel32</library>

Modified: trunk/reactos/dll/win32/olepro32/olepro32stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/olepro3…
==============================================================================
--- trunk/reactos/dll/win32/olepro32/olepro32stubs.c (original)
+++ trunk/reactos/dll/win32/olepro32/olepro32stubs.c Thu Nov 29 14:06:46 2007
@@ -33,7 +33,7 @@
 /***********************************************************************
  *		DllUnregisterServer (OLEPRO32.258)
  */
-HRESULT WINAPI DllUnregisterServer()
+HRESULT WINAPI DllUnregisterServer(void)
 {
 	FIXME("stub\n");
 	return S_OK;
@@ -42,7 +42,7 @@
 /***********************************************************************
  *		DllRegisterServer (OLEPRO32.257)
  */
-HRESULT WINAPI DllRegisterServer()
+HRESULT WINAPI DllRegisterServer(void)
 {
 	FIXME("stub\n");
 	return S_OK;