April 2010 - Wine-Commits - list.winehq.org

Roderick Colenbrander : wined3d: Remove remaining redundant code from d3dfmt_get_conv.
by Alexandre Julliard April 8, 2010

April 8, 2010

Module: wine Branch: master Commit: 1c02a909e59de60159ece427550f93f7aac47d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c02a909e59de60159ece4275… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Apr 7 23:12:23 2010 +0200 wined3d: Remove remaining redundant code from d3dfmt_get_conv. --- dlls/wined3d/surface.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bc44070..a82d52a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2237,8 +2237,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ } else { /* Load it into unsigned R5G6B5, swap L and V channels, and revert that in the shader */ *target_bpp = 2; - *format = GL_RGB; - *type = GL_UNSIGNED_SHORT_5_6_5; } break; @@ -2253,9 +2251,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ * the needed type and format parameter, so the internal format contains a * 4th component, which is returned as alpha */ - } else { - *format = GL_BGRA; - *type = GL_UNSIGNED_INT_8_8_8_8_REV; } break;

1 0

Alexandre Julliard : winecrt0: Add a trampoline function to align the stack on x86_64 before continuing an exception .
by Alexandre Julliard April 8, 2010

April 8, 2010

Module: wine Branch: master Commit: 772112cfcb3c496a525238b416eb1ba4b1598c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=772112cfcb3c496a525238b41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 16:12:14 2010 +0200 winecrt0: Add a trampoline function to align the stack on x86_64 before continuing an exception. --- dlls/winecrt0/exception.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index 65b6b41..c81c821 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -23,6 +23,12 @@ #include "winternl.h" #include "wine/exception.h" +#if defined(__x86_64__) && defined(__ASM_GLOBAL_FUNC) +extern void __wine_unwind_trampoline(void); +/* we need an extra call to make sure the stack is correctly aligned */ +__ASM_GLOBAL_FUNC( __wine_unwind_trampoline, "callq *%rax" ); +#endif + /* wrapper for RtlUnwind since it clobbers registers on Windows */ void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, void (*target)(void) ) @@ -41,6 +47,8 @@ void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD * : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3), "=c" (dummy4) : "0" (RtlUnwind), "1" (frame), "2" (target), "3" (record) : "edx", "memory" ); +#elif defined(__x86_64__) && defined(__ASM_GLOBAL_FUNC) + RtlUnwind( frame, __wine_unwind_trampoline, record, target ); #else RtlUnwind( frame, target, record, 0 ); #endif

1 0

Rico Schüller : d3d10: Move the effect shader input signature into a separate struct.
by Alexandre Julliard April 8, 2010

April 8, 2010

