January 2022 - Wine-Commits

Nikolay Sivov : tests: Fix shader tests crashes on WARP driver.
by Alexandre Julliard Jan. 7, 2022

Jan. 7, 2022

Module: vkd3d Branch: master Commit: 3a480415c1dd863756dbd391ad3348bff34c771a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3a480415c1dd863756dbd39… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 19 15:41:06 2021 +0300 tests: Fix shader tests crashes on WARP driver. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12_test_utils.h | 13 +++++++++++++ tests/shader_runner_d3d12.c | 7 ++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 5d900f8..f2ce922 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -956,6 +956,8 @@ struct test_context ID3D12CommandQueue *queue; ID3D12CommandAllocator *allocator; ID3D12GraphicsCommandList *list; + ID3D12PipelineState **pso; + size_t pso_count, pso_capacity; D3D12_RESOURCE_DESC render_target_desc; ID3D12Resource *render_target; @@ -1074,6 +1076,15 @@ static inline bool init_test_context_(unsigned int line, struct test_context *co return true; } +static inline void destroy_pipeline_state_objects(struct test_context *context) +{ + size_t i; + + for (i = 0; i < context->pso_count; ++i) + ID3D12PipelineState_Release(context->pso[i]); + context->pso_count = 0; +} + #define destroy_test_context(context) destroy_test_context_(__LINE__, context) static inline void destroy_test_context_(unsigned int line, struct test_context *context) { @@ -1092,6 +1103,8 @@ static inline void destroy_test_context_(unsigned int line, struct test_context ID3D12CommandAllocator_Release(context->allocator); ID3D12CommandQueue_Release(context->queue); ID3D12GraphicsCommandList_Release(context->list); + destroy_pipeline_state_objects(context); + free(context->pso); refcount = ID3D12Device_Release(context->device); ok_(line)(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index d404895..47f419b 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -419,10 +419,12 @@ static void parse_test_directive(struct shader_context *context, const char *lin hr = create_root_signature(context->c.device, &root_signature_desc, &context->c.root_signature); ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); - pso = create_pipeline_state(context->c.device, context->c.root_signature, - context->c.render_target_desc.Format, NULL, &ps, NULL); + pso = create_pipeline_state(context->c.device, context->c.root_signature, context->c.render_target_desc.Format, + NULL, &ps, NULL); if (!pso) return; + vkd3d_array_reserve((void **)&context->c.pso, &context->c.pso_capacity, context->c.pso_count + 1, sizeof(*context->c.pso)); + context->c.pso[context->c.pso_count++] = pso; ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->c.root_signature); if (context->uniform_count) @@ -439,7 +441,6 @@ static void parse_test_directive(struct shader_context *context, const char *lin ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->c.rtv, clear_color, 0, NULL); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); - ID3D12PipelineState_Release(pso); transition_resource_state(command_list, context->c.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); }

1 0

Zebediah Figura : vkd3d-compiler: Print usage instructions only if --help is specified.
by Alexandre Julliard Jan. 7, 2022

Jan. 7, 2022

Module: vkd3d Branch: master Commit: 1e2bcb04581506892f5b1c5c7687f1aac58b6467 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1e2bcb04581506892f5b1c5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Dec 25 22:43:12 2021 -0600 vkd3d-compiler: Print usage instructions only if --help is specified. vkd3d-compiler is hardly the only program to print usage instructions on all invalid invocations, but it's rather annoying to have one's whole screen wiped due to a typo. It also makes it hard to notice the actual error messages printed on e.g. `vkd3d-compiler -x`. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 4d7d628..4e56e8f 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -209,6 +209,7 @@ struct options enum vkd3d_shader_source_type source_type; enum vkd3d_shader_target_type target_type; bool preprocess_only; + bool print_help; bool print_version; bool print_source_types; bool print_target_types; @@ -446,6 +447,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->preprocess_only = true; break; + case 'h': + case OPTION_HELP: + options->print_help = true; + return true; + case OPTION_OUTPUT: case 'o': options->output_filename = optarg; @@ -623,9 +629,12 @@ int main(int argc, char **argv) int ret; if (!parse_command_line(argc, argv, &options)) + return 1; + + if (options.print_help) { print_usage(argv[0]); - return 1; + return 0; } if (options.print_version)

