January 2009 - Wine-Commits

Alexandre Julliard : kernel32: Change the DEFINE_REGS_ENTRYPOINT macro to use a number of args instead of a size .
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: 9f6ff3d5af60374ffae9f47b69f568e2889168ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f6ff3d5af60374ffae9f47b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 6 12:49:38 2009 +0100 kernel32: Change the DEFINE_REGS_ENTRYPOINT macro to use a number of args instead of a size. Also assume that all register functions are stdcall. --- dlls/kernel32/kernel_private.h | 4 ++-- dlls/kernel32/thunk.c | 32 ++++++++++++++++---------------- dlls/kernel32/vxd.c | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 18d71b5..5ab5b0e 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -146,12 +146,12 @@ extern HANDLE get_BaseNamedObjects_handle(void); /* Register functions */ #ifdef __i386__ -#define DEFINE_REGS_ENTRYPOINT( name, args, pop_args ) \ +#define DEFINE_REGS_ENTRYPOINT( name, args ) \ __ASM_GLOBAL_FUNC( name, \ "pushl %eax\n\t" \ "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \ ".long " __ASM_NAME("__regs_") #name "-.\n\t" \ - ".byte " #args "," #pop_args ) + ".byte 4*" #args ",4*" #args ) #endif #endif diff --git a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c index 29093de..1b72e99 100644 --- a/dlls/kernel32/thunk.c +++ b/dlls/kernel32/thunk.c @@ -192,7 +192,7 @@ void WINAPI __regs_LogApiThkLSF( LPSTR func, CONTEXT86 *context ) TRACE( "%s\n", debugstr_a(func) ); } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( LogApiThkLSF, 4, 4 ) +DEFINE_REGS_ENTRYPOINT( LogApiThkLSF, 1 ) #endif /*********************************************************************** @@ -205,7 +205,7 @@ void WINAPI __regs_LogApiThkSL( LPSTR func, CONTEXT86 *context ) TRACE( "%s\n", debugstr_a(func) ); } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( LogApiThkSL, 4, 4 ) +DEFINE_REGS_ENTRYPOINT( LogApiThkSL, 1 ) #endif /*********************************************************************** @@ -218,7 +218,7 @@ void WINAPI __regs_LogCBThkSL( LPSTR func, CONTEXT86 *context ) TRACE( "%s\n", debugstr_a(func) ); } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( LogCBThkSL, 4, 4 ) +DEFINE_REGS_ENTRYPOINT( LogCBThkSL, 1 ) #endif /*********************************************************************** @@ -487,7 +487,7 @@ void WINAPI __regs_QT_Thunk( CONTEXT86 *context ) ( OFFSETOF(NtCurrentTeb()->WOW32Reserved) - argsize ); } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( QT_Thunk, 0, 0 ) +DEFINE_REGS_ENTRYPOINT( QT_Thunk, 0 ) #endif @@ -555,7 +555,7 @@ void WINAPI __regs_FT_Prolog( CONTEXT86 *context ) *(DWORD *)(context->Ebp - 52) = context->Edx; } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( FT_Prolog, 0, 0 ) +DEFINE_REGS_ENTRYPOINT( FT_Prolog, 0 ) #endif /********************************************************************** @@ -623,7 +623,7 @@ void WINAPI __regs_FT_Thunk( CONTEXT86 *context ) memcpy( oldstack, newstack, argsize ); } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( FT_Thunk, 0, 0 ) +DEFINE_REGS_ENTRYPOINT( FT_Thunk, 0 ) #endif #ifdef __i386__ @@ -779,7 +779,7 @@ void WINAPI __regs_Common32ThkLS( CONTEXT86 *context ) context->Esp += LOBYTE(context16.Ebx); } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( Common32ThkLS, 0, 0 ) +DEFINE_REGS_ENTRYPOINT( Common32ThkLS, 0 ) #endif /*********************************************************************** @@ -836,7 +836,7 @@ void WINAPI __regs_OT_32ThkLSF( CONTEXT86 *context ) ( OFFSETOF(NtCurrentTeb()->WOW32Reserved) - argsize ); } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( OT_32ThkLSF, 0, 0 ) +DEFINE_REGS_ENTRYPOINT( OT_32ThkLSF, 0 ) #endif /*********************************************************************** @@ -938,7 +938,7 @@ void WINAPI __regs_FT_PrologPrime( CONTEXT86 *context ) context->Eip = (DWORD)relayCode; } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( FT_PrologPrime, 0, 0 ) +DEFINE_REGS_ENTRYPOINT( FT_PrologPrime, 0 ) #endif /*********************************************************************** @@ -970,7 +970,7 @@ void WINAPI __regs_QT_ThunkPrime( CONTEXT86 *context ) context->Eip = (DWORD)relayCode; } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( QT_ThunkPrime, 0, 0 ) +DEFINE_REGS_ENTRYPOINT( QT_ThunkPrime, 0 ) #endif /*********************************************************************** @@ -1113,7 +1113,7 @@ void WINAPI __regs_W32S_BackTo32( CONTEXT86 *context ) context->Eip = stack32_pop(context); } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( W32S_BackTo32, 0, 0 ) +DEFINE_REGS_ENTRYPOINT( W32S_BackTo32, 0 ) #endif /********************************************************************** @@ -1230,7 +1230,7 @@ void WINAPI __regs_AllocMappedBuffer( } } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( AllocMappedBuffer, 0, 0 ) +DEFINE_REGS_ENTRYPOINT( AllocMappedBuffer, 0 ) #endif /********************************************************************** @@ -1255,7 +1255,7 @@ void WINAPI __regs_FreeMappedBuffer( } } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( FreeMappedBuffer, 0, 0 ) +DEFINE_REGS_ENTRYPOINT( FreeMappedBuffer, 0 ) #endif /********************************************************************** @@ -1363,7 +1363,7 @@ void WINAPI __regs_K32Thk1632Prolog( CONTEXT86 *context ) ReleaseThunkLock(&CURRENT_STACK16->entry_point); } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( K32Thk1632Prolog, 0, 0 ) +DEFINE_REGS_ENTRYPOINT( K32Thk1632Prolog, 0 ) #endif /*********************************************************************** @@ -1400,7 +1400,7 @@ void WINAPI __regs_K32Thk1632Epilog( CONTEXT86 *context ) } } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( K32Thk1632Epilog, 0, 0 ) +DEFINE_REGS_ENTRYPOINT( K32Thk1632Epilog, 0 ) #endif /********************************************************************* @@ -2212,7 +2212,7 @@ void WINAPI __regs_CommonUnimpStub( CONTEXT86 *context ) context->Esp += (context->Ecx & 0x0f) * 4; } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( CommonUnimpStub, 0, 0 ) +DEFINE_REGS_ENTRYPOINT( CommonUnimpStub, 0 ) #endif /********************************************************************** diff --git a/dlls/kernel32/vxd.c b/dlls/kernel32/vxd.c index 1ce1060..92ad242 100644 --- a/dlls/kernel32/vxd.c +++ b/dlls/kernel32/vxd.c @@ -297,7 +297,7 @@ void WINAPI __regs_VxDCall( DWORD service, CONTEXT86 *context ) } } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( VxDCall, 4, 4 ) +DEFINE_REGS_ENTRYPOINT( VxDCall, 1 ) #endif

