From 5be8e7d8e0eff284549678e77fd423915a03bf1f Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 6 Dec 2000 01:50:47 +0000 Subject: [PATCH] Created a small static library in ole/libuuid.a that contains all the UUID definitions (with the help of Francois Gouget). --- Make.rules.in | 1 + Makefile.in | 14 +++------- dlls/avifil32/Makefile.in | 1 + dlls/avifil32/avifile.c | 4 +-- dlls/commdlg/Makefile.in | 1 + dlls/commdlg/filedlgbrowser.c | 3 --- dlls/ddraw/Makefile.in | 1 + dlls/ddraw/main.c | 4 --- dlls/dinput/Makefile.in | 1 + dlls/dinput/dinput_main.c | 3 --- dlls/dplayx/Makefile.in | 1 + dlls/dplayx/dplayx_main.c | 5 ---- dlls/dsound/Makefile.in | 1 + dlls/dsound/dsound_main.c | 2 -- dlls/ole32/Makefile.in | 1 + dlls/ole32/oleobj.c | 2 -- dlls/oleaut32/Makefile.in | 1 + dlls/oleaut32/oleaut.c | 6 +---- dlls/shell32/Makefile.in | 3 +-- dlls/shell32/shellguid.c | 16 ----------- dlls/shell32/shlfolder.c | 4 --- dlls/shlwapi/Makefile.in | 2 +- dlls/shlwapi/shlwapi_main.c | 4 --- include/dplay.h | 5 +++- ole/Makefile.in | 21 ++++++++++++--- ole/uuid.c | 51 +++++++++++++++++++++++++++++++++++ 26 files changed, 89 insertions(+), 69 deletions(-) delete mode 100644 dlls/shell32/shellguid.c create mode 100644 ole/uuid.c diff --git a/Make.rules.in b/Make.rules.in index f53cba8c577..28305511393 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -65,6 +65,7 @@ DLLDIR = $(TOPOBJDIR)/dlls LIBWINE = -L$(TOPOBJDIR)/library -lwine LIBTSX11 = -L$(TOPOBJDIR)/tsx11 -lwine_tsx11 LIBUNICODE= -L$(TOPOBJDIR)/unicode -lwine_unicode +LIBUUID = -L$(TOPOBJDIR)/ole -luuid @SET_MAKE@ diff --git a/Makefile.in b/Makefile.in index e6c5c6380d2..a409f770c7f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33,6 +33,7 @@ LIBPROGRAMS = \ # Libraries (not dlls) to build LIBRARIES = \ library/libwine.$(LIBEXT) \ + ole/libuuid.a \ tsx11/libwine_tsx11.$(LIBEXT) \ unicode/libwine_unicode.$(LIBEXT) @@ -44,18 +45,10 @@ LIBSYMLINKS = \ # Sub-directories to run make depend/clean into SUBDIRS = \ - debugger \ - dlls \ - documentation \ - include \ - library \ + $(INSTALLSUBDIRS) \ libtest \ miscemu \ - programs \ - server \ - tools \ - tsx11 \ - unicode + programs # Sub-directories to run make install into INSTALLSUBDIRS = \ @@ -64,6 +57,7 @@ INSTALLSUBDIRS = \ documentation \ include \ library \ + ole \ server \ tools \ tsx11 \ diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in index 4a97b8a457f..e303b87ba3b 100644 --- a/dlls/avifil32/Makefile.in +++ b/dlls/avifil32/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = avifil32 ALTNAMES = avifile +EXTRALIBS = $(LIBUUID) LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index a7d838d5817..f38334ecdfb 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -9,10 +9,8 @@ #include "winnls.h" #include "mmsystem.h" #include "winerror.h" -#include "debugtools.h" - -#include "initguid.h" #include "vfw.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(avifile); diff --git a/dlls/commdlg/Makefile.in b/dlls/commdlg/Makefile.in index b88f5188f1f..56442f30736 100644 --- a/dlls/commdlg/Makefile.in +++ b/dlls/commdlg/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = comdlg32 ALTNAMES = commdlg +EXTRALIBS = $(LIBUUID) LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/commdlg/filedlgbrowser.c b/dlls/commdlg/filedlgbrowser.c index b3a465341fd..f93d4a59ade 100644 --- a/dlls/commdlg/filedlgbrowser.c +++ b/dlls/commdlg/filedlgbrowser.c @@ -13,9 +13,6 @@ #include "heap.h" #include "debugtools.h" -#define INITGUID -#include "initguid.h" -#include "unknwn.h" #include "filedlgbrowser.h" #include "cdlg.h" #include "shlguid.h" diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in index 3e5a53eb16b..fcdc594d17e 100644 --- a/dlls/ddraw/Makefile.in +++ b/dlls/ddraw/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ddraw +EXTRALIBS = $(LIBUUID) SOVERSION = 1.0 IMPORTS = user32 x11drv gdi32 kernel32 diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 24b37f7eb43..d00a1454b3e 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -18,10 +18,6 @@ #include "wine/exception.h" #include "debugtools.h" -#include "initguid.h" -#include "ddraw.h" -#include "d3d.h" - /* This for all the enumeration and creation of D3D-related objects */ #include "ddraw_private.h" diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index 322e02ab5de..71d264d8d78 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dinput +EXTRALIBS = $(LIBUUID) SOVERSION = 1.0 IMPORTS = user32 kernel32 ntdll diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 7a49625aaaf..6f4380421c1 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -25,9 +25,6 @@ #include "winbase.h" #include "winerror.h" #include "windef.h" - -#include "initguid.h" -#include "dinput.h" #include "dinput_private.h" DEFAULT_DEBUG_CHANNEL(dinput); diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in index 951860fe3c2..08fd7d523ad 100644 --- a/dlls/dplayx/Makefile.in +++ b/dlls/dplayx/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dplayx +EXTRALIBS = $(LIBUUID) LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/dplayx/dplayx_main.c b/dlls/dplayx/dplayx_main.c index 77c0da7185b..7e3e1ff8448 100644 --- a/dlls/dplayx/dplayx_main.c +++ b/dlls/dplayx/dplayx_main.c @@ -8,15 +8,10 @@ #include "winerror.h" #include "winbase.h" #include "debugtools.h" - -#include "initguid.h" /* To define the GUIDs */ -#include "dplaysp.h" #include "dplayx_global.h" DEFAULT_DEBUG_CHANNEL(dplay); -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); - static DWORD DPLAYX_dwProcessesAttached = 0; /* This is a globally exported variable at ordinal 6 of DPLAYX.DLL */ diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in index d9cc4ab43bf..6aef5d8496a 100644 --- a/dlls/dsound/Makefile.in +++ b/dlls/dsound/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dsound +EXTRALIBS = $(LIBUUID) LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 115f0199c0f..39b98c07ce5 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -40,8 +40,6 @@ #include "mmsystem.h" #include "wine/windef16.h" #include "debugtools.h" - -#include "initguid.h" #include "dsound.h" #include "dsdriver.h" diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index b0234a5be65..5bfef5a5669 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ole32 ALTNAMES = ole2 ole2nls ole2conv ole2prox ole2thk storage compobj +EXTRALIBS = $(LIBUUID) LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 4c0838baf69..da02cf67956 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -10,8 +10,6 @@ #include "winbase.h" #include "winerror.h" #include "debugtools.h" - -#include "initguid.h" #include "oleidl.h" DEFAULT_DEBUG_CHANNEL(ole); diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index 3f815a8763c..ca43a2de570 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = oleaut32 ALTNAMES = ole2disp typelib +EXTRALIBS = $(LIBUUID) LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index e31e2ee7768..50e8b78fcfb 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -8,15 +8,11 @@ #include "winuser.h" #include "winerror.h" +#include "ole2.h" #include "heap.h" #include "ldt.h" #include "debugtools.h" -#include "initguid.h" -#include "oleauto.h" -#include "ole2.h" -#include "olectl.h" - DEFAULT_DEBUG_CHANNEL(ole); static WCHAR _delimiter[2] = {'!',0}; /* default delimiter apparently */ diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 5dc905ab874..ef80323de4d 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = shell32 ALTNAMES = shell -EXTRALIBS = $(LIBUNICODE) +EXTRALIBS = $(LIBUUID) $(LIBUNICODE) LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o @@ -23,7 +23,6 @@ C_SRCS = \ pidl.c \ shell32_main.c \ shell.c \ - shellguid.c \ shelllink.c \ shlmenu.c \ shellole.c \ diff --git a/dlls/shell32/shellguid.c b/dlls/shell32/shellguid.c deleted file mode 100644 index bad0aa02866..00000000000 --- a/dlls/shell32/shellguid.c +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Shell UID - * - * 1998 Juergen Schmied (jsch) * - * - * this in in a single file due to interfering definitions - * - */ -#include "winbase.h" - -#include "initguid.h" - -#include "shlwapi.h" -#include "shlguid.h" -#include "shlobj.h" -#include "docobj.h" diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 113a34db674..1f1afb6f856 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -27,11 +27,7 @@ #include "shell32_main.h" #include "shresdef.h" #include "shlwapi.h" - -#define INITGUID -#include "initguid.h" #include "shellfolder.h" -#include "wine/obj_queryassociations.h" DEFAULT_DEBUG_CHANNEL(shell); diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index 2f484ade4c6..0ed6fd8742e 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = shlwapi -EXTRALIBS = $(LIBUNICODE) +EXTRALIBS = $(LIBUUID) $(LIBUNICODE) LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index 05fa3e74800..3ffea705382 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -8,10 +8,6 @@ #include "winbase.h" #include "winerror.h" #include "debugtools.h" - -#include "initguid.h" -#include "wine/obj_base.h" -#include "wine/obj_storage.h" #include "shlwapi.h" DEFAULT_DEBUG_CHANNEL(shell); diff --git a/include/dplay.h b/include/dplay.h index 1d409aa42a7..e22da01feb2 100644 --- a/include/dplay.h +++ b/include/dplay.h @@ -352,7 +352,10 @@ typedef BOOL CALLBACK (*LPDPENUMDPCALLBACKA)( DWORD dwMinorVersion, /* Minor # of driver spec in lpguidSP */ LPVOID lpContext); /* User given */ -typedef const GUID *LPCGUID; +#ifndef __LPCGUID_DEFINED__ +#define __LPCGUID_DEFINED__ +typedef const GUID *LPCGUID; +#endif typedef const DPNAME *LPCDPNAME; diff --git a/ole/Makefile.in b/ole/Makefile.in index 64f114caf55..6e63d439e25 100644 --- a/ole/Makefile.in +++ b/ole/Makefile.in @@ -6,13 +6,26 @@ VPATH = @srcdir@ MODULE = ole C_SRCS = \ - ole2nls.c + ole2nls.c \ + uuid.c -all: $(MODULE).o +all: $(MODULE).o libuuid.a @MAKE_RULES@ -$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in - $(LDCOMBINE) $(OBJS) -o $@ +$(MODULE).o: ole2nls.o Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) ole2nls.o -o $@ + +libuuid.a: uuid.o + $(RM) $@ + $(AR) $@ uuid.o + $(RANLIB) $@ + +install: libuuid.a + [ -d $(libdir) ] || $(MKDIR) $(libdir) + $(INSTALL_DATA) libuuid.a $(libdir)/libuuid.a + +uninstall:: + cd $(libdir) && $(RM) libuuid.a ### Dependencies: diff --git a/ole/uuid.c b/ole/uuid.c new file mode 100644 index 00000000000..b7c1c9cf4a9 --- /dev/null +++ b/ole/uuid.c @@ -0,0 +1,51 @@ +/* + * GUID definitions + */ + +#include "initguid.h" + +/* GUIDs defined in uuids.lib */ + +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" + +#include "objbase.h" +#include "servprov.h" + +#include "oleauto.h" +#include "oleidl.h" +#include "objidl.h" +#include "olectl.h" + +#include "ocidl.h" + +#include "docobj.h" + +#include "shlguid.h" +#include "shlobj.h" +#include "wine/obj_queryassociations.h" + +/* FIXME: cguids declares GUIDs but does not define their values */ + + + +/* GUIDs defined in dxguid.lib */ + +#include "d3d.h" +#include "ddraw.h" +#include "dsound.h" +#include "dplay.h" +#include "dplobby.h" +#include "dinput.h" + +/* other GUIDs */ + +#include "vfw.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);