1 0

Zebediah Figura : include: Avoid using a field reference as a truth value.
by Alexandre Julliard Jan. 7, 2022

Jan. 7, 2022

Module: vkd3d Branch: master Commit: d0e539aec98d358a7c167eb8133b067de83941cd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d0e539aec98d358a7c167eb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 17 11:48:17 2021 -0600 include: Avoid using a field reference as a truth value. Ported from 5d01ebab89cee8a3499ee00729c048068d5b719d from Wine. Despite the commit message there, even GCC 11.1 chokes on this. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/rbtree.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/private/rbtree.h b/include/private/rbtree.h index b4993da..b5d38bc 100644 --- a/include/private/rbtree.h +++ b/include/private/rbtree.h @@ -133,7 +133,7 @@ static inline struct rb_entry *rb_postorder_next(struct rb_entry *iter) /* iterate through the tree using a tree entry */ #define RB_FOR_EACH_ENTRY(elem, tree, type, field) \ for ((elem) = RB_ENTRY_VALUE(rb_head((tree)->root), type, field); \ - &(elem)->field; \ + (elem) != RB_ENTRY_VALUE(0, type, field); \ (elem) = RB_ENTRY_VALUE(rb_next(&elem->field), type, field)) /* iterate through the tree using using postorder, making it safe to free the entry */ @@ -145,7 +145,7 @@ static inline struct rb_entry *rb_postorder_next(struct rb_entry *iter) /* iterate through the tree using a tree entry and postorder, making it safe to free the entry */ #define RB_FOR_EACH_ENTRY_DESTRUCTOR(elem, elem2, tree, type, field) \ for ((elem) = RB_ENTRY_VALUE(rb_postorder_head((tree)->root), type, field); \ - &(elem)->field \ + (elem) != WINE_RB_ENTRY_VALUE(0, type, field) \ && (((elem2) = RB_ENTRY_VALUE(rb_postorder_next(&(elem)->field), type, field)) || 1); \ (elem) = (elem2))

1 0

Francois Gouget : testbot/SetWinLocale: Add support for setting the code pages to UTF-8.
by Alexandre Julliard Jan. 7, 2022

Jan. 7, 2022

