September 2009 - Wine-Commits

Vincent Povirk : oleaut32: Implement ITypeLibComp::BindType.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 9abdf54cb753cdfb85979d84aa00e6e35a52c737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9abdf54cb753cdfb85979d84a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 9 11:51:29 2009 -0500 oleaut32: Implement ITypeLibComp::BindType. --- dlls/oleaut32/typelib.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 887c6be..1484a00 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4835,8 +4835,29 @@ static HRESULT WINAPI ITypeLibComp_fnBindType( ITypeInfo ** ppTInfo, ITypeComp ** ppTComp) { - FIXME("(%s, %x, %p, %p): stub\n", debugstr_w(szName), lHash, ppTInfo, ppTComp); - return E_NOTIMPL; + ITypeLibImpl *This = impl_from_ITypeComp(iface); + ITypeInfoImpl *pTypeInfo; + + TRACE("(%s, %x, %p, %p)\n", debugstr_w(szName), lHash, ppTInfo, ppTComp); + + for (pTypeInfo = This->pTypeInfo; pTypeInfo; pTypeInfo = pTypeInfo->next) + { + /* FIXME: should use lHash to do the search */ + if (pTypeInfo->Name && !strcmpW(pTypeInfo->Name, szName)) + { + TRACE("returning %p\n", pTypeInfo); + *ppTInfo = (ITypeInfo *)&pTypeInfo->lpVtbl; + ITypeInfo_AddRef(*ppTInfo); + *ppTComp = (ITypeComp *)&pTypeInfo->lpVtblTypeComp; + ITypeComp_AddRef(*ppTComp); + return S_OK; + } + } + + TRACE("not found\n"); + *ppTInfo = NULL; + *ppTComp = NULL; + return S_OK; } static const ITypeCompVtbl tlbtcvt =

1 0

André Hentschel : README.de: Convert to utf-8.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 0f84fd260a6c69d648fdc9ff2cdc89f851eb8409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f84fd260a6c69d648fdc9ff2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 9 18:37:13 2009 +0200 README.de: Convert to utf-8. --- documentation/README.de | 138 +++++++++++++++++++++++----------------------- 1 files changed, 69 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f84fd260a6c69d648fdc…

1 0

Henri Verbeet : d3d10: Implement ID3D10EffectVariable::AsMatrix().
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 508635ac4c290b00bd2aa97026e627a50d3c4cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=508635ac4c290b00bd2aa9702… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 9 18:12:43 2009 +0200 d3d10: Implement ID3D10EffectVariable::AsMatrix(). --- dlls/d3d10/effect.c | 276 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 274 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=508635ac4c290b00bd2aa…

1 0

Henri Verbeet : d3d10: Implement ID3D10EffectVariable::AsVector().
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 58fcb06c07cbe4fd9cd94dc138d625cf08b82fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58fcb06c07cbe4fd9cd94dc13… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 9 18:12:42 2009 +0200 d3d10: Implement ID3D10EffectVariable::AsVector(). --- dlls/d3d10/effect.c | 310 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 308 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58fcb06c07cbe4fd9cd94…

1 0

Henri Verbeet : d3d10: Implement ID3D10EffectVariable::AsScalar().
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: fbbbdc09a591d7e8deae3830400ac7ad1d2fca8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbbbdc09a591d7e8deae38304… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 9 18:12:41 2009 +0200 d3d10: Implement ID3D10EffectVariable::AsScalar(). --- dlls/d3d10/effect.c | 319 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 316 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fbbbdc09a591d7e8deae3…

1 0

