[ros-diffs] [sserapion] 36503: Remove hack in cstub.c, it was caused by a hack in the rbuild file. Fix fill_table() definition for non i386.

Author: sserapion
Date: Thu Sep 25 00:13:21 2008
New Revision: 36503

URL: http://svn.reactos.org/svn/reactos?rev=36503&view=rev
Log:
Remove hack in cstub.c, it was caused by a hack in the rbuild file.
Fix fill_table() definition for non i386.

Modified:
    branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cproxy.c
    branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cstub.c
    branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/rpcrt4.rbuild

Modified: branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cproxy.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cproxy.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cproxy.c [iso-8859-1] Thu Sep 25
00:13:21 2008
@@ -56,7 +56,7 @@
 
 static const IRpcProxyBufferVtbl StdProxy_Vtbl;
 
-#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) -
FIELD_OFFSET(impl,field))
+#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) -
offsetof(impl,field))
 
 /* How the Windows stubless proxy thunks work is explained at
  * http://msdn.microsoft.com/library/en-us/dnmsj99/html/com0199.asp,

Modified: branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cstub.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cstub.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cstub.c [iso-8859-1] Thu Sep 25
00:13:21 2008
@@ -194,7 +194,7 @@
 #else  /* __i386__ */
 
 typedef struct {int dummy;} vtbl_method_t;
-static void fill_table(IUnknownVtbl *vtbl, DWORD num)
+static void fill_table(IUnknownVtbl *vtbl, void **methods, DWORD num)
 {
     ERR("delegated stubs are not supported on this architecture\n");
 }

Modified: branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] Thu Sep
25 00:13:21 2008
@@ -7,7 +7,6 @@
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<define name="WINVER">0x501</define>
-	<define name="_STDDEF_H" />
 	<define name="_RPCRT4_" />
 	<define name="COM_NO_WINDOWS_H" />
 	<define name="MSWMSG" />