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

Tobias Jakobi : wined3d: Add ps_np2fixup_info structure.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 7906774339c503200d950e5ad03d3b4d5955855b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7906774339c503200d950e5ad… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Jun 17 23:24:25 2009 +0200 wined3d: Add ps_np2fixup_info structure. --- dlls/wined3d/glsl_shader.c | 23 ++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 035844a..bd5724a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -114,6 +114,7 @@ struct glsl_shader_prog_link { struct vs_compile_args vs_args; struct ps_compile_args ps_args; UINT constant_version; + const struct ps_np2fixup_info *np2Fixup_info; }; typedef struct { @@ -126,11 +127,13 @@ typedef struct { struct shader_glsl_ctx_priv { const struct vs_compile_args *cur_vs_args; const struct ps_compile_args *cur_ps_args; + struct ps_np2fixup_info *cur_np2fixup_info; }; struct glsl_ps_compiled_shader { struct ps_compile_args args; + struct ps_np2fixup_info np2fixup; GLhandleARB prgId; }; @@ -3627,7 +3630,7 @@ static void hardcode_local_constants(IWineD3DBaseShaderImpl *shader, const WineD /* GL locking is done by the caller */ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, - SHADER_BUFFER *buffer, const struct ps_compile_args *args) + SHADER_BUFFER *buffer, const struct ps_compile_args *args, struct ps_np2fixup_info *np2fixup_info) { const struct shader_reg_maps *reg_maps = &This->baseShader.reg_maps; CONST DWORD *function = This->baseShader.function; @@ -3640,6 +3643,7 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.cur_ps_args = args; + priv_ctx.cur_np2fixup_info = np2fixup_info; shader_addline(buffer, "#version 120\n"); @@ -3792,13 +3796,15 @@ static GLuint shader_glsl_generate_vshader(IWineD3DVertexShaderImpl *This, return shader_obj; } -static GLhandleARB find_glsl_pshader(IWineD3DPixelShaderImpl *shader, const struct ps_compile_args *args) +static GLhandleARB find_glsl_pshader(IWineD3DPixelShaderImpl *shader, const struct ps_compile_args *args, + const struct ps_np2fixup_info **np2fixup_info) { UINT i; DWORD new_size; struct glsl_ps_compiled_shader *new_array; + struct glsl_pshader_private *shader_data; + struct ps_np2fixup_info *np2fixup = NULL; SHADER_BUFFER buffer; - struct glsl_pshader_private *shader_data; GLhandleARB ret; if(!shader->backend_priv) { @@ -3812,6 +3818,7 @@ static GLhandleARB find_glsl_pshader(IWineD3DPixelShaderImpl *shader, const stru */ for(i = 0; i < shader_data->num_gl_shaders; i++) { if(memcmp(&shader_data->gl_shaders[i].args, args, sizeof(*args)) == 0) { + if(args->np2_fixup) *np2fixup_info = &shader_data->gl_shaders[i].np2fixup; return shader_data->gl_shaders[i].prgId; } } @@ -3838,13 +3845,17 @@ static GLhandleARB find_glsl_pshader(IWineD3DPixelShaderImpl *shader, const stru shader_data->gl_shaders[shader_data->num_gl_shaders].args = *args; + memset(&shader_data->gl_shaders[shader_data->num_gl_shaders].np2fixup, 0, sizeof(struct ps_np2fixup_info)); + if (args->np2_fixup) np2fixup = &shader_data->gl_shaders[shader_data->num_gl_shaders].np2fixup; + pixelshader_update_samplers(&shader->baseShader.reg_maps, ((IWineD3DDeviceImpl *)shader->baseShader.device)->stateBlock->textures); shader_buffer_init(&buffer); - ret = shader_glsl_generate_pshader(shader, &buffer, args); + ret = shader_glsl_generate_pshader(shader, &buffer, args, np2fixup); shader_buffer_free(&buffer); shader_data->gl_shaders[shader_data->num_gl_shaders++].prgId = ret; + *np2fixup_info = np2fixup; return ret; } @@ -3956,6 +3967,7 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use entry->vs_args = vs_compile_args; entry->ps_args = ps_compile_args; entry->constant_version = 0; + entry->np2Fixup_info = NULL; /* Add the hash table entry */ add_glsl_program_entry(priv, entry); @@ -4006,7 +4018,8 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use /* Attach GLSL pshader */ if (pshader) { - GLhandleARB pshader_id = find_glsl_pshader((IWineD3DPixelShaderImpl *)pshader, &ps_compile_args); + GLhandleARB pshader_id = find_glsl_pshader((IWineD3DPixelShaderImpl *)pshader, &ps_compile_args, + &entry->np2Fixup_info); TRACE("Attaching GLSL shader object %u to program %u\n", pshader_id, programId); GL_EXTCALL(glAttachObjectARB(programId, pshader_id)); checkGLcall("glAttachObjectARB"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index afef4af..afdf642 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2707,6 +2707,24 @@ void find_vs_compile_args(IWineD3DVertexShaderImpl *shader, IWineD3DStateBlockIm /***************************************************************************** * IDirect3DPixelShader implementation structure */ + +/* Using additional shader constants (uniforms in GLSL / program environment + * or local parameters in ARB) is costly: + * ARB only knows float4 parameters and GLSL compiler are not really smart + * when it comes to efficiently pack float2 uniforms, so no space is wasted + * (in fact most compilers map a float2 to a full float4 uniform). + * + * For NP2 texcoord fixup we only need 2 floats (width and height) for each + * 2D texture used in the shader. We therefore pack fixup info for 2 textures + * into a single shader constant (uniform / program parameter). + * + * This structure is shared between the GLSL and the ARB backend.*/ +struct ps_np2fixup_info { + unsigned char idx[MAX_FRAGMENT_SAMPLERS]; /* indices to the real constant */ + WORD active; /* bitfield indicating if we can apply the fixup */ + WORD num_consts; +}; + typedef struct IWineD3DPixelShaderImpl { /* IUnknown parts */ const IWineD3DPixelShaderVtbl *lpVtbl;

1 0

Alexandre Julliard : msvcrt: Add call frame annotations in x86 assembly code.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 0cb406ef290f46ba0060d609a2b1024c28cf1352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb406ef290f46ba0060d609a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 11:50:42 2009 +0200 msvcrt: Add call frame annotations in x86 assembly code. --- dlls/msvcrt/cppexcept.c | 8 ++++++++ dlls/msvcrt/except.c | 5 +++++ dlls/msvcrt/misc.c | 5 +++++ 3 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c index 6dafc9e..a777025 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/cppexcept.c @@ -413,14 +413,22 @@ extern DWORD CDECL __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRAT PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch ); __ASM_GLOBAL_FUNC( __CxxFrameHandler, "pushl $0\n\t" /* nested_trylevel */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl $0\n\t" /* nested_frame */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl %eax\n\t" /* descr */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl 28(%esp)\n\t" /* dispatch */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl 28(%esp)\n\t" /* context */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl 28(%esp)\n\t" /* frame */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl 28(%esp)\n\t" /* rec */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "call " __ASM_NAME("cxx_frame_handler") "\n\t" "add $28,%esp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -28\n\t") "ret" ) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 9b254f8..5de42db 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -117,14 +117,19 @@ static DWORD MSVCRT_nested_handler(PEXCEPTION_RECORD rec, /* Provided for VC++ binary compatibility only */ __ASM_GLOBAL_FUNC(_EH_prolog, + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") /* skip ret addr */ "pushl $-1\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl %eax\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl %fs:0\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "movl %esp, %fs:0\n\t" "movl 12(%esp), %eax\n\t" "movl %ebp, 12(%esp)\n\t" "leal 12(%esp), %ebp\n\t" "pushl %eax\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "ret") static void msvcrt_local_unwind2(MSVCRT_EXCEPTION_FRAME* frame, int trylevel, void *ebp) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 3d3c03b..082c38b 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -138,7 +138,10 @@ __ASM_GLOBAL_FUNC(_chkesp, "jnz 1f\n\t" "ret\n" "1:\tpushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") "subl $12,%esp\n\t" "pushl %eax\n\t" "pushl %ecx\n\t" @@ -148,6 +151,8 @@ __ASM_GLOBAL_FUNC(_chkesp, "popl %ecx\n\t" "popl %eax\n\t" "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") "ret") void CDECL MSVCRT_chkesp_fail(void)

1 0

Alexandre Julliard : rpcrt4: Add call frame annotations in x86 assembly code.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: b6efd13ef5c7f1b458c49aef3cb4e6a3bc6a46bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6efd13ef5c7f1b458c49aef3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 11:51:30 2009 +0200 rpcrt4: Add call frame annotations in x86 assembly code. --- dlls/rpcrt4/cproxy.c | 2 ++ dlls/rpcrt4/ndr_stubless.c | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 0887aa2..9ce555f 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -76,8 +76,10 @@ struct thunk { extern void call_stubless_func(void); __ASM_GLOBAL_FUNC(call_stubless_func, "pushl %esp\n\t" /* pointer to index */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "call " __ASM_NAME("ObjectStubless") __ASM_STDCALL(4) "\n\t" "popl %edx\n\t" /* args size */ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") "movl (%esp),%ecx\n\t" /* return address */ "addl %edx,%esp\n\t" "jmp *%ecx" ); diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 6a3854e..8cb5f2b 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -867,9 +867,14 @@ __declspec(naked) LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigne LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, unsigned int stack_size); __ASM_GLOBAL_FUNC(call_server_func, "pushl %ebp\n\t" - "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") "pushl %edi\n\t" /* Save registers */ + __ASM_CFI(".cfi_rel_offset %edi,-4\n\t") "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") "movl 16(%ebp), %eax\n\t" /* Get stack size */ "subl %eax, %esp\n\t" /* Make room in stack for arguments */ "andl $~15, %esp\n\t" /* Make sure stack has 16-byte alignment for Mac OS X */ @@ -882,9 +887,13 @@ __ASM_GLOBAL_FUNC(call_server_func, "call *8(%ebp)\n\t" /* Call function */ "leal -8(%ebp), %esp\n\t" /* Restore stack */ "popl %esi\n\t" /* Restore registers */ + __ASM_CFI(".cfi_same_value %esi\n\t") "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") "popl %ebp\n\t" - "ret\n" ) + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) #else #warning call_server_func not implemented for your architecture LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, unsigned short stack_size)

1 0

Alexandre Julliard : user32: Add call frame annotations in x86 assembly code.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 39984d4824fa6e2ecf2960d06190eaab753d7789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39984d4824fa6e2ecf2960d06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 11:51:52 2009 +0200 user32: Add call frame annotations in x86 assembly code. --- dlls/user32/winproc.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 2a88329..91eeeb7 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -282,10 +282,16 @@ extern LRESULT WINPROC_wrapper( WNDPROC proc, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); __ASM_GLOBAL_FUNC( WINPROC_wrapper, "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-4\n\t") "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-12\n\t") "subl $12,%esp\n\t" "pushl 24(%ebp)\n\t" "pushl 20(%ebp)\n\t" @@ -295,9 +301,14 @@ __ASM_GLOBAL_FUNC( WINPROC_wrapper, "call *%eax\n\t" "leal -12(%ebp),%esp\n\t" "popl %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") "popl %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") "ret" ) #else static inline LRESULT WINPROC_wrapper( WNDPROC proc, HWND hwnd, UINT msg,

1 0

Alexandre Julliard : winedos: Add call frame annotations in x86 assembly code.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: e7da3b519f7806ef429b6cc2c7ebe3e39e7fce7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7da3b519f7806ef429b6cc2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 11:52:01 2009 +0200 winedos: Add call frame annotations in x86 assembly code. --- dlls/winedos/int31.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c index 905d7e6..0c5bdc7 100644 --- a/dlls/winedos/int31.c +++ b/dlls/winedos/int31.c @@ -312,9 +312,14 @@ void DPMI_CallRMCB32(RMCB *rmcb, UINT16 ss, DWORD esp, UINT16*es, DWORD*edi) ; __ASM_GLOBAL_FUNC(DPMI_CallRMCB32, "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-4\n\t") "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") "movl 0x8(%ebp),%eax\n\t" "movl 0x10(%ebp),%esi\n\t" "movl 0xc(%ebp),%edx\n\t" @@ -339,8 +344,12 @@ __ASM_GLOBAL_FUNC(DPMI_CallRMCB32, "movl 0x18(%ebp),%edx\n\t" "movl %edi,(%edx)\n\t" "popl %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") "ret") #endif

1 0

Alexandre Julliard : libwine: Add call frame annotations in x86 assembly code.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 065287ed66e7886672a8650e0bea34c99a5acd82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=065287ed66e7886672a8650e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 11:54:02 2009 +0200 libwine: Add call frame annotations in x86 assembly code. --- libs/port/interlocked.c | 8 ++++++++ libs/wine/port.c | 18 ++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index fc40fe5..cefbb5e 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -40,7 +40,11 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg_ptr, "ret") __ASM_GLOBAL_FUNC(interlocked_cmpxchg64, "push %ebx\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebx,0\n\t") "push %esi\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %esi,0\n\t") "movl 12(%esp),%esi\n\t" "movl 16(%esp),%ebx\n\t" "movl 20(%esp),%ecx\n\t" @@ -48,7 +52,11 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg_ptr, "movl 28(%esp),%edx\n\t" "lock; cmpxchg8b (%esi)\n\t" "pop %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") "pop %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") "ret") __ASM_GLOBAL_FUNC(interlocked_xchg, "movl 8(%esp),%eax\n\t" diff --git a/libs/wine/port.c b/libs/wine/port.c index 6307069..cfd3bcd 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -94,19 +94,29 @@ void DECLSPEC_NORETURN wine_switch_to_stack( void (*func)(void *), void *arg, vo #if defined(__i386__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_call_on_stack, "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") "pushl %esi\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %esi,0\n\t") + "movl %esp,%esi\n\t" + __ASM_CFI(".cfi_def_cfa_register %esi\n\t") "movl 12(%esp),%ecx\n\t" /* func */ "movl 16(%esp),%edx\n\t" /* arg */ - "movl 20(%esp),%esi\n\t" /* stack */ - "andl $~15,%esi\n\t" - "subl $12,%esi\n\t" - "xchgl %esi,%esp\n\t" + "movl 20(%esp),%eax\n\t" /* stack */ + "andl $~15,%eax\n\t" + "subl $12,%eax\n\t" + "movl %eax,%esp\n\t" "pushl %edx\n\t" "xorl %ebp,%ebp\n\t" "call *%ecx\n\t" "movl %esi,%esp\n\t" "popl %esi\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + __ASM_CFI(".cfi_same_value %esi\n\t") "popl %ebp\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") "ret" ) #elif defined(__i386__) && defined(_MSC_VER) __declspec(naked) int wine_call_on_stack( int (*func)(void *), void *arg, void *stack )

1 0

Alexandre Julliard : ntdll: Add call frame annotations in x86 assembly code .
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 0c463415432769df5bfe295a071380f3eebe6283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c463415432769df5bfe295a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 12:02:53 2009 +0200 ntdll: Add call frame annotations in x86 assembly code. --- dlls/ntdll/loader.c | 7 +++ dlls/ntdll/relay.c | 49 +++++++++++++--------- dlls/ntdll/signal_i386.c | 99 ++++++++++++++++++++++++++++------------------ 3 files changed, 96 insertions(+), 59 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 166766b..2f9b41e 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -148,8 +148,12 @@ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) extern BOOL call_dll_entry_point( DLLENTRYPROC proc, void *module, UINT reason, void *reserved ); __ASM_GLOBAL_FUNC(call_dll_entry_point, "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-4\n\t") "subl $8,%esp\n\t" "pushl 20(%ebp)\n\t" "pushl 16(%ebp)\n\t" @@ -158,7 +162,10 @@ __ASM_GLOBAL_FUNC(call_dll_entry_point, "call *%eax\n\t" "leal -4(%ebp),%esp\n\t" "popl %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") "popl %ebp\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") "ret" ) #else /* __i386__ */ static inline BOOL call_dll_entry_point( DLLENTRYPROC proc, void *module, diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 0f74c41..1981e51 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -320,26 +320,35 @@ static inline void RELAY_PrintArgs( const INT_PTR *args, int nb_args, unsigned i extern LONGLONG CDECL call_entry_point( void *func, int nb_args, const INT_PTR *args ); #ifdef __i386__ __ASM_GLOBAL_FUNC( call_entry_point, - "\tpushl %ebp\n" - "\tmovl %esp,%ebp\n" - "\tpushl %esi\n" - "\tpushl %edi\n" - "\tmovl 12(%ebp),%edx\n" - "\tshll $2,%edx\n" - "\tjz 1f\n" - "\tsubl %edx,%esp\n" - "\tandl $~15,%esp\n" - "\tmovl 12(%ebp),%ecx\n" - "\tmovl 16(%ebp),%esi\n" - "\tmovl %esp,%edi\n" - "\tcld\n" - "\trep; movsl\n" - "1:\tcall *8(%ebp)\n" - "\tleal -8(%ebp),%esp\n" - "\tpopl %edi\n" - "\tpopl %esi\n" - "\tpopl %ebp\n" - "\tret" ) + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-4\n\t") + "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-8\n\t") + "movl 12(%ebp),%edx\n\t" + "shll $2,%edx\n\t" + "jz 1f\n\t" + "subl %edx,%esp\n\t" + "andl $~15,%esp\n\t" + "movl 12(%ebp),%ecx\n\t" + "movl 16(%ebp),%esi\n\t" + "movl %esp,%edi\n\t" + "cld\n\t" + "rep; movsl\n" + "1:\tcall *8(%ebp)\n\t" + "leal -8(%ebp),%esp\n\t" + "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") + "popl %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") + "popl %ebp\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) #else __ASM_GLOBAL_FUNC( call_entry_point, "pushq %rbp\n\t" diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index ff251fa..d0e0172 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -137,11 +137,15 @@ void vm86_return(void); void vm86_return_end(void); __ASM_GLOBAL_FUNC(vm86_enter, "pushl %ebp\n\t" - "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-4\n\t") "movl $166,%eax\n\t" /*SYS_vm86*/ "movl 8(%ebp),%ecx\n\t" /* vm86_ptr */ "movl (%ecx),%ecx\n\t" - "pushl %ebx\n\t" "movl $1,%ebx\n\t" /*VM86_ENTER*/ "pushl %ecx\n\t" /* put vm86plus_struct ptr somewhere we can find it */ "pushl %fs\n\t" @@ -154,7 +158,10 @@ __ASM_GLOBAL_FUNC(vm86_enter, "popl %fs\n\t" "popl %ecx\n\t" "popl %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") "popl %ebp\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") "testl %eax,%eax\n\t" "jl 0f\n\t" "cmpb $0,%al\n\t" /* VM86_SIGNAL */ @@ -2268,7 +2275,10 @@ DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) extern void DECLSPEC_NORETURN call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg ); __ASM_GLOBAL_FUNC(call_thread_func, "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") "subl $4,%esp\n\t" "pushl 12(%ebp)\n\t" "call *8(%ebp)\n\t" @@ -2329,42 +2339,53 @@ __ASM_STDCALL_FUNC( NtCurrentTeb, 0, ".byte 0x64\n\tmovl 0x18,%eax\n\tret" ) * function calling the handler having only 5 parameters (*4). */ __ASM_GLOBAL_FUNC( EXC_CallHandler, -" pushl %ebp\n" -" movl %esp, %ebp\n" -" pushl %ebx\n" -" movl 28(%ebp), %edx\n" /* ugly hack to pass the 6th param needed because of Shrinker */ -" pushl 24(%ebp)\n" -" pushl 20(%ebp)\n" -" pushl 16(%ebp)\n" -" pushl 12(%ebp)\n" -" pushl 8(%ebp)\n" -" call " __ASM_NAME("call_exception_handler") "\n" -" popl %ebx\n" -" leave\n" -" ret\n" -) + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-4\n\t") + "movl 28(%ebp), %edx\n\t" /* ugly hack to pass the 6th param needed because of Shrinker */ + "pushl 24(%ebp)\n\t" + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("call_exception_handler") "\n\t" + "popl %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) __ASM_GLOBAL_FUNC(call_exception_handler, -" pushl %ebp\n" -" movl %esp, %ebp\n" -" subl $12,%esp\n" -" pushl 12(%ebp)\n" /* make any exceptions in this... */ -" pushl %edx\n" /* handler be handled by... */ -" .byte 0x64\n" -" pushl (0)\n" /* nested_handler (passed in edx). */ -" .byte 0x64\n" -" movl %esp,(0)\n" /* push the new exception frame onto the exception stack. */ -" pushl 20(%ebp)\n" -" pushl 16(%ebp)\n" -" pushl 12(%ebp)\n" -" pushl 8(%ebp)\n" -" movl 24(%ebp), %ecx\n" /* (*1) */ -" call *%ecx\n" /* call handler. (*2) */ -" .byte 0x64\n" -" movl (0), %esp\n" /* restore previous... (*3) */ -" .byte 0x64\n" -" popl (0)\n" /* exception frame. */ -" movl %ebp, %esp\n" /* restore saved stack, in case it was corrupted */ -" popl %ebp\n" -" ret $20\n" /* (*4) */ -) + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "subl $12,%esp\n\t" + "pushl 12(%ebp)\n\t" /* make any exceptions in this... */ + "pushl %edx\n\t" /* handler be handled by... */ + ".byte 0x64\n\t" + "pushl (0)\n\t" /* nested_handler (passed in edx). */ + ".byte 0x64\n\t" + "movl %esp,(0)\n\t" /* push the new exception frame onto the exception stack. */ + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "movl 24(%ebp), %ecx\n\t" /* (*1) */ + "call *%ecx\n\t" /* call handler. (*2) */ + ".byte 0x64\n\t" + "movl (0), %esp\n\t" /* restore previous... (*3) */ + ".byte 0x64\n\t" + "popl (0)\n\t" /* exception frame. */ + "movl %ebp, %esp\n\t" /* restore saved stack, in case it was corrupted */ + "popl %ebp\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $20" ) /* (*4) */ + #endif /* __i386__ */

