More include optimisations and fixes.

This commit is contained in:
Marcus Meissner 1999-02-28 19:14:33 +00:00 committed by Alexandre Julliard
parent c642e4a31e
commit 064f170f76
45 changed files with 56 additions and 107 deletions

View File

@ -17,7 +17,6 @@
#include <stdlib.h>
#include <string.h>
#include "bitmap.h"
#include "win.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
@ -25,8 +24,6 @@
#include "task.h"
#include "heap.h"
#include "menu.h"
#include "module.h"
#include "neexe.h"
#include "nonclient.h"
#include "user.h"
#include "message.h"

View File

@ -7,15 +7,11 @@
*/
#include <string.h>
#include "debug.h"
#include "wintypes.h"
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
#include "wine/obj_dataobject.h"
#include "pidl.h"
#include "winerror.h"
#include "shell32_main.h"
#include "debug.h"
UINT cfShellIDList=0;
UINT cfFileGroupDesc=0;

View File

@ -12,13 +12,11 @@
#include "debug.h"
#include "winerror.h"
#include "objbase.h"
#include "wine/obj_base.h"
#include "wine/obj_dragdrop.h"
#include "shlguid.h"
#include "pidl.h"
#include "objbase.h"
#include "shlobj.h"
#include "shell32_main.h"

View File

@ -1,8 +1,6 @@
#ifndef _WINE_OLEOBJ_H
#define _WINE_OLEOBJ_H
#include "ole.h"
#include "ole2.h"
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#include "wine/obj_moniker.h"

View File

@ -2,8 +2,10 @@
#define __WINE_SHLOBJ_H
#include "wintypes.h"
#include "winbase.h" /* WIN32_FIND_* */
#include "wine/obj_base.h"
#include "wine/obj_shelllink.h"
#include "ole2.h"
#include "shell.h"
#include "oleobj.h"
#include "commctrl.h"

View File

@ -1,12 +1,11 @@
/*
* Defines undocumented Microsoft COM interfaces and APIs seemingly related to some 'channel' notion.
*
* Depends on 'obj_base.h'.
*/
#ifndef __WINE_WINE_OBJ_CHANNEL_H
#define __WINE_WINE_OBJ_CHANNEL_H
#include "wine/obj_base.h"
/*****************************************************************************
* Predeclare the interfaces

View File

@ -1,12 +1,11 @@
/*
* Defines the COM interfaces and APIs related to client/server aspects.
*
* Depends on 'obj_base.h'.
*/
#ifndef __WINE_WINE_OBJ_CLIENTSERVER_H
#define __WINE_WINE_OBJ_CLIENTSERVER_H
#include "wine/obj_base.h"
/*****************************************************************************
* Predeclare the interfaces

View File

@ -9,6 +9,9 @@
#include "winbase.h"
#include "winuser.h"
#include "wine/obj_inplace.h"
#include "wine/obj_dragdrop.h"
/*****************************************************************************

View File

@ -7,6 +7,9 @@
#ifndef __WINE_WINE_OBJ_DATAOBJECT_H
#define __WINE_WINE_OBJ_DATAOBJECT_H
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
/*****************************************************************************
* Predeclare the structures

View File

@ -1,7 +1,5 @@
/*
* Defines the COM interfaces and APIs related to OLE Drag and Drop.
*
* Depends on 'obj_base.h'.
*/
#ifndef __WINE_WINE_OBJ_DRAGDROP_H
@ -9,6 +7,8 @@
#include "winnt.h"
#include "windef.h"
#include "wine/obj_base.h"
#include "wine/obj_dataobject.h"
/*****************************************************************************
* Predeclare the interfaces

View File

@ -10,6 +10,7 @@
#include "winbase.h"
#include "winuser.h"
#include "wine/obj_moniker.h"
/*****************************************************************************
* Predeclare the structures

View File

@ -1,13 +1,13 @@
/*
* Defines the COM interfaces and APIs that allow an interface to
* specify a custom marshaling for its objects.
*
* Depends on 'obj_storage.h' and 'obj_base.h'.
*/
#ifndef __WINE_WINE_OBJ_MARSHAL_H
#define __WINE_WINE_OBJ_MARSHAL_H
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
/*****************************************************************************
* Predeclare the interfaces

View File

@ -3,13 +3,12 @@
* These did not really fit into the other categories, whould have
* required their own specific category or are too rarely used to be
* put in 'obj_base.h'.
*
* Depends on 'obj_base.h'.
*/
#ifndef __WINE_WINE_OBJ_MISC_H
#define __WINE_WINE_OBJ_MISC_H
#include "wine/obj_base.h"
/*****************************************************************************
* Predeclare the interfaces

View File

@ -1,15 +1,13 @@
/*
* Defines the COM interfaces and APIs related to the moniker functionality.
*
* This file depends on 'obj_storage.h' and 'obj_base.h' and 'obj_misc.h' (IEnumString).
*/
#ifndef __WINE_WINE_OBJ_MONIKER_H
#define __WINE_WINE_OBJ_MONIKER_H
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#include "wine/obj_misc.h"
/*****************************************************************************
* Predeclare the interfaces
*/

