August 2021 - Wine-Commits - list.winehq.org

Francois Gouget : msxml3: SchemaCache_version() is unused so remove it.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 127d27d4694afd9b0ab3a927af50c91dbdefb993 URL: https://source.winehq.org/git/wine.git/?a=commit;h=127d27d4694afd9b0ab3a927… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 31 15:15:06 2021 +0200 msxml3: SchemaCache_version() is unused so remove it. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/main.c | 12 ------------ dlls/msxml3/msxml_private.h | 1 - 2 files changed, 13 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 11781a1ca2d..25400b698ca 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -406,18 +406,6 @@ const CLSID* DOMDocument_version(MSXML_VERSION v) } } -const CLSID* SchemaCache_version(MSXML_VERSION v) -{ - switch (v) - { - default: - case MSXML_DEFAULT: return &CLSID_XMLSchemaCache; - case MSXML3: return &CLSID_XMLSchemaCache30; - case MSXML4: return &CLSID_XMLSchemaCache40; - case MSXML6: return &CLSID_XMLSchemaCache60; - } -} - BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { MSXML_hInstance = hInstDLL; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 29b1156775c..f16040f3542 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -34,7 +34,6 @@ #endif extern const CLSID * DOMDocument_version(MSXML_VERSION v) DECLSPEC_HIDDEN; -extern const CLSID * SchemaCache_version(MSXML_VERSION v) DECLSPEC_HIDDEN; /* The XDR datatypes (urn:schemas-microsoft-com:datatypes)

1 0

Francois Gouget : comctl32: Fix an ASCII / ANSI mixup in a comment.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 29f73481df0508c9e6db94a055063f08794766b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29f73481df0508c9e6db94a0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 31 14:53:03 2021 +0200 comctl32: Fix an ASCII / ANSI mixup in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/toolbar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 2585e11530e..cf1dc42449b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -156,7 +156,7 @@ typedef struct BOOL bAnchor; /* anchor highlight enabled */ BOOL bDoRedraw; /* Redraw status */ BOOL bDragOutSent; /* has TBN_DRAGOUT notification been sent for this drag? */ - BOOL bUnicode; /* Notifications are ASCII (FALSE) or Unicode (TRUE)? */ + BOOL bUnicode; /* Notifications are ANSI (FALSE) or Unicode (TRUE)? */ BOOL bCaptured; /* mouse captured? */ DWORD dwStyle; /* regular toolbar style */ DWORD dwExStyle; /* extended toolbar style */

1 0

Nikolay Sivov : d3dx10/font: Implement GetTextMetrics().
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 107562fdbf46ce5c94a65d798568ed8d3db41dbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=107562fdbf46ce5c94a65d79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 08:08:10 2021 +0300 d3dx10/font: Implement GetTextMetrics(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/font.c | 12 ++++++++---- dlls/d3dx10_43/tests/d3dx10.c | 5 +---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx10_43/font.c b/dlls/d3dx10_43/font.c index d1590c8cc99..2145b1c6f1e 100644 --- a/dlls/d3dx10_43/font.c +++ b/dlls/d3dx10_43/font.c @@ -132,16 +132,20 @@ static HRESULT WINAPI d3dx_font_GetDescW(ID3DX10Font *iface, D3DX10_FONT_DESCW * static BOOL WINAPI d3dx_font_GetTextMetricsA(ID3DX10Font *iface, TEXTMETRICA *metrics) { - FIXME("iface %p, metrics %p stub!\n", iface, metrics); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); + + TRACE("iface %p, metrics %p.\n", iface, metrics); - return FALSE; + return GetTextMetricsA(font->hdc, metrics); } static BOOL WINAPI d3dx_font_GetTextMetricsW(ID3DX10Font *iface, TEXTMETRICW *metrics) { - FIXME("iface %p, metrics %p stub!\n", iface, metrics); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); + + TRACE("iface %p, metrics %p.\n", iface, metrics); - return FALSE; + return GetTextMetricsW(font->hdc, metrics); } static HDC WINAPI d3dx_font_GetDC(ID3DX10Font *iface) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 499d219924d..8c55dd5810b 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2206,11 +2206,8 @@ static void test_font(void) ok(ret, "Unexpected ret %#x.\n", ret); ret = ID3DX10Font_GetTextMetricsA(font, &metrics); -todo_wine ok(ret, "Unexpected ret %#x.\n", ret); -if (ret) -{ ok(metrics.tmHeight == expmetrics.tmHeight, "Unexpected height %d, expected %d.\n", metrics.tmHeight, expmetrics.tmHeight); ok(metrics.tmAscent == expmetrics.tmAscent, "Unexpected ascent %d, expected %d.\n", @@ -2251,7 +2248,7 @@ if (ret) metrics.tmPitchAndFamily, expmetrics.tmPitchAndFamily); ok(metrics.tmCharSet == expmetrics.tmCharSet, "Unexpected charset %u, expected %u.\n", metrics.tmCharSet, expmetrics.tmCharSet); -} + ID3DX10Font_Release(font); /* PreloadText */