Module: tools Branch: master Commit: 11225689cb4c8bb041a65646022d20b8e300e7e9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=11225689cb4c8bb041a6564… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 6 18:02:25 2022 +0100 testbot/SetWinLocale: Add support for setting the code pages to UTF-8. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 67 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 64 insertions(+), 3 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 2f72253..c8f681a 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -47,6 +47,7 @@ my $HKCU_USER_PROFILE = "HKCU\\Control Panel\\International\\User Profile"; my $HKCU_DESKTOP = "HKCU\\Control Panel\\Desktop"; my $HKLM_LANGUAGE = "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Language"; my $HKLM_LOCALE = "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Locale"; +my $HKLM_CODE_PAGE = "HKLM\\System\\CurrentControlSet\\Control\\Nls\\CodePage"; # @@ -297,7 +298,7 @@ sub CheckLocale($$) } my ($OptHostName, $OptShow, $OptReboot); -my ($OptDefault, $OptLocale, $OptSystem, $OptMUI, $OptCountry, $OptKeyboard); +my ($OptDefault, $OptLocale, $OptSystem, $OptMUI, $OptCountry, $OptKeyboard, $OptUTF8); while (@ARGV) { my $Arg = shift @ARGV; @@ -351,6 +352,10 @@ while (@ARGV) { $OptCountry = CheckValue($Arg, $OptCountry); } + elsif ($Arg eq "--utf8") + { + $OptUTF8 = 1; + } elsif ($Arg eq "--debug") { $Debug = 1; @@ -413,7 +418,7 @@ if (!defined $Usage) } if (!$OptLocale and !$OptSystem and !$OptMUI and !$OptKeyboard and - !$OptCountry and !$OptShow) + !$OptCountry and !$OptUTF8 and !$OptShow) { Error("you must specify at least one locale to change\n"); $Usage = 2; @@ -433,7 +438,7 @@ if (defined $Usage) exit $Usage; } print "Usage: $name0 [options] --show HOSTNAME\n"; - print "or $name0 [options] [--default DEF] [--locale LOC] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; + print "or $name0 [options] [--default DEF] [--locale LOC] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; print "\n"; print "Sets the locale of the specified Windows machine.\n"; print "\n"; @@ -456,6 +461,13 @@ if (defined $Usage) print " Administrative Language Settings -> Change system locale.\n"; print " . APIs: GetSystemDefaultLCID().\n"; print " . Powershell: Set-WinSystemLocale -SystemLocale SYS\n"; + print " --utf8 Set the code pages (ACP, MACCP and OEMCP) to UTF-8.\n"; + print " . Windows 10 GUI: Time & language -> Language ->\n"; + print " Administrative Language Settings -> Change system locale ->\n"; + print " Beta: Use Unicode UTF-8 for worldwide language support.\n"; + print " . APIs: GetACP(), GetOEMCP().\n"; + print " . Powershell: Automatically and unconditionally set by\n"; + print " Set-WinSystemLocale for the relevant locales.\n"; print " --mui MUI Specifies the display language (see --defaults).\n"; print " . Only takes effect after a log out + log in.\n"; print " . Windows 10 GUI: Time & language -> Language -> Windows\n"; @@ -533,6 +545,26 @@ sub RegGetValue($;$) return $Values->{defined $VName ? $VName : "(Default)"}; } +sub RegSetValue($$$$) +{ + my ($Key, $VName, $Type, $Value) = @_; + + my $Cmd = ["reg.exe", "add", $Key, "/f"]; + push @$Cmd, (defined $VName ? ("/v", $VName) : ("/ve")); + $Value = join("\\0", @$Value) if (ref($Value) eq "ARRAY"); + push @$Cmd, "/t" , $Type, "/d", $Value; + + my $Pid = $TA->Run($Cmd, 0); + if (!$Pid) + { + FatalError("failed to run @$Cmd\n"); + } + if (!defined $TA->Wait($Pid, 10)) + { + FatalError("@$Cmd timed out: ", $TA->GetLastError(), "\n"); + } +} + # # Show the host's locale settings @@ -570,6 +602,11 @@ sub GetWinSettings($) $Settings->{SysLanguage} = RegGetValue($HKLM_LANGUAGE, "Default"); $Settings->{SysLocale} = RegGetValue($HKLM_LOCALE, "(Default)"); } + if ($OptUTF8 or $All) + { + my $Values = RegGetValues($HKLM_CODE_PAGE, "*CP"); + map { $Settings->{$_} = $Values->{$_} } ("ACP", "MACCP", "OEMCP"); + } return $Settings; } @@ -595,6 +632,9 @@ sub ShowWinSettings($) print " Previous... (--mui) = ", Value2Str($Settings->{PreviousPreferredUILanguages}), "\n"; print "Nls:Language (--system) = ", Value2Str($Settings->{SysLanguage}), "\n"; print "Nls:Locale (--system) = ", Value2Str($Settings->{SysLocale}), "\n"; + print "ACP (--utf8) = ", Value2Str($Settings->{ACP}), "\n"; + print "MACCP (--utf8) = ", Value2Str($Settings->{MACCP}), "\n"; + print "OEMCP (--utf8) = ", Value2Str($Settings->{OEMCP}), "\n"; } if ($OptShow) @@ -784,6 +824,20 @@ if (!$DryRun) } +# +# Change the code pages manually +# + +if ($OptUTF8) +{ + # intl.cpl does not support setting a specific code page + foreach my $VName ("ACP", "MACCP", "OEMCP") + { + RegSetValue($HKLM_CODE_PAGE, $VName, "REG_SZ", "65001"); + } +} + + # # Reboot to finalize the changes # @@ -861,6 +915,13 @@ if ($OptSystem) CheckSetting($Settings, "SysLanguage", $LCIDSystem, "for --system $OptSystem", 1); CheckSetting($Settings, "SysLocale", "0000$LCIDSystem", "for --system $OptSystem", 1); } +if ($OptUTF8) +{ + foreach my $VName ("ACP", "MACCP", "OEMCP") + { + CheckSetting($Settings, $VName, "65001", "for --utf8"); + } +} exit(1) if (!$Success);

