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

Eric Pouech : dbghelp: Fix SymInitialize for a live 32bit target from a 64bit caller in WOW64.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 1cddd8d5715dcbba618425c20bfabf19f9a20422 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cddd8d5715dcbba618425c2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 31 13:20:39 2021 +0200 dbghelp: Fix SymInitialize for a live 32bit target from a 64bit caller in WOW64. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 00d7b61fbd8..9d99f0d646a 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -286,7 +286,7 @@ const WCHAR *process_getenv(const struct process *process, const WCHAR *name) * check_live_target * */ -static BOOL check_live_target(struct process* pcs) +static BOOL check_live_target(struct process* pcs, BOOL wow64, BOOL child_wow64) { PROCESS_BASIC_INFORMATION pbi; ULONG_PTR base = 0, env = 0; @@ -300,11 +300,17 @@ static BOOL check_live_target(struct process* pcs) if (!pcs->is_64bit) { + const char* peb32_addr; DWORD env32; PEB32 peb32; + C_ASSERT(sizeof(void*) != 4 || FIELD_OFFSET(RTL_USER_PROCESS_PARAMETERS, Environment) == 0x48); - if (!ReadProcessMemory(pcs->handle, pbi.PebBaseAddress, &peb32, sizeof(peb32), NULL)) return FALSE; - if (!ReadProcessMemory(pcs->handle, (char *)pbi.PebBaseAddress + 0x460 /* CloudFileFlags */, &base, sizeof(base), NULL)) return FALSE; + peb32_addr = (const char*)pbi.PebBaseAddress; + if (!wow64 && child_wow64) + /* current process is 64bit, while child process is 32 bit, need to read 32bit PEB */ + peb32_addr += 0x1000; + if (!ReadProcessMemory(pcs->handle, peb32_addr, &peb32, sizeof(peb32), NULL)) return FALSE; + if (!ReadProcessMemory(pcs->handle, peb32_addr + 0x460 /* CloudFileFlags */, &base, sizeof(base), NULL)) return FALSE; if (read_process_memory(pcs, peb32.ProcessParameters + 0x48, &env32, sizeof(env32))) env = env32; } else @@ -454,7 +460,7 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP pcs->next = process_first; process_first = pcs; - if (check_live_target(pcs)) + if (check_live_target(pcs, wow64, child_wow64)) { if (fInvadeProcess) EnumerateLoadedModulesW64(hProcess, process_invade_cb, hProcess);

1 0

Jacek Caban : gdi32: Use NtGdiCreateDIBSection for CreateDIBSection.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: f6e584e626523d2500f094f1e98f113018770c5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6e584e626523d2500f094f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 31 13:18:37 2021 +0100 gdi32: Use NtGdiCreateDIBSection for CreateDIBSection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/dib.c | 7 ++++--- dlls/gdi32/objects.c | 9 +++++++++ include/ntgdi.h | 3 +++ 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 7f66d2f66fe..497e8a59f24 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -877,7 +877,7 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, info.bmiHeader.biPlanes = 1; info.bmiHeader.biBitCount = 24; info.bmiHeader.biCompression = BI_RGB; - bmpWork = CreateDIBSection( 0, &info, DIB_RGB_COLORS, NULL, NULL, 0 ); + bmpWork = NtGdiCreateDIBSection( 0, NULL, 0, &info, DIB_RGB_COLORS, 0, 0, 0, NULL ); } else bmpWork = NtGdiCreateCompatibleBitmap( hdcDest, widthDest, heightDest ); oldWork = NtGdiSelectBitmap(hdcWork, bmpWork); diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 472efdec295..db6a4c44c84 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -76,7 +76,7 @@ HBITMAP WINAPI NtGdiCreateCompatibleBitmap( HDC hdc, INT width, INT height ) memcpy( bi->bmiColors, dib.dsBitfields, sizeof(dib.dsBitfields) ); else if (dib.dsBmih.biBitCount <= 8) /* copy the color table */ NtGdiDoPalette( hdc, 0, 256, bi->bmiColors, NtGdiGetDIBColorTable, FALSE ); - return CreateDIBSection( hdc, bi, DIB_RGB_COLORS, NULL, NULL, 0 ); + return NtGdiCreateDIBSection( hdc, NULL, 0, bi, DIB_RGB_COLORS, 0, 0, 0, NULL ); default: return 0; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index fa736223aae..68ca1c31664 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1460,10 +1460,11 @@ HBITMAP WINAPI NtGdiCreateDIBitmapInternal( HDC hdc, INT width, INT height, DWOR /*********************************************************************** - * CreateDIBSection (GDI32.@) + * NtGdiCreateDIBSection (win32u.@) */ -HBITMAP WINAPI DECLSPEC_HOTPATCH CreateDIBSection(HDC hdc, const BITMAPINFO *bmi, UINT usage, - void **bits, HANDLE section, DWORD offset) +HBITMAP WINAPI NtGdiCreateDIBSection( HDC hdc, HANDLE section, DWORD offset, const BITMAPINFO *bmi, + UINT usage, UINT header_size, ULONG flags, + ULONG_PTR color_space, void **bits ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 055994a1680..d1d9cdb1e35 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -753,6 +753,15 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, DWORD in 0, 0, 0, 0 ); } +/*********************************************************************** + * CreateDIBSection (GDI32.@) + */ +HBITMAP WINAPI DECLSPEC_HOTPATCH CreateDIBSection( HDC hdc, const BITMAPINFO *bmi, UINT usage, + void **bits, HANDLE section, DWORD offset ) +{ + return NtGdiCreateDIBSection( hdc, section, offset, bmi, usage, 0, 0, 0, bits ); +} + /*********************************************************************** * GetDIBits (win32u.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 72427a20295..f03b12a09ae 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -222,6 +222,9 @@ HBITMAP WINAPI NtGdiCreateDIBitmapInternal( HDC hdc, INT width, INT height, DWO const void *bits, const BITMAPINFO *data, UINT coloruse, UINT max_info, UINT max_bits, ULONG flags, HANDLE xform ); +HBITMAP WINAPI NtGdiCreateDIBSection( HDC hdc, HANDLE section, DWORD offset, const BITMAPINFO *bmi, + UINT usage, UINT header_size, ULONG flags, + ULONG_PTR color_space, void **bits ); HPALETTE WINAPI NtGdiCreateHalftonePalette( HDC hdc ); HBRUSH WINAPI NtGdiCreateHatchBrushInternal( INT style, COLORREF color, BOOL pen ); HDC WINAPI NtGdiCreateMetafileDC( HDC hdc );

1 0

Hans Leidekker : webservices: Return an error when the record value is too large for the description type.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 2986550e27bfcfd726f9e01a1958fa3a53a57362 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2986550e27bfcfd726f9e01a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 31 13:45:52 2021 +0200 webservices: Return an error when the record value is too large for the description type. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 19 +++++++------ dlls/webservices/tests/reader.c | 60 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ffa789fb6e6..c30abf5acd8 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -4495,8 +4495,7 @@ static HRESULT text_to_int8( const WS_XML_TEXT *text, INT64 *val ) case WS_XML_TEXT_TYPE_INT32: { const WS_XML_INT32_TEXT *text_int32 = (const WS_XML_INT32_TEXT *)text; - assert( text_int32->value >= MIN_INT8 ); - assert( text_int32->value <= MAX_INT8 ); + if (text_int32->value < MIN_INT8 || text_int32->value > MAX_INT8) return WS_E_NUMERIC_OVERFLOW; *val = text_int32->value; hr = S_OK; break; @@ -4577,8 +4576,7 @@ static HRESULT text_to_int16( const WS_XML_TEXT *text, INT64 *val ) case WS_XML_TEXT_TYPE_INT32: { const WS_XML_INT32_TEXT *text_int32 = (const WS_XML_INT32_TEXT *)text; - assert( text_int32->value >= MIN_INT16 ); - assert( text_int32->value <= MAX_INT16 ); + if (text_int32->value < MIN_INT16 || text_int32->value > MAX_INT16) return WS_E_NUMERIC_OVERFLOW; *val = text_int32->value; hr = S_OK; break; @@ -4819,7 +4817,7 @@ static HRESULT text_to_uint8( const WS_XML_TEXT *text, UINT64 *val ) case WS_XML_TEXT_TYPE_UINT64: { const WS_XML_UINT64_TEXT *text_uint64 = (const WS_XML_UINT64_TEXT *)text; - assert( text_uint64->value <= MAX_UINT8 ); + if (text_uint64->value > MAX_UINT8) return WS_E_NUMERIC_OVERFLOW; *val = text_uint64->value; hr = S_OK; break; @@ -4900,8 +4898,7 @@ static HRESULT text_to_uint16( const WS_XML_TEXT *text, UINT64 *val ) case WS_XML_TEXT_TYPE_INT32: { const WS_XML_INT32_TEXT *text_int32 = (const WS_XML_INT32_TEXT *)text; - assert( text_int32->value >= 0 ); - assert( text_int32->value <= MAX_UINT16 ); + if (text_int32->value < 0 || text_int32->value > MAX_UINT16) return WS_E_NUMERIC_OVERFLOW; *val = text_int32->value; hr = S_OK; break; @@ -4909,7 +4906,7 @@ static HRESULT text_to_uint16( const WS_XML_TEXT *text, UINT64 *val ) case WS_XML_TEXT_TYPE_UINT64: { const WS_XML_UINT64_TEXT *text_uint64 = (const WS_XML_UINT64_TEXT *)text; - assert( text_uint64->value <= MAX_UINT16 ); + if (text_uint64->value > MAX_UINT16) return WS_E_NUMERIC_OVERFLOW; *val = text_uint64->value; hr = S_OK; break; @@ -4990,7 +4987,7 @@ static HRESULT text_to_uint32( const WS_XML_TEXT *text, UINT64 *val ) case WS_XML_TEXT_TYPE_INT32: { const WS_XML_INT32_TEXT *text_int32 = (const WS_XML_INT32_TEXT *)text; - assert( text_int32->value >= 0 ); + if (text_int32->value < 0) return WS_E_NUMERIC_OVERFLOW; *val = text_int32->value; hr = S_OK; break; @@ -4998,7 +4995,7 @@ static HRESULT text_to_uint32( const WS_XML_TEXT *text, UINT64 *val ) case WS_XML_TEXT_TYPE_UINT64: { const WS_XML_UINT64_TEXT *text_uint64 = (const WS_XML_UINT64_TEXT *)text; - assert( text_uint64->value <= MAX_UINT32 ); + if (text_uint64->value > MAX_UINT32) return WS_E_NUMERIC_OVERFLOW; *val = text_uint64->value; hr = S_OK; break; @@ -5079,6 +5076,7 @@ static HRESULT text_to_uint64( const WS_XML_TEXT *text, UINT64 *val ) case WS_XML_TEXT_TYPE_INT32: { const WS_XML_INT32_TEXT *text_int32 = (const WS_XML_INT32_TEXT *)text; + if (text_int32->value < 0) return WS_E_NUMERIC_OVERFLOW; *val = text_int32->value; hr = S_OK; break; @@ -5086,6 +5084,7 @@ static HRESULT text_to_uint64( const WS_XML_TEXT *text, UINT64 *val ) case WS_XML_TEXT_TYPE_INT64: { const WS_XML_INT64_TEXT *text_int64 = (const WS_XML_INT64_TEXT *)text; + if (text_int64->value < 0) return WS_E_NUMERIC_OVERFLOW; *val = text_int64->value; hr = S_OK; break; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 7d56ebccd53..7ecb77fe6cd 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -4937,6 +4937,8 @@ static void test_binary_encoding(void) {0x40,0x01,'t',0x08,0x02,'n','s',0x01}; static const char test31[] = {0x40,0x01,'t',0x09,0x01,'p',0x02,'n','s',0x01}; + static const char test32[] = + {0x40,0x01,'t',0xb3,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; static const char test100[] = {0x40,0x01,'t',0x04,0x01,'t',0x98,0x00,0x01}; static const char test101[] = @@ -4973,6 +4975,14 @@ static void test_binary_encoding(void) { WS_BYTES data; } *typetest; + struct typetest2 + { + UINT32 val; + } *typetest2; + struct typetest3 + { + UINT64 val; + } *typetest3; hr = WsGetDictionary( WS_ENCODING_XML_BINARY_1, &dict, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -5629,6 +5639,56 @@ static void test_binary_encoding(void) ok( typetest->data.length == 2, "got %u\n", typetest->data.length ); ok( !memcmp( typetest->data.bytes, "ab", 2 ), "wrong data\n" ); + /* record value too large for description type */ + hr = set_input_bin( reader, test32, sizeof(test32), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateHeap( 1 << 8, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_ELEMENT_FIELD_MAPPING; + f.localName = &localname; + f.ns = &ns; + f.type = WS_UINT32_TYPE; + f.offset = FIELD_OFFSET(struct typetest2, val); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct typetest2); + s.alignment = TYPE_ALIGNMENT(struct typetest2); + s.fields = fields; + s.fieldCount = 1; + + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &typetest2, sizeof(typetest2), NULL ); + ok( hr == WS_E_NUMERIC_OVERFLOW, "got %08x\n", hr ); + + /* record value too small for description type */ + hr = set_input_bin( reader, test16, sizeof(test16), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateHeap( 1 << 8, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_ELEMENT_FIELD_MAPPING; + f.localName = &localname; + f.ns = &ns; + f.type = WS_UINT64_TYPE; + f.offset = FIELD_OFFSET(struct typetest3, val); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct typetest3); + s.alignment = TYPE_ALIGNMENT(struct typetest3); + s.fields = fields; + s.fieldCount = 1; + + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &typetest3, sizeof(typetest3), NULL ); + ok( hr == WS_E_NUMERIC_OVERFLOW, "got %08x\n", hr ); + WsFreeHeap( heap ); WsFreeReader( reader ); }