1 0

Nikolay Sivov : d3dx10/font: Store font description data.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 6c2fad576b2bb21c64231099992973e65fc7542d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c2fad576b2bb21c64231099… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 08:08:08 2021 +0300 d3dx10/font: Store font description data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/font.c | 26 ++++++++++++++++++++++---- dlls/d3dx10_43/tests/d3dx10.c | 6 +----- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx10_43/font.c b/dlls/d3dx10_43/font.c index 7b2295cc414..77604895903 100644 --- a/dlls/d3dx10_43/font.c +++ b/dlls/d3dx10_43/font.c @@ -32,6 +32,7 @@ struct d3dx_font ID3DX10Font ID3DX10Font_iface; LONG refcount; + D3DX10_FONT_DESCW desc; ID3D10Device *device; }; @@ -97,16 +98,32 @@ static HRESULT WINAPI d3dx_font_GetDevice(ID3DX10Font *iface, ID3D10Device **dev static HRESULT WINAPI d3dx_font_GetDescA(ID3DX10Font *iface, D3DX10_FONT_DESCA *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + return D3DERR_INVALIDCALL; + + memcpy(desc, &font->desc, FIELD_OFFSET(D3DX10_FONT_DESCA, FaceName)); + WideCharToMultiByte(CP_ACP, 0, font->desc.FaceName, -1, desc->FaceName, + ARRAY_SIZE(desc->FaceName), NULL, NULL); + + return S_OK; } static HRESULT WINAPI d3dx_font_GetDescW(ID3DX10Font *iface, D3DX10_FONT_DESCW *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + return D3DERR_INVALIDCALL; + + *desc = font->desc; + + return S_OK; } static BOOL WINAPI d3dx_font_GetTextMetricsA(ID3DX10Font *iface, TEXTMETRICA *metrics) @@ -345,6 +362,7 @@ HRESULT WINAPI D3DX10CreateFontIndirectW(ID3D10Device *device, const D3DX10_FONT object->ID3DX10Font_iface.lpVtbl = &d3dx_font_vtbl; object->refcount = 1; object->device = device; + object->desc = *desc; ID3D10Device_AddRef(device); *font = &object->ID3DX10Font_iface; diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 1b875e4fc09..eec2bfd3206 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2176,15 +2176,11 @@ static void test_font(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_GetDescA(font, NULL); -todo_wine ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_GetDescA(font, &desc); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -if (SUCCEEDED(hr)) -{ ok(desc.Height == 12, "Unexpected height %d.\n", desc.Height); ok(desc.Width == 8, "Unexpected width %u.\n", desc.Width); ok(desc.Weight == FW_BOLD, "Unexpected weight %u.\n", desc.Weight); @@ -2195,7 +2191,7 @@ if (SUCCEEDED(hr)) ok(desc.Quality == ANTIALIASED_QUALITY, "Unexpected quality %u.\n", desc.Quality); ok(desc.PitchAndFamily == VARIABLE_PITCH, "Unexpected pitch and family %#x.\n", desc.PitchAndFamily); ok(!strcmp(desc.FaceName, "Tahoma"), "Unexpected facename %s.\n", debugstr_a(desc.FaceName)); -} + ID3DX10Font_Release(font); /* GetDC + GetTextMetrics */

1 0

Nikolay Sivov : d3d10/effect: Support stream output declaration when creating geometry shaders.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 5071836f3e6796814fa561839b1e6e3c44657e8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5071836f3e6796814fa56183… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 08:06:39 2021 +0300 d3d10/effect: Support stream output declaration when creating geometry shaders. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 166 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index b5ea0be1554..81745f7f239 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -314,6 +314,32 @@ static const char *debug_d3d10_shader_variable_type(D3D10_SHADER_VARIABLE_TYPE t #undef WINE_D3D10_TO_STR +static BOOL d3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) +{ + SIZE_T max_capacity, new_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(1, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = count; + + if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} + static void read_dword(const char **ptr, DWORD *d) { memcpy(d, *ptr, sizeof(*d)); @@ -566,6 +592,127 @@ static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const return S_OK; } +struct d3d10_effect_so_decl +{ + D3D10_SO_DECLARATION_ENTRY *entries; + SIZE_T capacity; + SIZE_T count; + unsigned int stride; + char *decl; +}; + +static void d3d10_effect_cleanup_so_decl(struct d3d10_effect_so_decl *so_decl) +{ + heap_free(so_decl->entries); + heap_free(so_decl->decl); + memset(so_decl, 0, sizeof(*so_decl)); +} + +static HRESULT d3d10_effect_parse_stream_output_declaration(const char *decl, + struct d3d10_effect_so_decl *so_decl) +{ + static const char * allmask = "xyzw"; + char *p, *ptr, *end, *next, *mask, *m, *slot; + unsigned int len = strlen(decl); + D3D10_SO_DECLARATION_ENTRY e; + + memset(so_decl, 0, sizeof(*so_decl)); + + if (!(so_decl->decl = heap_alloc(len + 1))) + return E_OUTOFMEMORY; + memcpy(so_decl->decl, decl, len + 1); + + p = so_decl->decl; + + while (p && *p) + { + memset(&e, 0, sizeof(e)); + + end = strchr(p, ';'); + next = end ? end + 1 : p + strlen(p); + + len = next - p; + if (end) len--; + + /* Remove leading and trailing spaces. */ + while (len && isspace(*p)) { len--; p++; } + while (len && isspace(p[len - 1])) len--; + + p[len] = 0; + + /* Output slot */ + if ((slot = strchr(p, ':'))) + { + *slot = 0; + + ptr = p; + while (*ptr) + { + if (!isdigit(*ptr)) + { + WARN("Invalid output slot %s.\n", debugstr_a(p)); + goto failed; + } + ptr++; + } + + e.OutputSlot = atoi(p); + p = slot + 1; + } + + /* Mask */ + if ((mask = strchr(p, '.'))) + { + *mask = 0; mask++; + + if (!(m = strstr(allmask, mask))) + { + WARN("Invalid component mask %s.\n", debugstr_a(mask)); + goto failed; + } + + e.StartComponent = m - allmask; + e.ComponentCount = strlen(mask); + } + else + { + e.StartComponent = 0; + e.ComponentCount = 4; + } + + /* Semantic index and name */ + len = strlen(p); + while (isdigit(p[len - 1])) + len--; + + if (p[len]) + { + e.SemanticIndex = atoi(&p[len]); + p[len] = 0; + } + + e.SemanticName = p; + + if (!d3d_array_reserve((void **)&so_decl->entries, &so_decl->capacity, so_decl->count + 1, + sizeof(*so_decl->entries))) + goto failed; + + so_decl->entries[so_decl->count++] = e; + + if (e.OutputSlot == 0) + so_decl->stride += e.ComponentCount * sizeof(float); + + p = next; + } + + return S_OK; + +failed: + d3d10_effect_cleanup_so_decl(so_decl); + + return E_FAIL; +} + static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_variable *v) { ID3D10Device *device = v->effect->device; @@ -628,9 +775,22 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse case D3D10_SVT_GEOMETRYSHADER: if (v->type->flags & D3D10_EOT_FLAG_GS_SO) - FIXME("Create geometry shader with stream output.\n"); - hr = ID3D10Device_CreateGeometryShader(device, ptr, dxbc_size, &v->u.shader.shader.gs); - if (FAILED(hr)) return hr; + { + struct d3d10_effect_so_decl so_decl; + + if (FAILED(hr = d3d10_effect_parse_stream_output_declaration(v->u.shader.stream_output_declaration, &so_decl))) + { + WARN("Failed to parse stream output declaration, hr %#x.\n", hr); + break; + } + + hr = ID3D10Device_CreateGeometryShaderWithStreamOutput(device, ptr, dxbc_size, + so_decl.entries, so_decl.count, so_decl.stride, &v->u.shader.shader.gs); + + d3d10_effect_cleanup_so_decl(&so_decl); + } + else + hr = ID3D10Device_CreateGeometryShader(device, ptr, dxbc_size, &v->u.shader.shader.gs); break; default: @@ -1996,9 +2156,6 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, read_dword(ptr, &shader_offset); TRACE("Shader offset: %#x.\n", shader_offset); - if (FAILED(hr = parse_fx10_shader(data, data_size, shader_offset, var))) - return hr; - if (v->type->flags & D3D10_EOT_FLAG_GS_SO) { read_dword(ptr, &sodecl_offset); @@ -2013,6 +2170,9 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, TRACE("Stream output declaration: %s.\n", debugstr_a(var->u.shader.stream_output_declaration)); } + + if (FAILED(hr = parse_fx10_shader(data, data_size, shader_offset, var))) + return hr; } break;

1 0

Hans Leidekker : webservices: Add support for WS_XML_TEXT_TYPE_INT64 in text_to_uint32().
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: b47f7ebb6fd9e1e39b618fbcdd4afa234d827ba6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b47f7ebb6fd9e1e39b618fbc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 31 13:45:53 2021 +0200 webservices: Add support for WS_XML_TEXT_TYPE_INT64 in text_to_uint32(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index c30abf5acd8..69c4f2a3007 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -4992,6 +4992,14 @@ static HRESULT text_to_uint32( const WS_XML_TEXT *text, UINT64 *val ) hr = S_OK; break; } + case WS_XML_TEXT_TYPE_INT64: + { + const WS_XML_INT64_TEXT *text_int64 = (const WS_XML_INT64_TEXT *)text; + if (text_int64->value < 0 || text_int64->value > MAX_UINT32) return WS_E_NUMERIC_OVERFLOW; + *val = text_int64->value; + hr = S_OK; + break; + } case WS_XML_TEXT_TYPE_UINT64: { const WS_XML_UINT64_TEXT *text_uint64 = (const WS_XML_UINT64_TEXT *)text;

1 0

Nikolay Sivov : d3dx10_39/tests: Enable tests.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 5006f4c50d41165d44c17b3e7d0bde9831ff43b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5006f4c50d41165d44c17b3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 08:08:50 2021 +0300 d3dx10_39/tests: Enable tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/d3dx10_39/Makefile.in | 1 + dlls/d3dx10_39/tests/Makefile.in | 6 ++++++ 4 files changed, 9 insertions(+) diff --git a/configure b/configure index 5f8735b0d37..46ae09a38e8 100755 --- a/configure +++ b/configure @@ -20385,6 +20385,7 @@ wine_fn_config_makefile dlls/d3dx10_36 enable_d3dx10_36 wine_fn_config_makefile dlls/d3dx10_37 enable_d3dx10_37 wine_fn_config_makefile dlls/d3dx10_38 enable_d3dx10_38 wine_fn_config_makefile dlls/d3dx10_39 enable_d3dx10_39 +wine_fn_config_makefile dlls/d3dx10_39/tests enable_tests wine_fn_config_makefile dlls/d3dx10_40 enable_d3dx10_40 wine_fn_config_makefile dlls/d3dx10_40/tests enable_tests wine_fn_config_makefile dlls/d3dx10_41 enable_d3dx10_41 diff --git a/configure.ac b/configure.ac index 594794ed93c..11c43cdce47 100644 --- a/configure.ac +++ b/configure.ac @@ -3085,6 +3085,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_36) WINE_CONFIG_MAKEFILE(dlls/d3dx10_37) WINE_CONFIG_MAKEFILE(dlls/d3dx10_38) WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_39/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_41) diff --git a/dlls/d3dx10_39/Makefile.in b/dlls/d3dx10_39/Makefile.in index c8267284e61..94af7e61a13 100644 --- a/dlls/d3dx10_39/Makefile.in +++ b/dlls/d3dx10_39/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_39.dll +IMPORTLIB = d3dx10_39 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_39/tests/Makefile.in b/dlls/d3dx10_39/tests/Makefile.in new file mode 100644 index 00000000000..d4554399554 --- /dev/null +++ b/dlls/d3dx10_39/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_39.dll +IMPORTS = d3dx10_39 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c

1 0

Nikolay Sivov : d3dx10/font: Create gdi objects on font object creation.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 5e0577c2b85fd0e5fa35e467d93a17f2cdbf834a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e0577c2b85fd0e5fa35e467… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 08:08:09 2021 +0300 d3dx10/font: Create gdi objects on font object creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/Makefile.in | 2 +- dlls/d3dx10_43/font.c | 30 ++++++++++++++++++++++++++---- dlls/d3dx10_43/tests/d3dx10.c | 33 ++++++++++++++++++--------------- 3 files changed, 45 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index b6baed2b619..5509bca7e08 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dx10_43.dll IMPORTLIB = d3dx10 -IMPORTS = d3d10_1 d3dcompiler dxguid uuid +IMPORTS = d3d10_1 d3dcompiler dxguid uuid gdi32 DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_43/font.c b/dlls/d3dx10_43/font.c index 77604895903..d1590c8cc99 100644 --- a/dlls/d3dx10_43/font.c +++ b/dlls/d3dx10_43/font.c @@ -32,6 +32,8 @@ struct d3dx_font ID3DX10Font ID3DX10Font_iface; LONG refcount; + HDC hdc; + HFONT hfont; D3DX10_FONT_DESCW desc; ID3D10Device *device; }; @@ -77,6 +79,8 @@ static ULONG WINAPI d3dx_font_Release(ID3DX10Font *iface) if (!refcount) { + DeleteObject(font->hfont); + DeleteDC(font->hdc); ID3D10Device_Release(font->device); heap_free(font); } @@ -142,9 +146,11 @@ static BOOL WINAPI d3dx_font_GetTextMetricsW(ID3DX10Font *iface, TEXTMETRICW *me static HDC WINAPI d3dx_font_GetDC(ID3DX10Font *iface) { - FIXME("iface %p stub!\n", iface); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); + + TRACE("iface %p.\n", iface); - return NULL; + return font->hdc; } static HRESULT WINAPI d3dx_font_GetGlyphData(ID3DX10Font *iface, UINT glyph, @@ -353,11 +359,27 @@ HRESULT WINAPI D3DX10CreateFontIndirectW(ID3D10Device *device, const D3DX10_FONT if (!device || !desc || !font) return D3DERR_INVALIDCALL; + *font = NULL; + if (!(object = heap_alloc_zero(sizeof(*object)))) - { - *font = NULL; return E_OUTOFMEMORY; + + object->hdc = CreateCompatibleDC(NULL); + if (!object->hdc) + { + heap_free(object); + return E_FAIL; + } + + object->hfont = CreateFontW(desc->Height, desc->Width, 0, 0, desc->Weight, desc->Italic, FALSE, FALSE, desc->CharSet, + desc->OutputPrecision, CLIP_DEFAULT_PRECIS, desc->Quality, desc->PitchAndFamily, desc->FaceName); + if (!object->hfont) + { + DeleteDC(object->hdc); + heap_free(object); + return E_FAIL; } + SelectObject(object->hdc, object->hfont); object->ID3DX10Font_iface.lpVtbl = &d3dx_font_vtbl; object->refcount = 1; diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index eec2bfd3206..499d219924d 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2200,13 +2200,12 @@ static void test_font(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hdc = ID3DX10Font_GetDC(font); -todo_wine ok(!!hdc, "Unexpected hdc %p.\n", hdc); - ret = ID3DX10Font_GetTextMetricsA(font, &metrics); -todo_wine - ok(ret, "Unexpected ret %#x.\n", ret); ret = GetTextMetricsA(hdc, &expmetrics); + ok(ret, "Unexpected ret %#x.\n", ret); + + ret = ID3DX10Font_GetTextMetricsA(font, &metrics); todo_wine ok(ret, "Unexpected ret %#x.\n", ret); @@ -2303,7 +2302,6 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hdc = ID3DX10Font_GetDC(font); -todo_wine ok(!!hdc, "Unexpected hdc %p.\n", hdc); hr = ID3DX10Font_GetGlyphData(font, 0, NULL, &blackbox, &cellinc); @@ -2333,15 +2331,20 @@ todo_wine for (c = 'b'; c <= 'z'; ++c) { - if (!hdc) break; - winetest_push_context("Character %c", c); count = GetGlyphIndicesA(hdc, &c, 1, &glyph, 0); ok(count != GDI_ERROR, "Unexpected count %u.\n", count); hr = ID3DX10Font_GetGlyphData(font, glyph, &srv, &blackbox, &cellinc); + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + winetest_pop_context(); + break; + } + ID3D10ShaderResourceView_GetResource(srv, &resource); hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -2415,22 +2418,22 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hdc = ID3DX10Font_GetDC(font); - todo_wine ok(!!hdc, "Unexpected hdc %p.\n", hdc); - if (!hdc) - { - ID3DX10Font_Release(font); - winetest_pop_context(); - break; - } - count = GetGlyphIndicesA(hdc, &c, 1, &glyph, 0); ok(count != GDI_ERROR, "Unexpected count %u.\n", count); hr = ID3DX10Font_GetGlyphData(font, glyph, &srv, NULL, NULL); + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + ID3DX10Font_Release(font); + winetest_pop_context(); + break; + } + ID3D10ShaderResourceView_GetResource(srv, &resource); hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : d3d10/tests: Add a test for inline geometry shader with stream output declaration.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: a81c645c65904a7696752d5905aac13c301f0f88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a81c645c65904a7696752d59… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 31 14:54:09 2021 +0200 d3d10/tests: Add a test for inline geometry shader with stream output declaration. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 86 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 62 insertions(+), 24 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index da698078f08..70bcf1ea72b 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -2584,14 +2584,20 @@ technique10 Render SetVertexShader( v[1] ); SetGeometryShader( g ); } + pass P8 + { + SetPixelShader( p ); + SetVertexShader( v[1] ); + SetGeometryShader( ConstructGSWithSO(CompileShader( gs_4_0, GS()), "SV_POSITION.y") ); + } } #endif static DWORD fx_local_shader[] = { - 0x43425844, 0x0a74ff0f, 0xea10b516, 0x8be88332, 0x2a273ca7, 0x00000001, 0x0000182d, 0x00000001, - 0x00000024, 0x30315846, 0x00001801, 0xfeff1001, 0x00000000, 0x00000000, 0x00000007, 0x00000000, - 0x00000000, 0x00000000, 0x00000001, 0x00001549, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000e, 0x00000006, 0x00000000, 0x74726556, + 0x43425844, 0xd50d5743, 0xb5236e8f, 0x9a35cd8d, 0x59e3afe1, 0x00000001, 0x00001a92, 0x00000001, + 0x00000024, 0x30315846, 0x00001a66, 0xfeff1001, 0x00000000, 0x00000000, 0x00000007, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00001772, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000f, 0x00000007, 0x00000000, 0x74726556, 0x68537865, 0x72656461, 0x00000400, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000600, 0x00307600, 0x65786950, 0x6168536c, 0x00726564, 0x00000030, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x47003070, 0x656d6f65, 0x53797274, 0x65646168, @@ -2762,26 +2768,45 @@ static DWORD fx_local_shader[] = 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000005, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00001320, 0x00000000, 0x50003550, 0x00a50036, 0x00000000, 0x37500000, 0x0000a500, 0x00000100, - 0x00002d00, 0x00001100, 0x00000000, 0xffffff00, 0x000000ff, 0x00000000, 0x00005800, 0x00003c00, - 0x00000000, 0xffffff00, 0x000000ff, 0x00000000, 0x00008600, 0x00006a00, 0x00000000, 0xffffff00, - 0x000000ff, 0x00000000, 0x0000a500, 0x00008900, 0x00000000, 0xffffff00, 0x0000a7ff, 0x00025300, - 0x00000000, 0x0003ff00, 0x00003c00, 0x00000000, 0xffffff00, 0x000401ff, 0x00000000, 0x0005a900, - 0x00006a00, 0x00000000, 0xffffff00, 0x0005abff, 0x00000000, 0x0007cf00, 0x0007b300, 0x00000000, - 0xffffff00, 0x0007d4ff, 0x0009dc00, 0x00000000, 0x0009ea00, 0x00000800, 0x00000000, 0x0009f100, - 0x00000000, 0x00000000, 0x0009f400, 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000100, - 0x0009f700, 0x00000600, 0x00000000, 0x00000100, 0x000a0300, 0x00000800, 0x00000000, 0x00000100, - 0x000a0f00, 0x000a1b00, 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000100, 0x000a1e00, - 0x00000600, 0x00000000, 0x00000100, 0x000a2a00, 0x00000800, 0x00000000, 0x00000100, 0x000a3600, - 0x000a4200, 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000700, 0x000bed00, 0x00000600, - 0x00000000, 0x00000700, 0x000da100, 0x00000800, 0x00000000, 0x00000700, 0x000fb100, 0x000fb900, - 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000700, 0x00116400, 0x00000600, 0x00000000, - 0x00000700, 0x00131800, 0x00000800, 0x00000000, 0x00000700, 0x00152800, 0x00153000, 0x00000300, - 0x00000000, 0x00000700, 0x00000000, 0x00000200, 0x00005800, 0x00000600, 0x00000000, 0x00000200, - 0x00002d00, 0x00000800, 0x00000000, 0x00000200, 0x00008600, 0x00153300, 0x00000300, 0x00000000, - 0x00000700, 0x00000000, 0x00000200, 0x0003ff00, 0x00000600, 0x00000000, 0x00000300, 0x00153600, - 0x00000800, 0x00000000, 0x00000200, 0x0005a900, 0x00153e00, 0x00000300, 0x00000000, 0x00000700, - 0x00000000, 0x00000200, 0x0003ff00, 0x00000600, 0x00000000, 0x00000300, 0x00154100, 0x00000800, - 0x00000000, 0x00000200, 0x0005a900, 0x00000000, + 0x00385000, 0x000000a5, 0x00000001, 0x00000204, 0x43425844, 0x8e325e23, 0x0774e86e, 0xe636e15f, + 0xd3f67abf, 0x00000001, 0x00000204, 0x00000005, 0x00000034, 0x00000080, 0x000000b4, 0x000000e8, + 0x00000188, 0x46454452, 0x00000044, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0x47530400, + 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, + 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f, + 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x00000098, + 0x00020040, 0x00000026, 0x05000061, 0x002010f2, 0x00000003, 0x00000000, 0x00000001, 0x0100185d, + 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x0200005e, 0x00000003, 0x06000036, + 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, 0x00000000, 0x01000013, 0x06000036, 0x001020f2, + 0x00000000, 0x00201e46, 0x00000001, 0x00000000, 0x01000013, 0x06000036, 0x001020f2, 0x00000000, + 0x00201e46, 0x00000002, 0x00000000, 0x01000013, 0x01000009, 0x0100003e, 0x54415453, 0x00000074, + 0x00000008, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, + 0x00000005, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x505f5653, 0x5449534f, 0x2e4e4f49, + 0x15540079, 0x175c0000, 0x002d0000, 0x00110000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00000000, + 0x00580000, 0x003c0000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00000000, 0x00860000, 0x006a0000, + 0x00000000, 0xffff0000, 0x0000ffff, 0x00000000, 0x00a50000, 0x00890000, 0x00000000, 0xffff0000, + 0x00a7ffff, 0x02530000, 0x00000000, 0x03ff0000, 0x003c0000, 0x00000000, 0xffff0000, 0x0401ffff, + 0x00000000, 0x05a90000, 0x006a0000, 0x00000000, 0xffff0000, 0x05abffff, 0x00000000, 0x07cf0000, + 0x07b30000, 0x00000000, 0xffff0000, 0x07d4ffff, 0x09dc0000, 0x00000000, 0x09ea0000, 0x00090000, + 0x00000000, 0x09f10000, 0x00000000, 0x00000000, 0x09f40000, 0x00030000, 0x00000000, 0x00070000, + 0x00000000, 0x00010000, 0x09f70000, 0x00060000, 0x00000000, 0x00010000, 0x0a030000, 0x00080000, + 0x00000000, 0x00010000, 0x0a0f0000, 0x0a1b0000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, + 0x00010000, 0x0a1e0000, 0x00060000, 0x00000000, 0x00010000, 0x0a2a0000, 0x00080000, 0x00000000, + 0x00010000, 0x0a360000, 0x0a420000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00070000, + 0x0bed0000, 0x00060000, 0x00000000, 0x00070000, 0x0da10000, 0x00080000, 0x00000000, 0x00070000, + 0x0fb10000, 0x0fb90000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00070000, 0x11640000, + 0x00060000, 0x00000000, 0x00070000, 0x13180000, 0x00080000, 0x00000000, 0x00070000, 0x15280000, + 0x15300000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00020000, 0x00580000, 0x00060000, + 0x00000000, 0x00020000, 0x002d0000, 0x00080000, 0x00000000, 0x00020000, 0x00860000, 0x15330000, + 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00020000, 0x03ff0000, 0x00060000, 0x00000000, + 0x00030000, 0x15360000, 0x00080000, 0x00000000, 0x00020000, 0x05a90000, 0x153e0000, 0x00030000, + 0x00000000, 0x00070000, 0x00000000, 0x00020000, 0x03ff0000, 0x00060000, 0x00000000, 0x00030000, + 0x15410000, 0x00080000, 0x00000000, 0x00020000, 0x05a90000, 0x15490000, 0x00030000, 0x00000000, + 0x00070000, 0x00000000, 0x00020000, 0x03ff0000, 0x00060000, 0x00000000, 0x00030000, 0x154c0000, + 0x00080000, 0x00000000, 0x00070000, 0x176a0000, 0x00000000, }; static void test_effect_local_shader(void) @@ -3639,6 +3664,19 @@ if (0) ok(typedesc.Stride == 0x0, "Stride is %#x, expected 0x0\n", typedesc.Stride); /* Geometry shader with stream output */ + + /* Inline variant */ + p = t->lpVtbl->GetPassByName(t, "P8"); + hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = pdesc.pShaderVariable->lpVtbl->GetShaderDesc(pdesc.pShaderVariable, 0, &shaderdesc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine { + ok(shaderdesc.IsInline, "Unexpected inline flag.\n"); + ok(shaderdesc.SODecl && !strcmp(shaderdesc.SODecl, "SV_POSITION.y"), "Unexpected stream output declaration %s.\n", + shaderdesc.SODecl); +} + v = effect->lpVtbl->GetVariableByName(effect, "g_so"); gs = v->lpVtbl->AsShader(v); hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc);

1 0

Nikolay Sivov : d3d10/effect: Store bytecode blob for every shader.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 87f099b7dc5d70af18473e182853dc9662f73a6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=87f099b7dc5d70af18473e18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 08:06:37 2021 +0300 d3d10/effect: Store bytecode blob for every shader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 12 ++++++++++++ dlls/d3d10/tests/effect.c | 9 +-------- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 5e406110988..64c445ec07a 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -107,6 +107,7 @@ struct d3d10_effect_shader_variable { ID3D10ShaderReflection *reflection; ID3D10Blob *input_signature; + ID3D10Blob *bytecode; union { ID3D10VertexShader *vs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index e143f74ff58..2fa21ad4064 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -606,6 +606,11 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse D3DGetInputSignatureBlob(ptr, dxbc_size, &v->u.shader.input_signature); + if (FAILED(hr = D3DCreateBlob(dxbc_size, &v->u.shader.bytecode))) + return hr; + + memcpy(ID3D10Blob_GetBufferPointer(v->u.shader.bytecode), ptr, dxbc_size); + if (FAILED(hr = get_fx10_shader_resources(v, ptr, dxbc_size))) return hr; @@ -2589,6 +2594,8 @@ static void d3d10_effect_shader_variable_destroy(struct d3d10_effect_shader_vari s->reflection->lpVtbl->Release(s->reflection); if (s->input_signature) ID3D10Blob_Release(s->input_signature); + if (s->bytecode) + ID3D10Blob_Release(s->bytecode); switch (type) { @@ -6828,6 +6835,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetShaderDesc( if (s->input_signature) desc->pInputSignature = ID3D10Blob_GetBufferPointer(s->input_signature); desc->SODecl = s->stream_output_declaration; + if (s->bytecode) + { + desc->pBytecode = ID3D10Blob_GetBufferPointer(s->bytecode); + desc->BytecodeLength = ID3D10Blob_GetBufferSize(s->bytecode); + } if (s->reflection) { if (SUCCEEDED(hr = s->reflection->lpVtbl->GetDesc(s->reflection, &shader_desc))) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 7645b6c45ab..fc10a59e9c2 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -5887,10 +5887,8 @@ static void test_effect_optimize(void) ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); ok(!!shaderdesc.pInputSignature, "Expected input signature.\n"); ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); -todo_wine { ok(!!shaderdesc.pBytecode, "Expected bytecode.\n"); ok(!!shaderdesc.BytecodeLength, "Unexpected bytecode length.\n"); -} ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x"), "Unexpected stream output declaration %s.\n", shaderdesc.SODecl); ok(!!shaderdesc.NumInputSignatureEntries, "Unexpected input signature count.\n"); ok(!!shaderdesc.NumOutputSignatureEntries, "Unexpected output signature count.\n"); @@ -5903,9 +5901,9 @@ todo_wine ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); ok(!!shaderdesc.pInputSignature, "Expected input signature.\n"); ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); +todo_wine { ok(!shaderdesc.pBytecode, "Unexpected bytecode.\n"); ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length.\n"); -todo_wine { ok(!shaderdesc.SODecl, "Unexpected stream output declaration %p.\n", shaderdesc.SODecl); ok(!shaderdesc.NumInputSignatureEntries, "Unexpected input signature count.\n"); ok(!shaderdesc.NumOutputSignatureEntries, "Unexpected output signature count.\n"); @@ -5950,28 +5948,23 @@ static void test_effect_shader_description(void) ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 3, &shaderdesc); ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); -todo_wine ok(shaderdesc.BytecodeLength == 424, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 4, &shaderdesc); ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); -todo_wine ok(shaderdesc.BytecodeLength == 424, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 5, &shaderdesc); ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); -todo_wine ok(shaderdesc.BytecodeLength == 420, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 6, &shaderdesc); ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); -todo_wine ok(shaderdesc.BytecodeLength == 516, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); ok(!shaderdesc.SODecl, "Unexpected SO declaration %p.\n", shaderdesc.SODecl); hr = s->lpVtbl->GetShaderDesc(s, 7, &shaderdesc); ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); -todo_wine ok(shaderdesc.BytecodeLength == 516, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x"), "Unexpected SO declaration %s.\n",

1 0