1 0

Jacek Caban : winegcc: Use libgcc on Cygwin target.
by Alexandre Julliard Jan. 5, 2022

Jan. 5, 2022

Module: wine Branch: master Commit: 099ba1b4101103a5758b7d457b1179946c914dee URL: https://source.winehq.org/git/wine.git/?a=commit;h=099ba1b4101103a5758b7d45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 5 00:00:28 2022 +0100 winegcc: Use libgcc on Cygwin target. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52328 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e8457e46643..8644afe7535 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1254,10 +1254,18 @@ static void build(struct options* opts) /* link everything together now */ link_args = get_link_args( opts, output_name ); - if ((opts->nodefaultlibs || opts->use_msvcrt) && opts->target.platform == PLATFORM_MINGW) + if (opts->nodefaultlibs || opts->use_msvcrt) { - libgcc = find_libgcc(opts->prefix, link_args); - if (!libgcc) libgcc = "-lgcc"; + switch (opts->target.platform) + { + case PLATFORM_MINGW: + case PLATFORM_CYGWIN: + libgcc = find_libgcc( opts->prefix, link_args ); + if (!libgcc) libgcc = "-lgcc"; + break; + default: + break; + } } strarray_add(&link_args, "-o");

1 0

Jacek Caban : urlmon/tests: Remove unreliable test.
by Alexandre Julliard Jan. 5, 2022

Jan. 5, 2022

Module: wine Branch: master Commit: f9f4ee1b5882067b1900a67201c376f0a1abe3ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9f4ee1b5882067b1900a672… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 5 22:05:09 2022 +0100 urlmon/tests: Remove unreliable test. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index eb58bb54550..8a47a4bb942 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -2515,7 +2515,6 @@ static void test_bsc_marshaling(void) "szExtraInfo = %s\n", wine_dbgstr_w(bindinfo.szExtraInfo)); ok(bindinfo.grfBindInfoF == 22, "grfBindInfoF = %u\n", rem_bindinfo.grfBindInfoF); ok(bindinfo.dwBindVerb == 23, "dwBindVerb = %u\n", bindinfo.dwBindVerb); - ok(bindinfo.szCustomVerb != verb_out, "szCustomVerb == inbuf\n"); ok(!lstrcmpW(bindinfo.szCustomVerb, L"custom verb out"), "szCustomVerb = %s\n", wine_dbgstr_w(bindinfo.szCustomVerb)); ok(bindinfo.cbstgmedData == 29, "cbstgmedData = %u\n", bindinfo.cbstgmedData);

1 0

Jacek Caban : urlmon/tests: Silence some debug traces.
by Alexandre Julliard Jan. 5, 2022

Jan. 5, 2022

