March 2020 - Wine-Commits - list.winehq.org

Sven Baars : d3dx9: Handle DT_SINGLELINE in ID3DXFont_DrawText.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: 333687f522730befb8c64d297dc52f654e53a744 URL: https://source.winehq.org/git/wine.git/?a=commit;h=333687f522730befb8c64d29… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Mar 10 11:21:38 2020 +0100 d3dx9: Handle DT_SINGLELINE in ID3DXFont_DrawText. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 29 ++++++++++++++++++++--------- dlls/d3dx9_36/tests/core.c | 2 +- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 5d4c0a5786..e27858a2ce 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -512,7 +512,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite, } static void word_break(HDC hdc, const WCHAR *str, unsigned int *str_len, - unsigned int chars_fit, unsigned int *chars_used, SIZE *size) + unsigned int chars_fit, unsigned int *chars_used, DWORD format, SIZE *size) { SCRIPT_LOGATTR *sla; SCRIPT_ANALYSIS sa; @@ -535,7 +535,7 @@ static void word_break(HDC hdc, const WCHAR *str, unsigned int *str_len, --i; /* If the there is no word that fits put in all characters that do fit */ - if (!sla[i].fSoftBreak) + if (!sla[i].fSoftBreak || (format & DT_SINGLELINE)) i = chars_fit; *chars_used = i; @@ -561,10 +561,10 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, int *count, SIZE size; *dest_len = 0; - while (*count && str[i] != '\n') + while (*count && (str[i] != '\n' || (format & DT_SINGLELINE))) { --(*count); - if (str[i] != '\r') + if (str[i] != '\r' && str[i] != '\n') dest[(*dest_len)++] = str[i]; ++i; } @@ -572,13 +572,21 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, int *count, num_fit = 0; GetTextExtentExPointW(hdc, dest, *dest_len, width, &num_fit, NULL, &size); - if (num_fit < *dest_len && (format & DT_WORDBREAK)) + if (num_fit < *dest_len) { - unsigned int chars_used; + if (format & DT_WORDBREAK) + { + unsigned int chars_used; - word_break(hdc, dest, dest_len, num_fit, &chars_used, &size); - *count = orig_count - chars_used; - i = chars_used; + word_break(hdc, dest, dest_len, num_fit, &chars_used, format, &size); + *count = orig_count - chars_used; + i = chars_used; + } + else if (format & DT_SINGLELINE) + { + *dest_len = num_fit; + *count = 0; + } } if (*count && str[i] == '\n') @@ -617,6 +625,9 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, if (format & DT_CALCRECT) format |= DT_NOCLIP; + if (format & DT_SINGLELINE) + format &= ~DT_WORDBREAK; + if (!rect) { y = ID3DXFont_DrawTextW(iface, NULL, string, count, &textrect, format | DT_CALCRECT, 0); diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 45cde62b3a..2b5a868033 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -771,7 +771,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(height == 12, "Got unexpected height %d.\n", height); height = ID3DXFont_DrawTextW(font, NULL, L"a\na", -1, &rect, DT_SINGLELINE, 0xff00ff); - todo_wine ok(height == 12, "Got unexpected height %d.\n", height); + ok(height == 12, "Got unexpected height %d.\n", height); height = ID3DXFont_DrawTextW(font, NULL, L"a\naaaaa aaaa", -1, &rect, 0, 0xff00ff); ok(height == 24, "Got unexpected height %d.\n", height);

1 0

Tag wine-5.4 : Alexandre Julliard : Release 5.4
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: refs/tags/wine-5.4 Tag: 85ae5a2e7fc1cb4a2f1153980905475e4cfbcbe7 URL: https://source.winehq.org/git/wine.git/?a=tag;h=85ae5a2e7fc1cb4a2f115398090… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 21:23:09 2020 +0100 Release 5.4

1 0

Alexandre Julliard : Release 5.4.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: 4c61c8dce09307ecfe0beea307213bd1fb6a69db URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c61c8dce09307ecfe0beea3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 21:23:09 2020 +0100 Release 5.4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 936 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 493 insertions(+), 464 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4c61c8dce09307ecfe0b…

1 0

