- Wine-Commits - list.winehq.org

Francisco Casas : vkd3d-shader/hlsl: Use values at the time of the swizzle's load in copy-propagation.
by Alexandre Julliard Nov. 29, 2023

Nov. 29, 2023

Module: vkd3d Branch: master Commit: 736f3ae2df476108c64604ae462241d2d9008f2f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/736f3ae2df476108c64604ae46224… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Nov 21 19:48:50 2023 -0300 vkd3d-shader/hlsl: Use values at the time of the swizzle's load in copy-propagation. This preempts us from replacing a swizzle incorrectly, as in the following example: 1: A.x = 1.0 2: A 3: A.x = 2.0 4: @2.x were @4 ends up being 2.0 instead of 1.0, because that's the value stored in A.x at time 4, and we should be querying it at time 2. This also helps us to avoid replacing a swizzle with itself in copy-prop which can result in infinite loops, as with the included tests this commit. Consider the following sequence of instructions: 1 : A 2 : B = @1 3 : B 4 : A = @3 5 : @1.x Current copy-prop would replace 5 so it points to @3 now: 1 : A 2 : B = @1 3 : B 4 : A = @3 5 : @3.x But in the next iteration it would make it point back to @1, keeping it spinning infinitively. The solution is to index the instructions and don't replace the swizzle if the new load happens after the current load. --- libs/vkd3d-shader/hlsl_codegen.c | 20 ++++++++----- tests/hlsl/hard-copy-prop.shader_test | 55 +++++++++++++++++++++++++++++++++-- 2 files changed, 65 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index e4bf0bc6..4a622185 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1518,12 +1518,14 @@ static void copy_propagation_set_value(struct hlsl_ctx *ctx, struct copy_propaga } static bool copy_propagation_replace_with_single_instr(struct hlsl_ctx *ctx, - const struct copy_propagation_state *state, const struct hlsl_deref *deref, + const struct copy_propagation_state *state, const struct hlsl_ir_load *load, unsigned int swizzle, struct hlsl_ir_node *instr) { const unsigned int instr_component_count = hlsl_type_component_count(instr->data_type); + const struct hlsl_deref *deref = &load->src; const struct hlsl_ir_var *var = deref->var; struct hlsl_ir_node *new_instr = NULL; + unsigned int time = load->node.index; unsigned int start, count, i; unsigned int ret_swizzle = 0; @@ -1535,7 +1537,7 @@ static bool copy_propagation_replace_with_single_instr(struct hlsl_ctx *ctx, struct copy_propagation_value *value; if (!(value = copy_propagation_get_value(state, var, start + hlsl_swizzle_get_component(swizzle, i), - instr->index))) + time))) return false; if (!new_instr) @@ -1570,12 +1572,14 @@ static bool copy_propagation_replace_with_single_instr(struct hlsl_ctx *ctx, } static bool copy_propagation_replace_with_constant_vector(struct hlsl_ctx *ctx, - const struct copy_propagation_state *state, const struct hlsl_deref *deref, + const struct copy_propagation_state *state, const struct hlsl_ir_load *load, unsigned int swizzle, struct hlsl_ir_node *instr) { const unsigned int instr_component_count = hlsl_type_component_count(instr->data_type); + const struct hlsl_deref *deref = &load->src; const struct hlsl_ir_var *var = deref->var; struct hlsl_constant_value values = {0}; + unsigned int time = load->node.index; unsigned int start, count, i; struct hlsl_ir_node *cons; @@ -1587,7 +1591,7 @@ static bool copy_propagation_replace_with_constant_vector(struct hlsl_ctx *ctx, struct copy_propagation_value *value; if (!(value = copy_propagation_get_value(state, var, start + hlsl_swizzle_get_component(swizzle, i), - instr->index)) || value->node->type != HLSL_IR_CONSTANT) + time)) || value->node->type != HLSL_IR_CONSTANT) return false; values.u[i] = hlsl_ir_constant(value->node)->value.u[value->component]; @@ -1624,10 +1628,10 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx, return false; } - if (copy_propagation_replace_with_constant_vector(ctx, state, &load->src, HLSL_SWIZZLE(X, Y, Z, W), &load->node)) + if (copy_propagation_replace_with_constant_vector(ctx, state, load, HLSL_SWIZZLE(X, Y, Z, W), &load->node)) return true; - if (copy_propagation_replace_with_single_instr(ctx, state, &load->src, HLSL_SWIZZLE(X, Y, Z, W), &load->node)) + if (copy_propagation_replace_with_single_instr(ctx, state, load, HLSL_SWIZZLE(X, Y, Z, W), &load->node)) return true; return false; @@ -1642,10 +1646,10 @@ static bool copy_propagation_transform_swizzle(struct hlsl_ctx *ctx, return false; load = hlsl_ir_load(swizzle->val.node); - if (copy_propagation_replace_with_constant_vector(ctx, state, &load->src, swizzle->swizzle, &swizzle->node)) + if (copy_propagation_replace_with_constant_vector(ctx, state, load, swizzle->swizzle, &swizzle->node)) return true; - if (copy_propagation_replace_with_single_instr(ctx, state, &load->src, swizzle->swizzle, &swizzle->node)) + if (copy_propagation_replace_with_single_instr(ctx, state, load, swizzle->swizzle, &swizzle->node)) return true; return false; diff --git a/tests/hlsl/hard-copy-prop.shader_test b/tests/hlsl/hard-copy-prop.shader_test index 52746b4f..8d20425f 100644 --- a/tests/hlsl/hard-copy-prop.shader_test +++ b/tests/hlsl/hard-copy-prop.shader_test @@ -18,7 +18,58 @@ float4 main() : sv_target [test] uniform 0 float 0.0 draw quad -todo(sm<6) probe all rgba (2.0, 2.0, 2.0, 2.0) +probe all rgba (2.0, 2.0, 2.0, 2.0) uniform 0 float 1.0 draw quad -todo(sm<6) probe all rgba (-2.0, -2.0, -2.0, -2.0) +probe all rgba (-2.0, -2.0, -2.0, -2.0) + + +[pixel shader] +float cond; + +float4 main() : sv_target +{ + float2 r = {1, 2}; + float2 tmp; + + // invalidate r + if (cond) + r = float2(10, 20); + + tmp = r; + r = tmp; + return r.y; +} + +[test] +uniform 0 float 0.0 +draw quad +probe all rgba (2.0, 2.0, 2.0, 2.0) +uniform 0 float 1.0 +draw quad +probe all rgba (20.0, 20.0, 20.0, 20.0) + + +[pixel shader] +float cond; + +float4 main() : sv_target +{ + float2 r = {3, 4}; + + // invalidate r + if (cond) + r = float2(30, 40); + + r = r; + r = float2(1, r.y); + + return float4(r, 0, 0); +} +[test] +uniform 0 float 0.0 +draw quad +probe all rgba (1.0, 4.0, 0.0, 0.0) +uniform 0 float 1.0 +draw quad +probe all rgba (1.0, 40.0, 0.0, 0.0)

