mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-03 00:08:32 +00:00
Added 'strmiids.lib'.
Moved CLSID_FilterGraph and the related GUIDs to strmiids.
This commit is contained in:
parent
a98f77668d
commit
a896389679
|
@ -1646,6 +1646,7 @@ dlls/shlwapi/Makefile
|
|||
dlls/shlwapi/tests/Makefile
|
||||
dlls/snmpapi/Makefile
|
||||
dlls/sti/Makefile
|
||||
dlls/strmiids/Makefile
|
||||
dlls/tapi32/Makefile
|
||||
dlls/ttydrv/Makefile
|
||||
dlls/twain/Makefile
|
||||
|
|
|
@ -172,6 +172,7 @@ SUBDIRS = \
|
|||
glu32 \
|
||||
glut32 \
|
||||
opengl32 \
|
||||
strmiids \
|
||||
uuid \
|
||||
wined3d \
|
||||
x11drv
|
||||
|
@ -291,6 +292,7 @@ SYMLINKS_SO = \
|
|||
libdxerr8.a \
|
||||
libdxerr9.a \
|
||||
libdxguid.a \
|
||||
libstrmiids.a \
|
||||
libuuid.a \
|
||||
lz32.dll.so \
|
||||
mapi32.dll.so \
|
||||
|
@ -950,6 +952,9 @@ libdxerr9.a: dxerr9/libdxerr9.a
|
|||
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 @@ IMPORT_LIBS = \
|
|||
libdxerr8.a \
|
||||
libdxerr9.a \
|
||||
libdxguid.a \
|
||||
libstrmiids.a \
|
||||
libuuid.a
|
||||
|
||||
implib: $(IMPORT_LIBS)
|
||||
|
@ -1986,6 +1992,7 @@ x11drv/x11drv.dll.so: x11drv
|
|||
dxerr8/libdxerr8.a: dxerr8
|
||||
dxerr9/libdxerr9.a: dxerr9
|
||||
dxguid/libdxguid.a: dxguid
|
||||
strmiids/libstrmiids.a: strmiids
|
||||
uuid/libuuid.a: uuid
|
||||
|
||||
# Rules for auto documentation
|
||||
|
|
|
@ -4,7 +4,7 @@ SRCDIR = @srcdir@
|
|||
VPATH = @srcdir@
|
||||
MODULE = amstream.dll
|
||||
IMPORTS = ole32 user32 advapi32 kernel32
|
||||
EXTRALIBS = -luuid
|
||||
EXTRALIBS = -lstrmiids -luuid
|
||||
|
||||
C_SRCS = \
|
||||
amstream.c \
|
||||
|
|
|
@ -4,7 +4,7 @@ SRCDIR = @srcdir@
|
|||
VPATH = @srcdir@
|
||||
MODULE = devenum.dll
|
||||
IMPORTS = ole32 oleaut32 winmm user32 advapi32 kernel32
|
||||
EXTRALIBS = -luuid
|
||||
EXTRALIBS = -lstrmiids -luuid
|
||||
|
||||
C_SRCS = \
|
||||
createdevenum.c \
|
||||
|
|
|
@ -4,7 +4,7 @@ SRCDIR = @srcdir@
|
|||
VPATH = @srcdir@
|
||||
MODULE = mshtml.dll
|
||||
IMPORTS = user32 advapi32 kernel32 ntdll
|
||||
EXTRALIBS = $(LIBUNICODE) -luuid
|
||||
EXTRALIBS = $(LIBUNICODE) -lstrmiids -luuid
|
||||
EXTRADEFS = -DCOM_NO_WINDOWS_H
|
||||
|
||||
C_SRCS = \
|
||||
|
|
|
@ -4,7 +4,7 @@ SRCDIR = @srcdir@
|
|||
VPATH = @srcdir@
|
||||
MODULE = quartz.dll
|
||||
IMPORTS = ole32 oleaut32 advapi32 kernel32 user32
|
||||
EXTRALIBS = -ldxguid -luuid $(LIBUNICODE)
|
||||
EXTRALIBS = -lstrmiids -luuid $(LIBUNICODE)
|
||||
|
||||
C_SRCS = \
|
||||
avisplit.c \
|
||||
|
|
|
@ -4,7 +4,7 @@ SRCDIR = @srcdir@
|
|||
VPATH = @srcdir@
|
||||
TESTDLL = quartz.dll
|
||||
IMPORTS = ole32 user32 gdi32 kernel32
|
||||
EXTRALIBS = -luuid
|
||||
EXTRALIBS = -lstrmiids
|
||||
|
||||
CTESTS = \
|
||||
filtergraph.c
|
||||
|
|
1
dlls/strmiids/.cvsignore
Normal file
1
dlls/strmiids/.cvsignore
Normal file
|
@ -0,0 +1 @@
|
|||
Makefile
|
27
dlls/strmiids/Makefile.in
Normal file
27
dlls/strmiids/Makefile.in
Normal file
|
@ -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)
|
||||
|
||||
@MAKE_RULES@
|
||||
|
||||
$(MODULE): $(OBJS) Makefile.in
|
||||
$(RM) $@
|
||||
$(AR) $@ $(OBJS)
|
||||
$(RANLIB) $@
|
||||
|
||||
man:
|
||||
|
||||
doc-html:
|
||||
|
||||
doc-sgml:
|
||||
|
||||
### Dependencies:
|
38
dlls/strmiids/strmiids.c
Normal file
38
dlls/strmiids/strmiids.c
Normal file
|
@ -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"
|
|
@ -62,16 +62,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
|
|||
|
||||
#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);
|
||||
|
|
Loading…
Reference in a new issue