View File

@ -1,14 +1,11 @@
/*
* Defines the COM interfaces and APIs related to OLE automation support.
*
* Depends on 'obj_base.h'.
*/
#ifndef __WINE_WINE_OBJ_OLEAUT_H
#define __WINE_WINE_OBJ_OLEAUT_H
#include "windows.h"
#include "wintypes.h"
#include "wine/obj_base.h"
/*****************************************************************************
* Predeclare the interfaces

View File

@ -7,8 +7,8 @@
#ifndef __WINE_WINE_OBJ_OLEFONT_H
#define __WINE_WINE_OBJ_OLEFONT_H
#include "windows.h"
#include "wintypes.h"
#include "wine/obj_base.h"
#include "wingdi.h" /* TEXTMETRIC*/
/*****************************************************************************
* Predeclare the interfaces

View File

@ -1,12 +1,12 @@
/*
* Defines the COM interfaces and APIs related to saving properties to file.
*
* Depends on 'obj_storage.h' and 'obj_base.h'.
*/
#ifndef __WINE_WINE_OBJ_PROPERTYSTORAGE_H
#define __WINE_WINE_OBJ_PROPERTYSTORAGE_H
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
/*****************************************************************************
* Predeclare the interfaces

View File

@ -1,15 +1,13 @@
/*
* Defines the COM interfaces and APIs related to structured data storage.
*
* Depends on 'obj_base.h'.
*/
#ifndef __WINE_WINE_OBJ_STORAGE_H
#define __WINE_WINE_OBJ_STORAGE_H
#include "winbase.h"
#include "winnt.h"
#include "wine/obj_base.h"
/*****************************************************************************
* Predeclare the structures

View File

@ -1,6 +1,7 @@
#ifndef __WINE_WINUSER16_H
#define __WINE_WINUSER16_H
#include "wintypes.h"
#include "winbase.h"
#include "winuser.h"

View File

@ -1,7 +1,7 @@
/* Sample winestub.c file for compiling programs with libwine.so. */
#include <string.h>
#include "windows.h"
#include "winuser.h"
#include "xmalloc.h"
extern int PASCAL WinMain(HINSTANCE,HINSTANCE,LPSTR,int);

View File

@ -7,8 +7,9 @@
#include <ctype.h>
#include <string.h>
#include "winbase.h"
#include "winuser.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "wine/keyboard16.h"
#include "winerror.h"
#include "ldt.h"
#include "debug.h"

View File

@ -4,6 +4,7 @@
#include <stdlib.h>
#include "wintypes.h"
#include "wine/winesound.h"
#include "debug.h"
INT16 WINAPI OpenSound16(void)

View File

@ -24,12 +24,10 @@
#include "winbase.h"
#include "windef.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "heap.h"
#include "ldt.h"
#include "user.h"
#include "driver.h"
#include "mmsystem.h"
#include "multimedia.h"
#include "callback.h"
#include "module.h"

View File

@ -9,8 +9,6 @@
#include <string.h>
#include <assert.h>
#include "winerror.h"
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
#include "debug.h"
#include "heap.h"

View File

@ -8,10 +8,8 @@
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include "winerror.h"
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
#include "winerror.h"
#include "debug.h"
#include "heap.h"

View File

@ -13,7 +13,6 @@
#include "heap.h"
#include "wine/winbase16.h"
#include "wine/obj_base.h"
#include "objbase.h"
#include "local.h"
#include "module.h"
#include "debug.h"

View File

@ -9,8 +9,6 @@
#include <string.h>
#include <assert.h>
#include "winerror.h"
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
#include "debug.h"
#include "heap.h"

View File

@ -10,8 +10,6 @@
#include <string.h>
#include <assert.h>
#include "winerror.h"
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
#include "debug.h"

View File