1 0

Francisco Casas : tests: Test current failure when propagating swizzles.
by Alexandre Julliard Nov. 29, 2023

Nov. 29, 2023

Module: vkd3d Branch: master Commit: e6b7b38a29184ef1d36aad6b9fef3de4c3c86df2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e6b7b38a29184ef1d36aad6b9fef3… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Nov 23 12:59:31 2023 -0300 tests: Test current failure when propagating swizzles. The included test fails because copy_propagation_transform_swizzle() is using the value recorded for the variable when the swizzle is being read, and not the swizzle's load. --- Makefile.am | 1 + tests/hlsl/hard-copy-prop.shader_test | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/Makefile.am b/Makefile.am index c92d7b83..2616a857 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,6 +103,7 @@ vkd3d_shader_tests = \ tests/hlsl/gather.shader_test \ tests/hlsl/getdimensions.shader_test \ tests/hlsl/half.shader_test \ + tests/hlsl/hard-copy-prop.shader_test \ tests/hlsl/initializer-flatten.shader_test \ tests/hlsl/initializer-implicit-array.shader_test \ tests/hlsl/initializer-invalid-arg-count.shader_test \ diff --git a/tests/hlsl/hard-copy-prop.shader_test b/tests/hlsl/hard-copy-prop.shader_test new file mode 100644 index 00000000..52746b4f --- /dev/null +++ b/tests/hlsl/hard-copy-prop.shader_test @@ -0,0 +1,24 @@ +[pixel shader] +float cond; + +float4 main() : sv_target +{ + float4 a = {1, 2, 3, 4}; + float4 b; + + // invalidate a + if (cond) + a = float4(-1, -2, -3, -4); + + b = a; + a.y = 357; + return b.y; +} + +[test] +uniform 0 float 0.0 +draw quad +todo(sm<6) probe all rgba (2.0, 2.0, 2.0, 2.0) +uniform 0 float 1.0 +draw quad +todo(sm<6) probe all rgba (-2.0, -2.0, -2.0, -2.0)