Module: wine Branch: master Commit: 9664e2b62fddd0da1554241a002b9937d12a2159 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9664e2b62fddd0da1554241a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 5 22:05:00 2022 +0100 urlmon/tests: Silence some debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 6fc864f7777..a5406121585 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -254,7 +254,7 @@ static ULONG WINAPI HttpSecurity_Release(IHttpSecurity *iface) static HRESULT WINAPI HttpSecurity_GetWindow(IHttpSecurity* iface, REFGUID rguidReason, HWND *phwnd) { - trace("HttpSecurity_GetWindow\n"); + if(winetest_debug > 1) trace("HttpSecurity_GetWindow\n"); return S_FALSE; } @@ -466,13 +466,13 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG } if(IsEqualGUID(&IID_IGetBindHandle, guidService)) { - trace("QueryService(IID_IGetBindHandle)\n"); + if(winetest_debug > 1) trace("QueryService(IID_IGetBindHandle)\n"); *ppv = NULL; return E_NOINTERFACE; } if(IsEqualGUID(&IID_IWindowForBindingUI, guidService)) { - trace("QueryService(IID_IWindowForBindingUI)\n"); + if(winetest_debug > 1) trace("QueryService(IID_IWindowForBindingUI)\n"); *ppv = NULL; return E_NOINTERFACE; } @@ -642,7 +642,7 @@ static void call_continue(PROTOCOLDATA *protocol_data) HRESULT hres; if (winetest_debug > 1) - trace("continue in state %d\n", state); + if(winetest_debug > 1) trace("continue in state %d\n", state); if(state == STATE_CONNECTING) { if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST || tested_protocol == FTP_TEST) { @@ -949,10 +949,10 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ok(!lstrcmpW(szStatusText, pjpegW), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); break; case BINDSTATUS_RESERVED_7: - trace("BINDSTATUS_RESERVED_7\n"); + if(winetest_debug > 1) trace("BINDSTATUS_RESERVED_7\n"); break; case BINDSTATUS_RESERVED_8: - trace("BINDSTATUS_RESERVED_8\n"); + if(winetest_debug > 1) trace("BINDSTATUS_RESERVED_8\n"); break; default: ok(0, "Unexpected status %d (%d)\n", ulStatusCode, ulStatusCode-BINDSTATUS_LAST); @@ -2249,33 +2249,33 @@ static HRESULT WINAPI ProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid, v Protocol *This = impl_from_IUnknown(iface); if(IsEqualGUID(&IID_IUnknown, riid)) { - trace("QI(IUnknown)\n"); + if(winetest_debug > 1) trace("QI(IUnknown)\n"); *ppv = &This->IUnknown_inner; }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { - trace("QI(InternetProtocol)\n"); + if(winetest_debug > 1) trace("QI(InternetProtocol)\n"); *ppv = &This->IInternetProtocolEx_iface; }else if(IsEqualGUID(&IID_IInternetProtocolEx, riid)) { - trace("QI(InternetProtocolEx)\n"); + if(winetest_debug > 1) trace("QI(InternetProtocolEx)\n"); if(!impl_protex) { *ppv = NULL; return E_NOINTERFACE; } *ppv = &This->IInternetProtocolEx_iface; }else if(IsEqualGUID(&IID_IInternetPriority, riid)) { - trace("QI(InternetPriority)\n"); + if(winetest_debug > 1) trace("QI(InternetPriority)\n"); *ppv = &This->IInternetPriority_iface; }else if(IsEqualGUID(&IID_IWinInetInfo, riid)) { - trace("QI(IWinInetInfo)\n"); + if(winetest_debug > 1) trace("QI(IWinInetInfo)\n"); CHECK_EXPECT(QueryInterface_IWinInetInfo); *ppv = NULL; return E_NOINTERFACE; }else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { - trace("QI(IWinInetHttpInfo)\n"); + if(winetest_debug > 1) trace("QI(IWinInetHttpInfo)\n"); CHECK_EXPECT(QueryInterface_IWinInetHttpInfo); *ppv = NULL; return E_NOINTERFACE; }else if(IsEqualGUID(&IID_undocumentedIE10, riid)) { - trace("QI(%s)\n", wine_dbgstr_guid(riid)); + if(winetest_debug > 1) trace("QI(%s)\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; }else { @@ -3874,11 +3874,9 @@ static void test_CreateBinding(void) ok(obj_refcount(protocol) == 4, "wrong protocol refcount %d\n", obj_refcount(protocol)); - trace("Start >\n"); expect_hrResult = S_OK; hres = IInternetProtocol_Start(protocol, test_url, &protocol_sink, &bind_info, 0, 0); ok(hres == S_OK, "Start failed: %08x\n", hres); - trace("Start <\n"); CHECK_CALLED(QueryService_InternetProtocol);

1 0

Piotr Caban : oleacc/tests: Fix intermittent AccessibleObjectFromPoint tests failures.
by Alexandre Julliard Jan. 5, 2022

Jan. 5, 2022

Module: wine Branch: master Commit: 74ee5a215699af22c18c2d44ccd000b0ec650d9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=74ee5a215699af22c18c2d44… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 5 15:19:45 2022 +0100 oleacc/tests: Fix intermittent AccessibleObjectFromPoint tests failures. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 1f09581f64f..3b3f18a5a80 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -1318,7 +1318,7 @@ static void test_AccessibleObjectFromPoint(void) ok(SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)&DefWindowProcA), "SetWindowLongPtr failed\n"); - point.x = point.y = 0; + point.x = point.y = 10; ok(ClientToScreen(hwnd, &point), "ClientToScreen failed\n"); if (WindowFromPoint(point) != hwnd) @@ -1355,6 +1355,12 @@ static void test_AccessibleObjectFromPoint(void) 0, 0, 100, 100, hwnd, NULL, NULL, NULL); ok(child != NULL, "CreateWindow failed\n"); + if (WindowFromPoint(point) != child) + { + win_skip("test window not returned from WindowFromPoint\n"); + return; + } + hr = AccessibleObjectFromPoint(point, &acc, &cid); ok(hr == S_OK, "got %x\n", hr); ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4);

