From b4a4c05aed111f092e03da1c796df6050d7d14b6 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 4 Jan 2003 00:19:17 +0000 Subject: [PATCH] Removed a few more #ifdef __WINE__. --- dlls/comctl32/imagelist.c | 5 ++--- dlls/ntdll/signal_i386.c | 1 + dlls/ntdll/signal_powerpc.c | 1 + dlls/ntdll/signal_sparc.c | 1 + include/commctrl.h | 3 --- include/d3d8types.h | 8 +------- include/msvcrt/eh.h | 2 +- include/msvcrt/stdio.h | 6 +----- include/msvcrt/stdlib.h | 11 +---------- include/winbase.h | 2 -- include/wine/exception.h | 4 ---- 11 files changed, 9 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 93b2188a09d..ce14c34ba43 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -253,9 +253,8 @@ ImageList_Add (HIMAGELIST himl, HBITMAP hbmImage, HBITMAP hbmMask) * Success: index of the new image * Failure: -1 */ - -INT WINAPI -ImageList_AddIcon (HIMAGELIST himl, HICON hIcon) +#undef ImageList_AddIcon +INT WINAPI ImageList_AddIcon (HIMAGELIST himl, HICON hIcon) { return ImageList_ReplaceIcon (himl, -1, hIcon); } diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 73baf3a1c51..b168420b68c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -424,6 +424,7 @@ static wine_signal_handler handlers[256]; static sigset_t all_sigs; +extern void WINAPI EXC_RtlRaiseException( PEXCEPTION_RECORD, PCONTEXT ); /*********************************************************************** * dispatch_signal diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 5e6c51a3b1e..6259d12c9ec 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -78,6 +78,7 @@ static wine_signal_handler handlers[256]; static sigset_t all_sigs; +extern void WINAPI EXC_RtlRaiseException( PEXCEPTION_RECORD, PCONTEXT ); /*********************************************************************** * dispatch_signal diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index daf94faf672..7ac34c8ba36 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -51,6 +51,7 @@ static wine_signal_handler handlers[256]; static sigset_t all_sigs; +extern void WINAPI EXC_RtlRaiseException( PEXCEPTION_RECORD, PCONTEXT ); /*********************************************************************** * dispatch_signal diff --git a/include/commctrl.h b/include/commctrl.h index bc20ac5a597..b4fc82bd049 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -554,7 +554,6 @@ typedef struct _IMAGELISTDRAWPARAMS INT WINAPI ImageList_Add(HIMAGELIST,HBITMAP,HBITMAP); -INT WINAPI ImageList_AddIcon (HIMAGELIST, HICON); INT WINAPI ImageList_AddMasked(HIMAGELIST,HBITMAP,COLORREF); BOOL WINAPI ImageList_BeginDrag(HIMAGELIST,INT,INT,INT); BOOL WINAPI ImageList_Copy(HIMAGELIST,INT,HIMAGELIST,INT,INT); @@ -599,9 +598,7 @@ BOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT); BOOL WINAPI ImageList_Write(HIMAGELIST, LPSTREAM); #endif -#ifndef __WINE__ #define ImageList_AddIcon(himl,hicon) ImageList_ReplaceIcon(himl,-1,hicon) -#endif #define ImageList_ExtractIcon(hi,himl,i) ImageList_GetIcon(himl,i,0) #define ImageList_LoadBitmap(hi,lpbmp,cx,cGrow,crMask) \ ImageList_LoadImage(hi,lpbmp,cx,cGrow,crMask,IMAGE_BITMAP,0) diff --git a/include/d3d8types.h b/include/d3d8types.h index 7849f71dec7..20fea1f5b6a 100644 --- a/include/d3d8types.h +++ b/include/d3d8types.h @@ -988,13 +988,7 @@ typedef struct _D3DADAPTER_IDENTIFIER8 { char Driver[MAX_DEVICE_IDENTIFIER_STRING]; char Description[MAX_DEVICE_IDENTIFIER_STRING]; -#if defined(_WIN32) || defined(__WINE__) - LARGE_INTEGER DriverVersion; /* Defined for 32-bit components */ -#else - DWORD DriverVersionLowPart; /* Defined for 16-bit driver components */ - DWORD DriverVersionHighPart; -#endif - + LARGE_INTEGER DriverVersion; DWORD VendorId; DWORD DeviceId; DWORD SubSysId; diff --git a/include/msvcrt/eh.h b/include/msvcrt/eh.h index 94a8cbc8da0..8ac6706d0c8 100644 --- a/include/msvcrt/eh.h +++ b/include/msvcrt/eh.h @@ -21,7 +21,7 @@ #define __WINE_EH_H #define __WINE_USE_MSVCRT -#if !defined(__cplusplus) && !defined(__WINE__) +#if !defined(__cplusplus) && !defined(USE_MSVCRT_PREFIX) #error "eh.h is meant only for C++ applications" #endif diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index cd6e503306a..91506ff0cfd 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -140,11 +140,7 @@ MSVCRT(FILE)* MSVCRT(__p__iob)(void); #define stdin (_iob+STDIN_FILENO) #define stdout (_iob+STDOUT_FILENO) #define stderr (_iob+STDERR_FILENO) -#elif !defined(__WINE__) -#define MSVCRT_stdin (_iob+STDIN_FILENO) -#define MSVCRT_stdout (_iob+STDOUT_FILENO) -#define MSVCRT_stderr (_iob+STDERR_FILENO) -#endif /* USE_MSVCRT_PREFIX, __WINE__ */ +#endif /* USE_MSVCRT_PREFIX */ #ifndef MSVCRT_STDIO_DEFINED #define MSVCRT_STDIO_DEFINED diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 0ace665c7e1..6392b013386 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -118,16 +118,7 @@ extern unsigned int* __p__fmode(void); #define __mb_cur_max (*__p___mb_cur_max()) #define _doserrno (*__doserrno()) #define _fmode (*_fmode) -#elif !defined(__WINE__) -#define MSVCRT___argc (*__p___argc()) -#define MSVCRT___argv (*__p___argv()) -#define MSVCRT___wargv (*__p___wargv()) -#define MSVCRT__environ (*__p__environ()) -#define MSVCRT__wenviron (*__p__wenviron()) -#define MSVCRT___mb_cur_max (*__p___mb_cur_max()) -#define MSVCRT__doserrno (*__doserrno()) -#define MSVCRT__fmode (*_fmode()) -#endif /* USE_MSVCRT_PREFIX, __WINE__ */ +#endif /* USE_MSVCRT_PREFIX */ extern int* MSVCRT(_errno)(void); diff --git a/include/winbase.h b/include/winbase.h index 668e9e14365..7bba6c422f6 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -25,9 +25,7 @@ #include "basetsd.h" #include "windef.h" -#ifndef __WINE__ #include "winerror.h" -#endif #ifdef __cplusplus extern "C" { diff --git a/include/wine/exception.h b/include/wine/exception.h index 49540fa33b6..eca4527724f 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -192,8 +192,4 @@ static inline EXCEPTION_FRAME * WINE_UNUSED __wine_pop_frame( EXCEPTION_FRAME *f extern void __wine_enter_vm86( CONTEXT *context ); -#ifdef __WINE__ -extern void WINAPI EXC_RtlRaiseException( PEXCEPTION_RECORD, PCONTEXT ); -#endif - #endif /* __WINE_WINE_EXCEPTION_H */