1 0

Francisco Casas : vkd3d-shader/hlsl: Move index_instructions() up.
by Alexandre Julliard Nov. 29, 2023

Nov. 29, 2023

Module: vkd3d Branch: master Commit: 539294daea4fbb279fe50ea50cb9eeadd8aa5620 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/539294daea4fbb279fe50ea50cb9e… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Nov 17 15:29:54 2023 -0300 vkd3d-shader/hlsl: Move index_instructions() up. --- libs/vkd3d-shader/hlsl_codegen.c | 74 ++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 628de796..8c1a2020 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1203,6 +1203,43 @@ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, s return false; } +/* Allocate a unique, ordered index to each instruction, which will be used for + * computing liveness ranges. + * Index 0 means unused; index 1 means function entry, so start at 2. */ +static unsigned int index_instructions(struct hlsl_block *block, unsigned int index) +{ + struct hlsl_ir_node *instr; + + LIST_FOR_EACH_ENTRY(instr, &block->instrs, struct hlsl_ir_node, entry) + { + instr->index = index++; + + if (instr->type == HLSL_IR_IF) + { + struct hlsl_ir_if *iff = hlsl_ir_if(instr); + index = index_instructions(&iff->then_block, index); + index = index_instructions(&iff->else_block, index); + } + else if (instr->type == HLSL_IR_LOOP) + { + index = index_instructions(&hlsl_ir_loop(instr)->body, index); + hlsl_ir_loop(instr)->next_index = index; + } + else if (instr->type == HLSL_IR_SWITCH) + { + struct hlsl_ir_switch *s = hlsl_ir_switch(instr); + struct hlsl_ir_switch_case *c; + + LIST_FOR_EACH_ENTRY(c, &s->cases, struct hlsl_ir_switch_case, entry) + { + index = index_instructions(&c->body, index); + } + } + } + + return index; +} + /* * Copy propagation. The basic idea is to recognize instruction sequences of the * form: @@ -3240,42 +3277,6 @@ static bool dce(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) return false; } -/* Allocate a unique, ordered index to each instruction, which will be used for - * computing liveness ranges. */ -static unsigned int index_instructions(struct hlsl_block *block, unsigned int index) -{ - struct hlsl_ir_node *instr; - - LIST_FOR_EACH_ENTRY(instr, &block->instrs, struct hlsl_ir_node, entry) - { - instr->index = index++; - - if (instr->type == HLSL_IR_IF) - { - struct hlsl_ir_if *iff = hlsl_ir_if(instr); - index = index_instructions(&iff->then_block, index); - index = index_instructions(&iff->else_block, index); - } - else if (instr->type == HLSL_IR_LOOP) - { - index = index_instructions(&hlsl_ir_loop(instr)->body, index); - hlsl_ir_loop(instr)->next_index = index; - } - else if (instr->type == HLSL_IR_SWITCH) - { - struct hlsl_ir_switch *s = hlsl_ir_switch(instr); - struct hlsl_ir_switch_case *c; - - LIST_FOR_EACH_ENTRY(c, &s->cases, struct hlsl_ir_switch_case, entry) - { - index = index_instructions(&c->body, index); - } - } - } - - return index; -} - static void dump_function(struct rb_entry *entry, void *context) { struct hlsl_ir_function *func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); @@ -3518,7 +3519,6 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl struct hlsl_scope *scope; struct hlsl_ir_var *var; - /* Index 0 means unused; index 1 means function entry, so start at 2. */ index_instructions(&entry_func->body, 2); LIST_FOR_EACH_ENTRY(scope, &ctx->scopes, struct hlsl_scope, entry)

