PATCH: ole32 / new compiler
Marcus Meissner
marcus at jet.franken.de
Sun Jul 11 09:03:12 CDT 2004
Hi,
More fixes for errors with newer compiler.
Ciao, Marcus
Changelog:
IMalloc vtables are static to ifs.c.
IID_IObjectWithSite is already in libuuid, no need to declare here.
Index: dlls/ole32/ifs.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/ifs.c,v
retrieving revision 1.39
diff -u -r1.39 ifs.c
--- dlls/ole32/ifs.c 21 May 2004 20:52:57 -0000 1.39
+++ dlls/ole32/ifs.c 11 Jul 2004 14:01:33 -0000
@@ -45,7 +45,7 @@
*
*****************************************************************************/
/* set the vtable later */
-extern ICOM_VTABLE(IMalloc) VT_IMalloc32;
+static ICOM_VTABLE(IMalloc) VT_IMalloc32;
typedef struct {
ICOM_VFIELD(IMalloc);
@@ -361,7 +361,7 @@
*****************************************************************************/
/* set the vtable later */
-extern ICOM_VTABLE(IMallocSpy) VT_IMallocSpy;
+static ICOM_VTABLE(IMallocSpy) VT_IMallocSpy;
typedef struct {
ICOM_VFIELD(IMallocSpy);
Index: dlls/ole32/regsvr.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/regsvr.c,v
retrieving revision 1.6
diff -u -r1.6 regsvr.c
--- dlls/ole32/regsvr.c 27 Feb 2004 06:08:33 -0000 1.6
+++ dlls/ole32/regsvr.c 11 Jul 2004 14:01:33 -0000
@@ -466,9 +466,6 @@
static IID const IID_IProvideMultipleClassInfo = {
0xA7ABA9C1, 0x8983, 0x11CF, {0x8F,0x20,0x00,0x80,0x5F,0x2C,0xD0,0x64} };
-static IID const IID_IObjectWithSite = {
- 0xFC4801A3, 0x2BA9, 0x11CF, {0xA2,0x29,0x00,0xAA,0x00,0x3D,0x73,0x52} };
-
static struct regsvr_interface const interface_list[] = {
{ &IID_IUnknown,
"IUnknown",
More information about the wine-patches
mailing list