June 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : riched20: Add appropriate stdcall decorations to assembly functions.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: eb08df3a901f6de5d3767c9514b103889828f01e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb08df3a901f6de5d3767c951… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 15:34:20 2009 +0200 riched20: Add appropriate stdcall decorations to assembly functions. --- dlls/riched20/txthost.c | 168 +++++++++++++++++++++++----------------------- dlls/riched20/txtsrv.c | 44 ++++++------ 2 files changed, 106 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb08df3a901f6de5d3767…

1 0

Alexandre Julliard : rpcrt4: Add appropriate stdcall decorations to assembly functions.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: f2d65b5563f2040e5f0ac14807a728626e6b78e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2d65b5563f2040e5f0ac1480… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 15:34:24 2009 +0200 rpcrt4: Add appropriate stdcall decorations to assembly functions. --- dlls/rpcrt4/cproxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 5186ea6..0887aa2 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -76,7 +76,7 @@ struct thunk { extern void call_stubless_func(void); __ASM_GLOBAL_FUNC(call_stubless_func, "pushl %esp\n\t" /* pointer to index */ - "call " __ASM_NAME("ObjectStubless") "\n\t" + "call " __ASM_NAME("ObjectStubless") __ASM_STDCALL(4) "\n\t" "popl %edx\n\t" /* args size */ "movl (%esp),%ecx\n\t" /* return address */ "addl %edx,%esp\n\t"

1 0

Alexandre Julliard : hal: Add appropriate stdcall decorations to assembly functions.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 34ac93b78bf8dd937f7123a0599b2c48dc18af8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ac93b78bf8dd937f7123a05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 15:34:28 2009 +0200 hal: Add appropriate stdcall decorations to assembly functions. --- dlls/hal/hal.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 82ba80c..ed38e6c 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -38,18 +38,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); #ifdef __i386__ #define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ - __ASM_GLOBAL_FUNC( name, \ + __ASM_STDCALL_FUNC( name, 4, \ "popl %eax\n\t" \ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ - "jmp " __ASM_NAME("__regs_") #name ) + "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(4)) #define DEFINE_FASTCALL2_ENTRYPOINT( name ) \ - __ASM_GLOBAL_FUNC( name, \ + __ASM_STDCALL_FUNC( name, 8, \ "popl %eax\n\t" \ "pushl %edx\n\t" \ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ - "jmp " __ASM_NAME("__regs_") #name ) + "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(8)) #endif

1 0

Alexandre Julliard : ntoskrnl.exe: Add appropriate stdcall decorations to assembly functions.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 5c4612b3fae73cca176c970b5dbfdcc3f35c9044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4612b3fae73cca176c970b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 15:34:34 2009 +0200 ntoskrnl.exe: Add appropriate stdcall decorations to assembly functions. --- dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6371d85..714164e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -66,18 +66,25 @@ struct IrpInstance #ifdef __i386__ #define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ - __ASM_GLOBAL_FUNC( name, \ + __ASM_STDCALL_FUNC( name, 4, \ "popl %eax\n\t" \ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ - "jmp " __ASM_NAME("__regs_") #name ) + "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(4)) #define DEFINE_FASTCALL2_ENTRYPOINT( name ) \ - __ASM_GLOBAL_FUNC( name, \ + __ASM_STDCALL_FUNC( name, 8, \ "popl %eax\n\t" \ "pushl %edx\n\t" \ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ - "jmp " __ASM_NAME("__regs_") #name ) + "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(8)) +#define DEFINE_FASTCALL3_ENTRYPOINT( name ) \ + __ASM_STDCALL_FUNC( name, 12, \ + "popl %eax\n\t" \ + "pushl %edx\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(12)) #endif static inline LPCSTR debugstr_us( const UNICODE_STRING *us ) @@ -745,8 +752,8 @@ void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) /*********************************************************************** * InterlockedCompareExchange (NTOSKRNL.EXE.@) */ -#ifdef DEFINE_FASTCALL2_ENTRYPOINT -DEFINE_FASTCALL2_ENTRYPOINT( NTOSKRNL_InterlockedCompareExchange ) +#ifdef DEFINE_FASTCALL3_ENTRYPOINT +DEFINE_FASTCALL3_ENTRYPOINT( NTOSKRNL_InterlockedCompareExchange ) LONG WINAPI __regs_NTOSKRNL_InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) #else LONG WINAPI NTOSKRNL_InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare )

1 0

Alexandre Julliard : kernel32: Add appropriate stdcall decorations to assembly functions.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: d303d9dc29203026eb4312bd39df76d795def329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d303d9dc29203026eb4312bd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 15:34:09 2009 +0200 kernel32: Add appropriate stdcall decorations to assembly functions. --- dlls/kernel32/ne_module.c | 16 ++++++++-------- dlls/kernel32/process.c | 4 ++-- dlls/kernel32/selector.c | 18 +++++++++--------- dlls/kernel32/sync.c | 10 +++++----- dlls/kernel32/thread.c | 8 ++++---- dlls/kernel32/thunk.c | 2 +- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index 47c3f4d..4b45e7b 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -2210,37 +2210,37 @@ void WINAPI MapHInstSL16( CONTEXT86 *context ) /*************************************************************************** * MapHInstLS (KERNEL32.@) */ -__ASM_GLOBAL_FUNC( MapHInstLS, +__ASM_STDCALL_FUNC( MapHInstLS, 0, "pushl %eax\n\t" - "call " __ASM_NAME("MapHModuleLS") "\n\t" + "call " __ASM_NAME("MapHModuleLS") __ASM_STDCALL(4) "\n\t" "ret" ) /*************************************************************************** * MapHInstSL (KERNEL32.@) */ -__ASM_GLOBAL_FUNC( MapHInstSL, +__ASM_STDCALL_FUNC( MapHInstSL, 0, "pushl %eax\n\t" - "call " __ASM_NAME("MapHModuleSL") "\n\t" + "call " __ASM_NAME("MapHModuleSL") __ASM_STDCALL(4) "\n\t" "ret" ) /*************************************************************************** * MapHInstLS_PN (KERNEL32.@) */ -__ASM_GLOBAL_FUNC( MapHInstLS_PN, +__ASM_STDCALL_FUNC( MapHInstLS_PN, 0, "testl %eax,%eax\n\t" "jz 1f\n\t" "pushl %eax\n\t" - "call " __ASM_NAME("MapHModuleLS") "\n" + "call " __ASM_NAME("MapHModuleLS") __ASM_STDCALL(4) "\n" "1:\tret" ) /*************************************************************************** * MapHInstSL_PN (KERNEL32.@) */ -__ASM_GLOBAL_FUNC( MapHInstSL_PN, +__ASM_STDCALL_FUNC( MapHInstSL_PN, 0, "andl $0xffff,%eax\n\t" "jz 1f\n\t" "pushl %eax\n\t" - "call " __ASM_NAME("MapHModuleSL") "\n" + "call " __ASM_NAME("MapHModuleSL") __ASM_STDCALL(4) "\n" "1:\tret" ) #endif /* __i386__ */ diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 31faf73..83d1aa5 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2215,13 +2215,13 @@ BOOL WINAPI TerminateProcess( HANDLE handle, DWORD exit_code ) * Nothing. */ #ifdef __i386__ -__ASM_GLOBAL_FUNC( ExitProcess, /* Shrinker depend on this particular ExitProcess implementation */ +__ASM_STDCALL_FUNC( ExitProcess, 4, /* Shrinker depend on this particular ExitProcess implementation */ "pushl %ebp\n\t" ".byte 0x8B, 0xEC\n\t" /* movl %esp, %ebp */ ".byte 0x6A, 0x00\n\t" /* pushl $0 */ ".byte 0x68, 0x00, 0x00, 0x00, 0x00\n\t" /* pushl $0 - 4 bytes immediate */ "pushl 8(%ebp)\n\t" - "call " __ASM_NAME("process_ExitProcess") "\n\t" + "call " __ASM_NAME("process_ExitProcess") __ASM_STDCALL(4) "\n\t" "leave\n\t" "ret $4" ) diff --git a/dlls/kernel32/selector.c b/dlls/kernel32/selector.c index c8841b1..4a642c0 100644 --- a/dlls/kernel32/selector.c +++ b/dlls/kernel32/selector.c @@ -565,7 +565,7 @@ LPVOID WINAPI MapSLFix( SEGPTR sptr ) * Must not change EAX, hence defined as asm function. */ #ifdef __i386__ -__ASM_GLOBAL_FUNC( UnMapSLFixArray, "ret $8" ) +__ASM_STDCALL_FUNC( UnMapSLFixArray, 8, "ret $8" ) #endif @@ -595,22 +595,22 @@ BOOL WINAPI GetThreadSelectorEntry( HANDLE hthread, DWORD sel, LPLDT_ENTRY ldten /*********************************************************************** * SMapLS (KERNEL32.@) */ -__ASM_GLOBAL_FUNC( SMapLS, +__ASM_STDCALL_FUNC( SMapLS, 0, "xor %edx,%edx\n\t" "testl $0xffff0000,%eax\n\t" "jz 1f\n\t" "pushl %eax\n\t" - "call " __ASM_NAME("MapLS") "\n\t" + "call " __ASM_NAME("MapLS") __ASM_STDCALL(4) "\n\t" "movl %eax,%edx\n" "1:\tret" ) /*********************************************************************** * SUnMapLS (KERNEL32.@) */ -__ASM_GLOBAL_FUNC( SUnMapLS, +__ASM_STDCALL_FUNC( SUnMapLS, 0, "pushl %eax\n\t" /* preserve eax */ "pushl %eax\n\t" - "call " __ASM_NAME("UnMapLS") "\n\t" + "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t" "popl %eax\n\t" "ret" ) @@ -631,9 +631,9 @@ __ASM_GLOBAL_FUNC( SUnMapLS, * unravel them at SUnMapLS. We just store the segmented pointer there. */ #define DEFINE_SMapLS(n) \ - __ASM_GLOBAL_FUNC( SMapLS_IP_EBP_ ## n, \ + __ASM_STDCALL_FUNC( SMapLS_IP_EBP_ ## n, 0, \ "movl " #n "(%ebp),%eax\n\t" \ - "call " __ASM_NAME("SMapLS") "\n\t" \ + "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t" \ "movl %edx," #n "(%ebp)\n\t" \ "ret" ) @@ -661,10 +661,10 @@ DEFINE_SMapLS(40) */ #define DEFINE_SUnMapLS(n) \ - __ASM_GLOBAL_FUNC( SUnMapLS_IP_EBP_ ## n, \ + __ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_ ## n, 0, \ "pushl %eax\n\t" /* preserve eax */ \ "pushl " #n "(%ebp)\n\t" \ - "call " __ASM_NAME("UnMapLS") "\n\t" \ + "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t" \ "movl $0," #n "(%ebp)\n\t" \ "popl %eax\n\t" \ "ret" ) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index ab59688..e45f1bc 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2275,7 +2275,7 @@ BOOL WINAPI BindIoCompletionCallback( HANDLE FileHandle, LPOVERLAPPED_COMPLETION * InterlockedCompareExchange (KERNEL32.@) */ /* LONG WINAPI InterlockedCompareExchange( PLONG dest, LONG xchg, LONG compare ); */ -__ASM_GLOBAL_FUNC(InterlockedCompareExchange, +__ASM_STDCALL_FUNC(InterlockedCompareExchange, 12, "movl 12(%esp),%eax\n\t" "movl 8(%esp),%ecx\n\t" "movl 4(%esp),%edx\n\t" @@ -2286,7 +2286,7 @@ __ASM_GLOBAL_FUNC(InterlockedCompareExchange, * InterlockedExchange (KERNEL32.@) */ /* LONG WINAPI InterlockedExchange( PLONG dest, LONG val ); */ -__ASM_GLOBAL_FUNC(InterlockedExchange, +__ASM_STDCALL_FUNC(InterlockedExchange, 8, "movl 8(%esp),%eax\n\t" "movl 4(%esp),%edx\n\t" "lock; xchgl %eax,(%edx)\n\t" @@ -2296,7 +2296,7 @@ __ASM_GLOBAL_FUNC(InterlockedExchange, * InterlockedExchangeAdd (KERNEL32.@) */ /* LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr ); */ -__ASM_GLOBAL_FUNC(InterlockedExchangeAdd, +__ASM_STDCALL_FUNC(InterlockedExchangeAdd, 8, "movl 8(%esp),%eax\n\t" "movl 4(%esp),%edx\n\t" "lock; xaddl %eax,(%edx)\n\t" @@ -2306,7 +2306,7 @@ __ASM_GLOBAL_FUNC(InterlockedExchangeAdd, * InterlockedIncrement (KERNEL32.@) */ /* LONG WINAPI InterlockedIncrement( PLONG dest ); */ -__ASM_GLOBAL_FUNC(InterlockedIncrement, +__ASM_STDCALL_FUNC(InterlockedIncrement, 4, "movl 4(%esp),%edx\n\t" "movl $1,%eax\n\t" "lock; xaddl %eax,(%edx)\n\t" @@ -2316,7 +2316,7 @@ __ASM_GLOBAL_FUNC(InterlockedIncrement, /*********************************************************************** * InterlockedDecrement (KERNEL32.@) */ -__ASM_GLOBAL_FUNC(InterlockedDecrement, +__ASM_STDCALL_FUNC(InterlockedDecrement, 4, "movl 4(%esp),%edx\n\t" "movl $-1,%eax\n\t" "lock; xaddl %eax,(%edx)\n\t" diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 8cd2fb1..0b899c2 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -568,7 +568,7 @@ HANDLE WINAPI GetCurrentThread(void) * SetLastError (KERNEL32.@) */ /* void WINAPI SetLastError( DWORD error ); */ -__ASM_GLOBAL_FUNC( SetLastError, +__ASM_STDCALL_FUNC( SetLastError, 4, "movl 4(%esp),%eax\n\t" ".byte 0x64\n\t" "movl %eax,0x34\n\t" @@ -579,21 +579,21 @@ __ASM_GLOBAL_FUNC( SetLastError, * GetLastError (KERNEL32.@) */ /* DWORD WINAPI GetLastError(void); */ -__ASM_GLOBAL_FUNC( GetLastError, ".byte 0x64\n\tmovl 0x34,%eax\n\tret" ) +__ASM_STDCALL_FUNC( GetLastError, 0, ".byte 0x64\n\tmovl 0x34,%eax\n\tret" ) /*********************************************************************** * GetCurrentProcessId (KERNEL.471) * GetCurrentProcessId (KERNEL32.@) */ /* DWORD WINAPI GetCurrentProcessId(void) */ -__ASM_GLOBAL_FUNC( GetCurrentProcessId, ".byte 0x64\n\tmovl 0x20,%eax\n\tret" ) +__ASM_STDCALL_FUNC( GetCurrentProcessId, 0, ".byte 0x64\n\tmovl 0x20,%eax\n\tret" ) /*********************************************************************** * GetCurrentThreadId (KERNEL.462) * GetCurrentThreadId (KERNEL32.@) */ /* DWORD WINAPI GetCurrentThreadId(void) */ -__ASM_GLOBAL_FUNC( GetCurrentThreadId, ".byte 0x64\n\tmovl 0x24,%eax\n\tret" ) +__ASM_STDCALL_FUNC( GetCurrentThreadId, 0, ".byte 0x64\n\tmovl 0x24,%eax\n\tret" ) #else /* __i386__ */ diff --git a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c index 8785644..be098b5 100644 --- a/dlls/kernel32/thunk.c +++ b/dlls/kernel32/thunk.c @@ -645,7 +645,7 @@ DEFINE_REGS_ENTRYPOINT( FT_Thunk, 0 ) "leave\n\t" #define DEFINE_FT_Exit(n) \ - __ASM_GLOBAL_FUNC( FT_Exit ## n, FT_EXIT_RESTORE_REGS "ret $" #n ) + __ASM_STDCALL_FUNC( FT_Exit ## n, 0, FT_EXIT_RESTORE_REGS "ret $" #n ) DEFINE_FT_Exit(0) DEFINE_FT_Exit(4)

1 0

Alexandre Julliard : ntdll: Add appropriate stdcall decorations to assembly functions.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: e65ebee63f58ab6a63e2ed7cee505bcb94d1b5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e65ebee63f58ab6a63e2ed7ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 15:34:09 2009 +0200 ntdll: Add appropriate stdcall decorations to assembly functions. --- dlls/ntdll/resource.c | 2 +- dlls/ntdll/rtl.c | 4 ++-- dlls/ntdll/signal_i386.c | 6 +++--- dlls/ntdll/signal_x86_64.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 5f3e845..b9d2a6b 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -357,7 +357,7 @@ static inline NTSTATUS access_resource( HMODULE hmod, const IMAGE_RESOURCE_DATA_ * "call access_resource" instruction being there. */ #ifdef __i386__ -__ASM_GLOBAL_FUNC( LdrAccessResource, +__ASM_STDCALL_FUNC( LdrAccessResource, 16, "pushl %ebp\n\t" "movl %esp, %ebp\n\t" "subl $4,%esp\n\t" diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 4959946..16533b2 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -405,7 +405,7 @@ RtlDeleteSecurityObject( PSECURITY_DESCRIPTOR *ObjectDescriptor ) * Glorified "enter xxxx". */ #ifdef __i386__ -__ASM_GLOBAL_FUNC( _chkstk, +__ASM_STDCALL_FUNC( _chkstk, 0, "negl %eax\n\t" "addl %esp,%eax\n\t" "xchgl %esp,%eax\n\t" @@ -420,7 +420,7 @@ __ASM_GLOBAL_FUNC( _chkstk, * Glorified "enter xxxx". */ #ifdef __i386__ -__ASM_GLOBAL_FUNC( _alloca_probe, +__ASM_STDCALL_FUNC( _alloca_probe, 0, "negl %eax\n\t" "addl %esp,%eax\n\t" "xchgl %esp,%eax\n\t" diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 13896f6..dc1f12c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2267,17 +2267,17 @@ DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) /********************************************************************** * DbgBreakPoint (NTDLL.@) */ -__ASM_GLOBAL_FUNC( DbgBreakPoint, "int $3; ret") +__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret") /********************************************************************** * DbgUserBreakPoint (NTDLL.@) */ -__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret") +__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret") /********************************************************************** * NtCurrentTeb (NTDLL.@) */ -__ASM_GLOBAL_FUNC( NtCurrentTeb, ".byte 0x64\n\tmovl 0x18,%eax\n\tret" ) +__ASM_STDCALL_FUNC( NtCurrentTeb, 0, ".byte 0x64\n\tmovl 0x18,%eax\n\tret" ) /********************************************************************** diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1748221..4987643 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1668,11 +1668,11 @@ void __wine_enter_vm86( CONTEXT *context ) /********************************************************************** * DbgBreakPoint (NTDLL.@) */ -__ASM_GLOBAL_FUNC( DbgBreakPoint, "int $3; ret") +__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret") /********************************************************************** * DbgUserBreakPoint (NTDLL.@) */ -__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret") +__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret") #endif /* __x86_64__ */

1 0

Juan Lang : wintrust: Check for the presence of required members of WINTRUST_BLOB_INFO rather than requiring callers to be compiled with the same SDK version .
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: abacfc0f451cf1247c619167ba4dcb16bd7ac95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=abacfc0f451cf1247c619167b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jun 12 09:21:35 2009 -0700 wintrust: Check for the presence of required members of WINTRUST_BLOB_INFO rather than requiring callers to be compiled with the same SDK version. --- dlls/wintrust/wintrust_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index fa4da16..0a40fba 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -303,7 +303,8 @@ static HRESULT WINAPI WINTRUST_CertVerifyObjTrust(CRYPT_PROVIDER_DATA *data) { case WTD_CHOICE_BLOB: if (data->pWintrustData->u.pBlob && - data->pWintrustData->u.pBlob->cbStruct == sizeof(WINTRUST_BLOB_INFO) && + WVT_IS_CBSTRUCT_GT_MEMBEROFFSET(WINTRUST_BLOB_INFO, + data->pWintrustData->u.pBlob->cbStruct, pbMemObject) && data->pWintrustData->u.pBlob->cbMemObject == sizeof(CERT_VERIFY_CERTIFICATE_TRUST) && data->pWintrustData->u.pBlob->pbMemObject)

1 0

Juan Lang : wintrust: Check for the presence of required members of WINTRUST_CERT_INFO rather than requiring callers to be compiled with the same SDK version .
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 9da4d2f3a9dedd724c66c2e3a90da516fd3d0c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da4d2f3a9dedd724c66c2e3a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jun 12 09:35:41 2009 -0700 wintrust: Check for the presence of required members of WINTRUST_CERT_INFO rather than requiring callers to be compiled with the same SDK version. --- dlls/wintrust/softpub.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 9c79fa8..7f5f86f 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -256,7 +256,8 @@ static BOOL SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) BOOL ret; if (data->pWintrustData->u.pCert && - data->pWintrustData->u.pCert->cbStruct == sizeof(WINTRUST_CERT_INFO)) + WVT_IS_CBSTRUCT_GT_MEMBEROFFSET(WINTRUST_CERT_INFO, + data->pWintrustData->u.pCert->cbStruct, psCertContext)) { if (data->psPfns) { @@ -266,7 +267,9 @@ static BOOL SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) /* Add a signer with nothing but the time to verify, so we can * add a cert to it */ - if (data->pWintrustData->u.pCert->psftVerifyAsOf) + if (WVT_ISINSTRUCT(WINTRUST_CERT_INFO, + data->pWintrustData->u.pCert->cbStruct, psftVerifyAsOf) && + data->pWintrustData->u.pCert->psftVerifyAsOf) data->sftSystemTime = signer.sftVerifyAsOf; else { @@ -280,10 +283,12 @@ static BOOL SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) { ret = data->psPfns->pfnAddCert2Chain(data, 0, FALSE, 0, data->pWintrustData->u.pCert->psCertContext); - for (i = 0; ret && i < data->pWintrustData->u.pCert->chStores; - i++) - ret = data->psPfns->pfnAddStore2Chain(data, - data->pWintrustData->u.pCert->pahStores[i]); + if (WVT_ISINSTRUCT(WINTRUST_CERT_INFO, + data->pWintrustData->u.pCert->cbStruct, pahStores)) + for (i = 0; + ret && i < data->pWintrustData->u.pCert->chStores; i++) + ret = data->psPfns->pfnAddStore2Chain(data, + data->pWintrustData->u.pCert->pahStores[i]); } } else

1 0

Paul Vriens : riched32/tests: Fix test failures on Win9x, WinMe and NT4.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: c5946beccc4c316df024b1ecc489c3b4c619fa18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5946beccc4c316df024b1ecc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jun 12 21:24:59 2009 +0200 riched32/tests: Fix test failures on Win9x, WinMe and NT4. --- dlls/riched32/tests/editor.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 0d853a6..5cc269d 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -768,7 +768,9 @@ static void test_EM_POSFROMCHAR(void) if (i == 0) { ok(pl.y == 0, "EM_POSFROMCHAR reports y=%d, expected 0\n", pl.y); - ok(pl.x == 1, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == 1 || + broken(pl.x == 0), /* Win9x, WinME and NT4 */ + "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); xpos = pl.x; } else if (i == 1) @@ -829,7 +831,9 @@ static void test_EM_POSFROMCHAR(void) result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 0); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == 0, "EM_POSFROMCHAR reports y=%d, expected 0\n", pl.y); - ok(pl.x == 1, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == 1 || + broken(pl.x == 0), /* Win9x, WinME and NT4 */ + "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); xpos = pl.x; SendMessage(hwndRichEdit, WM_HSCROLL, SB_LINERIGHT, 0); @@ -838,7 +842,9 @@ static void test_EM_POSFROMCHAR(void) ok(pl.y == 0, "EM_POSFROMCHAR reports y=%d, expected 0\n", pl.y); todo_wine { /* Fails on builtin because horizontal scrollbar is not being shown */ - ok(pl.x < xpos, "EM_POSFROMCHAR reports x=%hd, expected value less than %d\n", pl.x, xpos); + ok(pl.x < xpos || + broken(pl.x == xpos), /* Win9x, WinME and NT4 */ + "EM_POSFROMCHAR reports x=%hd, expected value less than %d\n", pl.x, xpos); } DestroyWindow(hwndRichEdit); }

1 0

Alexandre Julliard : riched20: Move the textHostVtbl definition to work around Mac OS X breakage with __ASM_GLOBAL_FUNC .
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 3fe51326cd84dafc7f50731c8846401475ed937a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe51326cd84dafc7f50731c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 13 12:19:40 2009 +0200 riched20: Move the textHostVtbl definition to work around Mac OS X breakage with __ASM_GLOBAL_FUNC. --- dlls/riched20/txthost.c | 90 +++++++++++++++++++++++----------------------- 1 files changed, 45 insertions(+), 45 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 8fabd83..ae15e62 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -583,51 +583,6 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxImmGetContext); DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxImmReleaseContext); DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth); -static ITextHostVtbl textHostVtbl = { - ITextHostImpl_QueryInterface, - ITextHostImpl_AddRef, - ITextHostImpl_Release, - THISCALL(ITextHostImpl_TxGetDC), - THISCALL(ITextHostImpl_TxReleaseDC), - THISCALL(ITextHostImpl_TxShowScrollBar), - THISCALL(ITextHostImpl_TxEnableScrollBar), - THISCALL(ITextHostImpl_TxSetScrollRange), - THISCALL(ITextHostImpl_TxSetScrollPos), - THISCALL(ITextHostImpl_TxInvalidateRect), - THISCALL(ITextHostImpl_TxViewChange), - THISCALL(ITextHostImpl_TxCreateCaret), - THISCALL(ITextHostImpl_TxShowCaret), - THISCALL(ITextHostImpl_TxSetCaretPos), - THISCALL(ITextHostImpl_TxSetTimer), - THISCALL(ITextHostImpl_TxKillTimer), - THISCALL(ITextHostImpl_TxScrollWindowEx), - THISCALL(ITextHostImpl_TxSetCapture), - THISCALL(ITextHostImpl_TxSetFocus), - THISCALL(ITextHostImpl_TxSetCursor), - THISCALL(ITextHostImpl_TxScreenToClient), - THISCALL(ITextHostImpl_TxClientToScreen), - THISCALL(ITextHostImpl_TxActivate), - THISCALL(ITextHostImpl_TxDeactivate), - THISCALL(ITextHostImpl_TxGetClientRect), - THISCALL(ITextHostImpl_TxGetViewInset), - THISCALL(ITextHostImpl_TxGetCharFormat), - THISCALL(ITextHostImpl_TxGetParaFormat), - THISCALL(ITextHostImpl_TxGetSysColor), - THISCALL(ITextHostImpl_TxGetBackStyle), - THISCALL(ITextHostImpl_TxGetMaxLength), - THISCALL(ITextHostImpl_TxGetScrollBars), - THISCALL(ITextHostImpl_TxGetPasswordChar), - THISCALL(ITextHostImpl_TxGetAcceleratorPos), - THISCALL(ITextHostImpl_TxGetExtent), - THISCALL(ITextHostImpl_OnTxCharFormatChange), - THISCALL(ITextHostImpl_OnTxParaFormatChange), - THISCALL(ITextHostImpl_TxGetPropertyBits), - THISCALL(ITextHostImpl_TxNotify), - THISCALL(ITextHostImpl_TxImmGetContext), - THISCALL(ITextHostImpl_TxImmReleaseContext), - THISCALL(ITextHostImpl_TxGetSelectionBarWidth), -}; - #ifdef __i386__ /* thiscall functions are i386-specific */ #define STDCALL(func) __stdcall_ ## func @@ -680,6 +635,51 @@ DEFINE_STDCALL_WRAPPER(39,ITextHostImpl_TxImmGetContext); DEFINE_STDCALL_WRAPPER(40,ITextHostImpl_TxImmReleaseContext); DEFINE_STDCALL_WRAPPER(41,ITextHostImpl_TxGetSelectionBarWidth); +static ITextHostVtbl textHostVtbl = { + ITextHostImpl_QueryInterface, + ITextHostImpl_AddRef, + ITextHostImpl_Release, + THISCALL(ITextHostImpl_TxGetDC), + THISCALL(ITextHostImpl_TxReleaseDC), + THISCALL(ITextHostImpl_TxShowScrollBar), + THISCALL(ITextHostImpl_TxEnableScrollBar), + THISCALL(ITextHostImpl_TxSetScrollRange), + THISCALL(ITextHostImpl_TxSetScrollPos), + THISCALL(ITextHostImpl_TxInvalidateRect), + THISCALL(ITextHostImpl_TxViewChange), + THISCALL(ITextHostImpl_TxCreateCaret), + THISCALL(ITextHostImpl_TxShowCaret), + THISCALL(ITextHostImpl_TxSetCaretPos), + THISCALL(ITextHostImpl_TxSetTimer), + THISCALL(ITextHostImpl_TxKillTimer), + THISCALL(ITextHostImpl_TxScrollWindowEx), + THISCALL(ITextHostImpl_TxSetCapture), + THISCALL(ITextHostImpl_TxSetFocus), + THISCALL(ITextHostImpl_TxSetCursor), + THISCALL(ITextHostImpl_TxScreenToClient), + THISCALL(ITextHostImpl_TxClientToScreen), + THISCALL(ITextHostImpl_TxActivate), + THISCALL(ITextHostImpl_TxDeactivate), + THISCALL(ITextHostImpl_TxGetClientRect), + THISCALL(ITextHostImpl_TxGetViewInset), + THISCALL(ITextHostImpl_TxGetCharFormat), + THISCALL(ITextHostImpl_TxGetParaFormat), + THISCALL(ITextHostImpl_TxGetSysColor), + THISCALL(ITextHostImpl_TxGetBackStyle), + THISCALL(ITextHostImpl_TxGetMaxLength), + THISCALL(ITextHostImpl_TxGetScrollBars), + THISCALL(ITextHostImpl_TxGetPasswordChar), + THISCALL(ITextHostImpl_TxGetAcceleratorPos), + THISCALL(ITextHostImpl_TxGetExtent), + THISCALL(ITextHostImpl_OnTxCharFormatChange), + THISCALL(ITextHostImpl_OnTxParaFormatChange), + THISCALL(ITextHostImpl_TxGetPropertyBits), + THISCALL(ITextHostImpl_TxNotify), + THISCALL(ITextHostImpl_TxImmGetContext), + THISCALL(ITextHostImpl_TxImmReleaseContext), + THISCALL(ITextHostImpl_TxGetSelectionBarWidth), +}; + ITextHostVtbl itextHostStdcallVtbl = { NULL, NULL,

1 0