1 0

Francisco Casas : vkd3d-shader/hlsl: Record trace of stored values in copy-propagation.
by Alexandre Julliard Nov. 29, 2023

Nov. 29, 2023

Module: vkd3d Branch: master Commit: d877b877b3d10916a2169b2d049d050955c7159b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d877b877b3d10916a2169b2d049d0… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Nov 21 19:09:32 2023 -0300 vkd3d-shader/hlsl: Record trace of stored values in copy-propagation. Instead of only storing the value that each variable's component has at the moment of the instruction currently handled by copy-prop, we store the trace of all the historic values with their timestamps, i.e. the instruction index on which the value was stored. This would allow us to query the value that the variable had at the time of execution of previous instructions. --- libs/vkd3d-shader/hlsl_codegen.c | 166 ++++++++++++++++++++++++++------------- 1 file changed, 110 insertions(+), 56 deletions(-)

1 0

Jactry Zeng : ntdll: Use different variable names for Mac locales.
by Alexandre Julliard Nov. 28, 2023

Nov. 28, 2023

Module: wine Branch: master Commit: c2f4619db9f0f018ea7a2ac1eba343763423dc4f URL: https://gitlab.winehq.org/wine/wine/-/commit/c2f4619db9f0f018ea7a2ac1eba343… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Nov 28 09:33:08 2023 +0100 ntdll: Use different variable names for Mac locales. --- dlls/ntdll/unix/env.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 5a58911c759..6b249917cfe 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -807,9 +807,9 @@ static void init_locale(void) #ifdef __APPLE__ if (!system_locale[0]) { - CFLocaleRef locale = CFLocaleCopyCurrent(); - CFStringRef lang = CFLocaleGetValue( locale, kCFLocaleLanguageCode ); - CFStringRef country = CFLocaleGetValue( locale, kCFLocaleCountryCode ); + CFLocaleRef mac_sys_locale = CFLocaleCopyCurrent(); + CFStringRef lang = CFLocaleGetValue( mac_sys_locale, kCFLocaleLanguageCode ); + CFStringRef country = CFLocaleGetValue( mac_sys_locale, kCFLocaleCountryCode ); CFStringRef locale_string; if (country) @@ -818,7 +818,7 @@ static void init_locale(void) locale_string = CFStringCreateCopy(NULL, lang); CFStringGetCString(locale_string, system_locale, sizeof(system_locale), kCFStringEncodingUTF8); - CFRelease(locale); + CFRelease(mac_sys_locale); CFRelease(locale_string); } if (!user_locale[0]) @@ -833,13 +833,13 @@ static void init_locale(void) { CFStringRef lang = CFDictionaryGetValue( components, kCFLocaleLanguageCode ); CFStringRef country = CFDictionaryGetValue( components, kCFLocaleCountryCode ); - CFLocaleRef locale = NULL; + CFLocaleRef mac_user_locale = NULL; CFStringRef locale_string; if (!country) { - locale = CFLocaleCopyCurrent(); - country = CFLocaleGetValue( locale, kCFLocaleCountryCode ); + mac_user_locale = CFLocaleCopyCurrent(); + country = CFLocaleGetValue( mac_user_locale, kCFLocaleCountryCode ); } if (country) locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@-%@"), lang, country ); @@ -847,7 +847,7 @@ static void init_locale(void) locale_string = CFStringCreateCopy( NULL, lang ); CFStringGetCString( locale_string, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 ); CFRelease( locale_string ); - if (locale) CFRelease( locale ); + if (mac_user_locale) CFRelease( mac_user_locale ); CFRelease( components ); } }

