- Wine-Devel - list.winehq.org

[PATCH 5/9] ole32: Use nameless unions.
by Jacek Caban March 22, 2021

March 22, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/Makefile.in | 2 +- dlls/ole32/stg_prop.c | 206 ++++++++++++++++++++--------------------- 2 files changed, 104 insertions(+), 104 deletions(-)

1 0

[PATCH 4/9] wininet: Use nameless structs and unions.
by Jacek Caban March 22, 2021

March 22, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/Makefile.in | 1 - dlls/wininet/urlcache.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-)

1 0

[PATCH 2/9] combase: Use nameless unions.
by Jacek Caban March 22, 2021

March 22, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/combase/Makefile.in | 1 - dlls/combase/combase.c | 156 +++++++++++++++++++-------------------- 2 files changed, 78 insertions(+), 79 deletions(-)

1 0

[PATCH 2/3] include: Use nameless unions in dxva2api.idl helpers.
by Jacek Caban March 22, 2021

March 22, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50836 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mfplat/Makefile.in | 1 - dlls/mfplat/main.c | 62 ++++++++++++++++++------------------ dlls/mfplat/mfplat_private.h | 14 ++++---- dlls/mfreadwrite/Makefile.in | 1 - dlls/mfreadwrite/reader.c | 10 +++--- include/dxva2api.idl | 13 ++++---- 6 files changed, 49 insertions(+), 52 deletions(-)

2 1

[PATCH vkd3d 1/5] vkd3d-shader: Rename hlsl_type_compare() to hlsl_types_are_equal().
by Zebediah Figura March 22, 2021

March 22, 2021