1 0

Alexandre Julliard : kernel32: Add call frame annotations in x86 assembly code.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 69bb29ced960e9e126d82c67c446645588b2f195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69bb29ced960e9e126d82c67c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 12:02:59 2009 +0200 kernel32: Add call frame annotations in x86 assembly code. --- dlls/kernel32/relay16.c | 49 +++++++++++++++++++++++++++------------------- 1 files changed, 29 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/relay16.c b/dlls/kernel32/relay16.c index a2a550c..b3ac234 100644 --- a/dlls/kernel32/relay16.c +++ b/dlls/kernel32/relay16.c @@ -283,26 +283,35 @@ static const CALLFROM16 *get_entry_point( STACK16FRAME *frame, LPSTR module, LPS extern int call_entry_point( void *func, int nb_args, const int *args ); __ASM_GLOBAL_FUNC( call_entry_point, - "\tpushl %ebp\n" - "\tmovl %esp,%ebp\n" - "\tpushl %esi\n" - "\tpushl %edi\n" - "\tmovl 12(%ebp),%edx\n" - "\tshll $2,%edx\n" - "\tjz 1f\n" - "\tsubl %edx,%esp\n" - "\tandl $~15,%esp\n" - "\tmovl 12(%ebp),%ecx\n" - "\tmovl 16(%ebp),%esi\n" - "\tmovl %esp,%edi\n" - "\tcld\n" - "\trep; movsl\n" - "1:\tcall *8(%ebp)\n" - "\tleal -8(%ebp),%esp\n" - "\tpopl %edi\n" - "\tpopl %esi\n" - "\tpopl %ebp\n" - "\tret" ) + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-4\n\t") + "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-8\n\t") + "movl 12(%ebp),%edx\n\t" + "shll $2,%edx\n\t" + "jz 1f\n\t" + "subl %edx,%esp\n\t" + "andl $~15,%esp\n\t" + "movl 12(%ebp),%ecx\n\t" + "movl 16(%ebp),%esi\n\t" + "movl %esp,%edi\n\t" + "cld\n\t" + "rep; movsl\n" + "1:\tcall *8(%ebp)\n\t" + "leal -8(%ebp),%esp\n\t" + "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") + "popl %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") + "popl %ebp\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) /***********************************************************************

1 0

Matej Spindler : mshtml: Update Slovenian translation.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 56b56a686ab7e59e99224af1fd92a0acc71bb210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b56a686ab7e59e99224af1f… Author: Matej Spindler <matej.spindler(a)gmail.com> Date: Wed Jun 24 17:29:05 2009 +0200 mshtml: Update Slovenian translation. --- dlls/mshtml/Si.rc | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/Si.rc b/dlls/mshtml/Si.rc index 2a67290..9500c18 100644 --- a/dlls/mshtml/Si.rc +++ b/dlls/mshtml/Si.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_HTMLDISABLED "Prikazovanje HTML dokumento je trenutno onemogočeno." + IDS_HTMLDISABLED "Prikazovanje HTML dokumentov je trenutno onemogočeno." IDS_HTMLDOCUMENT "HTML dokument" IDS_DOWNLOADING "Nalagam ..." IDS_INSTALLING "Nameščam ..." @@ -56,4 +56,15 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Prekliči", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "V redu", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Prekliči", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +} + #pragma code_page(default)

1 0

Paul Vriens : user32/tests: Prevent some 'deadcode' (Coverity).
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: d3b3b3e0b909bb5a24c6fdd18cef0580fa33aff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b3b3e0b909bb5a24c6fdd18… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 25 11:07:43 2009 +0200 user32/tests: Prevent some 'deadcode' (Coverity). --- dlls/user32/tests/cursoricon.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index b15acc2..3b646fb 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1111,11 +1111,6 @@ static void test_DrawIcon(void) check_alpha_draw(hdcDst, FALSE, FALSE, 32, __LINE__); todo_wine check_alpha_draw(hdcDst, FALSE, TRUE, 32, __LINE__); - SelectObject(hdcDst, bmpOld); - DeleteObject(bmpDst); - bmpOld = NULL; - bmpDst = NULL; - cleanup: if(bmpOld) SelectObject(hdcDst, bmpOld);

1 0