1 0

Jactry Zeng : ntdll: Try harder to fallback to neutral locales.
by Alexandre Julliard Nov. 28, 2023

Nov. 28, 2023

Module: wine Branch: master Commit: 1967d7cd4de8cae388231235a4da25cd97041f21 URL: https://gitlab.winehq.org/wine/wine/-/commit/1967d7cd4de8cae388231235a4da25… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Nov 28 09:33:21 2023 +0100 ntdll: Try harder to fallback to neutral locales. --- dlls/ntdll/unix/env.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 1110acfd0fd..4fd3254b2d2 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -799,6 +799,7 @@ static void init_locale(void) struct locale_nls_header *header; const NLS_LOCALE_HEADER *locale_table; const NLS_LOCALE_DATA *locale; + char *p; setlocale( LC_ALL, "" ); if (!unix_to_win_locale( setlocale( LC_CTYPE, NULL ), system_locale )) system_locale[0] = 0; @@ -863,10 +864,21 @@ static void init_locale(void) if ((header = read_nls_file( "locale.nls" ))) { locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales); - if ((locale = get_win_locale( locale_table, system_locale )) && locale->idefaultlanguage != LOCALE_CUSTOM_UNSPECIFIED) + while (!(locale = get_win_locale( locale_table, system_locale ))) + { + if (!(p = strrchr( system_locale, '-' ))) break; + *p = 0; + } + if (locale && locale->idefaultlanguage != LOCALE_CUSTOM_UNSPECIFIED) system_lcid = locale->idefaultlanguage; - if ((locale = get_win_locale( locale_table, user_locale ))) - user_lcid = locale->idefaultlanguage; + + while (!(locale = get_win_locale( locale_table, user_locale ))) + { + if (!(p = strrchr( user_locale, '-' ))) break; + *p = 0; + } + if (locale) user_lcid = locale->idefaultlanguage; + free( header ); } if (!system_lcid) system_lcid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT );

1 0

Alex Henrie : d3dx9_36/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 28, 2023

Nov. 28, 2023

Module: wine Branch: master Commit: bc13bda5ee4edaafa7ba9472d41acbad50c42112 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc13bda5ee4edaafa7ba9472d41acb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 27 20:12:18 2023 -0700 d3dx9_36/tests: Use CRT allocation functions. --- dlls/d3dx9_36/tests/asm.c | 12 ++++++------ dlls/d3dx9_36/tests/effect.c | 38 ++++++++++++++++---------------------- dlls/d3dx9_36/tests/surface.c | 4 ++-- dlls/d3dx9_36/tests/xfile.c | 4 ++-- 4 files changed, 26 insertions(+), 32 deletions(-)

1 0

Alex Henrie : comdlg32/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 28, 2023

Nov. 28, 2023

