Add 'strmiids.lib'
Francois Gouget
fgouget at free.fr
Thu Aug 19 11:57:07 CDT 2004
MSVC puts CLSID_FilterGraph in strmiids.lib and not in uuid.lib like
Wine does. The same goes for a bunch of other GUIDs so this patch adds
an strmiids library.
Note that some GUIDs are declared both in dxguid.lib and strmiids.lib,
in particular the DirectDraw GUIDs. So this is the case here too.
After applying this patch, autoconf needs to be re-run.
Changelog:
* configure.ac
dlls/Makefile.in
dlls/quartz/Makefile.in
dlls/quartz/tests/Makefile.in
dlls/uuid/uuid.c
dlls/strmiids/Makefile.in
dlls/strmiids/strmiids.c
dlls/strmiids/.cvsignore
Add 'strmiids.lib'.
Move CLSID_FilterGraph and the related GUIDs to strmiids.
Index: configure.ac
===================================================================
RCS file: /var/cvs/wine/configure.ac,v
retrieving revision 1.301
diff -u -r1.301 configure.ac
--- configure.ac 19 Aug 2004 01:20:45 -0000 1.301
+++ configure.ac 19 Aug 2004 13:36:15 -0000
@@ -1646,6 +1646,7 @@
dlls/shlwapi/tests/Makefile
dlls/snmpapi/Makefile
dlls/sti/Makefile
+dlls/strmiids/Makefile
dlls/tapi32/Makefile
dlls/ttydrv/Makefile
dlls/twain/Makefile
Index: dlls/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/Makefile.in,v
retrieving revision 1.223
diff -u -r1.223 Makefile.in
--- dlls/Makefile.in 11 Aug 2004 20:59:09 -0000 1.223
+++ dlls/Makefile.in 19 Aug 2004 13:38:46 -0000
@@ -172,6 +172,7 @@
glu32 \
glut32 \
opengl32 \
+ strmiids \
uuid \
wined3d \
x11drv
@@ -291,6 +292,7 @@
libdxerr8.a \
libdxerr9.a \
libdxguid.a \
+ libstrmiids.a \
libuuid.a \
lz32.dll.so \
mapi32.dll.so \
@@ -950,6 +952,9 @@
libdxguid.a: dxguid/libdxguid.a
$(RM) $@ && $(LN_S) dxguid/libdxguid.a $@
+libstrmiids.a: strmiids/libstrmiids.a
+ $(RM) $@ && $(LN_S) strmiids/libstrmiids.a $@
+
libuuid.a: uuid/libuuid.a
$(RM) $@ && $(LN_S) uuid/libuuid.a $@
@@ -1083,6 +1088,7 @@
libdxerr8.a \
libdxerr9.a \
libdxguid.a \
+ libstrmiids.a \
libuuid.a
implib: $(IMPORT_LIBS)
@@ -1986,6 +1992,7 @@
dxerr8/libdxerr8.a: dxerr8
dxerr9/libdxerr9.a: dxerr9
dxguid/libdxguid.a: dxguid
+strmiids/libstrmiids.a: strmiids
uuid/libuuid.a: uuid
# Rules for auto documentation
Index: dlls/quartz/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/quartz/Makefile.in,v
retrieving revision 1.38
diff -u -r1.38 Makefile.in
--- dlls/quartz/Makefile.in 16 Aug 2004 21:14:28 -0000 1.38
+++ dlls/quartz/Makefile.in 19 Aug 2004 13:39:09 -0000
@@ -4,7 +4,7 @@
VPATH = @srcdir@
MODULE = quartz.dll
IMPORTS = ole32 oleaut32 advapi32 kernel32 user32
-EXTRALIBS = -ldxguid -luuid $(LIBUNICODE)
+EXTRALIBS = -lstrmiids $(LIBUNICODE)
C_SRCS = \
avisplit.c \
Index: dlls/quartz/tests/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/quartz/tests/Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 Makefile.in
--- dlls/quartz/tests/Makefile.in 16 Aug 2004 21:14:28 -0000 1.1
+++ dlls/quartz/tests/Makefile.in 19 Aug 2004 14:04:12 -0000
@@ -4,7 +4,7 @@
VPATH = @srcdir@
TESTDLL = quartz.dll
IMPORTS = ole32 user32 gdi32 kernel32
-EXTRALIBS = -luuid
+EXTRALIBS = -lstrmiids
CTESTS = \
filtergraph.c
Index: dlls/uuid/uuid.c
===================================================================
RCS file: /var/cvs/wine/dlls/uuid/uuid.c,v
retrieving revision 1.6
diff -u -r1.6 uuid.c
--- dlls/uuid/uuid.c 4 Aug 2004 18:15:27 -0000 1.6
+++ dlls/uuid/uuid.c 19 Aug 2004 14:07:56 -0000
@@ -62,16 +62,6 @@
#include "vfw.h"
-#include "uuids.h"
-
-/* the GUID for these interfaces are already defined by dxguid.c */
-#define __IReferenceClock_INTERFACE_DEFINED__
-#define __IKsPropertySet_INTERFACE_DEFINED__
-#include "strmif.h"
-#include "control.h"
-#define __DDRAW_GUID_DEFINED__
-#include "amstream.h"
-
/* GUIDs not declared in an exported header file */
DEFINE_GUID(IID_IDirectPlaySP,0xc9f6360,0xcc61,0x11cf,0xac,0xec,0x00,0xaa,0x00,0x68,0x86,0xe3);
DEFINE_GUID(IID_ISFHelper,0x1fe68efb,0x1874,0x9812,0x56,0xdc,0x00,0x00,0x00,0x00,0x00,0x00);
--- /dev/null 2004-08-10 11:44:31.000000000 +0200
+++ dlls/strmiids/Makefile.in 2004-08-19 15:35:43.000000000 +0200
@@ -0,0 +1,27 @@
+DEFS = -D__WINESRC__
+DLLFLAGS = @DLLFLAGS@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR = @srcdir@
+VPATH = @srcdir@
+MODULE = libstrmiids.a
+
+C_SRCS = \
+ strmiids.c
+
+all: $(MODULE)
+
+ at MAKE_RULES@
+
+$(MODULE): $(OBJS) Makefile.in
+ $(RM) $@
+ $(AR) $@ $(OBJS)
+ $(RANLIB) $@
+
+man:
+
+doc-html:
+
+doc-sgml:
+
+### Dependencies:
--- /dev/null 2004-08-10 11:44:31.000000000 +0200
+++ dlls/strmiids/strmiids.c 2004-08-19 16:11:47.000000000 +0200
@@ -0,0 +1,38 @@
+/*
+ * GUID definitions
+ *
+ * Copyright 2000 Alexandre Julliard
+ * Copyright 2000 Francois Gouget
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * 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
+ */
+
+#include <stdarg.h>
+
+#define COM_NO_WINDOWS_H
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+
+#include "objbase.h"
+#include "oleauto.h"
+#include "olectl.h"
+#include "initguid.h"
+
+#include "uuids.h"
+#include "strmif.h"
+#include "control.h"
+#include "amstream.h"
--- /dev/null 2004-08-10 11:44:31.000000000 +0200
+++ dlls/strmiids/.cvsignore 2004-08-19 17:21:20.000000000 +0200
@@ -0,0 +1 @@
+Makefile
--
Francois Gouget fgouget at free.fr http://fgouget.free.fr/
145 = 1! + 4! + 5!
More information about the wine-patches
mailing list