Moved GUID definitions to their respective dll.

This commit is contained in:
Alexandre Julliard 2000-08-03 04:22:35 +00:00
parent 08aad6ac25
commit bea617be47
10 changed files with 39 additions and 28 deletions

View File

@ -6,12 +6,14 @@
#include <assert.h>
#include "winbase.h"
#include "vfw.h"
#include "wine/winestring.h"
#include "mmsystem.h"
#include "winerror.h"
#include "debugtools.h"
#include "initguid.h"
#include "vfw.h"
DEFAULT_DEBUG_CHANNEL(avifile);
static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile* iface,REFIID refiid,LPVOID *obj);

View File

@ -18,11 +18,13 @@
#include "dc.h"
#include "win.h"
#include "wine/exception.h"
#include "ddraw.h"
#include "d3d.h"
#include "debugtools.h"
#include "message.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"

View File

@ -38,9 +38,8 @@
# include <linux/joystick.h>
# define JOYDEV "/dev/js0"
#endif
#include "wine/obj_base.h"
#include "debugtools.h"
#include "dinput.h"
#include "input.h"
#include "user.h"
#include "message.h"
@ -51,6 +50,9 @@
#include "wingdi.h"
#include "winuser.h"
#include "initguid.h"
#include "dinput.h"
DEFAULT_DEBUG_CHANNEL(dinput);
/* Wine mouse driver object instances */

View File

@ -8,9 +8,13 @@
#include "winbase.h"
#include "debugtools.h"
#include "initguid.h"
#include "dplay.h"
#include "dplobby.h"
#include "dplayx_global.h"
DEFAULT_DEBUG_CHANNEL(dplay)
DEFAULT_DEBUG_CHANNEL(dplay);
static DWORD DPLAYX_dwProcessesAttached = 0;

View File

@ -34,17 +34,19 @@
#include <stdlib.h>
#include <string.h>
#include <math.h> /* Insomnia - pow() function */
#include "dsound.h"
#include "dsdriver.h"
#include "windef.h"
#include "wingdi.h"
#include "winuser.h"
#include "winerror.h"
#include "mmsystem.h"
#include "wine/obj_base.h"
#include "thread.h"
#include "debugtools.h"
#include "initguid.h"
#include "dsound.h"
#include "dsdriver.h"
DEFAULT_DEBUG_CHANNEL(dsound);
/* these are eligible for tuning... they must be high on slow machines... */

View File

@ -9,10 +9,12 @@
#include <string.h>
#include "winbase.h"
#include "winerror.h"
#include "oleidl.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
#include "initguid.h"
#include "oleidl.h"
DEFAULT_DEBUG_CHANNEL(ole);
#define INITIAL_SINKS 10

View File

@ -8,13 +8,15 @@
#include "winuser.h"
#include "winerror.h"
#include "winversion.h"
#include "oleauto.h"
#include "wine/obj_base.h"
#include "wine/obj_moniker.h"
#include "heap.h"
#include "ldt.h"
#include "debugtools.h"
#include "initguid.h"
#include "oleauto.h"
#include "olectl.h"
DEFAULT_DEBUG_CHANNEL(ole);
static WCHAR _delimiter[2] = {'!',0}; /* default delimiter apparently */

View File

@ -6,19 +6,9 @@
* this in in a single file due to interfering definitions
*
*/
#define INITGUID
#include "initguid.h"
#include "shlwapi.h"
/* #include "shlguid.h" */
/*
* Francis Beaudet <francis@macadamian.com>
*
* I moved the contents of this file to the ole/guid.c file.
*
* I know that the purpose of this file being here is that it would
* separate the definitions reserved to the shell DLL into one place. *
However, until the shell DLL is a real DLL, as long as it is *
statically linked with the rest of wine, the initializer of it's * GUIDs
will have to be in the same place as everybody else. This is * the same
problem as with "real" Windows programs. */
#include "shlguid.h"
#include "shlobj.h"
#include "docobj.h"

View File

@ -9,6 +9,9 @@
#include "winerror.h"
#include "debugtools.h"
#include "initguid.h"
#include "wine/obj_storage.h"
DEFAULT_DEBUG_CHANNEL(shell);
HINSTANCE shlwapi_hInstance = 0;

View File

@ -9,6 +9,7 @@
*/
#include "initguid.h"
#if 0
#include "shlguid.h"
#include "docobj.h"
#include "olectl.h"
@ -25,6 +26,7 @@
#include "dplobby.h"
#include "vfw.h"
#include "shlobj.h"
#endif
/* and now for the one assumed GUID... */
DEFINE_GUID(GUID_NULL, 0,0,0,0,0,0,0,0,0,0,0);