Module: wine Branch: master Commit: 14158bb57fac6194e33a284aa094c9c947e1ada4 URL: https://gitlab.winehq.org/wine/wine/-/commit/14158bb57fac6194e33a284aa094c9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 27 20:17:32 2023 -0700 comdlg32/tests: Use CRT allocation functions. --- dlls/comdlg32/tests/fontdlg.c | 4 ++-- dlls/comdlg32/tests/itemdlg.c | 4 ++-- dlls/comdlg32/tests/printdlg.c | 21 ++++++++++----------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/comdlg32/tests/fontdlg.c b/dlls/comdlg32/tests/fontdlg.c index a96e6dc1590..cbcfd34a21f 100644 --- a/dlls/comdlg32/tests/fontdlg.c +++ b/dlls/comdlg32/tests/fontdlg.c @@ -57,14 +57,14 @@ static HDC get_printer_ic(void) if (info_size == 0) return NULL; - info = HeapAlloc(GetProcessHeap(), 0, info_size); + info = malloc(info_size); ret = EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 2, (LPBYTE)info, info_size, &info_size, &num_printers); if (ret) result = CreateICA(info->pDriverName, info->pPrinterName, NULL, NULL); - HeapFree(GetProcessHeap(), 0, info); + free(info); return result; } diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 15c898adc50..573a267a37e 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -150,7 +150,7 @@ static ULONG WINAPI IFileDialogEvents_fnRelease(IFileDialogEvents *iface) LONG ref = InterlockedDecrement(&This->ref); if(!ref) - HeapFree(GetProcessHeap(), 0, This); + free(This); return ref; } @@ -325,7 +325,7 @@ static IFileDialogEvents *IFileDialogEvents_Constructor(void) { IFileDialogEventsImpl *This; - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IFileDialogEventsImpl)); + This = calloc(1, sizeof(IFileDialogEventsImpl)); This->IFileDialogEvents_iface.lpVtbl = &vt_IFileDialogEvents; This->ref = 1; diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index ad8ddf0a7f7..7fd4567ba9e 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -59,7 +59,7 @@ static void test_PageSetupDlgA(void) LPPAGESETUPDLGA pDlg; DWORD res; - pDlg = HeapAlloc(GetProcessHeap(), 0, (sizeof(PAGESETUPDLGA)) * 2); + pDlg = malloc((sizeof(PAGESETUPDLGA)) * 2); if (!pDlg) return; SetLastError(0xdeadbeef); @@ -97,7 +97,7 @@ static void test_PageSetupDlgA(void) if (!res && (CommDlgExtendedError() == PDERR_NODEFAULTPRN)) { skip("No printer configured.\n"); - HeapFree(GetProcessHeap(), 0, pDlg); + free(pDlg); return; } @@ -108,8 +108,7 @@ static void test_PageSetupDlgA(void) GlobalFree(pDlg->hDevMode); GlobalFree(pDlg->hDevNames); - HeapFree(GetProcessHeap(), 0, pDlg); - + free(pDlg); } /* ########################### */ @@ -138,7 +137,7 @@ static void test_PrintDlgA(void) LPSTR ptr; DEVMODEA *dm; - pDlg = HeapAlloc(GetProcessHeap(), 0, (sizeof(PRINTDLGA)) * 2); + pDlg = malloc((sizeof(PRINTDLGA)) * 2); if (!pDlg) return; @@ -178,7 +177,7 @@ static void test_PrintDlgA(void) if (!res && (CommDlgExtendedError() == PDERR_NODEFAULTPRN)) { skip("No printer configured.\n"); - HeapFree(GetProcessHeap(), 0, pDlg); + free(pDlg); return; } @@ -269,7 +268,7 @@ static void test_PrintDlgA(void) GlobalFree(pDlg->hDevNames); } - HeapFree(GetProcessHeap(), 0, pDlg); + free(pDlg); } /* ########################### */ @@ -390,7 +389,7 @@ static void test_PrintDlgExW(void) res, GetLastError(), CommDlgExtendedError() ); } - pDlg = HeapAlloc(GetProcessHeap(), 0, (sizeof(PRINTDLGEXW)) + 8); + pDlg = malloc(sizeof(PRINTDLGEXW) + 8); if (!pDlg) return; /* lStructSize must be exact */ @@ -471,7 +470,7 @@ static void test_PrintDlgExW(void) if (res == E_FAIL) { skip("No printer configured.\n"); - HeapFree(GetProcessHeap(), 0, pDlg); + free(pDlg); return; } @@ -533,7 +532,7 @@ static void test_PrintDlgExW(void) if (!winetest_interactive) { skip("interactive PrintDlgEx tests (set WINETEST_INTERACTIVE=1)\n"); - HeapFree(GetProcessHeap(), 0, pDlg); + free(pDlg); return; } @@ -552,7 +551,7 @@ static void test_PrintDlgExW(void) GlobalFree(pDlg->hDevNames); DeleteDC(pDlg->hDC); - HeapFree(GetProcessHeap(), 0, pDlg); + free(pDlg); } static BOOL abort_proc_called = FALSE;

1 0

Jactry Zeng : ntdll: Initialize locale from Mac language identifiers with script name.
by Alexandre Julliard Nov. 28, 2023

