October 2009 - Wine-Commits

Alexandre Julliard : tests: Build all tests with strict prototypes.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 239265fd8b83b7047c85138a014d34b8f2f2ebbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=239265fd8b83b7047c85138a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 13:34:37 2009 +0200 tests: Build all tests with strict prototypes. --- dlls/Maketest.rules.in | 2 +- dlls/user32/tests/class.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index aff002c..95f5c2b 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -10,7 +10,7 @@ # DLLFLAGS = @DLLFLAGS@ -DEFS = $(EXTRADEFS) +DEFS = -DWINE_STRICT_PROTOTYPES $(EXTRADEFS) MODULE = $(TESTDLL:%.dll=%)_test.exe TESTRESULTS = $(CTESTS:.c=.ok) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index f8a4cd8..0e7b0e4 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -598,8 +598,8 @@ static void test_builtinproc(void) HWND hwnd; int i; - pDefWindowProcA = GetProcAddress(GetModuleHandle("user32.dll"), "DefWindowProcA"); - pDefWindowProcW = GetProcAddress(GetModuleHandle("user32.dll"), "DefWindowProcW"); + pDefWindowProcA = (void *)GetProcAddress(GetModuleHandle("user32.dll"), "DefWindowProcA"); + pDefWindowProcW = (void *)GetProcAddress(GetModuleHandle("user32.dll"), "DefWindowProcW"); for (i = 0; i < 4; i++) {

1 0

