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

[winesync at svn.reactos.org]

Author: winesync
Date: Fri Apr  4 09:15:40 2008
New Revision: 32854

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

Modified:
    trunk/reactos/dll/win32/oleacc/main.c
    trunk/reactos/dll/win32/oleacc/oleacc.rbuild
    trunk/reactos/dll/win32/oleacc/oleacc.spec

Modified: trunk/reactos/dll/win32/oleacc/main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/main.c?rev=32854&r1=32853&r2=32854&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oleacc/main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oleacc/main.c [iso-8859-1] Fri Apr  4 09:15:40 2008
@@ -61,3 +61,9 @@
     FIXME("\n");
     return S_OK;
 }
+
+void WINAPI GetOleaccVersionInfo(DWORD* pVersion, DWORD* pBuild)
+{
+    *pVersion = MAKELONG(2,4); /* Windows XP version of oleacc: 4.2.5406.0 */
+    *pBuild = MAKELONG(0,5406);
+}

Modified: trunk/reactos/dll/win32/oleacc/oleacc.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.rbuild?rev=32854&r1=32853&r2=32854&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oleacc/oleacc.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oleacc/oleacc.rbuild [iso-8859-1] Fri Apr  4 09:15:40 2008
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="oleacc" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_OLEACC}" installbase="system32" installname="oleacc.dll" allowwarnings="true">
+<group>
+<module name="oleacc" type="win32dll" baseaddress="${BASEADDRESS_OLEACC}" installbase="system32" installname="oleacc.dll" allowwarnings="true" entrypoint="0">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="oleacc.spec.def" />
 	<include base="oleacc">.</include>
@@ -8,9 +9,10 @@
 	<define name="__WINESRC__" />
 	<define name="WINVER">0x600</define>
 	<define name="_WIN32_WINNT">0x600</define>
+	<file>main.c</file>
+	<file>oleacc.spec</file>
 	<library>wine</library>
 	<library>kernel32</library>
 	<library>ntdll</library>
-	<file>main.c</file>
-	<file>oleacc.spec</file>
 </module>
+</group>

Modified: trunk/reactos/dll/win32/oleacc/oleacc.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.spec?rev=32854&r1=32853&r2=32854&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oleacc/oleacc.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oleacc/oleacc.spec [iso-8859-1] Fri Apr  4 09:15:40 2008
@@ -7,7 +7,7 @@
 @ stub CreateStdAccessibleProxyW
 @ stdcall -private DllRegisterServer()
 @ stdcall -private DllUnregisterServer()
-@ stub GetOleaccVersionInfo
+@ stdcall GetOleaccVersionInfo(ptr ptr)
 @ stub GetRoleTextA
 @ stub GetRoleTextW
 @ stub GetStateTextA