@ -7,17 +7,12 @@
#include <assert.h>
#include "windows.h"
#include "winuser.h"
#include "winerror.h"
#include "ole2.h"
#include "process.h"
#include "debug.h"
#include "objbase.h"
#include "objidl.h"
#include "wine/obj_base.h"
#include "wine/obj_clientserver.h"
#include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
#include "debug.h"
/******************************************************************************
* These are static/global variables and internal data structures that the

View File

@ -5,14 +5,10 @@
*/
#include <string.h>
#include "windows.h"
#include "winerror.h"
#include "ole.h"
#include "ole2.h"
#include "oleauto.h"
#include "wtypes.h"
#include "wine/obj_base.h"
#include "objbase.h"
#include "heap.h"
#include "ldt.h"
#include "debug.h"

View File

@ -10,7 +10,6 @@
#include <stdlib.h>
#include "winuser.h"
#include "heap.h"
#include "ole.h"
#include "options.h"
#include "winnls.h"
#include "winreg.h"

View File

@ -7,13 +7,11 @@
/* At the moment, these are only empty stubs.
*/
#include "windows.h"
#include "winerror.h"
#include "ole.h"
#include "gdi.h"
#include "wine/obj_dataobject.h"
#include "debug.h"
#include "ole2.h"
#include "objidl.h"
extern LONG OLE_current_handle;

View File

@ -4,8 +4,8 @@
* Copyright 1998 Patrik Stridvall
*/
#include "windows.h"
#include "wintypes.h"
#include "winbase.h"
#include "winerror.h"
#include "ole.h"
#include "oledlg.h"

View File

@ -8,7 +8,6 @@
*/
#include <assert.h>
#include <string.h>
#include "windows.h"
#include "winerror.h"
#include "oleauto.h"
#include "ocidl.h"

View File

@ -6,14 +6,13 @@
#include <string.h>
#include "ole.h"
#include "ole2.h"
#include "oleobj.h"
#include "winbase.h"
#include "winerror.h"
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
#include "wine/obj_dataobject.h"
#include "oleobj.h"
#include "debug.h"

View File

@ -7,7 +7,6 @@
/* At the moment, these are only empty stubs.
*/
#include "windows.h"
#include "ole.h"
#include "debug.h"

View File

@ -7,15 +7,14 @@
* Copyright 1999 Sylvain St-Germain
*/
#include <wintypes.h>
#include <winerror.h>
#include <winbase.h>
#include <oleauto.h>
#include <ole.h>
#include <strings.h>
#include <stdio.h>
#include <debug.h>
#include <strings.h>
#include "wintypes.h"
#include "winerror.h"
#include "winbase.h"
#include "oleauto.h"
#include "wine/obj_base.h"
#include "debug.h"
/* Localy used methods */
static INT

View File

@ -23,11 +23,8 @@
#include <stdio.h>
#include <string.h>
#include "windows.h"
#include "winbase.h"
#include "winerror.h"
#include "ole.h"
#include "ole2.h"
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#include "storage32.h"

View File

@ -13,11 +13,8 @@
#include <stdio.h>
#include <string.h>
#include "windows.h"
#include "winbase.h"
#include "winerror.h"
#include "ole.h"
#include "ole2.h"
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#include "storage32.h"

View File

@ -18,7 +18,6 @@
#include "ole.h"
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#include "objbase.h"
#include "heap.h"
#include "module.h"
#include "ldt.h"

View File

@ -15,18 +15,12 @@
#include <stdio.h>
#include <string.h>
#include "windows.h"
#include "winbase.h"
#include "winerror.h"
#include "file.h"
#include "ole.h"
#include "ole2.h"
#include "objbase.h"
#include "wine/obj_storage.h"
#include "wine/winestring.h"
#include "crtdll.h"
#include "tchar.h"
#include "heap.h"
#include "winnt.h"
#include "winbase.h"
#include "debug.h"
#include "storage32.h"

View File

@ -8,13 +8,12 @@
#include <string.h>
#include <assert.h>
#include "wintypes.h"
#include "winerror.h"
#include "winreg.h"
#include "oleauto.h"
#include "wine/winbase16.h"
#include "heap.h"
#include "winreg.h"
#include "winerror.h"
#include "oleauto.h"
#include "wine/obj_base.h"
#include "objbase.h"
#include "debug.h"
#include "winversion.h"

View File

@ -25,7 +25,6 @@
#include "heap.h"
#include "debug.h"
#include "winerror.h"
#include "mapidefs.h"
#include "parsedt.h"
#include <string.h>

View File

@ -15,7 +15,7 @@
#include <unistd.h>
#include <fcntl.h>
#include "windows.h"
#include "winuser.h"
#include "fnt2bdf.h"
#include "neexe.h"
#include "module.h"

View File

@ -7,8 +7,8 @@
#include "config.h"
#include "debug.h"
#include "display.h"
#include "debug.h"
#include "wintypes.h"
#ifndef X_DISPLAY_MISSING