1 0

Jactry Zeng : po: Update Japanese translation.
by Alexandre Julliard Jan. 5, 2022

Jan. 5, 2022

Module: wine Branch: master Commit: e2f05746f104d4af71efa6976d57f424675c1474 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2f05746f104d4af71efa697… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Jan 5 02:42:36 2022 -0600 po: Update Japanese translation. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index ba9835a5494..f2f7a431995 100644 --- a/po/ja.po +++ b/po/ja.po @@ -443,7 +443,7 @@ msgstr "閉じる(&C)" #: dlls/comctl32/comctl32.rc:101 msgid "R&eset" -msgstr "リセット(R&)" +msgstr "リセット(&E)" #: dlls/comctl32/comctl32.rc:102 dlls/comdlg32/comdlg32.rc:173 #: dlls/comdlg32/comdlg32.rc:195 dlls/comdlg32/comdlg32.rc:266 @@ -9008,7 +9008,7 @@ msgstr "利用するデータソース名(&D)" #: dlls/oledb32/version.rc:74 msgid "Use c&onnection string" -msgstr "利用する接続文字列(&C)" +msgstr "利用する接続文字列(&O)" #: dlls/oledb32/version.rc:75 msgid "&Connection string:"

1 0

Alex Henrie : kernel32/tests: Drop change test workarounds for Windows <= 2000.
by Alexandre Julliard Jan. 5, 2022

Jan. 5, 2022

Module: wine Branch: master Commit: 566c0653f2c559e49c7946258027bb4d7642fedd URL: https://source.winehq.org/git/wine.git/?a=commit;h=566c0653f2c559e49c794625… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 5 00:12:03 2022 -0700 kernel32/tests: Drop change test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/change.c | 154 +++++++++++++------------------------------ 1 file changed, 44 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=566c0653f2c559e49c79…

1 0