1 0

Alexandre Julliard : winebuild: Improve the calling sequence for register functions.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: e31188d9dac2368e050a693086cb8ad2bbdfb2e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e31188d9dac2368e050a69308… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 6 12:51:18 2009 +0100 winebuild: Improve the calling sequence for register functions. Pass parameters on the stack instead of retrieving them from the code stream; this ensures that the code contains only valid instructions. --- dlls/kernel32/kernel_private.h | 8 ++++---- dlls/ntdll/ntdll_misc.h | 8 ++++---- dlls/ntdll/relay.c | 9 +++++---- tools/winebuild/relay.c | 33 ++++++++++++++++----------------- tools/winebuild/spec32.c | 1 - 5 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 5ab5b0e..b23aedf 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -148,10 +148,10 @@ extern HANDLE get_BaseNamedObjects_handle(void); #ifdef __i386__ #define DEFINE_REGS_ENTRYPOINT( name, args ) \ __ASM_GLOBAL_FUNC( name, \ - "pushl %eax\n\t" \ - "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \ - ".long " __ASM_NAME("__regs_") #name "-.\n\t" \ - ".byte 4*" #args ",4*" #args ) + ".byte 0x68\n\t" /* pushl $__regs_func */ \ + ".long " __ASM_NAME("__regs_") #name "-.-11\n\t" \ + ".byte 0x6a," #args "\n\t" /* pushl $args */ \ + "call " __ASM_NAME("__wine_call_from_32_regs")) #endif #endif diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 9d7ba6a..d8777bc 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -219,10 +219,10 @@ static inline struct ntdll_thread_regs *ntdll_get_thread_regs(void) #ifdef __i386__ #define DEFINE_REGS_ENTRYPOINT( name, args ) \ __ASM_GLOBAL_FUNC( name, \ - "pushl %eax\n\t" \ - "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \ - ".long " __ASM_NAME("__regs_") #name "-.\n\t" \ - ".byte 4*" #args ",4*" #args ) + ".byte 0x68\n\t" /* pushl $__regs_func */ \ + ".long " __ASM_NAME("__regs_") #name "-.-11\n\t" \ + ".byte 0x6a," #args "\n\t" /* pushl $args */ \ + "call " __ASM_NAME("__wine_call_from_32_regs")) /* FIXME: add support for other CPUs */ #endif diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 4fae06e..d369c16 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -447,16 +447,17 @@ void WINAPI __regs_relay_call_regs( struct relay_descr *descr, unsigned int idx, context->Edx, context->Esi, context->Edi, context->Ebp, context->Esp, context->SegDs, context->SegEs, context->SegFs, context->SegGs, context->EFlags ); - assert( orig_func[0] == 0x50 /* pushl %eax */ ); - assert( orig_func[1] == 0xe8 /* call */ ); + assert( orig_func[0] == 0x68 /* pushl func */ ); + assert( orig_func[5] == 0x6a /* pushl args */ ); + assert( orig_func[7] == 0xe8 /* call */ ); } /* now call the real function */ memcpy( args_copy, args, nb_args * sizeof(args[0]) ); - args_copy[nb_args++] = (int)context; /* append context argument */ + args_copy[nb_args++] = (INT_PTR)context; /* append context argument */ - call_entry_point( orig_func + 6 + *(int *)(orig_func + 6), nb_args, args_copy ); + call_entry_point( orig_func + 12 + *(int *)(orig_func + 1), nb_args, args_copy ); if (TRACE_ON(relay)) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index a1c7970..2dfda98 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -741,9 +741,10 @@ static void BuildCallTo32CBClient( BOOL isEx ) * * Stack layout: * ... - * (ebp+16) first arg - * (ebp+12) ret addr to user code - * (ebp+8) eax saved by relay code + * (ebp+20) first arg + * (ebp+16) ret addr to user code + * (ebp+12) func to call (relative to relay code ret addr) + * (ebp+8) number of args * (ebp+4) ret addr to relay code * (ebp+0) saved ebp * (ebp-128) buffer area to allow stack frame manipulation @@ -770,17 +771,16 @@ static void BuildCallFrom32Regs(void) output( "\tpushl %%ebp\n" ); output( "\tmovl %%esp,%%ebp\n "); - output( "\tleal -%d(%%esp), %%esp\n", STACK_SPACE + 4 /* for context arg */); + output( "\tleal -%d(%%esp),%%esp\n", STACK_SPACE ); /* Build the context structure */ + output( "\tmovl %%eax,%d(%%ebp)\n", CONTEXTOFFSET(Eax) - STACK_SPACE ); output( "\tpushfl\n" ); output( "\tpopl %%eax\n" ); output( "\tmovl %%eax,%d(%%ebp)\n", CONTEXTOFFSET(EFlags) - STACK_SPACE ); output( "\tmovl 0(%%ebp),%%eax\n" ); output( "\tmovl %%eax,%d(%%ebp)\n", CONTEXTOFFSET(Ebp) - STACK_SPACE ); - output( "\tmovl 8(%%ebp),%%eax\n" ); - output( "\tmovl %%eax,%d(%%ebp)\n", CONTEXTOFFSET(Eax) - STACK_SPACE ); output( "\tmovl %%ebx,%d(%%ebp)\n", CONTEXTOFFSET(Ebx) - STACK_SPACE ); output( "\tmovl %%ecx,%d(%%ebp)\n", CONTEXTOFFSET(Ecx) - STACK_SPACE ); output( "\tmovl %%edx,%d(%%ebp)\n", CONTEXTOFFSET(Edx) - STACK_SPACE ); @@ -805,31 +805,30 @@ static void BuildCallFrom32Regs(void) output( "\tmovl $0x%x,%%eax\n", CONTEXT86_FULL ); output( "\tmovl %%eax,%d(%%ebp)\n", CONTEXTOFFSET(ContextFlags) - STACK_SPACE ); - output( "\tmovl 12(%%ebp),%%eax\n" ); /* Get %eip at time of call */ + output( "\tmovl 16(%%ebp),%%eax\n" ); /* Get %eip at time of call */ output( "\tmovl %%eax,%d(%%ebp)\n", CONTEXTOFFSET(Eip) - STACK_SPACE ); /* Transfer the arguments */ - output( "\tmovl 4(%%ebp),%%ebx\n" ); /* get relay code addr */ - output( "\tmovzbl 4(%%ebx),%%ecx\n" ); /* fetch number of args to copy */ - output( "\tsubl %%ecx,%%esp\n" ); + output( "\tmovl 8(%%ebp),%%ecx\n" ); /* fetch number of args to copy */ + output( "\tleal 4(,%%ecx,4),%%edx\n" ); /* add 4 for context arg */ + output( "\tsubl %%edx,%%esp\n" ); output( "\tandl $~15,%%esp\n" ); - output( "\tleal 16(%%ebp),%%esi\n" ); /* get %esp at time of call */ + output( "\tleal 20(%%ebp),%%esi\n" ); /* get %esp at time of call */ output( "\tmovl %%esp,%%edi\n" ); - output( "\tshrl $2,%%ecx\n" ); + output( "\ttest %%ecx,%%ecx\n" ); output( "\tjz 1f\n" ); output( "\tcld\n" ); output( "\trep\n\tmovsl\n" ); /* copy args */ output( "1:\tleal %d(%%ebp),%%eax\n", -STACK_SPACE ); /* get addr of context struct */ output( "\tmovl %%eax,(%%edi)\n" ); /* and pass it as extra arg */ - output( "\tmovzbl 5(%%ebx),%%eax\n" ); /* fetch number of args to remove */ - output( "\tleal 16(%%ebp,%%eax),%%eax\n" ); - output( "\tmovl %%eax,%d(%%ebp)\n", CONTEXTOFFSET(Esp) - STACK_SPACE ); + output( "\tmovl %%esi,%d(%%ebp)\n", CONTEXTOFFSET(Esp) - STACK_SPACE ); /* Call the entry point */ - output( "\taddl (%%ebx),%%ebx\n" ); - output( "\tcall *%%ebx\n" ); + output( "\tmovl 4(%%ebp),%%eax\n" ); /* get relay code addr */ + output( "\taddl 12(%%ebp),%%eax\n" ); + output( "\tcall *%%eax\n" ); output( "\tleal -%d(%%ebp),%%ecx\n", STACK_SPACE ); /* Restore the context structure */ diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 9cf60c3..2000937 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -137,7 +137,6 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tpushl %%esp\n" ); if (odp->flags & FLAG_RET64) flags |= 1; - if (odp->type == TYPE_STDCALL) flags |= 2; output( "\tpushl $%u\n", (flags << 24) | (args << 16) | (i - spec->base) ); if (UsePIC)