Nov. 28, 2023

Module: wine Branch: master Commit: 730bdf6c5c0d35eabd2563cc65e3e4208e5a306f URL: https://gitlab.winehq.org/wine/wine/-/commit/730bdf6c5c0d35eabd2563cc65e3e4… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Nov 28 09:33:15 2023 +0100 ntdll: Initialize locale from Mac language identifiers with script name. --- dlls/ntdll/unix/env.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 6b249917cfe..1110acfd0fd 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -833,6 +833,7 @@ static void init_locale(void) { CFStringRef lang = CFDictionaryGetValue( components, kCFLocaleLanguageCode ); CFStringRef country = CFDictionaryGetValue( components, kCFLocaleCountryCode ); + CFStringRef script = CFDictionaryGetValue( components, kCFLocaleScriptCode ); CFLocaleRef mac_user_locale = NULL; CFStringRef locale_string; @@ -841,7 +842,11 @@ static void init_locale(void) mac_user_locale = CFLocaleCopyCurrent(); country = CFLocaleGetValue( mac_user_locale, kCFLocaleCountryCode ); } - if (country) + if (country && script) + locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@-%@-%@"), lang, script, country ); + else if (script) + locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@-%@"), lang, script ); + else if (country) locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@-%@"), lang, country ); else locale_string = CFStringCreateCopy( NULL, lang );

1 0

Alexandre Julliard : opencl: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 28, 2023

Nov. 28, 2023

Module: wine Branch: master Commit: 9b2353c3b3d6d40ed0f4986ee8f1db99a20ee1d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b2353c3b3d6d40ed0f4986ee8f1db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 28 21:53:07 2023 +0100 opencl: Remove DECLSPEC_HIDDEN usage. --- dlls/opencl/opencl_private.h | 2 +- dlls/opencl/unix_private.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/opencl/opencl_private.h b/dlls/opencl/opencl_private.h index 28968296221..aabfe70cea3 100644 --- a/dlls/opencl/opencl_private.h +++ b/dlls/opencl/opencl_private.h @@ -31,7 +31,7 @@ #include "wine/unixlib.h" #include "wine/debug.h" -BOOL extension_is_supported( const char *name, size_t len ) DECLSPEC_HIDDEN; +BOOL extension_is_supported( const char *name, size_t len ); #define OPENCL_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params ) diff --git a/dlls/opencl/unix_private.h b/dlls/opencl/unix_private.h index 4344c69f0b0..49ac2102dfc 100644 --- a/dlls/opencl/unix_private.h +++ b/dlls/opencl/unix_private.h @@ -44,13 +44,13 @@ #include "unixlib.h" -NTSTATUS wrap_clBuildProgram( void *args ) DECLSPEC_HIDDEN; -NTSTATUS wrap_clCreateContext( void *args ) DECLSPEC_HIDDEN; -NTSTATUS wrap_clCreateContextFromType( void *args ) DECLSPEC_HIDDEN; -NTSTATUS wrap_clEnqueueNativeKernel( void *args ) DECLSPEC_HIDDEN; -NTSTATUS wrap_clSetEventCallback( void *args ) DECLSPEC_HIDDEN; -NTSTATUS wrap_clSetMemObjectDestructorCallback( void *args ) DECLSPEC_HIDDEN; -NTSTATUS wrap_clCompileProgram( void *args ) DECLSPEC_HIDDEN; -NTSTATUS wrap_clLinkProgram( void *args ) DECLSPEC_HIDDEN; +NTSTATUS wrap_clBuildProgram( void *args ); +NTSTATUS wrap_clCreateContext( void *args ); +NTSTATUS wrap_clCreateContextFromType( void *args ); +NTSTATUS wrap_clEnqueueNativeKernel( void *args ); +NTSTATUS wrap_clSetEventCallback( void *args ); +NTSTATUS wrap_clSetMemObjectDestructorCallback( void *args ); +NTSTATUS wrap_clCompileProgram( void *args ); +NTSTATUS wrap_clLinkProgram( void *args ); #endif

1 0