Henri Verbeet : d3d10core: Use debugstr_a()/debugstr_an() to trace external strings.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 1ba006037c0ee957c4dfd55dd80750e97ba97ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ba006037c0ee957c4dfd55dd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 9 18:12:40 2009 +0200 d3d10core: Use debugstr_a()/debugstr_an() to trace external strings. --- dlls/d3d10core/d3d10core_private.h | 7 ------- dlls/d3d10core/inputlayout.c | 5 +---- dlls/d3d10core/shader.c | 9 +++------ dlls/d3d10core/utils.c | 5 ++--- 4 files changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 4828ab6..3074bdb 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -63,13 +63,6 @@ static inline void read_dword(const char **ptr, DWORD *d) void skip_dword_unknown(const char **ptr, unsigned int count); -static inline void read_tag(const char **ptr, DWORD *t, char t_str[5]) -{ - read_dword(ptr, t); - memcpy(t_str, t, 4); - t_str[4] = '\0'; -} - HRESULT parse_dxbc(const char *data, SIZE_T data_size, HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx); diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index f6f50bc..69d2173 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -27,7 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); static HRESULT isgn_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) { struct wined3d_shader_signature *is = ctx; - char tag_str[5]; switch(tag) { @@ -35,9 +34,7 @@ static HRESULT isgn_handler(const char *data, DWORD data_size, DWORD tag, void * return shader_parse_signature(data, data_size, is); default: - memcpy(tag_str, &tag, 4); - tag_str[4] = '\0'; - FIXME("Unhandled chunk %s\n", tag_str); + FIXME("Unhandled chunk %s.\n", debugstr_an((const char *)&tag, 4)); return S_OK; } } diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 582d2a8..11e080d 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -27,7 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) { struct d3d10_shader_info *shader_info = ctx; - char tag_str[5]; HRESULT hr; switch(tag) @@ -42,9 +41,7 @@ static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void * break; default: - memcpy(tag_str, &tag, 4); - tag_str[4] = '\0'; - FIXME("Unhandled chunk %s\n", tag_str); + FIXME("Unhandled chunk %s\n", debugstr_an((const char *)&tag, 4)); break; } @@ -118,8 +115,8 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d TRACE("semantic: %s, semantic idx: %u, sysval_semantic %#x, " "type %u, register idx: %u, use_mask %#x, input_mask %#x\n", - e[i].semantic_name, e[i].semantic_idx, e[i].sysval_semantic, e[i].component_type, - e[i].register_idx, (e[i].mask >> 8) & 0xff, e[i].mask & 0xff); + debugstr_a(e[i].semantic_name), e[i].semantic_idx, e[i].sysval_semantic, + e[i].component_type, e[i].register_idx, (e[i].mask >> 8) & 0xff, e[i].mask & 0xff); } s->elements = e; diff --git a/dlls/d3d10core/utils.c b/dlls/d3d10core/utils.c index 29f1e7a..206efdf 100644 --- a/dlls/d3d10core/utils.c +++ b/dlls/d3d10core/utils.c @@ -365,12 +365,11 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, HRESULT hr = S_OK; DWORD chunk_count; DWORD total_size; - char tag_str[5]; unsigned int i; DWORD tag; - read_tag(&ptr, &tag, tag_str); - TRACE("tag: %s\n", tag_str); + read_dword(&ptr, &tag); + TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); if (tag != TAG_DXBC) {

1 0

Henri Verbeet : d3d10: Add a debug function for D3D10_SHADER_VARIABLE_TYPE.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: ecc6a9519ff75023fbb3be27a3594ef2c8640edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc6a9519ff75023fbb3be27a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 9 18:12:39 2009 +0200 d3d10: Add a debug function for D3D10_SHADER_VARIABLE_TYPE. --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 2 +- dlls/d3d10/utils.c | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 2ba0d11..3311779 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -32,6 +32,7 @@ /* TRACE helper functions */ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type); const char *debug_d3d10_shader_variable_class(D3D10_SHADER_VARIABLE_CLASS c); +const char *debug_d3d10_shader_variable_type(D3D10_SHADER_VARIABLE_TYPE t); void *d3d10_rb_alloc(size_t size); void *d3d10_rb_realloc(void *ptr, size_t size); diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3ec3a38..f4c660f 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -486,7 +486,7 @@ static HRESULT parse_fx10_type(struct d3d10_effect_type *t, const char *ptr, con TRACE("Type description: %#x.\n", tmp); TRACE("\tcolumns: %u.\n", t->column_count); TRACE("\trows: %u.\n", t->row_count); - TRACE("\tbasetype: %#x.\n", t->basetype); + TRACE("\tbasetype: %s.\n", debug_d3d10_shader_variable_type(t->basetype)); TRACE("\tclass: %s.\n", debug_d3d10_shader_variable_class(t->type_class)); TRACE("\tunknown bits: %#x.\n", tmp & ~(D3D10_FX10_TYPE_COLUMN_MASK | D3D10_FX10_TYPE_ROW_MASK | D3D10_FX10_TYPE_BASETYPE_MASK | D3D10_FX10_TYPE_CLASS_MASK)); diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 7ee8512..c5419d3 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -56,6 +56,45 @@ const char *debug_d3d10_shader_variable_class(D3D10_SHADER_VARIABLE_CLASS c) } } +const char *debug_d3d10_shader_variable_type(D3D10_SHADER_VARIABLE_TYPE t) +{ + switch (t) + { + WINE_D3D10_TO_STR(D3D10_SVT_VOID); + WINE_D3D10_TO_STR(D3D10_SVT_BOOL); + WINE_D3D10_TO_STR(D3D10_SVT_INT); + WINE_D3D10_TO_STR(D3D10_SVT_FLOAT); + WINE_D3D10_TO_STR(D3D10_SVT_STRING); + WINE_D3D10_TO_STR(D3D10_SVT_TEXTURE); + WINE_D3D10_TO_STR(D3D10_SVT_TEXTURE1D); + WINE_D3D10_TO_STR(D3D10_SVT_TEXTURE2D); + WINE_D3D10_TO_STR(D3D10_SVT_TEXTURE3D); + WINE_D3D10_TO_STR(D3D10_SVT_TEXTURECUBE); + WINE_D3D10_TO_STR(D3D10_SVT_SAMPLER); + WINE_D3D10_TO_STR(D3D10_SVT_PIXELSHADER); + WINE_D3D10_TO_STR(D3D10_SVT_VERTEXSHADER); + WINE_D3D10_TO_STR(D3D10_SVT_UINT); + WINE_D3D10_TO_STR(D3D10_SVT_UINT8); + WINE_D3D10_TO_STR(D3D10_SVT_GEOMETRYSHADER); + WINE_D3D10_TO_STR(D3D10_SVT_RASTERIZER); + WINE_D3D10_TO_STR(D3D10_SVT_DEPTHSTENCIL); + WINE_D3D10_TO_STR(D3D10_SVT_BLEND); + WINE_D3D10_TO_STR(D3D10_SVT_BUFFER); + WINE_D3D10_TO_STR(D3D10_SVT_CBUFFER); + WINE_D3D10_TO_STR(D3D10_SVT_TBUFFER); + WINE_D3D10_TO_STR(D3D10_SVT_TEXTURE1DARRAY); + WINE_D3D10_TO_STR(D3D10_SVT_TEXTURE2DARRAY); + WINE_D3D10_TO_STR(D3D10_SVT_RENDERTARGETVIEW); + WINE_D3D10_TO_STR(D3D10_SVT_DEPTHSTENCILVIEW); + WINE_D3D10_TO_STR(D3D10_SVT_TEXTURE2DMS); + WINE_D3D10_TO_STR(D3D10_SVT_TEXTURE2DMSARRAY); + WINE_D3D10_TO_STR(D3D10_SVT_TEXTURECUBEARRAY); + default: + FIXME("Unrecognized D3D10_SHADER_VARIABLE_TYPE %#x.\n", t); + return "unrecognized"; + } +} + #undef WINE_D3D10_TO_STR void *d3d10_rb_alloc(size_t size)