Module: wine Branch: master Commit: bd4bacba1ee9bead600f5c9dc6c3da937231c569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd4bacba1ee9bead600f5c9dc… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Apr 7 18:34:16 2010 +0200 d3d10: Move the effect shader input signature into a separate struct. --- dlls/d3d10/d3d10_private.h | 9 +++++++-- dlls/d3d10/effect.c | 17 +++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index e2ad432..50fe710 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -62,10 +62,15 @@ struct d3d10_effect_object void *data; }; +struct d3d10_effect_shader_signature +{ + char *signature; + UINT signature_size; +}; + struct d3d10_effect_shader_variable { - char *input_signature; - UINT input_signature_size; + struct d3d10_effect_shader_signature input_signature; union { ID3D10VertexShader *vs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 89fe623..da4e344 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -237,17 +237,18 @@ static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag { /* 32 (DXBC header) + 1 * 4 (chunk index) + 2 * 4 (chunk header) + data_size (chunk data) */ UINT size = 44 + data_size; + struct d3d10_effect_shader_signature *sig = &s->input_signature; char *ptr; - s->input_signature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if (!s->input_signature) + sig->signature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (!sig->signature) { ERR("Failed to allocate input signature data\n"); return E_OUTOFMEMORY; } - s->input_signature_size = size; + sig->signature_size = size; - ptr = s->input_signature; + ptr = sig->signature; write_dword(&ptr, TAG_DXBC); @@ -267,7 +268,7 @@ static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag write_dword(&ptr, 1); /* chunk index */ - write_dword(&ptr, (ptr - s->input_signature) + 4); + write_dword(&ptr, (ptr - sig->signature) + 4); /* chunk */ write_dword(&ptr, TAG_ISGN); @@ -1784,7 +1785,7 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) case D3D10_SVT_VERTEXSHADER: case D3D10_SVT_PIXELSHADER: case D3D10_SVT_GEOMETRYSHADER: - HeapFree(GetProcessHeap(), 0, ((struct d3d10_effect_shader_variable *)v->data)->input_signature); + HeapFree(GetProcessHeap(), 0, ((struct d3d10_effect_shader_variable *)v->data)->input_signature.signature); break; default: @@ -2387,8 +2388,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *ifa { struct d3d10_effect_variable *v = o->data; struct d3d10_effect_shader_variable *s = v->data; - desc->pIAInputSignature = (BYTE *)s->input_signature; - desc->IAInputSignatureSize = s->input_signature_size; + desc->pIAInputSignature = (BYTE *)s->input_signature.signature; + desc->IAInputSignatureSize = s->input_signature.signature_size; break; } }

1 0

Rico Schüller : d3d10: Implement ID3DEffectVariable:: GetOutputSignatureElementDesc().
by Alexandre Julliard April 8, 2010

April 8, 2010

Module: wine Branch: master Commit: 2b17e2918354bb7f7751b8feb366c904ceed6084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b17e2918354bb7f7751b8feb… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Apr 7 18:34:36 2010 +0200 d3d10: Implement ID3DEffectVariable::GetOutputSignatureElementDesc(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 60 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 0cad484..2cdd329 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -80,6 +80,7 @@ struct d3d10_effect_shader_signature struct d3d10_effect_shader_variable { struct d3d10_effect_shader_signature input_signature; + struct d3d10_effect_shader_signature output_signature; union { ID3D10VertexShader *vs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 9c98b2c..59b6c31 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -31,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_FX10 MAKE_TAG('F', 'X', '1', '0') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') +#define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define D3D10_FX10_TYPE_COLUMN_SHIFT 11 #define D3D10_FX10_TYPE_COLUMN_MASK (0x7 << D3D10_FX10_TYPE_COLUMN_SHIFT) @@ -288,12 +289,16 @@ static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag switch(tag) { case TAG_ISGN: + case TAG_OSGN: { /* 32 (DXBC header) + 1 * 4 (chunk index) + 2 * 4 (chunk header) + data_size (chunk data) */ UINT size = 44 + data_size; - struct d3d10_effect_shader_signature *sig = &s->input_signature; + struct d3d10_effect_shader_signature *sig; char *ptr; + if (tag == TAG_ISGN) sig = &s->input_signature; + else sig = &s->output_signature; + sig->signature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (!sig->signature) { @@ -325,7 +330,7 @@ static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag write_dword(&ptr, (ptr - sig->signature) + 4); /* chunk */ - write_dword(&ptr, TAG_ISGN); + write_dword(&ptr, tag); write_dword(&ptr, data_size); memcpy(ptr, data, data_size); @@ -1864,6 +1869,7 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) case D3D10_SVT_PIXELSHADER: case D3D10_SVT_GEOMETRYSHADER: shader_free_signature(&((struct d3d10_effect_shader_variable *)v->data)->input_signature); + shader_free_signature(&((struct d3d10_effect_shader_variable *)v->data)->output_signature); break; default: @@ -5296,10 +5302,56 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetOutputSignature ID3D10EffectShaderVariable *iface, UINT shader_index, UINT element_index, D3D10_SIGNATURE_PARAMETER_DESC *desc) { - FIXME("iface %p, shader_index %u, element_index %u, desc %p stub!\n", + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; + struct d3d10_effect_shader_variable *s; + D3D10_SIGNATURE_PARAMETER_DESC *d; + + TRACE("iface %p, shader_index %u, element_index %u, desc %p\n", iface, shader_index, element_index, desc); - return E_NOTIMPL; + if (!iface->lpVtbl->IsValid(iface)) + { + WARN("Null variable specified\n"); + return E_FAIL; + } + + /* Check shader_index, this crashes on W7/DX10 */ + if (shader_index >= This->effect->used_shader_count) + { + WARN("This should crash on W7/DX10!\n"); + return E_FAIL; + } + + s = This->effect->used_shaders[shader_index]->data; + if (!s->output_signature.signature) + { + WARN("No shader signature\n"); + return D3DERR_INVALIDCALL; + } + + /* Check desc for NULL, this crashes on W7/DX10 */ + if (!desc) + { + WARN("This should crash on W7/DX10!\n"); + return E_FAIL; + } + + if (element_index >= s->output_signature.element_count) + { + WARN("Invalid element index specified\n"); + return E_INVALIDARG; + } + + d = &s->output_signature.elements[element_index]; + desc->SemanticName = d->SemanticName; + desc->SemanticIndex = d->SemanticIndex; + desc->SystemValueType = d->SystemValueType; + desc->ComponentType = d->ComponentType; + desc->Register = d->Register; + desc->ReadWriteMask = d->ReadWriteMask; + desc->Mask = d->Mask; + + return S_OK; }

1 0

Piotr Caban : msvcr80: Fix typo in msvcr80.spec.
by Alexandre Julliard April 8, 2010

April 8, 2010

Module: wine Branch: master Commit: 50192c8fb626feba8c08d62fce887e2ac30dadb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50192c8fb626feba8c08d62fc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 8 10:24:55 2010 +0200 msvcr80: Fix typo in msvcr80.spec. --- dlls/msvcr80/msvcr80.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9a27a8b..e1b5318 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -72,7 +72,7 @@ @ stub ?vswprintf@@YAHPA_WIPB_WPAD(a)Z @ stub ?what(a)exception@std@@UBEPBDXZ @ stub @_calloc_crt(a)8 -@ cdecl _malloc_crt(a)4(long) msvcrt.malloc +@ cdecl @_malloc_crt(a)4(long) msvcrt.malloc @ stub @_realloc_crt(a)8 @ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT @ cdecl -arch=i386 _CIacos() msvcrt._CIacos

1 0

Alexandre Julliard : include: Move the exception handling support functions to winecrt0 instead of having them inline .
by Alexandre Julliard April 8, 2010

April 8, 2010

Module: wine Branch: master Commit: 655292ae00d1aeda2cda0e04131727fd4e8118bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=655292ae00d1aeda2cda0e041… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 14:41:01 2010 +0200 include: Move the exception handling support functions to winecrt0 instead of having them inline. --- dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/exception.c | 127 ++++++++++++++++++++++++++++++++++++++++++++ include/wine/exception.h | 129 +++++++-------------------------------------- 3 files changed, 147 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=655292ae00d1aeda2cda0…

1 0

Piotr Caban : msvcr90: Forward ?_open@@YAHPBDHH@Z calls to _open.
by Alexandre Julliard April 8, 2010

April 8, 2010

Module: wine Branch: master Commit: 6468fa558862fa875999df03a4bdcac5fc2184a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6468fa558862fa875999df03a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 8 10:25:11 2010 +0200 msvcr90: Forward ?_open@@YAHPBDHH(a)Z calls to _open. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e1b5318..9d77dc2 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -45,7 +45,7 @@ @ stub ?_invalid_parameter@@YAXPBG00II(a)Z @ stub ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z @ stub ?_name_internal_method(a)type_info@@QBEPBDPAU__type_info_node@@@Z -@ stub ?_open@@YAHPBDHH(a)Z +@ varargs ?_open@@YAHPBDHH(a)Z(str long) msvcrt._open @ cdecl ?_query_new_handler@@YAP6AHI(a)ZXZ() msvcrt.?_query_new_handler@@YAP6AHI(a)ZXZ @ cdecl ?_query_new_mode@@YAHXZ() msvcrt.?_query_new_mode@@YAHXZ @ stub ?_set_new_handler@@YAP6AHI(a)ZH@Z diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 7f8cdc0..1d66b0b 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -45,7 +45,7 @@ @ stub ?_invalid_parameter@@YAXPBG00II(a)Z @ stub ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z @ stub ?_name_internal_method(a)type_info@@QBEPBDPAU__type_info_node@@@Z -@ stub ?_open@@YAHPBDHH(a)Z +@ varargs ?_open@@YAHPBDHH(a)Z(str long) msvcrt._open @ cdecl ?_query_new_handler@@YAP6AHI(a)ZXZ() msvcrt.?_query_new_handler@@YAP6AHI(a)ZXZ @ cdecl ?_query_new_mode@@YAHXZ() msvcrt.?_query_new_mode@@YAHXZ @ stub ?_set_new_handler@@YAP6AHI(a)ZH@Z

1 0

Piotr Caban : msvcrt: Added _iswalpha_l implementation.
by Alexandre Julliard April 8, 2010

April 8, 2010

Module: wine Branch: master Commit: 903c524d43893c004764cef4fa84f2072de22529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=903c524d43893c004764cef4f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 8 10:24:44 2010 +0200 msvcrt: Added _iswalpha_l implementation. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8692e7d..95f610e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -554,7 +554,7 @@ # stub _isspace_l # stub _isupper_l # stub _iswalnum_l -# stub _iswalpha_l +@ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l # stub _iswcntrl_l # stub _iswctype_l # stub _iswdigit_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index d7b0058..e453e9c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1023,6 +1023,14 @@ INT CDECL MSVCRT_iswalpha( MSVCRT_wchar_t wc ) } /********************************************************************* + * iswalpha_l (MSVCRT.@) + */ +INT CDECL MSVCRT__iswalpha_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return isalphaW( wc ); +} + +/********************************************************************* * iswcntrl (MSVCRT.@) */ INT CDECL MSVCRT_iswcntrl( MSVCRT_wchar_t wc )

1 0

Piotr Caban : msvcrt: Added implemenatation of _create_locale and _free_locale.
by Alexandre Julliard April 8, 2010

April 8, 2010

Module: wine Branch: master Commit: 7a1ff50ddc6ac1b312f3f18ae59dee8172b76668 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a1ff50ddc6ac1b312f3f18ae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 8 10:24:25 2010 +0200 msvcrt: Added implemenatation of _create_locale and _free_locale. --- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/locale.c | 503 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/msvcrt.h | 20 ++- dlls/msvcrt/msvcrt.spec | 2 + 5 files changed, 523 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a1ff50ddc6ac1b312f3f…

1 0

Alexandre Julliard : configure: Define WINE_CROSSTEST when building crosstests, and disable use of config. h in that case.
by Alexandre Julliard April 8, 2010

April 8, 2010

Module: wine Branch: master Commit: 5d2b8e77d29d981e14fed7119c42eafe957abb88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d2b8e77d29d981e14fed7119… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 17:29:11 2010 +0200 configure: Define WINE_CROSSTEST when building crosstests, and disable use of config.h in that case. --- Make.rules.in | 2 +- configure.ac | 4 +++- include/config.h.in | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 77cf558..0f9c02a 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -143,7 +143,7 @@ filter: dummy $(CC) -c $(ALLCFLAGS) -o $@ $< .c.cross.o: - $(CROSSCC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) -o $@ $< + $(CROSSCC) -c $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -o $@ $< .y.tab.c: $(BISON) $(BISONFLAGS) -p $*_ -o $@ $< diff --git a/configure.ac b/configure.ac index 7d9031d..f39347e 100644 --- a/configure.ac +++ b/configure.ac @@ -2160,7 +2160,9 @@ esac dnl **** Generate output files **** -AH_TOP([#define __WINE_CONFIG_H]) +AH_TOP([#ifndef WINE_CROSSTEST +#define __WINE_CONFIG_H]) +AH_BOTTOM([#endif /* WINE_CROSSTEST */]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) diff --git a/include/config.h.in b/include/config.h.in index 29e711c..0faf127 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1,5 +1,6 @@ /* include/config.h.in. Generated from configure.ac by autoheader. */ +#ifndef WINE_CROSSTEST #define __WINE_CONFIG_H /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ @@ -1307,3 +1308,5 @@ #ifndef __cplusplus #undef inline #endif + +#endif /* WINE_CROSSTEST */

1 0