1 0

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

31 Aug '21

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

Hans Leidekker : webservices: Increase the size of the writer heap.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 375854cafed051d4990a642f6119720371e52132 URL: https://source.winehq.org/git/wine.git/?a=commit;h=375854cafed051d4990a642f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 31 13:45:54 2021 +0200 webservices: Increase the size of the writer heap. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 28df4a3c4ef..68f43a7cdb4 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -220,15 +220,7 @@ HRESULT WINAPI WsCreateWriter( const WS_XML_WRITER_PROPERTY *properties, ULONG c } } - hr = prop_get( writer->prop, writer->prop_count, WS_XML_WRITER_PROPERTY_BUFFER_MAX_SIZE, - &max_size, sizeof(max_size) ); - if (hr != S_OK) - { - free_writer( writer ); - return hr; - } - - hr = WsCreateHeap( max_size, 0, NULL, 0, &writer->output_heap, NULL ); + hr = WsCreateHeap( 1 << 20, 0, NULL, 0, &writer->output_heap, NULL ); if (hr != S_OK) { free_writer( writer );

1 0

Hans Leidekker : webservices: Add support for RECORD_BYTES32_TEXT in write_text_bin().
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 7b3550fbae30a697daaa827625b26e219c02f66d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b3550fbae30a697daaa8276… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 31 13:45:55 2021 +0200 webservices: Add support for RECORD_BYTES32_TEXT in write_text_bin(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 68f43a7cdb4..c9e443b0e80 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -2766,6 +2766,26 @@ static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, U } return S_OK; } + case RECORD_BYTES32_TEXT: + { + const WS_XML_BASE64_TEXT *text_base64 = (const WS_XML_BASE64_TEXT *)text; + UINT32 rem = text_base64->length % 3, len = text_base64->length - rem; + if (len) + { + if ((hr = write_grow_buffer( writer, 1 + sizeof(len) + len )) != S_OK) return hr; + write_char( writer, rem ? RECORD_BYTES32_TEXT : RECORD_BYTES32_TEXT_WITH_ENDELEMENT ); + write_bytes( writer, (const BYTE *)&len, sizeof(len) ); + write_bytes( writer, text_base64->bytes, len ); + } + if (rem) + { + if ((hr = write_grow_buffer( writer, 3 )) != S_OK) return hr; + write_char( writer, RECORD_BYTES8_TEXT_WITH_ENDELEMENT ); + write_char( writer, rem ); + write_bytes( writer, (const BYTE *)text_base64->bytes + len, rem ); + } + return S_OK; + } case RECORD_ZERO_TEXT_WITH_ENDELEMENT: case RECORD_ONE_TEXT_WITH_ENDELEMENT: case RECORD_FALSE_TEXT_WITH_ENDELEMENT:

1 0

Nikolay Sivov : d3d10/effect: Add a semi-stub for GetShaderDesc().
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 2b83832fdf518fd8ceff537504a8f55a088e048b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b83832fdf518fd8ceff5375… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 31 14:54:05 2021 +0200 d3d10/effect: Add a semi-stub for GetShaderDesc(). 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 | 84 +++++++++++++++++++---------- dlls/d3d10/tests/effect.c | 134 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 184 insertions(+), 34 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index acc7199138b..e143f74ff58 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -6780,12 +6780,64 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetRawValue( /* ID3D10EffectShaderVariable methods */ +static HRESULT d3d10_get_shader_variable(struct d3d10_effect_variable *v, UINT shader_index, + struct d3d10_effect_shader_variable **s) +{ + unsigned int i; + + if (v->type->element_count) + v = &v->elements[0]; + + if (!shader_index) + { + *s = &v->u.shader; + return S_OK; + } + + /* Index is used as an offset from this variable. */ + + for (i = 0; i < v->effect->used_shader_count; ++i) + { + if (v == v->effect->used_shaders[i]) break; + } + + if (i + shader_index >= v->effect->used_shader_count) + { + WARN("Invalid shader index %u.\n", shader_index); + return E_FAIL; + } + + *s = &v->effect->used_shaders[i + shader_index]->u.shader; + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetShaderDesc( ID3D10EffectShaderVariable *iface, UINT index, D3D10_EFFECT_SHADER_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); + struct d3d10_effect_shader_variable *s; + D3D10_SHADER_DESC shader_desc; + HRESULT hr; - return E_NOTIMPL; + FIXME("iface %p, index %u, desc %p semi-stub.\n", iface, index, desc); + + if (FAILED(hr = d3d10_get_shader_variable(v, index, &s))) + return hr; + + memset(desc, 0, sizeof(*desc)); + if (s->input_signature) + desc->pInputSignature = ID3D10Blob_GetBufferPointer(s->input_signature); + desc->SODecl = s->stream_output_declaration; + if (s->reflection) + { + if (SUCCEEDED(hr = s->reflection->lpVtbl->GetDesc(s->reflection, &shader_desc))) + { + desc->NumInputSignatureEntries = shader_desc.InputParameters; + desc->NumOutputSignatureEntries = shader_desc.OutputParameters; + } + } + + return hr; } static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetVertexShader( @@ -6858,32 +6910,10 @@ static HRESULT d3d10_get_shader_variable_signature(struct d3d10_effect_variable UINT shader_index, UINT element_index, BOOL output, D3D10_SIGNATURE_PARAMETER_DESC *desc) { struct d3d10_effect_shader_variable *s; - unsigned int i; - - if (v->type->element_count) - v = &v->elements[0]; - - if (shader_index == 0) - { - s = &v->u.shader; - } - else - { - /* Index is used as an offset from this variable. */ - - for (i = 0; i < v->effect->used_shader_count; ++i) - { - if (v == v->effect->used_shaders[i]) break; - } - - if (i + shader_index >= v->effect->used_shader_count) - { - WARN("This should crash!\n"); - return E_FAIL; - } + HRESULT hr; - s = &v->effect->used_shaders[i + shader_index]->u.shader; - } + if (FAILED(hr = d3d10_get_shader_variable(v, shader_index, &s))) + return hr; if (!s->reflection) return D3DERR_INVALIDCALL; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 5fcece4695b..7645b6c45ab 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3642,14 +3642,10 @@ if (0) v = effect->lpVtbl->GetVariableByName(effect, "g_so"); gs = v->lpVtbl->AsShader(v); hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); -todo_wine ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); - if (hr == S_OK) - { - ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); - ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x"), "Unexpected stream output declaration %s.\n", - shaderdesc.SODecl); - } + ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); + ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x"), "Unexpected stream output declaration %s.\n", + shaderdesc.SODecl); /* Signature description */ v = effect->lpVtbl->GetVariableByName(effect, "p"); @@ -5865,6 +5861,128 @@ static void test_effect_resource_variable(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_effect_optimize(void) +{ + D3D10_EFFECT_SHADER_DESC shaderdesc; + ID3D10EffectShaderVariable *gs; + ID3D10EffectVariable *v; + ID3D10Effect *effect; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = create_effect(fx_local_shader, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + + v = effect->lpVtbl->GetVariableByName(effect, "g_so"); + + gs = v->lpVtbl->AsShader(v); + hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); + 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"); + + hr = effect->lpVtbl->Optimize(effect); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); + 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"); + 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"); +} + effect->lpVtbl->Release(effect); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + +static void test_effect_shader_description(void) +{ + D3D10_EFFECT_SHADER_DESC shaderdesc; + ID3D10EffectShaderVariable *s; + ID3D10EffectVariable *v; + ID3D10Effect *effect; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = create_effect(fx_local_shader, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + + v = effect->lpVtbl->GetVariableByName(effect, "v0"); + + /* GetShaderDesc() is indexing through all shaders in the effect.*/ + s = v->lpVtbl->AsShader(v); + hr = s->lpVtbl->GetShaderDesc(s, 0, &shaderdesc); + ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); + hr = s->lpVtbl->GetShaderDesc(s, 1, &shaderdesc); + ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); + hr = s->lpVtbl->GetShaderDesc(s, 2, &shaderdesc); + ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + 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", + wine_dbgstr_a(shaderdesc.SODecl)); + + effect->lpVtbl->Release(effect); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(effect) { test_effect_constant_buffer_type(); @@ -5881,4 +5999,6 @@ START_TEST(effect) test_effect_vector_variable(); test_effect_matrix_variable(); test_effect_resource_variable(); + test_effect_optimize(); + test_effect_shader_description(); }