Alexandre Julliard : include: Add support for building Wine with strict prototype checking.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 0e67f65cab65fb157adbe6196676279d71453e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e67f65cab65fb157adbe6196… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 12:30:49 2009 +0200 include: Add support for building Wine with strict prototype checking. --- dlls/msvfw32/msvideo_main.c | 2 +- include/mscoree.idl | 4 ++++ include/rpcndr.h | 4 ++++ include/vfw.h | 4 ++++ include/windef.h | 10 ++++++++-- include/wine/windef16.h | 10 ++++++++-- 6 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 6196fac..5217c58 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -472,7 +472,7 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) /*********************************************************************** * ICOpenFunction [MSVFW32.@] */ -HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, FARPROC lpfnHandler) +HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPROC lpfnHandler) { ICOPEN icopen; WINE_HIC* whic; diff --git a/include/mscoree.idl b/include/mscoree.idl index aed31da..19749fb 100644 --- a/include/mscoree.idl +++ b/include/mscoree.idl @@ -27,7 +27,11 @@ cpp_quote("HRESULT WINAPI GetCORSystemDirectory(LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI GetCORVersion(LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,DWORD,LPWSTR,DWORD,DWORD*,LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI LoadLibraryShim(LPCWSTR,LPCWSTR,LPVOID,HMODULE*);") +cpp_quote("#ifdef WINE_STRICT_PROTOTYPES") +cpp_quote("typedef HRESULT (__stdcall *FLockClrVersionCallback)(void);") +cpp_quote("#else") cpp_quote("typedef HRESULT (__stdcall *FLockClrVersionCallback)();") +cpp_quote("#endif") cpp_quote("HRESULT WINAPI LockClrVersion(FLockClrVersionCallback,FLockClrVersionCallback*,FLockClrVersionCallback*);") typedef void* HDOMAINENUM; diff --git a/include/rpcndr.h b/include/rpcndr.h index 78c9a47..8fee143 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -383,7 +383,11 @@ typedef struct _MIDL_SYNTAX_INFO typedef void (__RPC_API *STUB_THUNK)( PMIDL_STUB_MESSAGE ); +#ifdef WINE_STRICT_PROTOTYPES +typedef LONG (__RPC_API *SERVER_ROUTINE)(void); +#else typedef LONG (__RPC_API *SERVER_ROUTINE)(); +#endif typedef struct _MIDL_SERVER_INFO_ { diff --git a/include/vfw.h b/include/vfw.h index ed62545..c0689fb 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -499,7 +499,11 @@ BOOL VFWAPI ICInstall(DWORD fccType, DWORD fccHandler, LPARAM lParam, LPSTR BOOL VFWAPI ICRemove(DWORD fccType, DWORD fccHandler, UINT wFlags); LRESULT VFWAPI ICGetInfo(HIC hic,ICINFO *picinfo, DWORD cb); HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode); +#ifdef WINE_STRICT_PROTOTYPES +HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPROC lpfnHandler); +#else HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, FARPROC lpfnHandler); +#endif LRESULT VFWAPI ICClose(HIC hic); HIC VFWAPI ICLocate(DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut, WORD wFlags); diff --git a/include/windef.h b/include/windef.h index 825255b..8f5ea30 100644 --- a/include/windef.h +++ b/include/windef.h @@ -227,7 +227,8 @@ typedef unsigned int ULONG, *PULONG; /* Note that Winelib is purely Win32. */ #ifdef __WINESRC__ -#define WINE_NO_UNICODE_MACROS +#define WINE_NO_UNICODE_MACROS 1 +#define WINE_STRICT_PROTOTYPES 1 #endif #ifdef WINE_NO_UNICODE_MACROS @@ -304,10 +305,15 @@ typedef HICON HCURSOR; /* Callback function pointers types */ +#ifdef WINE_STRICT_PROTOTYPES +typedef INT_PTR (CALLBACK *FARPROC)(void); +typedef INT_PTR (CALLBACK *NEARPROC)(void); +typedef INT_PTR (CALLBACK *PROC)(void); +#else typedef INT_PTR (CALLBACK *FARPROC)(); typedef INT_PTR (CALLBACK *NEARPROC)(); typedef INT_PTR (CALLBACK *PROC)(); - +#endif /* Macros to split words and longs. */ diff --git a/include/wine/windef16.h b/include/wine/windef16.h index 8c58aae..40d96ee 100644 --- a/include/wine/windef16.h +++ b/include/wine/windef16.h @@ -151,8 +151,6 @@ typedef struct typedef LRESULT (CALLBACK *DRIVERPROC16)(DWORD,HDRVR16,UINT16,LPARAM,LPARAM); typedef BOOL16 (CALLBACK *DLGPROC16)(HWND16,UINT16,WPARAM16,LPARAM); typedef INT16 (CALLBACK *EDITWORDBREAKPROC16)(LPSTR,INT16,INT16,INT16); -typedef LRESULT (CALLBACK *FARPROC16)(); -typedef INT16 (CALLBACK *PROC16)(); typedef BOOL16 (CALLBACK *GRAYSTRINGPROC16)(HDC16,LPARAM,INT16); typedef LRESULT (CALLBACK *HOOKPROC16)(INT16,WPARAM16,LPARAM); typedef BOOL16 (CALLBACK *PROPENUMPROC16)(HWND16,SEGPTR,HANDLE16); @@ -160,4 +158,12 @@ typedef VOID (CALLBACK *TIMERPROC16)(HWND16,UINT16,UINT16,DWORD); typedef LRESULT (CALLBACK *WNDENUMPROC16)(HWND16,LPARAM); typedef LRESULT (CALLBACK *WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM); +#ifdef WINE_STRICT_PROTOTYPES +typedef LRESULT (CALLBACK *FARPROC16)(void); +typedef INT16 (CALLBACK *PROC16)(void); +#else +typedef LRESULT (CALLBACK *FARPROC16)(); +typedef INT16 (CALLBACK *PROC16)(); +#endif + #endif /* __WINE_WINDEF16_H */

1 0

Andrey Turkin : ntdll: Handle invalid pointers in NtQueryInformationProcess (ProcessDebugObjectHandle).
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: f2432a8bc2dddaa34cfca0abbaf8b0d1ac19b44b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2432a8bc2dddaa34cfca0abb… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Tue Oct 6 13:34:21 2009 +0400 ntdll: Handle invalid pointers in NtQueryInformationProcess(ProcessDebugObjectHandle). --- dlls/ntdll/process.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index cae3f79..ba51df5 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -304,7 +304,14 @@ NTSTATUS WINAPI NtQueryInformationProcess( * set it to 0 aka "no debugger" to satisfy copy protections */ len = sizeof(HANDLE); if (ProcessInformationLength == len) - memset(ProcessInformation, 0, ProcessInformationLength); + { + if (!ProcessInformation) + ret = STATUS_ACCESS_VIOLATION; + else if (!ProcessHandle) + ret = STATUS_INVALID_HANDLE; + else + memset(ProcessInformation, 0, ProcessInformationLength); + } else ret = STATUS_INFO_LENGTH_MISMATCH; break;

1 0

Matteo Bruni : wpp: Add error management callbacks.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 29af4f9fa833a1f73f50bf68a3b5c02759a85464 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29af4f9fa833a1f73f50bf68a… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Sep 29 12:34:17 2009 +0200 wpp: Add error management callbacks. --- include/wine/wpp.h | 9 +++++++++ libs/wpp/preproc.c | 25 ++++++++++++++++++++++--- libs/wpp/wpp.c | 5 +++++ libs/wpp/wpp_private.h | 2 ++ 4 files changed, 38 insertions(+), 3 deletions(-) diff --git a/include/wine/wpp.h b/include/wine/wpp.h index 86575b1..dd341bd 100644 --- a/include/wine/wpp.h +++ b/include/wine/wpp.h @@ -22,6 +22,14 @@ #define __WINE_WPP_H #include <stdio.h> +#include <stdarg.h> + +struct wpp_callbacks +{ + /* Error callbacks */ + void (*error)( const char *file, int line, int col, const char *near, const char *msg, va_list ap ); + void (*warning)( const char *file, int line, int col, const char *near, const char *msg, va_list ap ); +}; /* Return value == 0 means successful execution */ extern int wpp_add_define( const char *name, const char *value ); @@ -33,5 +41,6 @@ extern int wpp_add_include_path( const char *path ); extern char *wpp_find_include( const char *name, const char *parent_name ); extern int wpp_parse( const char *input, FILE *output ); extern int wpp_parse_temp( const char *input, const char *output_base, char **output_name ); +extern void wpp_set_callbacks( const struct wpp_callbacks *callbacks ); #endif /* __WINE_WPP_H */ diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index cd46fc2..874e54c 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -674,13 +674,32 @@ end: fprintf(stderr, "\n"); } +static void wpp_default_error(const char *file, int line, int col, const char *near, const char *msg, va_list ap) +{ + generic_msg(msg, "Error", near, ap); + exit(1); +} + +static void wpp_default_warning(const char *file, int line, int col, const char *near, const char *msg, va_list ap) +{ + generic_msg(msg, "Warning", near, ap); +} + +static const struct wpp_callbacks default_callbacks = +{ + wpp_default_error, + wpp_default_warning, +}; + +const struct wpp_callbacks *wpp_callbacks = &default_callbacks; + int ppy_error(const char *s, ...) { va_list ap; va_start(ap, s); - generic_msg(s, "Error", ppy_text, ap); + wpp_callbacks->error(pp_status.input, pp_status.line_number, pp_status.char_number, ppy_text, s, ap); va_end(ap); - exit(1); + pp_status.state = 1; return 1; } @@ -688,7 +707,7 @@ int ppy_warning(const char *s, ...) { va_list ap; va_start(ap, s); - generic_msg(s, "Warning", ppy_text, ap); + wpp_callbacks->warning(pp_status.input, pp_status.line_number, pp_status.char_number, ppy_text, s, ap); va_end(ap); return 0; } diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index e3541fe..e6a1a83 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -230,3 +230,8 @@ int wpp_parse_temp( const char *input, const char *output_base, char **output_na fclose( output ); return ret; } + +void wpp_set_callbacks( const struct wpp_callbacks *callbacks ) +{ + wpp_callbacks = callbacks; +} diff --git a/libs/wpp/wpp_private.h b/libs/wpp/wpp_private.h index c0b95a4..e082213 100644 --- a/libs/wpp/wpp_private.h +++ b/libs/wpp/wpp_private.h @@ -218,6 +218,8 @@ int pp_get_if_depth(void); #define __attribute__(x) /*nothing*/ #endif +extern const struct wpp_callbacks *wpp_callbacks; + int ppy_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int ppy_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void pp_internal_error(const char *file, int line, const char *s, ...) __attribute__((format (printf, 3, 4)));

1 0

Matteo Bruni : wpp: get_string() now can return NULL, handle it.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 28fb6a24b143bbbe70b497dedcbcb5688aac9f8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=28fb6a24b143bbbe70b497ded… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Sep 29 12:06:24 2009 +0200 wpp: get_string() now can return NULL, handle it. --- libs/wpp/ppl.l | 3 +++ libs/wpp/ppy.y | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 062ac22..48a6959 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -1514,6 +1514,9 @@ void pp_do_include(char *fname, int type) int n; includelogicentry_t *iep; + if(!fname) + return; + for(iep = pp_includelogiclist; iep; iep = iep->next) { if(!strcmp(iep->filename, fname)) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index ba88320..b525e2f 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -279,16 +279,16 @@ preprocessor | tMACRO res_arg allmargs tMACROEND opt_mtexts tNL { pp_add_macro($1, macro_args, nmacro_args, $5); } - | tLINE tSINT tDQSTRING tNL { fprintf(ppy_out, "# %d %s\n", $2 , $3); free($3); } - | tGCCLINE tSINT tDQSTRING tNL { fprintf(ppy_out, "# %d %s\n", $2 , $3); free($3); } + | tLINE tSINT tDQSTRING tNL { if($3) fprintf(ppy_out, "# %d %s\n", $2 , $3); free($3); } + | tGCCLINE tSINT tDQSTRING tNL { if($3) fprintf(ppy_out, "# %d %s\n", $2 , $3); free($3); } | tGCCLINE tSINT tDQSTRING tSINT tNL - { fprintf(ppy_out, "# %d %s %d\n", $2, $3, $4); free($3); } + { if($3) fprintf(ppy_out, "# %d %s %d\n", $2, $3, $4); free($3); } | tGCCLINE tSINT tDQSTRING tSINT tSINT tNL - { fprintf(ppy_out, "# %d %s %d %d\n", $2 ,$3, $4, $5); free($3); } + { if($3) fprintf(ppy_out, "# %d %s %d %d\n", $2 ,$3, $4, $5); free($3); } | tGCCLINE tSINT tDQSTRING tSINT tSINT tSINT tNL - { fprintf(ppy_out, "# %d %s %d %d %d\n", $2 ,$3 ,$4 ,$5, $6); free($3); } + { if($3) fprintf(ppy_out, "# %d %s %d %d %d\n", $2 ,$3 ,$4 ,$5, $6); free($3); } | tGCCLINE tSINT tDQSTRING tSINT tSINT tSINT tSINT tNL - { fprintf(ppy_out, "# %d %s %d %d %d %d\n", $2 ,$3 ,$4 ,$5, $6, $7); free($3); } + { if($3) fprintf(ppy_out, "# %d %s %d %d %d %d\n", $2 ,$3 ,$4 ,$5, $6, $7); free($3); } | tGCCLINE tNL /* The null-token */ | tERROR opt_text tNL { ppy_error("#error directive: '%s'", $2); free($2); } | tWARNING opt_text tNL { ppy_warning("#warning directive: '%s'", $2); free($2); }

1 0

Alexandre Julliard : kernel32: Fix empty function prototypes.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: fe1374cc4c3f12f9fd40059830b9a21d3c78545e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1374cc4c3f12f9fd4005983… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 12:56:33 2009 +0200 kernel32: Fix empty function prototypes. --- dlls/kernel32/kernel16_private.h | 6 +++--- dlls/kernel32/wowthunk.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/kernel16_private.h b/dlls/kernel32/kernel16_private.h index aada5b2..6ad2aea 100644 --- a/dlls/kernel32/kernel16_private.h +++ b/dlls/kernel32/kernel16_private.h @@ -114,7 +114,7 @@ typedef struct { WORD pushw_bp; /* pushw %bp */ BYTE pushl; /* pushl $target */ - void (*target)(); + void *target; WORD call; /* call CALLFROM16 */ short callfrom16; } ENTRYPOINT16; @@ -147,8 +147,8 @@ typedef struct _THHOOK HTASK16 LockTDB; /* 14 hLockedTask */ } THHOOK; -extern LONG __wine_call_from_16(); -extern void __wine_call_from_16_regs(); +extern LONG __wine_call_from_16(void); +extern void __wine_call_from_16_regs(void); extern THHOOK *pThhook; diff --git a/dlls/kernel32/wowthunk.c b/dlls/kernel32/wowthunk.c index 75351b6..080ce3a 100644 --- a/dlls/kernel32/wowthunk.c +++ b/dlls/kernel32/wowthunk.c @@ -48,11 +48,11 @@ WINE_DECLARE_DEBUG_CHANNEL(snoop); extern DWORD WINAPI wine_call_to_16( FARPROC16 target, DWORD cbArgs, PEXCEPTION_HANDLER handler ); extern void WINAPI wine_call_to_16_regs( CONTEXT86 *context, DWORD cbArgs, PEXCEPTION_HANDLER handler ); extern void __wine_call_to_16_ret(void); -extern void CALL32_CBClient_Ret(); -extern void CALL32_CBClientEx_Ret(); -extern void DPMI_PendingEventCheck(); -extern void DPMI_PendingEventCheck_Cleanup(); -extern void DPMI_PendingEventCheck_Return(); +extern void CALL32_CBClient_Ret(void); +extern void CALL32_CBClientEx_Ret(void); +extern void DPMI_PendingEventCheck(void); +extern void DPMI_PendingEventCheck_Cleanup(void); +extern void DPMI_PendingEventCheck_Return(void); extern BYTE __wine_call16_start[]; extern BYTE __wine_call16_end[];

1 0

Alexandre Julliard : kernel32: Use call_entry_point to call functions with variable number of arguments.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 26aea12cce43df4caaa005c2ef923f9ffa25d93f URL: http://source.winehq.org/git/wine.git/?a=commit;h=26aea12cce43df4caaa005c2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 12:05:36 2009 +0200 kernel32: Use call_entry_point to call functions with variable number of arguments. --- dlls/kernel32/thunk.c | 89 +++---------------------------------------------- 1 files changed, 5 insertions(+), 84 deletions(-) diff --git a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c index be098b5..5befee5 100644 --- a/dlls/kernel32/thunk.c +++ b/dlls/kernel32/thunk.c @@ -149,7 +149,8 @@ struct SLApiDB SEGPTR CALL32_CBClient_RetAddr = 0; SEGPTR CALL32_CBClientEx_RetAddr = 0; -extern void __wine_call_from_16_thunk(); +extern int call_entry_point( void *func, int nb_args, const DWORD *args ); +extern void __wine_call_from_16_thunk(void); /* Push a DWORD on the 32-bit stack */ static inline void stack32_push( CONTEXT86 *context, DWORD val ) @@ -1036,39 +1037,7 @@ DWORD WINAPIV SSCall( DPRINTF("0x%08x,",args[i]); DPRINTF("])\n"); } - switch (nr) { - case 0: ret = fun(); - break; - case 4: ret = fun(args[0]); - break; - case 8: ret = fun(args[0],args[1]); - break; - case 12: ret = fun(args[0],args[1],args[2]); - break; - case 16: ret = fun(args[0],args[1],args[2],args[3]); - break; - case 20: ret = fun(args[0],args[1],args[2],args[3],args[4]); - break; - case 24: ret = fun(args[0],args[1],args[2],args[3],args[4],args[5]); - break; - case 28: ret = fun(args[0],args[1],args[2],args[3],args[4],args[5],args[6]); - break; - case 32: ret = fun(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7]); - break; - case 36: ret = fun(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8]); - break; - case 40: ret = fun(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9]); - break; - case 44: ret = fun(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10]); - break; - case 48: ret = fun(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11]); - break; - default: - WARN("Unsupported nr of arguments, %d\n",nr); - ret = 0; - break; - - } + ret = call_entry_point( fun, nr / sizeof(DWORD), args ); TRACE(" returning %d ...\n",ret); return ret; } @@ -1081,9 +1050,7 @@ void WINAPI __regs_W32S_BackTo32( CONTEXT86 *context ) LPDWORD stack = (LPDWORD)context->Esp; FARPROC proc = (FARPROC)context->Eip; - context->Eax = proc( stack[1], stack[2], stack[3], stack[4], stack[5], - stack[6], stack[7], stack[8], stack[9], stack[10] ); - + context->Eax = call_entry_point( proc, 10, stack + 1 ); context->Eip = stack32_pop(context); } DEFINE_REGS_ENTRYPOINT( W32S_BackTo32, 0 ) @@ -2378,54 +2345,8 @@ static DWORD WOW_CallProc32W16( FARPROC proc32, DWORD nrofargs, DWORD *args ) DWORD mutex_count; ReleaseThunkLock( &mutex_count ); - - /* - * FIXME: If ( nrofargs & CPEX_DEST_CDECL ) != 0, we should call a - * 32-bit CDECL routine ... - */ - if (!proc32) ret = 0; - else switch (nrofargs) - { - case 0: ret = proc32(); - break; - case 1: ret = proc32(args[0]); - break; - case 2: ret = proc32(args[0],args[1]); - break; - case 3: ret = proc32(args[0],args[1],args[2]); - break; - case 4: ret = proc32(args[0],args[1],args[2],args[3]); - break; - case 5: ret = proc32(args[0],args[1],args[2],args[3],args[4]); - break; - case 6: ret = proc32(args[0],args[1],args[2],args[3],args[4],args[5]); - break; - case 7: ret = proc32(args[0],args[1],args[2],args[3],args[4],args[5],args[6]); - break; - case 8: ret = proc32(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7]); - break; - case 9: ret = proc32(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8]); - break; - case 10:ret = proc32(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9]); - break; - case 11:ret = proc32(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10]); - break; - case 12:ret = proc32(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11]); - break; - case 13:ret = proc32(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12]); - break; - case 14:ret = proc32(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13]); - break; - case 15:ret = proc32(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14]); - break; - default: - /* FIXME: should go up to 32 arguments */ - ERR("Unsupported number of arguments %d, please report.\n",nrofargs); - ret = 0; - break; - } - + else ret = call_entry_point( proc32, nrofargs & ~CPEX_DEST_CDECL, args ); RestoreThunkLock( mutex_count ); TRACE("returns %08x\n",ret);

1 0

Henri Verbeet : d3d9: Make the individual stateblock tests responsible for checking data.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 7d0d8c0245f66f09bbb6b7affa8f0b8948e4851d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d0d8c0245f66f09bbb6b7aff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 09:05:53 2009 +0200 d3d9: Make the individual stateblock tests responsible for checking data. --- dlls/d3d9/tests/stateblock.c | 735 ++++++++++++++++++++++++------------------ 1 files changed, 427 insertions(+), 308 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d0d8c0245f66f09bbb6b…

1 0

Michael Stefaniuc : user32: Fix a memory leak on a error patch (Smatch).
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: e6cd096d65e4fdfcc1fe7c481298748e7757b91b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6cd096d65e4fdfcc1fe7c481… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 6 00:53:24 2009 +0200 user32: Fix a memory leak on a error patch (Smatch). --- dlls/user32/cursoricon.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index fca04ce..2ed1138 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -828,10 +828,10 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, hXorBits = 0; } } - - HeapFree( GetProcessHeap(), 0, pSrcInfo ); - HeapFree( GetProcessHeap(), 0, pDestInfo ); } + + HeapFree( GetProcessHeap(), 0, pSrcInfo ); + HeapFree( GetProcessHeap(), 0, pDestInfo ); } if( !hXorBits || !hAndBits )