1 0

Henri Verbeet : d3d10: Add a debug function for D3D10_SHADER_VARIABLE_CLASS .
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 7f617f3d2e94e8b673b27f302c6612cf99e8c40b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f617f3d2e94e8b673b27f302… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 9 18:12:38 2009 +0200 d3d10: Add a debug function for D3D10_SHADER_VARIABLE_CLASS. --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 2 +- dlls/d3d10/utils.c | 18 +++++++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index bbcbef0..2ba0d11 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -31,6 +31,7 @@ /* TRACE helper functions */ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type); +const char *debug_d3d10_shader_variable_class(D3D10_SHADER_VARIABLE_CLASS c); void *d3d10_rb_alloc(size_t size); void *d3d10_rb_realloc(void *ptr, size_t size); diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 4ce26db..3ec3a38 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -487,7 +487,7 @@ static HRESULT parse_fx10_type(struct d3d10_effect_type *t, const char *ptr, con TRACE("\tcolumns: %u.\n", t->column_count); TRACE("\trows: %u.\n", t->row_count); TRACE("\tbasetype: %#x.\n", t->basetype); - TRACE("\tclass: %#x.\n", t->type_class); + TRACE("\tclass: %s.\n", debug_d3d10_shader_variable_class(t->type_class)); TRACE("\tunknown bits: %#x.\n", tmp & ~(D3D10_FX10_TYPE_COLUMN_MASK | D3D10_FX10_TYPE_ROW_MASK | D3D10_FX10_TYPE_BASETYPE_MASK | D3D10_FX10_TYPE_CLASS_MASK)); } diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 2424557..7ee8512 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -1,5 +1,5 @@ /* - * Copyright 2008 Henri Verbeet for CodeWeavers + * Copyright 2008-2009 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,6 +40,22 @@ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) } } +const char *debug_d3d10_shader_variable_class(D3D10_SHADER_VARIABLE_CLASS c) +{ + switch (c) + { + WINE_D3D10_TO_STR(D3D10_SVC_SCALAR); + WINE_D3D10_TO_STR(D3D10_SVC_VECTOR); + WINE_D3D10_TO_STR(D3D10_SVC_MATRIX_ROWS); + WINE_D3D10_TO_STR(D3D10_SVC_MATRIX_COLUMNS); + WINE_D3D10_TO_STR(D3D10_SVC_OBJECT); + WINE_D3D10_TO_STR(D3D10_SVC_STRUCT); + default: + FIXME("Unrecognized D3D10_SHADER_VARIABLE_CLASS %#x.\n", c); + return "unrecognized"; + } +} + #undef WINE_D3D10_TO_STR void *d3d10_rb_alloc(size_t size)

1 0

Juan Lang : crypt32: Fix potential buffer overruns in CertGetNameStringW.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 5cefdb68c53c6e4bffde2f57a03936f1f6837711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cefdb68c53c6e4bffde2f57a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 9 08:40:44 2009 -0700 crypt32: Fix potential buffer overruns in CertGetNameStringW. --- dlls/crypt32/str.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index fa6eed9..b0a3d25 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -1018,7 +1018,7 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, { if (!pszNameString) ret = strlenW(entry->pwszRfc822Name) + 1; - else + else if (cchNameString) { ret = min(strlenW(entry->pwszRfc822Name), cchNameString - 1); memcpy(pszNameString, entry->pwszRfc822Name, @@ -1103,7 +1103,7 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, { if (!pszNameString) ret = strlenW(entry->pwszRfc822Name) + 1; - else + else if (cchNameString) { ret = min(strlenW(entry->pwszRfc822Name), cchNameString - 1); @@ -1140,7 +1140,7 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, { if (!pszNameString) ret = strlenW(entry->pwszDNSName) + 1; - else + else if (cchNameString) { ret = min(strlenW(entry->pwszDNSName), cchNameString - 1); memcpy(pszNameString, entry->pwszDNSName, ret * sizeof(WCHAR)); @@ -1164,7 +1164,7 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, { if (!pszNameString) ret = strlenW(entry->pwszURL) + 1; - else + else if (cchNameString) { ret = min(strlenW(entry->pwszURL), cchNameString - 1); memcpy(pszNameString, entry->pwszURL, ret * sizeof(WCHAR));

1 0

André Hentschel : oleaut32: Test for rolled minutes.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: a83f94afa23c5b7f7c1e0031a7c67f6f03a643cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83f94afa23c5b7f7c1e0031a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 9 16:10:11 2009 +0200 oleaut32: Test for rolled minutes. --- dlls/oleaut32/tests/vartest.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 53b0afc..5deab05 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1647,6 +1647,7 @@ static void test_VarDateFromUdate(void) UD2T(1,1,10000,0,0,0,0,0,0,0,E_INVALIDARG,0.0); /* > 31 Dec 9999 => err */ UD2T(1,1,1980,18,1,16,0,2,1,0,S_OK,29221.75087962963); /* 6:18:02 PM */ + todo_wine UD2T(1,1,1980,17,61,16,0,2,1,0,S_OK,29221.75087962963); /* Test rolled minutes */ UD2T(0,1,1980,0,0,0,0,2,1,0,S_OK,29220.0); /* Rolls back to 31 Dec 1899 */ UD2T(1,13,1980,0,0,0,0,2,1,0,S_OK,29587.0); /* Rolls fwd to 1/1/1981 */

1 0