1 0

Alexandre Julliard : ntdll: Change the DEFINE_REGS_ENTRYPOINT macro to use a number of args instead of a size .
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: 4986f42b9f3087039d9fa5578514a6742148eed3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4986f42b9f3087039d9fa5578… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 6 12:49:18 2009 +0100 ntdll: Change the DEFINE_REGS_ENTRYPOINT macro to use a number of args instead of a size. Also assume that all register functions are stdcall. --- dlls/ntdll/exception.c | 6 +++--- dlls/ntdll/ntdll_misc.h | 4 ++-- dlls/ntdll/relay.c | 10 ++++------ dlls/ntdll/signal_i386.c | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index c1c53c3..de27434 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -401,7 +401,7 @@ void WINAPI __regs_RtlCaptureContext( CONTEXT *context_out, CONTEXT *context_in /**********************************************************************/ #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( RtlCaptureContext, 4, 4 ) +DEFINE_REGS_ENTRYPOINT( RtlCaptureContext, 1 ) #else void WINAPI RtlCaptureContext( CONTEXT *context_out ) { @@ -430,7 +430,7 @@ void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) /**********************************************************************/ #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 4, 4 ) +DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) #else void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) { @@ -522,7 +522,7 @@ void WINAPI __regs_RtlUnwind( EXCEPTION_REGISTRATION_RECORD* pEndFrame, PVOID un /**********************************************************************/ #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( RtlUnwind, 16, 16 ) +DEFINE_REGS_ENTRYPOINT( RtlUnwind, 4 ) #else void WINAPI RtlUnwind( PVOID pEndFrame, PVOID unusedEip, PEXCEPTION_RECORD pRecord, PVOID returnEax ) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index ced68d9..9d7ba6a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -217,12 +217,12 @@ static inline struct ntdll_thread_regs *ntdll_get_thread_regs(void) /* Register functions */ #ifdef __i386__ -#define DEFINE_REGS_ENTRYPOINT( name, args, pop_args ) \ +#define DEFINE_REGS_ENTRYPOINT( name, args ) \ __ASM_GLOBAL_FUNC( name, \ "pushl %eax\n\t" \ "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \ ".long " __ASM_NAME("__regs_") #name "-.\n\t" \ - ".byte " #args "," #pop_args ) + ".byte 4*" #args ",4*" #args ) /* FIXME: add support for other CPUs */ #endif diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 6dec576..4fae06e 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -421,7 +421,6 @@ void WINAPI __regs_relay_call_regs( struct relay_descr *descr, unsigned int idx, { WORD ordinal = LOWORD(idx); BYTE nb_args = LOBYTE(HIWORD(idx)); - BYTE flags = HIBYTE(HIWORD(idx)); struct relay_private_data *data = descr->private; struct relay_entry_point *entry_point = data->entry_points + ordinal; BYTE *orig_func = entry_point->orig_func; @@ -431,8 +430,7 @@ void WINAPI __regs_relay_call_regs( struct relay_descr *descr, unsigned int idx, /* restore the context to what it was before the relay thunk */ context->Eax = orig_eax; context->Eip = ret_addr; - if (flags & 2) /* stdcall */ - context->Esp += nb_args * sizeof(int); + context->Esp += nb_args * sizeof(int); if (TRACE_ON(relay)) { @@ -479,7 +477,7 @@ void WINAPI __regs_relay_call_regs( struct relay_descr *descr, unsigned int idx, } } extern void WINAPI relay_call_regs(void); -DEFINE_REGS_ENTRYPOINT( relay_call_regs, 16, 16 ) +DEFINE_REGS_ENTRYPOINT( relay_call_regs, 4 ) #endif @@ -973,8 +971,8 @@ void WINAPI __regs_SNOOP_Return( CONTEXT86 *context ) } /* assembly wrappers that save the context */ -DEFINE_REGS_ENTRYPOINT( SNOOP_Entry, 0, 0 ) -DEFINE_REGS_ENTRYPOINT( SNOOP_Return, 0, 0 ) +DEFINE_REGS_ENTRYPOINT( SNOOP_Entry, 0 ) +DEFINE_REGS_ENTRYPOINT( SNOOP_Return, 0 ) #else /* __i386__ */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 47788e6..32c39f3 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -896,7 +896,7 @@ void WINAPI __regs_get_cpu_context( CONTEXT *context, CONTEXT *regs ) if (fpux_support) save_fpux( context ); else save_fpu( context ); } -DEFINE_REGS_ENTRYPOINT( get_cpu_context, 4, 4 ) +DEFINE_REGS_ENTRYPOINT( get_cpu_context, 1 ) /***********************************************************************

1 0

Henri Verbeet : wined3d: Convert textureState to a bitmap in struct SAVEDSTATES.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: bddf5e76ea7c0cee5593963f293840b3a483bef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bddf5e76ea7c0cee5593963f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 6 11:43:45 2009 +0100 wined3d: Convert textureState to a bitmap in struct SAVEDSTATES. --- dlls/wined3d/device.c | 26 +++++++++++++++----------- dlls/wined3d/stateblock.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 6 +++--- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 09ecce7..dd6eff7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -478,9 +478,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, object->num_contained_render_states = NUM_SAVEDPIXELSTATES_R; for (j = 0; j < MAX_TEXTURES; j++) { for (i = 0; i < NUM_SAVEDPIXELSTATES_T; i++) { - object->changed.textureState[j][SavedPixelStates_T[i]] = TRUE; + DWORD state = SavedPixelStates_T[i]; + object->changed.textureState[j] |= 1 << state; object->contained_tss_states[object->num_contained_tss_states].stage = j; - object->contained_tss_states[object->num_contained_tss_states].state = SavedPixelStates_T[i]; + object->contained_tss_states[object->num_contained_tss_states].state = state; object->num_contained_tss_states++; } } @@ -537,9 +538,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, object->num_contained_render_states = NUM_SAVEDVERTEXSTATES_R; for (j = 0; j < MAX_TEXTURES; j++) { for (i = 0; i < NUM_SAVEDVERTEXSTATES_T; i++) { - object->changed.textureState[j][SavedVertexStates_T[i]] = TRUE; + DWORD state = SavedVertexStates_T[i]; + object->changed.textureState[j] |= 1 << state; object->contained_tss_states[object->num_contained_tss_states].stage = j; - object->contained_tss_states[object->num_contained_tss_states].state = SavedVertexStates_T[i]; + object->contained_tss_states[object->num_contained_tss_states].state = state; object->num_contained_tss_states++; } } @@ -4448,7 +4450,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *if return WINED3D_OK; } - This->updateStateBlock->changed.textureState[Stage][Type] = TRUE; + This->updateStateBlock->changed.textureState[Stage] |= 1 << Type; This->updateStateBlock->textureState[Stage][Type] = Value; if (This->isRecordingState) { @@ -4816,13 +4818,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, IW } } for(i = 0; i < MAX_TEXTURES; i++) { - for (j = 0; j <= WINED3D_HIGHEST_TEXTURE_STATE; ++j) + DWORD map = object->changed.textureState[i]; + + for(j = 0; map; map >>= 1, ++j) { - if(object->changed.textureState[i][j]) { - object->contained_tss_states[object->num_contained_tss_states].stage = i; - object->contained_tss_states[object->num_contained_tss_states].state = j; - object->num_contained_tss_states++; - } + if (!(map & 1)) continue; + + object->contained_tss_states[object->num_contained_tss_states].stage = i; + object->contained_tss_states[object->num_contained_tss_states].state = j; + ++object->num_contained_tss_states; } } for(i = 0; i < MAX_COMBINED_SAMPLERS; i++){ diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index af77df3..4203073 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -91,7 +91,7 @@ static void stateblock_savedstates_copy(IWineD3DStateBlock* iface, SAVEDSTATES * dest->textures = source->textures; memcpy(dest->transform, source->transform, sizeof(source->transform)); memcpy(dest->renderState, source->renderState, sizeof(source->renderState)); - memcpy(dest->textureState, source->textureState, bsize * MAX_TEXTURES * (WINED3D_HIGHEST_TEXTURE_STATE + 1)); + memcpy(dest->textureState, source->textureState, sizeof(source->textureState)); memcpy(dest->samplerState, source->samplerState, sizeof(source->samplerState)); dest->clipplane = source->clipplane; dest->pixelShaderConstantsB = source->pixelShaderConstantsB; @@ -138,6 +138,7 @@ void stateblock_savedstates_set( states->textures = 0xfffff; stateblock_set_bits(states->transform, HIGHEST_TRANSFORMSTATE + 1); stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); + for (i = 0; i < MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3fff; states->clipplane = 0xffffffff; states->pixelShaderConstantsB = 0xffff; @@ -152,6 +153,7 @@ void stateblock_savedstates_set( states->textures = 0; memset(states->transform, 0, sizeof(states->transform)); memset(states->renderState, 0, sizeof(states->renderState)); + memset(states->textureState, 0, sizeof(states->textureState)); memset(states->samplerState, 0, sizeof(states->samplerState)); states->clipplane = 0; states->pixelShaderConstantsB = 0; @@ -159,7 +161,6 @@ void stateblock_savedstates_set( states->vertexShaderConstantsB = 0; states->vertexShaderConstantsI = 0; } - memset(states->textureState, value, bsize * MAX_TEXTURES * (WINED3D_HIGHEST_TEXTURE_STATE + 1)); /* Dynamically sized arrays */ memset(states->pixelShaderConstantsF, value, bsize * GL_LIMITS(pshader_constantsF)); @@ -808,7 +809,7 @@ should really perform a delta so that only the changes get updated*/ DWORD stage = This->contained_tss_states[i].stage; DWORD state = This->contained_tss_states[i].state; ((IWineD3DDeviceImpl *)pDevice)->stateBlock->textureState[stage][state] = This->textureState[stage][state]; - ((IWineD3DDeviceImpl *)pDevice)->stateBlock->changed.textureState[stage][state] = TRUE; + ((IWineD3DDeviceImpl *)pDevice)->stateBlock->changed.textureState[stage] |= 1 << state; /* TODO: Record a display list to apply all gl states. For now apply by brute force */ IWineD3DDeviceImpl_MarkStateDirty((IWineD3DDeviceImpl *)pDevice, STATE_TEXTURESTAGE(stage, state)); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 43111f4..1a78e90 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1761,10 +1761,10 @@ typedef struct SAVEDSTATES { DWORD transform[(HIGHEST_TRANSFORMSTATE >> 5) + 1]; WORD streamSource; /* MAX_STREAMS, 16 */ WORD streamFreq; /* MAX_STREAMS, 16 */ - DWORD textures; /* MAX_COMBINED_SAMPLERS, 20 */ DWORD renderState[(WINEHIGHEST_RENDER_STATE >> 5) + 1]; - BOOL textureState[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; - WORD samplerState[MAX_COMBINED_SAMPLERS]; /* WINED3D_HIGHEST_SAMPLER_STATE + 1, 14*/ + DWORD textureState[MAX_TEXTURES]; /* WINED3D_HIGHEST_TEXTURE_STATE + 1, 18 */ + WORD samplerState[MAX_COMBINED_SAMPLERS]; /* WINED3D_HIGHEST_SAMPLER_STATE + 1, 14 */ + DWORD textures; /* MAX_COMBINED_SAMPLERS, 20 */ DWORD clipplane; /* WINED3DMAXUSERCLIPPLANES, 32 */ WORD pixelShaderConstantsB; /* MAX_CONST_B, 16 */ WORD pixelShaderConstantsI; /* MAX_CONST_I, 16 */

1 0

Henri Verbeet : wined3d: Renumber WINED3DTEXTURESTAGESTATETYPE enum elements.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: a8697d90e43c12d237992c6f12c34e96b8910403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8697d90e43c12d237992c6f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 6 11:43:45 2009 +0100 wined3d: Renumber WINED3DTEXTURESTAGESTATETYPE enum elements. Saves some space by not having unused entries is the arrays tracking these states. --- dlls/wined3d/arb_program_shader.c | 4 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/device.c | 9 +++++-- dlls/wined3d/nvidia_texture_shader.c | 4 +- dlls/wined3d/state.c | 12 +++++----- dlls/wined3d/stateblock.c | 3 +- dlls/wined3d/utils.c | 3 -- dlls/wined3d/wined3d_private.h | 4 +- include/wine/wined3d.idl | 36 +++++++++++++++++----------------- 9 files changed, 39 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8697d90e43c12d237992…

1 0

Henri Verbeet : d3d: Explicitly translate texture stage states.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: 352e60e6edb901ece2d1a66e977af28d87490ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=352e60e6edb901ece2d1a66e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 6 11:43:45 2009 +0100 d3d: Explicitly translate texture stage states. Ddraw and d3d8 already translate half of them, it turns out the lookup table actually saves lines there. --- dlls/d3d8/device.c | 126 +++++++++-------------- dlls/d3d9/device.c | 41 +++++++- dlls/ddraw/device.c | 287 +++++++++++++++++++++----------------------------- 3 files changed, 208 insertions(+), 246 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=352e60e6edb901ece2d1a…

1 0

Henri Verbeet : ddraw: Properly handle sampler states.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: c51bc826e8112ff2cd5138576c7818cad987f616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51bc826e8112ff2cd5138576… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 6 11:43:44 2009 +0100 ddraw: Properly handle sampler states. --- dlls/ddraw/device.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7efc66f..da0ca0e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5095,6 +5095,23 @@ IDirect3DDeviceImpl_7_GetTextureStageState(IDirect3DDevice7 *iface, WINED3DSAMP_ADDRESSV, State); break; + + case D3DTSS_BORDERCOLOR: + hr = IWineD3DDevice_GetSamplerState(This->wineD3DDevice, Stage, WINED3DSAMP_BORDERCOLOR, State); + break; + + case D3DTSS_MIPMAPLODBIAS: + hr = IWineD3DDevice_GetSamplerState(This->wineD3DDevice, Stage, WINED3DSAMP_MIPMAPLODBIAS, State); + break; + + case D3DTSS_MAXMIPLEVEL: + hr = IWineD3DDevice_GetSamplerState(This->wineD3DDevice, Stage, WINED3DSAMP_MAXMIPLEVEL, State); + break; + + case D3DTSS_MAXANISOTROPY: + hr = IWineD3DDevice_GetSamplerState(This->wineD3DDevice, Stage, WINED3DSAMP_MAXANISOTROPY, State); + break; + default: hr = IWineD3DDevice_GetTextureStageState(This->wineD3DDevice, Stage, @@ -5247,6 +5264,22 @@ IDirect3DDeviceImpl_7_SetTextureStageState(IDirect3DDevice7 *iface, State); break; + case D3DTSS_BORDERCOLOR: + hr = IWineD3DDevice_SetSamplerState(This->wineD3DDevice, Stage, WINED3DSAMP_BORDERCOLOR, State); + break; + + case D3DTSS_MIPMAPLODBIAS: + hr = IWineD3DDevice_SetSamplerState(This->wineD3DDevice, Stage, WINED3DSAMP_MIPMAPLODBIAS, State); + break; + + case D3DTSS_MAXMIPLEVEL: + hr = IWineD3DDevice_SetSamplerState(This->wineD3DDevice, Stage, WINED3DSAMP_MAXMIPLEVEL, State); + break; + + case D3DTSS_MAXANISOTROPY: + hr = IWineD3DDevice_SetSamplerState(This->wineD3DDevice, Stage, WINED3DSAMP_MAXANISOTROPY, State); + break; + default: hr = IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, Stage,

1 0

Hans Leidekker : sfc: Add a stub implementation for ordinal 3.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: d5d2a27aa4a42f82c6f2b0287a71006fffee3e32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d2a27aa4a42f82c6f2b0287… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 6 08:34:08 2009 +0100 sfc: Add a stub implementation for ordinal 3. --- dlls/sfc/sfc.spec | 2 +- dlls/sfc/sfc_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/sfc/sfc.spec b/dlls/sfc/sfc.spec index 2db3cb3..04307d2 100644 --- a/dlls/sfc/sfc.spec +++ b/dlls/sfc/sfc.spec @@ -1,6 +1,6 @@ 1 stub @ 2 stub @ -3 stub @ +3 stdcall @(long) SFC_3 4 stub @ 5 stub @ 6 stub @ diff --git a/dlls/sfc/sfc_main.c b/dlls/sfc/sfc_main.c index 58957c8..c715867 100644 --- a/dlls/sfc/sfc_main.c +++ b/dlls/sfc/sfc_main.c @@ -52,3 +52,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +DWORD WINAPI SFC_3(DWORD unknown) +{ + FIXME("%x\n", unknown); + return 0; +}

1 0

Henri Verbeet : d3d9: Don't test invalid texture stages.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: 04808cc5aa27e43ca6cafa0254ab573e97ffe313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04808cc5aa27e43ca6cafa025… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Tue Jan 6 11:43:44 2009 +0100 d3d9: Don't test invalid texture stages. --- dlls/d3d9/tests/texture.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c index 86132b7..4d433b1 100644 --- a/dlls/d3d9/tests/texture.c +++ b/dlls/d3d9/tests/texture.c @@ -99,7 +99,6 @@ static void test_texture_stage_states(IDirect3DDevice9 *device_ptr, int num_stag test_texture_stage_state(device_ptr, i, D3DTSS_ALPHAARG0, D3DTA_CURRENT); test_texture_stage_state(device_ptr, i, D3DTSS_RESULTARG, D3DTA_CURRENT); test_texture_stage_state(device_ptr, i, D3DTSS_CONSTANT, 0); - test_texture_stage_state(device_ptr, i, D3DTSS_FORCE_DWORD, 0); } }

1 0

Michael Stefaniuc : include: Change mapi. h to use ULONG for Win64 compatibility.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: ba01d15b1fd1ab58345e4feccfb96f9e47c8fa08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba01d15b1fd1ab58345e4fecc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 6 00:09:23 2009 +0100 include: Change mapi.h to use ULONG for Win64 compatibility. --- dlls/mapi32/sendmail.c | 2 +- include/mapi.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 4103117..7b8de66 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -71,7 +71,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, HRESULT res; DWORD size; - TRACE( "(0x%08lx 0x%08lx %p 0x%08lx 0x%08x)\n", session, uiparam, + TRACE( "(0x%08x 0x%08lx %p 0x%08x 0x%08x)\n", session, uiparam, message, flags, reserved ); if (!message) return MAPI_E_FAILURE; diff --git a/include/mapi.h b/include/mapi.h index f8695f3..2d335ea 100644 --- a/include/mapi.h +++ b/include/mapi.h @@ -27,15 +27,15 @@ extern "C" { #ifndef __LHANDLE #define __LHANDLE -typedef unsigned long LHANDLE, *LPLHANDLE; +typedef ULONG LHANDLE, *LPLHANDLE; #endif #define lhSessionNull ((LHANDLE)0) #ifndef WINE_FLAGS_DEFINED #define WINE_FLAGS_DEFINED -typedef unsigned long FLAGS; +typedef ULONG FLAGS; #endif -typedef unsigned long* LPULONG; +typedef ULONG *LPULONG; typedef struct {

1 0