hlsl_type_compare() implies a stable comparison function, as if to be passed to qsort(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 8 ++++---- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 14 +++++++------- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 988f64dc..cb13e8fd 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -230,7 +230,7 @@ unsigned int hlsl_type_component_count(struct hlsl_type *type) return count; } -bool hlsl_type_compare(const struct hlsl_type *t1, const struct hlsl_type *t2) +bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2) { if (t1 == t2) return true; @@ -259,7 +259,7 @@ bool hlsl_type_compare(const struct hlsl_type *t1, const struct hlsl_type *t2) { t1field = LIST_ENTRY(t1cur, struct hlsl_struct_field, entry); t2field = LIST_ENTRY(t2cur, struct hlsl_struct_field, entry); - if (!hlsl_type_compare(t1field->type, t2field->type)) + if (!hlsl_types_are_equal(t1field->type, t2field->type)) return false; if (strcmp(t1field->name, t2field->name)) return false; @@ -271,7 +271,7 @@ bool hlsl_type_compare(const struct hlsl_type *t1, const struct hlsl_type *t2) } if (t1->type == HLSL_CLASS_ARRAY) return t1->e.array.elements_count == t2->e.array.elements_count - && hlsl_type_compare(t1->e.array.type, t2->e.array.type); + && hlsl_types_are_equal(t1->e.array.type, t2->e.array.type); return true; } @@ -473,7 +473,7 @@ struct hlsl_ir_node *hlsl_new_binary_expr(enum hlsl_ir_expr_op op, struct hlsl_i { struct hlsl_ir_expr *expr; - assert(hlsl_type_compare(arg1->data_type, arg2->data_type)); + assert(hlsl_types_are_equal(arg1->data_type, arg2->data_type)); if (!(expr = vkd3d_calloc(1, sizeof(*expr)))) return NULL; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 92ac5270..c15a8d93 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -563,10 +563,10 @@ bool hlsl_scope_add_type(struct hlsl_scope *scope, struct hlsl_type *type) DECLS struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, unsigned int default_majority) DECLSPEC_HIDDEN; -bool hlsl_type_compare(const struct hlsl_type *t1, const struct hlsl_type *t2) DECLSPEC_HIDDEN; unsigned int hlsl_type_component_count(struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_type_is_row_major(const struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_type_is_void(const struct hlsl_type *type) DECLSPEC_HIDDEN; +bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2) DECLSPEC_HIDDEN; int hlsl_lexer_compile(struct hlsl_ctx *ctx, const struct vkd3d_shader_code *hlsl) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 47694751..af6c3976 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -169,7 +169,7 @@ static bool compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) if (t1->type == HLSL_CLASS_ARRAY) { - if (hlsl_type_compare(t1->e.array.type, t2)) + if (hlsl_types_are_equal(t1->e.array.type, t2)) /* e.g. float4[3] to float4 is allowed */ return true; @@ -226,7 +226,7 @@ static bool implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_typ || (t1->type <= HLSL_CLASS_LAST_NUMERIC && t2->type == HLSL_CLASS_ARRAY)) { /* e.g. float4[3] to float4 is allowed */ - if (t1->type == HLSL_CLASS_ARRAY && hlsl_type_compare(t1->e.array.type, t2)) + if (t1->type == HLSL_CLASS_ARRAY && hlsl_types_are_equal(t1->e.array.type, t2)) return true; if (hlsl_type_component_count(t1) == hlsl_type_component_count(t2)) return true; @@ -254,7 +254,7 @@ static bool implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_typ } if (t1->type == HLSL_CLASS_STRUCT && t2->type == HLSL_CLASS_STRUCT) - return hlsl_type_compare(t1, t2); + return hlsl_types_are_equal(t1, t2); return false; } @@ -265,7 +265,7 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct struct hlsl_type *src_type = node->data_type; struct hlsl_ir_expr *cast; - if (hlsl_type_compare(src_type, dst_type)) + if (hlsl_types_are_equal(src_type, dst_type)) return node; if (!implicit_compatible_data_types(src_type, dst_type)) @@ -1046,7 +1046,7 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type return NULL; } - if (hlsl_type_compare(t1, t2)) + if (hlsl_types_are_equal(t1, t2)) return t1; if (!expr_compatible_data_types(t1, t2)) @@ -1158,7 +1158,7 @@ static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, if (!operands[i]) break; - if (hlsl_type_compare(operands[i]->data_type, type)) + if (hlsl_types_are_equal(operands[i]->data_type, type)) continue; if (operands[i]->data_type->dimx * operands[i]->data_type->dimy != 1 && operands[i]->data_type->dimx * operands[i]->data_type->dimy != type->dimx * type->dimy) @@ -1799,7 +1799,7 @@ hlsl_prog: hlsl_note(ctx, decl->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously defined here.", $2.name); YYABORT; } - else if (!hlsl_type_compare(decl->return_type, $2.decl->return_type)) + else if (!hlsl_types_are_equal(decl->return_type, $2.decl->return_type)) { hlsl_error(ctx, $2.decl->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Function \"%s\" was already declared with a different return type.", $2.name); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 283a67e6..5b68a460 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -73,7 +73,7 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst if (expr->op != HLSL_IR_UNOP_CAST) return false; - if (hlsl_type_compare(src_type, dst_type) + if (hlsl_types_are_equal(src_type, dst_type) || (src_type->base_type == dst_type->base_type && is_vec1(src_type) && is_vec1(dst_type))) { replace_node(&expr->node, expr->operands[0].node); -- 2.30.1

6 21

[PATCH 1/3] include: Don't default to WINE_NO_NAMELESS_EXTENSION for Wine build.
by Jacek Caban March 22, 2021

March 22, 2021

2 1

[PATCH] include/dxva2api.idl: Fix build error when compiled as C++.
by Nikolay Sivov March 22, 2021

March 22, 2021

From: Liu Hao <lh_mouse(a)126.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50836 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/dxva2api.idl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/dxva2api.idl b/include/dxva2api.idl index 99c93518428..31cacbdcbd0 100644 --- a/include/dxva2api.idl +++ b/include/dxva2api.idl @@ -815,13 +815,15 @@ cpp_quote(" return f32;") cpp_quote("}") cpp_quote("") cpp_quote("static inline float DXVA2FixedToFloat(DXVA2_Fixed32 f32) {") -cpp_quote(" struct { USHORT Fraction; SHORT Value; } *_f32 = (void *)&f32;") +cpp_quote(" typedef struct { USHORT Fraction; SHORT Value; } fields;") +cpp_quote(" fields *_f32 = (fields *)(void *)&f32;") cpp_quote(" return (float)_f32->Value + (float)_f32->Fraction / (1 << 16);") cpp_quote("}") cpp_quote("") cpp_quote("static inline DXVA2_Fixed32 DXVA2FloatToFixed(float f) {") cpp_quote(" DXVA2_Fixed32 f32;") -cpp_quote(" struct { USHORT Fraction; SHORT Value; } *_f32 = (void *)&f32;") +cpp_quote(" typedef struct { USHORT Fraction; SHORT Value; } fields;") +cpp_quote(" fields *_f32 = (fields *)(void *)&f32;") cpp_quote(" _f32->Value = ((ULONG) (f * (1 << 16))) >> 16;") cpp_quote(" _f32->Fraction = ((ULONG) (f * (1 << 16))) & 0xFFFF;") cpp_quote(" return f32;") -- 2.30.2

2 1

[PATCH 3/3] ieframe: Use nameless unions.
by Jacek Caban March 22, 2021

March 22, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ieframe/Makefile.in | 1 - dlls/ieframe/intshcut.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-)

1 0

[PATCH] winetest: Guess when to append the .dll extension.
by Francois Gouget March 22, 2021

March 22, 2021

WineTest derives the dll name from the test executable filename. However the '.dll' extension is omitted in the executable filename. So if the guessed library name does not already have a three-letter extension (such as .ocx, .sys, etc.), assume it should have the '.dll' extension. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This allows WineTest to retrieve the version information for windows.media.speech.dll. This is pretty ugly but at least it's a simple patch. Plus three letters should be enough for any library extension ;-) --- programs/winetest/main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 225e9a2548b..6056dee2a75 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -901,7 +901,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP char filename[MAX_PATH]; WCHAR dllnameW[MAX_PATH]; HMODULE dll; - DWORD err; + DWORD err, len; HANDLE actctx; ULONG_PTR cookie; BOOL run; @@ -912,6 +912,14 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP CharLowerA(lpszName); strcpy(dllname, lpszName); *strstr(dllname, testexe) = 0; + len = strlen(dllname); + if (len >= 4 && dllname[len - 4] != '.') + { + /* If there is not a 3 characters extension already, + * assume it should be .dll. + */ + strcat(dllname, ".dll"); + } if (test_filtered_out( lpszName, NULL )) { -- 2.20.1

3 7

[PATCH] winetest: Fix detecting whether a test can be run or not.
by Francois Gouget March 22, 2021

March 22, 2021

Rather than second-guessing the loader, run 'test.exe --list' with the critical-error handler message box disabled and use the resulting exit codes. But keep the activation context and COM code to improve the chances of getting the dll version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45032 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50783 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Note that when a dll is missing (entirely / entry points / ordinals), it's not possible to issue 'skipped' lines because the test unit names are not even known. Also this introduces additional forms of the 'dll is missing' error in the 'Dll info' section, which winetest/dissect should understand in order to produce appropriate summary.txt files (that patch is in since yesterday). --- programs/winetest/main.c | 46 ++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 2e5fdc6ab8c..225e9a2548b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -608,11 +608,12 @@ static void append_path( const char *path) value of WaitForSingleObject. */ static int -run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms, DWORD* pid) +run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms, BOOL nocritical, DWORD* pid) { STARTUPINFOA si; PROCESS_INFORMATION pi; - DWORD wait, status; + DWORD wait, status, flags; + UINT old_errmode; /* Flush to disk so we know which test caused Windows to crash if it does */ if (out_file) @@ -623,14 +624,24 @@ run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms, DWORD* pid) si.hStdInput = GetStdHandle( STD_INPUT_HANDLE ); si.hStdOutput = out_file ? out_file : GetStdHandle( STD_OUTPUT_HANDLE ); si.hStdError = out_file ? out_file : GetStdHandle( STD_ERROR_HANDLE ); + if (nocritical) + { + old_errmode = SetErrorMode(0); + SetErrorMode(old_errmode | SEM_FAILCRITICALERRORS); + flags = 0; + } + else + flags = CREATE_DEFAULT_ERROR_MODE; - if (!CreateProcessA (NULL, cmd, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, + if (!CreateProcessA (NULL, cmd, NULL, NULL, TRUE, flags, NULL, tempdir, &si, &pi)) { + if (nocritical) SetErrorMode(old_errmode); if (pid) *pid = 0; return -2; } + if (nocritical) SetErrorMode(old_errmode); CloseHandle (pi.hThread); if (pid) *pid = pi.dwProcessId; status = wait_process( pi.hProcess, ms ); @@ -716,7 +727,7 @@ get_subtests (const char *tempdir, struct wine_test *test, LPSTR res_name) /* We need to add the path (to the main dll) to PATH */ append_path(test->maindllpath); } - status = run_ex (cmd, subfile, tempdir, 5000, NULL); + status = run_ex (cmd, subfile, tempdir, 5000, TRUE, NULL); err = GetLastError(); if (test->maindllpath) { /* Restore PATH again */ @@ -795,7 +806,7 @@ run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const ch char *cmd = strmake (NULL, "%s %s", test->exename, subtest); report (R_STEP, "Running: %s:%s", test->name, subtest); xprintf ("%s:%s start %s -\n", test->name, subtest, file); - status = run_ex (cmd, out_file, tempdir, 120000, &pid); + status = run_ex (cmd, out_file, tempdir, 120000, FALSE, &pid); heap_free (cmd); xprintf ("%s:%s:%04x done (%d) in %ds\n", test->name, subtest, pid, status, (GetTickCount()-start)/1000); if (status) failures++; @@ -946,12 +957,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP } run = TRUE; - if (!dll) - { - xprintf (" %s=dll is missing\n", dllname); - run = FALSE; - } - else + if (dll) { if (is_stub_dll(dllname)) { @@ -970,14 +976,26 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP if (run) { err = get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ); - if (!err) + switch (err) { + case 0: xprintf (" %s=%s\n", dllname, get_file_version(filename)); nr_of_tests += wine_tests[nr_of_files].subtest_count; nr_of_files++; - } - else + break; + case STATUS_DLL_NOT_FOUND: + xprintf (" %s=dll is missing\n", dllname); + break; + case STATUS_ORDINAL_NOT_FOUND: + xprintf (" %s=dll is missing an ordinal (%s)\n", dllname, get_file_version(filename)); + break; + case STATUS_ENTRYPOINT_NOT_FOUND: + xprintf (" %s=dll is missing an entrypoint (%s)\n", dllname, get_file_version(filename)); + break; + default: xprintf (" %s=load error %u\n", dllname, err); + break; + } } if (actctx != INVALID_HANDLE_VALUE) -- 2.20.1

1 1