1 0

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

31 Aug '21

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

Nikolay Sivov : d3d10/effect: Discard some of the shader metadata when optimizing an effect.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 87ac914e827210a22b075406eb30a1ea6dc62713 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87ac914e827210a22b075406… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 08:06:38 2021 +0300 d3d10/effect: Discard some of the shader metadata when optimizing an effect. 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 | 26 ++++++++++++++++++++++++-- dlls/d3d10/tests/effect.c | 4 +--- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 2fa21ad4064..b5ea0be1554 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3225,9 +3225,31 @@ static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqu static HRESULT STDMETHODCALLTYPE d3d10_effect_Optimize(ID3D10Effect *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d10_effect *effect = impl_from_ID3D10Effect(iface); + struct d3d10_effect_variable *v; + unsigned int i; - return E_NOTIMPL; + FIXME("iface %p semi-stub!\n", iface); + + for (i = 0; i < effect->used_shader_count; ++i) + { + v = effect->used_shaders[i]; + + if (v->u.shader.reflection) + { + v->u.shader.reflection->lpVtbl->Release(v->u.shader.reflection); + v->u.shader.reflection = NULL; + } + if (v->u.shader.bytecode) + { + ID3D10Blob_Release(v->u.shader.bytecode); + v->u.shader.bytecode = NULL; + } + heap_free(v->u.shader.stream_output_declaration); + v->u.shader.stream_output_declaration = NULL; + } + + return S_OK; } static BOOL STDMETHODCALLTYPE d3d10_effect_IsOptimized(ID3D10Effect *iface) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index fc10a59e9c2..da698078f08 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -5894,20 +5894,18 @@ static void test_effect_optimize(void) ok(!!shaderdesc.NumOutputSignatureEntries, "Unexpected output signature count.\n"); hr = effect->lpVtbl->Optimize(effect); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); 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"); 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"); -} + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device);

1 0

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

31 Aug '21

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