1 0

Andrey Turkin : kernel32: Always use ANSI version of OutputDebugString.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 3eaecf04761812caa7478af4bf812d2cd812b09c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eaecf04761812caa7478af4b… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Oct 5 21:42:22 2009 +0400 kernel32: Always use ANSI version of OutputDebugString. --- dlls/kernel32/debugger.c | 17 ++++++++--------- include/wine/server_protocol.h | 5 +---- server/debugger.c | 1 - server/protocol.def | 4 +--- server/request.h | 3 +-- server/trace.c | 4 +--- 6 files changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index bb0b5fa..f0dae2d 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -118,7 +118,7 @@ BOOL WINAPI WaitForDebugEvent( break; case OUTPUT_DEBUG_STRING_EVENT: event->u.DebugString.lpDebugStringData = wine_server_get_ptr( data.output_string.string ); - event->u.DebugString.fUnicode = data.output_string.unicode; + event->u.DebugString.fUnicode = FALSE; event->u.DebugString.nDebugStringLength = data.output_string.length; break; case RIP_EVENT: @@ -243,7 +243,6 @@ void WINAPI OutputDebugStringA( LPCSTR str ) SERVER_START_REQ( output_debug_string ) { req->string = wine_server_client_ptr( str ); - req->unicode = 0; req->length = strlen(str) + 1; wine_server_call( req ); } @@ -267,15 +266,15 @@ void WINAPI OutputDebugStringA( LPCSTR str ) */ void WINAPI OutputDebugStringW( LPCWSTR str ) { - SERVER_START_REQ( output_debug_string ) + UNICODE_STRING strW; + STRING strA; + + RtlInitUnicodeString( &strW, str ); + if (!RtlUnicodeStringToAnsiString( &strA, &strW, TRUE )) { - req->string = wine_server_client_ptr( str ); - req->unicode = 1; - req->length = (lstrlenW(str) + 1) * sizeof(WCHAR); - wine_server_call( req ); + OutputDebugStringA( strA.Buffer ); + RtlFreeAnsiString( &strA ); } - SERVER_END_REQ; - WARN("%s\n", debugstr_w(str)); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0b18b50..7683e8a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -115,7 +115,6 @@ typedef union struct { int code; - int unicode; client_ptr_t string; data_size_t length; } output_string; @@ -2048,8 +2047,6 @@ struct output_debug_string_request struct request_header __header; data_size_t length; client_ptr_t string; - int unicode; - char __pad_28[4]; }; struct output_debug_string_reply { @@ -5347,6 +5344,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 390 +#define SERVER_PROTOCOL_VERSION 391 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/debugger.c b/server/debugger.c index faade98..795a24a 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -699,7 +699,6 @@ DECL_HANDLER(output_debug_string) debug_event_t data; data.output_string.string = req->string; - data.output_string.unicode = req->unicode; data.output_string.length = req->length; generate_debug_event( current, OUTPUT_DEBUG_STRING_EVENT, &data ); } diff --git a/server/protocol.def b/server/protocol.def index 9748931..d7b31f4 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -131,9 +131,8 @@ typedef union struct { int code; /* OUTPUT_DEBUG_STRING_EVENT */ - int unicode; /* is it Unicode? */ - client_ptr_t string; /* string to display (in debugged process address space) */ data_size_t length; /* string length */ + client_ptr_t string; /* string to display (in debugged process address space) */ } output_string; struct { @@ -1580,7 +1579,6 @@ enum char_info_mode @REQ(output_debug_string) data_size_t length; /* string length */ client_ptr_t string; /* string to display (in debugged process address space) */ - int unicode; /* is it Unicode? */ @END diff --git a/server/request.h b/server/request.h index c726130..02c7984 100644 --- a/server/request.h +++ b/server/request.h @@ -1102,8 +1102,7 @@ C_ASSERT( FIELD_OFFSET(struct get_exception_status_request, handle) == 12 ); C_ASSERT( sizeof(struct get_exception_status_reply) == 8 ); C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, length) == 12 ); C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, string) == 16 ); -C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, unicode) == 24 ); -C_ASSERT( sizeof(struct output_debug_string_request) == 32 ); +C_ASSERT( sizeof(struct output_debug_string_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, tid) == 16 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, status) == 20 ); diff --git a/server/trace.c b/server/trace.c index 511c460..10c731c 100644 --- a/server/trace.c +++ b/server/trace.c @@ -656,8 +656,7 @@ static void dump_varargs_debug_event( const char *prefix, data_size_t size ) case OUTPUT_DEBUG_STRING_EVENT: fprintf( stderr, "%s{output_string", prefix ); dump_uint64( ",string=", &event.output_string.string ); - fprintf( stderr, ",unicode=%d,len=%u}", - event.output_string.unicode, event.output_string.length ); + fprintf( stderr, ",len=%u}", event.output_string.length ); break; case RIP_EVENT: fprintf( stderr, "%s{rip,err=%d,type=%d}", prefix, @@ -1994,7 +1993,6 @@ static void dump_output_debug_string_request( const struct output_debug_string_r { fprintf( stderr, " length=%u", req->length ); dump_uint64( ", string=", &req->string ); - fprintf( stderr, ", unicode=%d", req->unicode ); } static void dump_continue_debug_event_request( const struct continue_debug_event_request *req )

1 0