From 33929be46f041d65bf064b57b70aae1216e15b47 Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Wed, 18 Jul 2001 21:04:23 +0000 Subject: [PATCH] - Made sure that the files that contains the declarations of implementated functions are included. - Corrected mismatching prototypes. - Cleaned up the include section. --- dlls/comctl32/comctl32undoc.c | 7 +++++-- dlls/ddraw/dclipper/main.c | 6 +++++- dlls/ddraw/direct3d/mesa.c | 10 ++++++---- dlls/ddraw/dsurface/wndproc.c | 7 +++++-- dlls/ddraw/helper.c | 19 +++++++++---------- dlls/kernel/comm.c | 7 +++++-- dlls/kernel/kernel_main.c | 9 ++++++--- dlls/msacm/pcmconverter.c | 10 ++++++++-- dlls/msvcrt/errno.c | 9 ++++++--- dlls/msvcrt/mbcs.c | 6 ++++-- dlls/msvcrt/msvcrt.h | 2 +- dlls/user/lstr.c | 12 +++++++----- dlls/user/wsprintf.c | 8 ++++++-- dlls/version/resource.c | 13 +++++++------ dlls/winmm/joystick.c | 5 +++++ dlls/winmm/mci.c | 10 +++++++--- dlls/winmm/mmio.c | 8 ++++++-- dlls/winmm/mmsystem.c | 6 +++++- dlls/winmm/time.c | 8 +++++++- files/dos_fs.c | 13 ++++++++----- graphics/win16drv/objects.c | 5 +++++ graphics/x11drv/objects.c | 2 ++ include/msvcrt/string.h | 2 +- include/wine/winuser16.h | 1 - include/winuser.h | 11 ++++++----- loader/task.c | 22 ++++++++++++++-------- memory/environ.c | 10 +++++++--- misc/registry.c | 15 +++++++++------ msdos/dosconf.c | 10 ++++++++-- msdos/int29.c | 4 +++- msdos/ppdev.c | 13 ++++++++----- objects/brush.c | 9 ++++++++- objects/metafile.c | 8 ++++++-- objects/pen.c | 8 ++++++++ win32/file.c | 4 ++++ 35 files changed, 207 insertions(+), 92 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index c972e986834..c1c3cbb5421 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -20,11 +20,14 @@ #include /* atoi */ #include +#include "commctrl.h" +#include "objbase.h" #include "winbase.h" #include "winerror.h" + #include "wine/unicode.h" -#include "objbase.h" -#include "commctrl.h" +#include "comctl32.h" + #include "debugtools.h" DEFAULT_DEBUG_CHANNEL(commctrl); diff --git a/dlls/ddraw/dclipper/main.c b/dlls/ddraw/dclipper/main.c index 1102a70bbf6..b7fc60f4f04 100644 --- a/dlls/ddraw/dclipper/main.c +++ b/dlls/ddraw/dclipper/main.c @@ -8,12 +8,16 @@ #include #include + +#include "ddraw.h" #include "winerror.h" -#include "debugtools.h" + #include "ddraw_private.h" #include "dclipper/main.h" #include "ddraw/main.h" +#include "debugtools.h" + DEFAULT_DEBUG_CHANNEL(ddraw); /****************************************************************************** diff --git a/dlls/ddraw/direct3d/mesa.c b/dlls/ddraw/direct3d/mesa.c index 71efa267b92..ea4d5b9d5fb 100644 --- a/dlls/ddraw/direct3d/mesa.c +++ b/dlls/ddraw/direct3d/mesa.c @@ -6,13 +6,15 @@ #include #include -#include "winerror.h" -#include "ddraw.h" #include "d3d.h" -#include "options.h" -#include "debugtools.h" +#include "ddraw.h" +#include "winerror.h" +#include "ddraw_private.h" #include "mesa_private.h" +#include "options.h" + +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/dsurface/wndproc.c b/dlls/ddraw/dsurface/wndproc.c index def18798aa2..3c12f72dca4 100644 --- a/dlls/ddraw/dsurface/wndproc.c +++ b/dlls/ddraw/dsurface/wndproc.c @@ -4,14 +4,17 @@ */ #include "config.h" -#include "winerror.h" #include #include #include -#include "debugtools.h" +#include "winerror.h" + #include "ddraw_private.h" +#include "wndproc.h" + +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/helper.c b/dlls/ddraw/helper.c index 52f984b9802..8d29f1575ea 100644 --- a/dlls/ddraw/helper.c +++ b/dlls/ddraw/helper.c @@ -10,14 +10,17 @@ #include +#include "d3d.h" +#include "ddraw.h" #include "winerror.h" -#include "heap.h" + #include "wine/exception.h" -#include "ddraw.h" -#include "d3d.h" -#include "debugtools.h" +#include "ddraw_private.h" +#include "heap.h" #include "options.h" +#include "debugtools.h" + DEFAULT_DEBUG_CHANNEL(ddraw); /****************************************************************************** @@ -217,9 +220,7 @@ void DDRAW_dump_paletteformat(DWORD dwFlags) DDRAW_dump_flags(dwFlags, flags, sizeof(flags)/sizeof(flags[0])); } -void DDRAW_dump_pixelformat(void *in) { - LPDDPIXELFORMAT pf = (LPDDPIXELFORMAT) in; - +void DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf) { DPRINTF("( "); DDRAW_dump_pixelformat_flag(pf->dwFlags); if (pf->dwFlags & DDPF_FOURCC) { @@ -282,9 +283,7 @@ static void DDRAW_dump_DWORD(const void *in) { static void DDRAW_dump_PTR(const void *in) { DPRINTF("%p", *((const void **) in)); } -void DDRAW_dump_DDCOLORKEY(const void *in) { - const DDCOLORKEY *ddck = (const DDCOLORKEY *) in; - +void DDRAW_dump_DDCOLORKEY(const DDCOLORKEY *ddck) { DPRINTF(" Low : %ld - High : %ld", ddck->dwColorSpaceLowValue, ddck->dwColorSpaceHighValue); } diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c index 4188f7364ed..8415c829444 100644 --- a/dlls/kernel/comm.c +++ b/dlls/kernel/comm.c @@ -51,14 +51,17 @@ #include #include #include - -#include "windef.h" #ifdef HAVE_SYS_MODEM_H # include #endif #ifdef HAVE_SYS_STRTIO_H # include #endif + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" #include "heap.h" #include "options.h" #include "wine/port.h" diff --git a/dlls/kernel/kernel_main.c b/dlls/kernel/kernel_main.c index 1b585cbf4dd..382f185540e 100644 --- a/dlls/kernel/kernel_main.c +++ b/dlls/kernel/kernel_main.c @@ -2,17 +2,20 @@ * Kernel initialization code */ +#include "config.h" + #include #include #include #include "winbase.h" -#include "wine/winbase16.h" +#include "wine/winbase16.h" +#include "callback.h" +#include "global.h" +#include "miscemu.h" #include "module.h" #include "task.h" -#include "miscemu.h" -#include "global.h" extern void CODEPAGE_Init(void); extern BOOL RELAY_Init(void); diff --git a/dlls/msacm/pcmconverter.c b/dlls/msacm/pcmconverter.c index 14f99de7b54..f895a84afc8 100644 --- a/dlls/msacm/pcmconverter.c +++ b/dlls/msacm/pcmconverter.c @@ -15,14 +15,20 @@ * embedded driver handling scheme in msacm32.dll which isn't done yet */ +#include "config.h" + #include #include -#include "winnls.h" + +#include "msacm.h" #include "winbase.h" #include "wingdi.h" +#include "winnls.h" #include "winuser.h" -#include "msacm.h" + #include "msacmdrv.h" +#include "wineacm.h" + #include "debugtools.h" DEFAULT_DEBUG_CHANNEL(msacm); diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 971c9e0f777..48e54608776 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -9,7 +9,10 @@ #include #include + #include "msvcrt/conio.h" +#include "msvcrt/stdlib.h" +#include "msvcrt/string.h" DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -19,7 +22,7 @@ DEFAULT_DEBUG_CHANNEL(msvcrt); void MSVCRT__set_errno(int err) { int *errno = GET_THREAD_VAR_PTR(errno); - int *doserrno = GET_THREAD_VAR_PTR(doserrno); + unsigned long *doserrno = GET_THREAD_VAR_PTR(doserrno); *doserrno = err; @@ -86,7 +89,7 @@ int* MSVCRT__errno(void) /********************************************************************* * __doserrno (MSVCRT.@) */ -int* __doserrno(void) +unsigned long* __doserrno(void) { return GET_THREAD_VAR_PTR(doserrno); } @@ -102,7 +105,7 @@ char* MSVCRT_strerror(int err) /********************************************************************** * _strerror (MSVCRT.@) */ -const char* _strerror(const char* err) +char* _strerror(const char* err) { static char strerrbuff[256]; /* FIXME: Per thread, nprintf */ sprintf(strerrbuff,"%s: %s\n",err,MSVCRT_strerror(GET_THREAD_VAR(errno))); diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index e6a7a934f2b..7b930422e76 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -8,8 +8,10 @@ * Not currently binary compatible with win32. MSVCRT_mbctype must be * populated correctly and the ismb* functions should reference it. */ + #include "msvcrt.h" +#include "msvcrt/stdlib.h" #include "msvcrt/string.h" @@ -184,7 +186,7 @@ char *_mbsrchr(const char *s,unsigned int x) /********************************************************************* * mbtowc(MSVCRT.@) */ -int MSVCRT_mbtowc(WCHAR *dst, const unsigned char *str, unsigned int n) +int MSVCRT_mbtowc(WCHAR *dst, const char *str, unsigned int n) { if(n <= 0 || !str) return 0; @@ -385,7 +387,7 @@ char *_mbsnset(char *str, unsigned int c, unsigned int len) /********************************************************************* * _mbstrlen(MSVCRT.@) */ -int _mbstrlen(const unsigned char *str) +MSVCRT_size_t _mbstrlen(const char *str) { if(MSVCRT___mb_cur_max > 1) { diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index b4368da99df..a079ac2496e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -17,7 +17,7 @@ extern DWORD MSVCRT_tls_index; typedef struct __MSVCRT_thread_data { int errno; - int doserrno; + unsigned long doserrno; } MSVCRT_thread_data; #define GET_THREAD_DATA(x) \ diff --git a/dlls/user/lstr.c b/dlls/user/lstr.c index 48c73564c9f..cc8b2a13b46 100644 --- a/dlls/user/lstr.c +++ b/dlls/user/lstr.c @@ -6,22 +6,24 @@ * Copyright 1996 Marcus Meissner */ +#include "config.h" + #include #include #include #include #include -#include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winerror.h" + +#include "wine/exception.h" +#include "wine/keyboard16.h" +#include "wine/unicode.h" #include "wine/winbase16.h" #include "wine/winuser16.h" -#include "wine/unicode.h" -#include "wine/exception.h" - #include "heap.h" + #include "debugtools.h" DEFAULT_DEBUG_CHANNEL(resource); diff --git a/dlls/user/wsprintf.c b/dlls/user/wsprintf.c index 5c07af1d0f0..1911e0cf0ee 100644 --- a/dlls/user/wsprintf.c +++ b/dlls/user/wsprintf.c @@ -7,11 +7,15 @@ #include #include #include -#include "wine/winbase16.h" -#include "windef.h" + +#include "winbase.h" #include "wingdi.h" #include "winuser.h" + +#include "wine/winbase16.h" +#include "wine/winuser16.h" #include "stackframe.h" + #include "debugtools.h" DEFAULT_DEBUG_CHANNEL(string); diff --git a/dlls/version/resource.c b/dlls/version/resource.c index b533c7f0f65..126ad29bef4 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -6,20 +6,21 @@ * Copyright 1999 Ulrich Weigand */ +#include "config.h" + #include #include #include #include -#include "config.h" - #include "winbase.h" -#include "wine/winbase16.h" -#include "winnls.h" -#include "wine/unicode.h" +#include "lzexpand.h" +#include "wine/unicode.h" +#include "wine/winbase16.h" +#include "wine/winuser16.h" #include "winver.h" -#include "lzexpand.h" + #include "debugtools.h" DEFAULT_DEBUG_CHANNEL(ver); diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 667398f474d..0e9b8a97ca0 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -15,11 +15,16 @@ #include #include #include + +#include "mmsystem.h" #include "winbase.h" #include "winnls.h" #include "wingdi.h" #include "winuser.h" + +#include "wine/mmsystem16.h" #include "winemm.h" + #include "debugtools.h" DEFAULT_DEBUG_CHANNEL(mmsys); diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index f3aca250a45..64c409db77f 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -10,15 +10,19 @@ #include #include +#include "mmsystem.h" #include "winbase.h" #include "wingdi.h" +#include "winreg.h" #include "winuser.h" + +#include "wine/mmsystem16.h" +#include "wine/winbase16.h" +#include "digitalv.h" #include "heap.h" #include "winemm.h" -#include "digitalv.h" -#include "wine/winbase16.h" + #include "debugtools.h" -#include "winreg.h" DEFAULT_DEBUG_CHANNEL(mci); diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 53ad279034d..af60b3ad1f0 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -22,13 +22,17 @@ #include #include #include + +#include "mmsystem.h" #include "windef.h" + +#include "wine/mmsystem16.h" #include "wine/winbase16.h" #include "heap.h" -#include "mmsystem.h" -#include "debugtools.h" #include "winemm.h" +#include "debugtools.h" + DEFAULT_DEBUG_CHANNEL(mmio); /************************************************************************** diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index 88fb28b5f83..5f6a3452fbe 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -20,13 +20,17 @@ #include +#include "mmsystem.h" #include "winbase.h" #include "wingdi.h" + +#include "wine/mmsystem16.h" #include "wine/winuser16.h" #include "heap.h" +#include "ntddk.h" #include "winemm.h" + #include "debugtools.h" -#include "ntddk.h" DEFAULT_DEBUG_CHANNEL(mmsys); diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 40c3fe52e57..0f2a3c37aaa 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -6,17 +6,23 @@ * Copyright 1993 Martin Ayotte */ +#include "config.h" +#include "wine/port.h" + #include #include #include +#include "mmsystem.h" #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" + +#include "wine/mmsystem16.h" #include "winemm.h" + #include "debugtools.h" -#include "wine/port.h" DEFAULT_DEBUG_CHANNEL(mmtime); diff --git a/files/dos_fs.c b/files/dos_fs.c index 655e5008415..ee449fdf180 100644 --- a/files/dos_fs.c +++ b/files/dos_fs.c @@ -6,6 +6,7 @@ */ #include "config.h" + #include #include #include @@ -22,17 +23,19 @@ #include #include "windef.h" -#include "ntddk.h" -#include "winnls.h" -#include "wine/winbase16.h" -#include "wine/unicode.h" #include "winerror.h" +#include "wingdi.h" + +#include "wine/unicode.h" +#include "wine/winbase16.h" #include "drive.h" #include "file.h" #include "heap.h" #include "msdos.h" -#include "server.h" +#include "ntddk.h" #include "options.h" +#include "server.h" + #include "debugtools.h" DEFAULT_DEBUG_CHANNEL(dosfs); diff --git a/graphics/win16drv/objects.c b/graphics/win16drv/objects.c index fde57999177..824cd451382 100644 --- a/graphics/win16drv/objects.c +++ b/graphics/win16drv/objects.c @@ -4,12 +4,17 @@ * Copyright 1993 Alexandre Julliard */ +#include "config.h" + #include #include + #include "bitmap.h" #include "brush.h" #include "font.h" #include "pen.h" +#include "win16drv.h" + #include "debugtools.h" DEFAULT_DEBUG_CHANNEL(gdi); diff --git a/graphics/x11drv/objects.c b/graphics/x11drv/objects.c index e91f6b69387..839647d0776 100644 --- a/graphics/x11drv/objects.c +++ b/graphics/x11drv/objects.c @@ -13,6 +13,8 @@ #include "brush.h" #include "font.h" #include "pen.h" +#include "x11drv.h" + #include "debugtools.h" DEFAULT_DEBUG_CHANNEL(gdi); diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index c9c22ae5642..d803cced212 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -34,7 +34,7 @@ void* _memccpy(void*,const void*,int,MSVCRT(size_t)); int _memicmp(const void*,const void*,MSVCRT(size_t)); int _strcmpi(const char*,const char*); char* _strdup(const char*); -char* _strerror(int); +char* _strerror(const char*); int _stricmp(const char*,const char*); int _stricoll(const char*,const char*); char* _strlwr(char*); diff --git a/include/wine/winuser16.h b/include/wine/winuser16.h index c48697568e2..2829c1caebe 100644 --- a/include/wine/winuser16.h +++ b/include/wine/winuser16.h @@ -567,7 +567,6 @@ FARPROC16 WINAPI SetWindowsHook16(INT16,HOOKPROC16); HHOOK WINAPI SetWindowsHookEx16(INT16,HOOKPROC16,HINSTANCE16,HTASK16); BOOL16 WINAPI UnhookWindowsHook16(INT16,HOOKPROC16); BOOL16 WINAPI UnhookWindowsHookEx16(HHOOK); -INT16 WINAPI wvsnprintf16(LPSTR,UINT16,LPCSTR,LPCVOID); VOID WINAPI CalcChildScroll16(HWND16,WORD); VOID WINAPI CascadeChildWindows16(HWND16,WORD); INT16 WINAPI CloseComm16(INT16); diff --git a/include/winuser.h b/include/winuser.h index 1261967f140..9675580329d 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3735,11 +3735,12 @@ UINT WINAPI MapVirtualKeyW(UINT,UINT); UINT WINAPI MapVirtualKeyExA(UINT,UINT,HKL); UINT WINAPI MapVirtualKeyExW(UINT,UINT,HKL); #define MapVirtualKeyEx WINELIB_NAME_AW(MapVirtualKeyEx) -BOOL WINAPI MapDialogRect(HWND,LPRECT); -INT WINAPI MapWindowPoints(HWND,HWND,LPPOINT,UINT); -BOOL WINAPI MessageBeep(UINT); -INT WINAPI MessageBoxA(HWND,LPCSTR,LPCSTR,UINT); -INT WINAPI MessageBoxW(HWND,LPCWSTR,LPCWSTR,UINT); +BOOL WINAPI MapDialogRect(HWND,LPRECT); +INT WINAPI MapWindowPoints(HWND,HWND,LPPOINT,UINT); +UINT WINAPI MenuItemFromPoint(HWND,HMENU,POINT); +BOOL WINAPI MessageBeep(UINT); +INT WINAPI MessageBoxA(HWND,LPCSTR,LPCSTR,UINT); +INT WINAPI MessageBoxW(HWND,LPCWSTR,LPCWSTR,UINT); #define MessageBox WINELIB_NAME_AW(MessageBox) INT WINAPI MessageBoxIndirectA(LPMSGBOXPARAMSA); INT WINAPI MessageBoxIndirectW(LPMSGBOXPARAMSW); diff --git a/loader/task.c b/loader/task.c index 200b9b98a90..5b3819fddb5 100644 --- a/loader/task.c +++ b/loader/task.c @@ -4,14 +4,21 @@ * Copyright 1995 Alexandre Julliard */ +#include "config.h" +#include "wine/port.h" + #include #include #include #include -#include "wine/port.h" +#include "winbase.h" +#include "wingdi.h" +#include "winnt.h" +#include "winuser.h" +#include "winsock.h" + #include "wine/winbase16.h" -#include "ntddk.h" #include "callback.h" #include "drive.h" #include "file.h" @@ -19,18 +26,17 @@ #include "instance.h" #include "miscemu.h" #include "module.h" +#include "ntddk.h" #include "selectors.h" +#include "services.h" +#include "server.h" +#include "syslevel.h" #include "stackframe.h" #include "task.h" #include "thread.h" #include "toolhelp.h" -#include "winnt.h" -#include "syslevel.h" -#include "winsock.h" -#include "debugtools.h" -#include "services.h" -#include "server.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(task); DECLARE_DEBUG_CHANNEL(relay); diff --git a/memory/environ.c b/memory/environ.c index 6f479069af2..2bf27850cba 100644 --- a/memory/environ.c +++ b/memory/environ.c @@ -4,14 +4,18 @@ * Copyright 1996, 1998 Alexandre Julliard */ +#include "config.h" +#include "wine/port.h" + #include #include -#include "wine/port.h" + #include "windef.h" -#include "winnls.h" #include "winerror.h" -#include "ntddk.h" + +#include "wine/winbase16.h" #include "heap.h" +#include "ntddk.h" #include "selectors.h" /* Win32 process environment database */ diff --git a/misc/registry.c b/misc/registry.c index f39da22f98c..05ca70261df 100644 --- a/misc/registry.c +++ b/misc/registry.c @@ -29,18 +29,21 @@ #include #include #include +#ifdef HAVE_SYS_MMAN_H +# include +#endif + #include "winerror.h" +#include "winnt.h" +#include "winreg.h" + +#include "wine/winbase16.h" #include "file.h" #include "heap.h" -#include "debugtools.h" #include "options.h" -#include "winreg.h" #include "server.h" -#ifdef HAVE_SYS_MMAN_H -# include -#endif -#include "winnt.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(reg); diff --git a/msdos/dosconf.c b/msdos/dosconf.c index 0e7ee449f69..1f6c18b0966 100644 --- a/msdos/dosconf.c +++ b/msdos/dosconf.c @@ -5,16 +5,22 @@ * */ +#include "config.h" + #include #include #include #include #include + #include "winbase.h" + +#include "file.h" +#include "miscemu.h" #include "msdos.h" -#include "debugtools.h" #include "options.h" -#include "file.h" + +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(profile); diff --git a/msdos/int29.c b/msdos/int29.c index cf50a0bd140..8ffaa56c802 100644 --- a/msdos/int29.c +++ b/msdos/int29.c @@ -3,9 +3,11 @@ */ #include "config.h" -#include "windef.h" + #include "winnt.h" + #include "console.h" +#include "miscemu.h" /********************************************************************** * INT_Int29Handler diff --git a/msdos/ppdev.c b/msdos/ppdev.c index c8b49fc6438..78a102a11c2 100644 --- a/msdos/ppdev.c +++ b/msdos/ppdev.c @@ -4,11 +4,7 @@ #include "config.h" -#include "debugtools.h" - -DEFAULT_DEBUG_CHANNEL(int); - -#ifdef HAVE_PPDEV +#ifdef HAVE_PPDEV #include #include @@ -21,6 +17,11 @@ DEFAULT_DEBUG_CHANNEL(int); #include "winerror.h" #include "winreg.h" +#include "miscemu.h" + +#include "debugtools.h" + +DEFAULT_DEBUG_CHANNEL(int); typedef struct _PPDEVICESTRUCT{ int fd; /* NULL if device not available */ @@ -272,6 +273,8 @@ BOOL IO_pp_outp(int port, DWORD* res) #else /* HAVE_PPDEV */ +#include "windef.h" + char IO_pp_init(void) { return 1; diff --git a/objects/brush.c b/objects/brush.c index bc36fd64193..cef8f523c86 100644 --- a/objects/brush.c +++ b/objects/brush.c @@ -4,10 +4,17 @@ * Copyright 1993, 1994 Alexandre Julliard */ +#include "config.h" + #include + #include "winbase.h" -#include "brush.h" +#include "wingdi.h" + +#include "wine/wingdi16.h" #include "bitmap.h" +#include "brush.h" + #include "debugtools.h" DEFAULT_DEBUG_CHANNEL(gdi); diff --git a/objects/metafile.c b/objects/metafile.c index 8691df8d95d..ed5d0e32c21 100644 --- a/objects/metafile.c +++ b/objects/metafile.c @@ -30,16 +30,20 @@ * HDMD - 14/4/1999 */ +#include "config.h" #include #include + #include "wine/winbase16.h" -#include "metafile.h" +#include "wine/wingdi16.h" #include "bitmap.h" +#include "global.h" #include "heap.h" +#include "metafile.h" #include "toolhelp.h" + #include "debugtools.h" -#include "global.h" DEFAULT_DEBUG_CHANNEL(metafile); diff --git a/objects/pen.c b/objects/pen.c index e64bc680759..ae55d64a9e4 100644 --- a/objects/pen.c +++ b/objects/pen.c @@ -4,8 +4,16 @@ * Copyright 1993 Alexandre Julliard */ +#include "config.h" + #include + +#include "windef.h" +#include "wingdi.h" + +#include "wine/wingdi16.h" #include "pen.h" + #include "debugtools.h" DEFAULT_DEBUG_CHANNEL(gdi); diff --git a/win32/file.c b/win32/file.c index 36eb56b5c02..c0a4591e00f 100644 --- a/win32/file.c +++ b/win32/file.c @@ -21,10 +21,14 @@ #include #include #include + #include "winbase.h" #include "winerror.h" + +#include "wine/winbase16.h" #include "file.h" #include "heap.h" + #include "debugtools.h" DEFAULT_DEBUG_CHANNEL(file); -- 2.11.4.GIT