- Made sure that the files that contains the declarations

dlls/comctl32/comctl32undoc.c

@@ -20,11 +20,14 @@
 #include <stdlib.h> /* atoi */
 #include <ctype.h>
 
+#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);

dlls/ddraw/dclipper/main.c

@@ -8,12 +8,16 @@
 
 #include <stdlib.h>
 #include <string.h>
+
+#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);
 
 /******************************************************************************

dlls/ddraw/direct3d/mesa.c

@@ -6,13 +6,15 @@
 #include <string.h>
 #include <stdio.h>
 
-#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);
 

dlls/ddraw/dsurface/wndproc.c

@@ -4,14 +4,17 @@
  */
 
 #include "config.h"
-#include "winerror.h"
 
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "debugtools.h"
+#include "winerror.h"
+
 #include "ddraw_private.h"
+#include "wndproc.h"
+
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(ddraw);
 

dlls/ddraw/helper.c

@@ -10,14 +10,17 @@
 
 #include <stddef.h>
 
+#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);
 }
 

dlls/kernel/comm.c

@@ -51,14 +51,17 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 #include <sys/poll.h>
-
-#include "windef.h"
 #ifdef HAVE_SYS_MODEM_H
 # include <sys/modem.h>
 #endif
 #ifdef HAVE_SYS_STRTIO_H
 # include <sys/strtio.h>
 #endif
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
 #include "heap.h"
 #include "options.h"
 #include "wine/port.h"

dlls/kernel/kernel_main.c

@@ -2,17 +2,20 @@
  * Kernel initialization code
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <ctype.h>
 #include <string.h>
 
 #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);

dlls/msacm/pcmconverter.c

@@ -15,14 +15,20 @@
  *	  embedded driver handling scheme in msacm32.dll which isn't done yet
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <string.h>
-#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);

dlls/msvcrt/errno.c

@@ -9,7 +9,10 @@
 
 #include <stdio.h>
 #include <string.h>
+
 #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)));

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)
   {

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) \

dlls/user/lstr.c

@@ -6,22 +6,24 @@
  * Copyright 1996 Marcus Meissner
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
-#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);

dlls/user/wsprintf.c

@@ -7,11 +7,15 @@
 #include <stdarg.h>
 #include <string.h>
 #include <stdio.h>
-#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);

dlls/version/resource.c

@@ -6,20 +6,21 @@
  * Copyright 1999 Ulrich Weigand
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#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);

dlls/winmm/joystick.c

@@ -15,11 +15,16 @@
 #include <string.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+
+#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);

dlls/winmm/mci.c

@@ -10,15 +10,19 @@
 #include <stdio.h>
 #include <string.h>
 
+#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);
 

dlls/winmm/mmio.c

@@ -22,13 +22,17 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
+
+#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);
 
 /**************************************************************************

dlls/winmm/mmsystem.c

@@ -20,13 +20,17 @@
 
 #include <string.h>
 
+#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);
 

dlls/winmm/time.c

@@ -6,17 +6,23 @@
  * Copyright 1993 Martin Ayotte
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <time.h>
 #include <sys/time.h>
 #include <unistd.h>
 
+#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);
 

files/dos_fs.c

@@ -6,6 +6,7 @@
  */
 
 #include "config.h"
+
 #include <sys/types.h>
 #include <ctype.h>
 #include <dirent.h>
@@ -22,17 +23,19 @@
 #include <unistd.h>
 
 #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);

graphics/win16drv/objects.c

@@ -4,12 +4,17 @@
  * Copyright 1993 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
+
 #include "bitmap.h"
 #include "brush.h"
 #include "font.h"
 #include "pen.h"
+#include "win16drv.h"
+
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(gdi);

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);

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*);

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);

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);

loader/task.c

@@ -4,14 +4,21 @@
  * Copyright 1995 Alexandre Julliard
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include <unistd.h>
 
-#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);

memory/environ.c

@@ -4,14 +4,18 @@
  * Copyright 1996, 1998 Alexandre Julliard
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <stdlib.h>
 #include <string.h>
-#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 */

misc/registry.c

@@ -29,18 +29,21 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#ifdef HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+#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 <sys/mman.h>
-#endif
-#include "winnt.h"
 
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(reg);
 

msdos/dosconf.c

@@ -5,16 +5,22 @@
  *
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
+
 #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);
 

msdos/int29.c

@@ -3,9 +3,11 @@
  */
 
 #include "config.h"
-#include "windef.h"
+
 #include "winnt.h"
+
 #include "console.h"
+#include "miscemu.h"
 
 /**********************************************************************
  *	    INT_Int29Handler

msdos/ppdev.c

@@ -4,11 +4,7 @@
 
 #include "config.h"
 
-#include "debugtools.h"
-
-DEFAULT_DEBUG_CHANNEL(int);
-
-#ifdef  HAVE_PPDEV
+#ifdef HAVE_PPDEV
 
 #include <stdlib.h>
 #include <sys/types.h>
@@ -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;

objects/brush.c

@@ -4,10 +4,17 @@
  * Copyright 1993, 1994  Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <string.h>
+
 #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);

objects/metafile.c

@@ -30,16 +30,20 @@
  * HDMD - 14/4/1999
  */  
 
+#include "config.h"
 
 #include <string.h>
 #include <fcntl.h>
+
 #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);
 

objects/pen.c

@@ -4,8 +4,16 @@
  * Copyright 1993 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <string.h>
+
+#include "windef.h"
+#include "wingdi.h"
+
+#include "wine/wingdi16.h"
 #include "pen.h"
+
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(gdi);

win32/file.c

@@ -21,10 +21,14 @@
 #include <fcntl.h>
 #include <string.h>
 #include <time.h>
+
 #include "winbase.h"
 #include "winerror.h"
+
+#include "wine/winbase16.h"
 #include "file.h"
 #include "heap.h"
+
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(file);