From 402b79a1e8086292ab0f730948f1588fb7c6535f Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 27 Nov 2003 00:59:36 +0000 Subject: [PATCH] Porting fixes. --- dlls/kernel/computername.c | 1 + dlls/kernel/fiber.c | 3 +++ dlls/kernel/heap.c | 1 + dlls/kernel/instr.c | 3 +++ dlls/kernel/module.c | 1 + dlls/kernel/process.c | 1 + dlls/kernel/resource16.c | 1 + dlls/kernel/string.c | 3 +++ dlls/kernel/thread.c | 1 + dlls/ntdll/loader.c | 3 +++ dlls/ntdll/resource.c | 1 + dlls/rpcrt4/rpc_server.c | 3 +++ dlls/version/resource.c | 1 + dlls/win32s/w32sys.c | 1 + dlls/winedos/int25.c | 1 + dlls/winedos/int26.c | 1 + dlls/wininet/internet.c | 1 + dlls/winspool/info.c | 5 ++--- dlls/x11drv/xvidmode.c | 5 ++++- files/dos_fs.c | 2 ++ include/wine/server.h | 1 - libs/wine/port.c | 2 ++ programs/winecfg/drive.c | 4 ++-- programs/winedbg/dbg.y | 1 + programs/winedbg/debugger.h | 1 - programs/winedbg/msc.c | 2 ++ programs/winedbg/winedbg.c | 4 ++++ 27 files changed, 46 insertions(+), 8 deletions(-) diff --git a/dlls/kernel/computername.c b/dlls/kernel/computername.c index 55c61cc6ef5..1c8c506d368 100644 --- a/dlls/kernel/computername.c +++ b/dlls/kernel/computername.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include #include diff --git a/dlls/kernel/fiber.c b/dlls/kernel/fiber.c index a5514477133..768f28f52e4 100644 --- a/dlls/kernel/fiber.c +++ b/dlls/kernel/fiber.c @@ -21,6 +21,9 @@ * - proper handling of 16-bit stack and signal stack */ +#include "config.h" +#include "wine/port.h" + #include #include diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c index 21072102c93..14df465a3fa 100644 --- a/dlls/kernel/heap.c +++ b/dlls/kernel/heap.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include #include diff --git a/dlls/kernel/instr.c b/dlls/kernel/instr.c index 4fcff3af9ea..4572e17ed6c 100644 --- a/dlls/kernel/instr.c +++ b/dlls/kernel/instr.c @@ -18,6 +18,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" +#include "wine/port.h" + #include #include "ntstatus.h" diff --git a/dlls/kernel/module.c b/dlls/kernel/module.c index e145254fed2..1baa08501db 100644 --- a/dlls/kernel/module.c +++ b/dlls/kernel/module.c @@ -22,6 +22,7 @@ #include "wine/port.h" #include +#include #include #include #ifdef HAVE_SYS_TYPES_H diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 37d4be888e5..23e51c94e6d 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -37,6 +37,7 @@ #include "module.h" #include "options.h" #include "kernel_private.h" +#include "wine/exception.h" #include "wine/server.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/kernel/resource16.c b/dlls/kernel/resource16.c index 0052bd40cbd..fdf9342a32f 100644 --- a/dlls/kernel/resource16.c +++ b/dlls/kernel/resource16.c @@ -25,6 +25,7 @@ #include "wine/port.h" #include +#include #include #include #include diff --git a/dlls/kernel/string.c b/dlls/kernel/string.c index 71aef12fdba..d5ffb901617 100644 --- a/dlls/kernel/string.c +++ b/dlls/kernel/string.c @@ -20,6 +20,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" +#include "wine/port.h" + #include #include #include diff --git a/dlls/kernel/thread.c b/dlls/kernel/thread.c index 3394dc56b73..3c5bbd90fd1 100644 --- a/dlls/kernel/thread.c +++ b/dlls/kernel/thread.c @@ -41,6 +41,7 @@ #include "module.h" #include "thread.h" #include "wine/winbase16.h" +#include "wine/exception.h" #include "wine/library.h" #include "wine/pthread.h" #include "wine/server.h" diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1168e1c6bb6..5d0df0bc8fc 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -19,6 +19,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" +#include "wine/port.h" + #include #include diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 1df8787c2ce..f484be17fae 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -26,6 +26,7 @@ */ #include "config.h" +#include "wine/port.h" #include #include diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 74106f6243d..d18d0914fc5 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -21,6 +21,9 @@ * - a whole lot */ +#include "config.h" +#include "wine/port.h" + #include #include #include diff --git a/dlls/version/resource.c b/dlls/version/resource.c index cf35d5bbd21..a29baf47026 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -23,6 +23,7 @@ #include "config.h" #include +#include #include #include #include diff --git a/dlls/win32s/w32sys.c b/dlls/win32s/w32sys.c index 17bad8b9e53..414c26f13c9 100644 --- a/dlls/win32s/w32sys.c +++ b/dlls/win32s/w32sys.c @@ -22,6 +22,7 @@ #include "config.h" #include +#include #ifdef HAVE_UNISTD_H # include #endif diff --git a/dlls/winedos/int25.c b/dlls/winedos/int25.c index 22c454ba1a5..b555a237ab8 100644 --- a/dlls/winedos/int25.c +++ b/dlls/winedos/int25.c @@ -21,6 +21,7 @@ #include "config.h" #include +#include #include #include #ifdef HAVE_UNISTD_H diff --git a/dlls/winedos/int26.c b/dlls/winedos/int26.c index ac66187f219..bcb528412e7 100644 --- a/dlls/winedos/int26.c +++ b/dlls/winedos/int26.c @@ -21,6 +21,7 @@ #include "config.h" #include +#include #include #ifdef HAVE_UNISTD_H # include diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index c9d258a4599..bc81f5003a3 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -26,6 +26,7 @@ */ #include "config.h" +#include "wine/port.h" #define MAXHOSTNAME 100 /* from http.c */ diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index 0445e82f4c4..6b213b253ef 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -1073,12 +1073,11 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, /***************************************************************************** * GetPrintProcessorDirectoryA [WINSPOOL.@] */ -BOOL WINAPI GetPrintProcessorDirectoryA(LPSTR server, LPSTR environ, +BOOL WINAPI GetPrintProcessorDirectoryA(LPSTR server, LPSTR env, DWORD level, LPBYTE Info, DWORD cbBuf, LPDWORD needed) { - FIXME("(%s,%s,%ld,%p,0x%08lx): stub\n", server, environ, level, Info, - cbBuf); + FIXME("(%s,%s,%ld,%p,0x%08lx): stub\n", server, env, level, Info, cbBuf); return 0; } diff --git a/dlls/x11drv/xvidmode.c b/dlls/x11drv/xvidmode.c index 0faa8631b71..6d72e264a4b 100644 --- a/dlls/x11drv/xvidmode.c +++ b/dlls/x11drv/xvidmode.c @@ -28,8 +28,9 @@ #define XMD_H #include "basetsd.h" #include -#include "x11drv.h" +#endif /* HAVE_LIBXXF86VM */ +#include "x11drv.h" #include "x11ddraw.h" #include "xvidmode.h" @@ -40,6 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(xvidmode); +#ifdef HAVE_LIBXXF86VM + extern int usexvidmode; static int xf86vm_event, xf86vm_error, xf86vm_major, xf86vm_minor; diff --git a/files/dos_fs.c b/files/dos_fs.c index 9e0bba49852..ed3e08bf7dd 100644 --- a/files/dos_fs.c +++ b/files/dos_fs.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "wine/port.h" #include #include @@ -55,6 +56,7 @@ #include "file.h" #include "winternl.h" #include "wine/server.h" +#include "wine/exception.h" #include "excpt.h" #include "smb.h" diff --git a/include/wine/server.h b/include/wine/server.h index e9f3d6d8a04..6f59619f9f7 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -26,7 +26,6 @@ #include #include #include -#include #include /* client communication functions */ diff --git a/libs/wine/port.c b/libs/wine/port.c index 3027cb3e461..6ba553756c8 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -169,7 +169,9 @@ void wine_set_pe_load_area( void *base, size_t size ) */ void wine_free_pe_load_area(void) { +#ifdef HAVE_MMAP if (pe_area) munmap( pe_area, pe_area_size ); +#endif pe_area = NULL; } diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index 59d2a44b472..df0319e7f5f 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -88,7 +88,7 @@ void setDriveValue(char letter, const char *valueName, const char *newValue) { /* copies a drive configuration branch */ void copyDrive(char srcLetter, char destLetter) { - char *driveSection = alloca(strlen("Drive X")+1); + char driveSection[sizeof("Drive X")]; char *path, *label, *type, *serial, *fs; WINE_TRACE("srcLetter=%c, destLetter=%c\n", srcLetter, destLetter); @@ -115,7 +115,7 @@ void copyDrive(char srcLetter, char destLetter) { } void removeDrive(char letter) { - char *driveSection = alloca(strlen("Drive X")+1); + char driveSection[sizeof("Drive X")]; sprintf(driveSection, "Drive %c", letter); addTransaction(driveSection, NULL, ACTION_REMOVE, NULL); } diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index b1b6ffbfe53..072814faf01 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -22,6 +22,7 @@ */ #include "config.h" +#include "wine/port.h" #include #include diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 4ee41621077..623bc483a56 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -27,7 +27,6 @@ #include "windef.h" #include "winbase.h" #include "ntstatus.h" -#include "wine/exception.h" #ifdef __i386__ #define STEP_FLAG 0x00000100 /* single step flag */ diff --git a/programs/winedbg/msc.c b/programs/winedbg/msc.c index 8b074f55763..d88e4b460b6 100644 --- a/programs/winedbg/msc.c +++ b/programs/winedbg/msc.c @@ -30,6 +30,8 @@ */ #include "config.h" +#include "wine/port.h" + #include #include diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 751677213aa..e5058511a60 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -19,6 +19,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" +#include "wine/port.h" + #include #include #include @@ -31,6 +34,7 @@ #include "winuser.h" #include "winternl.h" #include "excpt.h" +#include "wine/exception.h" #include "wine/library.h" #include "winnls.h" -- 2.11.4.GIT