Serge Gautherie : tools: Remove 0x0501 API versions forced by winapi_test.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: aa384d36429110970aa72acbc5043158de6aff03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa384d36429110970aa72acb… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Mar 11 16:49:21 2020 +0100 tools: Remove 0x0501 API versions forced by winapi_test. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/generated.c | 4 ---- dlls/kernel32/tests/generated.c | 4 ---- dlls/ntdll/tests/generated.c | 4 ---- dlls/rpcrt4/tests/generated.c | 4 ---- dlls/shell32/tests/generated.c | 4 ---- dlls/shlwapi/tests/generated.c | 4 ---- dlls/urlmon/tests/generated.c | 4 ---- dlls/user32/tests/generated.c | 4 ---- dlls/wininet/tests/generated.c | 4 ---- dlls/winmm/tests/generated.c | 4 ---- tools/winapi/winapi_test | 4 ---- 11 files changed, 44 deletions(-) diff --git a/dlls/gdi32/tests/generated.c b/dlls/gdi32/tests/generated.c index 019524df86..fe3ecd937d 100644 --- a/dlls/gdi32/tests/generated.c +++ b/dlls/gdi32/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "windows.h" diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c index a166d9746c..7c57feaab7 100644 --- a/dlls/kernel32/tests/generated.c +++ b/dlls/kernel32/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "windows.h" diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c index b099a5c084..d277e02073 100644 --- a/dlls/ntdll/tests/generated.c +++ b/dlls/ntdll/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "ntdll_test.h" diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index 7eb8faa073..72672cd3a9 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/shell32/tests/generated.c b/dlls/shell32/tests/generated.c index ace877eb42..55f4eab894 100644 --- a/dlls/shell32/tests/generated.c +++ b/dlls/shell32/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/shlwapi/tests/generated.c b/dlls/shlwapi/tests/generated.c index e5e0896af8..3a8e4269fc 100644 --- a/dlls/shlwapi/tests/generated.c +++ b/dlls/shlwapi/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/urlmon/tests/generated.c b/dlls/urlmon/tests/generated.c index 63e892bc54..45fd5d84f3 100644 --- a/dlls/urlmon/tests/generated.c +++ b/dlls/urlmon/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/user32/tests/generated.c b/dlls/user32/tests/generated.c index 2107a44cb3..be1b698a2c 100644 --- a/dlls/user32/tests/generated.c +++ b/dlls/user32/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "windows.h" diff --git a/dlls/wininet/tests/generated.c b/dlls/wininet/tests/generated.c index 1282b6fda5..f88834ab9d 100644 --- a/dlls/wininet/tests/generated.c +++ b/dlls/wininet/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/winmm/tests/generated.c b/dlls/winmm/tests/generated.c index ec25e076df..4c0fe7a530 100644 --- a/dlls/winmm/tests/generated.c +++ b/dlls/winmm/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "windef.h" diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 92f4ae366a..48c29f8f4a 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -503,10 +503,6 @@ sub output_header($$$) { print OUT " */\n"; print OUT "\n"; - print OUT "#define WINVER 0x0501\n"; - print OUT "#define _WIN32_IE 0x0501\n"; - print OUT "#define _WIN32_WINNT 0x0501\n"; - print OUT "\n"; print OUT "#define WINE_NOWINSOCK\n"; print OUT "\n"; foreach my $test (@tests) {

1 0

Roman Pišl : wininet: Add stub for INTERNET_OPTION_IGNORE_OFFLINE.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: 6fcd1378b2516165468bcbd71263c1b18c6be491 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fcd1378b2516165468bcbd7… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Thu Mar 12 12:01:15 2020 +0100 wininet: Add stub for INTERNET_OPTION_IGNORE_OFFLINE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48739 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index aaa8b2a569..cdafbfa139 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2955,6 +2955,9 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_DISABLE_PASSPORT_AUTH: TRACE("Option INTERNET_OPTION_DISABLE_PASSPORT_AUTH: harmless stub, since not enabled\n"); break; + case INTERNET_OPTION_IGNORE_OFFLINE: + FIXME("Option INTERNET_OPTION_IGNORE_OFFLINE: STUB\n"); + break; case INTERNET_OPTION_SEND_TIMEOUT: case INTERNET_OPTION_RECEIVE_TIMEOUT: case INTERNET_OPTION_DATA_SEND_TIMEOUT:

1 0

Zebediah Figura : d3dcompiler: Apply type modifiers to the hlsl_type.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: 756ed811c72e692e58def76e76ab19e5418e8d5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=756ed811c72e692e58def76e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 13 17:34:56 2020 +0100 d3dcompiler: Apply type modifiers to the hlsl_type. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 96 ++++++++++++++++++++++++++++++---------------- 1 file changed, 62 insertions(+), 34 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 59e0df9d8c..6a5dddf5d4 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -168,7 +168,21 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) return TRUE; } -static DWORD add_modifier(DWORD modifiers, DWORD mod, const struct YYLTYPE *loc); +static DWORD add_modifiers(DWORD modifiers, DWORD mod, const struct source_location loc) +{ + if (modifiers & mod) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "modifier '%s' already specified", debug_modifiers(mod)); + return modifiers; + } + if (mod & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) + && modifiers & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR)) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "more than one matrix majority keyword"); + return modifiers; + } + return modifiers | mod; +} static BOOL add_type_to_scope(struct hlsl_scope *scope, struct hlsl_type *def) { @@ -602,7 +616,7 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, local = FALSE; } - if (var->modifiers & HLSL_MODIFIER_CONST && !(var->modifiers & HLSL_STORAGE_UNIFORM) && !v->initializer.args_count) + if (type->modifiers & HLSL_MODIFIER_CONST && !(var->modifiers & HLSL_STORAGE_UNIFORM) && !v->initializer.args_count) { hlsl_report_message(v->loc, HLSL_LEVEL_ERROR, "const variable without initializer"); free_declaration(var); @@ -703,6 +717,21 @@ static BOOL add_struct_field(struct list *fields, struct hlsl_struct_field *fiel return TRUE; } +static struct hlsl_type *apply_type_modifiers(struct hlsl_type *type, DWORD *modifiers, struct source_location loc) +{ + struct hlsl_type *new_type; + + if (!(*modifiers & HLSL_TYPE_MODIFIERS_MASK)) + return type; + + if (!(new_type = clone_hlsl_type(type))) + return NULL; + + new_type->modifiers = add_modifiers(new_type->modifiers, *modifiers, loc); + *modifiers &= ~HLSL_TYPE_MODIFIERS_MASK; + return new_type; +} + static struct list *gen_struct_fields(struct hlsl_type *type, DWORD modifiers, struct list *fields) { struct parse_variable_def *v, *v_next; @@ -1301,7 +1330,12 @@ fields_list: /* Empty */ field: var_modifiers type variables_def ';' { - $$ = gen_struct_fields($2, $1, $3); + struct hlsl_type *type; + DWORD modifiers = $1; + + if (!(type = apply_type_modifiers($2, &modifiers, get_location(&@1)))) + YYABORT; + $$ = gen_struct_fields(type, modifiers, $3); } | unnamed_struct_spec variables_def ';' { @@ -1449,9 +1483,15 @@ param_list: parameter parameter: input_mods var_modifiers type any_identifier colon_attribute { + struct hlsl_type *type; + DWORD modifiers = $2; + + if (!(type = apply_type_modifiers($3, &modifiers, get_location(&@2)))) + YYABORT; + $$.modifiers = $1 ? $1 : HLSL_MODIFIER_IN; - $$.modifiers |= $2; - $$.type = $3; + $$.modifiers |= modifiers; + $$.type = type; $$.name = $4; $$.semantic = $5.semantic; $$.reg_reservation = $5.reg_reservation; @@ -1639,7 +1679,12 @@ type_spec: any_identifier array declaration: var_modifiers type variables_def ';' { - $$ = declare_vars($2, $1, $3); + struct hlsl_type *type; + DWORD modifiers = $1; + + if (!(type = apply_type_modifiers($2, &modifiers, get_location(&@1)))) + YYABORT; + $$ = declare_vars(type, modifiers, $3); } variables_def_optional: /* Empty */ @@ -1717,47 +1762,47 @@ var_modifiers: /* Empty */ } | KW_EXTERN var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_EXTERN, &@1); + $$ = add_modifiers($2, HLSL_STORAGE_EXTERN, get_location(&@1)); } | KW_NOINTERPOLATION var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_NOINTERPOLATION, &@1); + $$ = add_modifiers($2, HLSL_STORAGE_NOINTERPOLATION, get_location(&@1)); } | KW_PRECISE var_modifiers { - $$ = add_modifier($2, HLSL_MODIFIER_PRECISE, &@1); + $$ = add_modifiers($2, HLSL_MODIFIER_PRECISE, get_location(&@1)); } | KW_SHARED var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_SHARED, &@1); + $$ = add_modifiers($2, HLSL_STORAGE_SHARED, get_location(&@1)); } | KW_GROUPSHARED var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_GROUPSHARED, &@1); + $$ = add_modifiers($2, HLSL_STORAGE_GROUPSHARED, get_location(&@1)); } | KW_STATIC var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_STATIC, &@1); + $$ = add_modifiers($2, HLSL_STORAGE_STATIC, get_location(&@1)); } | KW_UNIFORM var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_UNIFORM, &@1); + $$ = add_modifiers($2, HLSL_STORAGE_UNIFORM, get_location(&@1)); } | KW_VOLATILE var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_VOLATILE, &@1); + $$ = add_modifiers($2, HLSL_STORAGE_VOLATILE, get_location(&@1)); } | KW_CONST var_modifiers { - $$ = add_modifier($2, HLSL_MODIFIER_CONST, &@1); + $$ = add_modifiers($2, HLSL_MODIFIER_CONST, get_location(&@1)); } | KW_ROW_MAJOR var_modifiers { - $$ = add_modifier($2, HLSL_MODIFIER_ROW_MAJOR, &@1); + $$ = add_modifiers($2, HLSL_MODIFIER_ROW_MAJOR, get_location(&@1)); } | KW_COLUMN_MAJOR var_modifiers { - $$ = add_modifier($2, HLSL_MODIFIER_COLUMN_MAJOR, &@1); + $$ = add_modifiers($2, HLSL_MODIFIER_COLUMN_MAJOR, get_location(&@1)); } complex_initializer: initializer_expr @@ -2486,23 +2531,6 @@ static struct source_location get_location(const struct YYLTYPE *l) return loc; } -static DWORD add_modifier(DWORD modifiers, DWORD mod, const struct YYLTYPE *l) -{ - if (modifiers & mod) - { - hlsl_report_message(get_location(l), HLSL_LEVEL_ERROR, - "modifier '%s' already specified", debug_modifiers(mod)); - return modifiers; - } - if (mod & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) - && modifiers & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR)) - { - hlsl_report_message(get_location(l), HLSL_LEVEL_ERROR, "more than one matrix majority keyword"); - return modifiers; - } - return modifiers | mod; -} - static void dump_function_decl(struct wine_rb_entry *entry, void *context) { struct hlsl_ir_function_decl *func = WINE_RB_ENTRY_VALUE(entry, struct hlsl_ir_function_decl, entry);

1 0

Zebediah Figura : d3dcompiler/tests: Add a test for SM4 constant buffers.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: 7f39f2bae02755224ec647572f43ff2c0ad674ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f39f2bae02755224ec64757… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 13 17:34:53 2020 +0100 d3dcompiler/tests: Add a test for SM4 constant buffers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 164 +++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c index ed95457f1c..8e37976d5a 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c @@ -523,6 +523,168 @@ static void test_trig(void) release_test_context(&test_context); } +static void check_type_desc(const char *prefix, const D3D11_SHADER_TYPE_DESC *type, + const D3D11_SHADER_TYPE_DESC *expect) +{ + ok(type->Class == expect->Class, "%s: got class %#x.\n", prefix, type->Class); + ok(type->Type == expect->Type, "%s: got type %#x.\n", prefix, type->Type); + ok(type->Rows == expect->Rows, "%s: got %u rows.\n", prefix, type->Rows); + ok(type->Columns == expect->Columns, "%s: got %u columns.\n", prefix, type->Columns); + ok(type->Elements == expect->Elements, "%s: got %u elements.\n", prefix, type->Elements); + ok(type->Members == expect->Members, "%s: got %u members.\n", prefix, type->Members); + ok(type->Offset == expect->Offset, "%s: got %u members.\n", prefix, type->Members); + ok(!strcmp(type->Name, expect->Name), "%s: got name %s.\n", prefix, debugstr_a(type->Name)); +} + +static void test_reflection(void) +{ + ID3D11ShaderReflectionConstantBuffer *cbuffer; + ID3D11ShaderReflectionType *type, *field; + D3D11_SHADER_BUFFER_DESC buffer_desc; + ID3D11ShaderReflectionVariable *var; + D3D11_SHADER_VARIABLE_DESC var_desc; + ID3D11ShaderReflection *reflection; + D3D11_SHADER_TYPE_DESC type_desc; + ID3D10Blob *vs_code = NULL; + unsigned int i, j, k; + ULONG refcount; + HRESULT hr; + + static const char vs_source[] = + "typedef uint uint_t;\n" + "cbuffer b1\n" + "{\n" + " float a;\n" + " float2 b;\n" + " float4 c;\n" + " float d;\n" + " struct\n" + " {\n" + " float4 a;\n" + " float b;\n" + " float c;\n" + " } s;\n" + " float g;\n" + " float h[2];\n" + " int i;\n" + " uint_t j;\n" + " float3x1 k;\n" + " row_major float3x1 l;\n" + "};\n" + "\n" + "float m;\n" + "\n" + "float4 main(uniform float4 n) : SV_POSITION\n" + "{\n" + " return l._31 + m + n;\n" + "}"; + + struct shader_variable + { + D3D11_SHADER_VARIABLE_DESC var_desc; + D3D11_SHADER_TYPE_DESC type_desc; + }; + + static const D3D11_SHADER_TYPE_DESC field_types[] = + { + {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}, + {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 16, "float"}, + {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 20, "float"}, + }; + + static const struct shader_variable globals_vars = + {{"m", 0, 4, D3D_SVF_USED}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}}; + static const struct shader_variable params_vars = + {{"n", 0, 16, D3D_SVF_USED}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}}; + static const struct shader_variable buffer_vars[] = + { + {{"a", 0, 4}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}}, + {{"b", 4, 8}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 2, 0, 0, 0, "float2"}}, + {{"c", 16, 16}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}}, + {{"d", 32, 4}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}}, + {{"s", 48, 24}, {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 6, 0, 3, 0, "<unnamed>"}}, + {{"g", 72, 4}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}}, + {{"h", 80, 20}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 2, 0, 0, "float"}}, + {{"i", 100, 4}, {D3D_SVC_SCALAR, D3D_SVT_INT, 1, 1, 0, 0, 0, "int"}}, + {{"j", 104, 4}, {D3D_SVC_SCALAR, D3D_SVT_UINT, 1, 1, 0, 0, 0, "uint_t"}}, + {{"k", 112, 12}, {D3D_SVC_MATRIX_COLUMNS, D3D_SVT_FLOAT, 3, 1, 0, 0, 0, "float3x1"}}, + {{"l", 128, 36, D3D_SVF_USED}, {D3D_SVC_MATRIX_ROWS, D3D_SVT_FLOAT, 3, 1, 0, 0, 0, "float3x1"}}, + }; + + static const struct + { + D3D11_SHADER_BUFFER_DESC desc; + const struct shader_variable *vars; + } + vs_buffers[] = + { + {{"$Globals", D3D_CT_CBUFFER, 1, 16}, &globals_vars}, + {{"$Params", D3D_CT_CBUFFER, 1, 16}, &params_vars}, + {{"b1", D3D_CT_CBUFFER, ARRAY_SIZE(buffer_vars), 176}, buffer_vars}, + }; + + todo_wine vs_code = compile_shader(vs_source, "vs_5_0"); + if (!vs_code) + return; + + hr = pD3DReflect(ID3D10Blob_GetBufferPointer(vs_code), ID3D10Blob_GetBufferSize(vs_code), + &IID_ID3D11ShaderReflection, (void **)&reflection); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(vs_buffers); ++i) + { + cbuffer = reflection->lpVtbl->GetConstantBufferByIndex(reflection, i); + hr = cbuffer->lpVtbl->GetDesc(cbuffer, &buffer_desc); + ok(hr == S_OK, "Test %u: got hr %#x.\n", i, hr); + ok(!strcmp(buffer_desc.Name, vs_buffers[i].desc.Name), + "Test %u: got name %s.\n", i, debugstr_a(buffer_desc.Name)); + ok(buffer_desc.Type == vs_buffers[i].desc.Type, "Test %u: got type %#x.\n", i, buffer_desc.Type); + ok(buffer_desc.Variables == vs_buffers[i].desc.Variables, + "Test %u: got %u variables.\n", i, buffer_desc.Variables); + ok(buffer_desc.Size == vs_buffers[i].desc.Size, "Test %u: got size %u.\n", i, buffer_desc.Size); + ok(buffer_desc.uFlags == vs_buffers[i].desc.uFlags, "Test %u: got flags %#x.\n", i, buffer_desc.uFlags); + + for (j = 0; j < buffer_desc.Variables; ++j) + { + const struct shader_variable *expect = &vs_buffers[i].vars[j]; + char prefix[40]; + + var = cbuffer->lpVtbl->GetVariableByIndex(cbuffer, j); + hr = var->lpVtbl->GetDesc(var, &var_desc); + ok(hr == S_OK, "Test %u, %u: got hr %#x.\n", i, j, hr); + ok(!strcmp(var_desc.Name, expect->var_desc.Name), + "Test %u, %u: got name %s.\n", i, j, debugstr_a(var_desc.Name)); + ok(var_desc.StartOffset == expect->var_desc.StartOffset, "Test %u, %u: got offset %u.\n", + i, j, var_desc.StartOffset); + ok(var_desc.Size == expect->var_desc.Size, "Test %u, %u: got size %u.\n", i, j, var_desc.Size); + ok(var_desc.uFlags == expect->var_desc.uFlags, "Test %u, %u: got flags %#x.\n", i, j, var_desc.uFlags); + ok(!var_desc.DefaultValue, "Test %u, %u: got default value %p.\n", i, j, var_desc.DefaultValue); + + type = var->lpVtbl->GetType(var); + hr = type->lpVtbl->GetDesc(type, &type_desc); + ok(hr == S_OK, "Test %u, %u: got hr %#x.\n", i, j, hr); + sprintf(prefix, "Test %u, %u", i, j); + check_type_desc(prefix, &type_desc, &expect->type_desc); + + if (!strcmp(type_desc.Name, "<unnamed>")) + { + for (k = 0; k < ARRAY_SIZE(field_types); ++k) + { + field = type->lpVtbl->GetMemberTypeByIndex(type, k); + hr = field->lpVtbl->GetDesc(field, &type_desc); + ok(hr == S_OK, "Test %u, %u, %u: got hr %#x.\n", i, j, k, hr); + sprintf(prefix, "Test %u, %u, %u", i, j, k); + check_type_desc(prefix, &type_desc, &field_types[k]); + } + } + } + } + + ID3D10Blob_Release(vs_code); + refcount = reflection->lpVtbl->Release(reflection); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); +} + static BOOL load_d3dcompiler(void) { HMODULE module; @@ -548,6 +710,8 @@ START_TEST(hlsl_d3d11) return; } + test_reflection(); + if (!(mod = LoadLibraryA("d3d11.dll"))) { skip("Direct3D 11 is not available.\n");

1 0

Zebediah Figura : wined3d: Move the color masks to wined3d_blend_state.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: f396b49a92029051d1c454286bf8028ff84214a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f396b49a92029051d1c45428… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 12 23:25:02 2020 -0500 wined3d: Move the color masks to wined3d_blend_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 3 +- dlls/d3d11/device.c | 28 ++-------- dlls/d3d11/state.c | 5 +- dlls/d3d11/tests/d3d11.c | 6 +-- dlls/wined3d/context.c | 8 +-- dlls/wined3d/device.c | 29 ++++++++-- dlls/wined3d/state.c | 111 ++++++++++----------------------------- dlls/wined3d/surface.c | 5 +- include/wine/wined3d.h | 1 + 9 files changed, 63 insertions(+), 133 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f396b49a92029051d1c4…

1 0

Nikolay Sivov : mf: Use single list for topology nodes in current presentation.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: 2eb80e12786d701135905e622bdc97b6fe13ba99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eb80e12786d701135905e62… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 15:34:31 2020 +0300 mf: Use single list for topology nodes in current presentation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 325 ++++++++++++++++++++++++++---------------------------- 1 file changed, 155 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2eb80e12786d70113590…

1 0

Nikolay Sivov : mf/tests: Add a test for default node attributes.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: 38f94b48126c588734ce57981dafab25c1709521 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38f94b48126c588734ce5798… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 15:34:32 2020 +0300 mf/tests: Add a test for default node attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index d799446676..dfbd928f60 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -150,6 +150,17 @@ static void test_topology(void) IMFTopology_Release(topology2); + /* No attributes by default. */ + for (node_type = MF_TOPOLOGY_OUTPUT_NODE; node_type < MF_TOPOLOGY_TEE_NODE; ++node_type) + { + hr = MFCreateTopologyNode(node_type, &node); + ok(hr == S_OK, "Failed to create a node for type %d, hr %#x.\n", node_type, hr); + hr = IMFTopologyNode_GetCount(node, &count); + ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); + ok(!count, "Unexpected attribute count %u.\n", count); + IMFTopologyNode_Release(node); + } + hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr);

1 0