January 2022 - Wine-commits

Zebediah Figura : vkd3d-shader: Do not validate the target type in vkd3d_shader_scan().
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: vkd3d Branch: master Commit: f3050be89d2fbb4de38239320399591612df4535 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f3050be89d2fbb4de382393… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 28 16:20:17 2021 -0600 vkd3d-shader: Do not validate the target type in vkd3d_shader_scan(). 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> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 3982d07..47fe3d6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1025,7 +1025,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char if (messages) *messages = NULL; - if ((ret = vkd3d_shader_validate_compile_info(compile_info, true)) < 0) + if ((ret = vkd3d_shader_validate_compile_info(compile_info, false)) < 0) return ret; vkd3d_shader_message_context_init(&message_context, compile_info->log_level);

1 0

Zebediah Figura : vkd3d-shader: Make shader_extract_from_dxbc() static.
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: vkd3d Branch: master Commit: 2edec69da49e8b1336a87b771657de16cfaa3e04 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2edec69da49e8b1336a87b7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 28 16:20:18 2021 -0600 vkd3d-shader: Make shader_extract_from_dxbc() static. 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> --- libs/vkd3d-shader/dxbc.c | 74 ++++++++++++++++---------------- libs/vkd3d-shader/vkd3d_shader_private.h | 2 - 2 files changed, 37 insertions(+), 39 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index b83e265..0b76a4a 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1669,42 +1669,6 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t return true; } -int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser **parser) -{ - struct vkd3d_shader_desc *shader_desc; - struct vkd3d_shader_sm4_parser *sm4; - int ret; - - if (!(sm4 = vkd3d_calloc(1, sizeof(*sm4)))) - { - ERR("Failed to allocate parser.\n"); - return VKD3D_ERROR_OUT_OF_MEMORY; - } - - shader_desc = &sm4->p.shader_desc; - if ((ret = shader_extract_from_dxbc(compile_info->source.code, compile_info->source.size, - message_context, compile_info->source_name, shader_desc)) < 0) - { - WARN("Failed to extract shader, vkd3d result %d.\n", ret); - vkd3d_free(sm4); - return ret; - } - - if (!shader_sm4_init(sm4, shader_desc->byte_code, shader_desc->byte_code_size, - compile_info->source_name, &shader_desc->output_signature, message_context)) - { - WARN("Failed to initialise shader parser.\n"); - free_shader_desc(shader_desc); - vkd3d_free(sm4); - return VKD3D_ERROR_INVALID_ARGUMENT; - } - - *parser = &sm4->p; - - return VKD3D_OK; -} - static bool require_space(size_t offset, size_t count, size_t size, size_t data_size) { return !count || (data_size - offset) / count >= size; @@ -2039,7 +2003,7 @@ void free_shader_desc(struct vkd3d_shader_desc *desc) vkd3d_shader_free_shader_signature(&desc->patch_constant_signature); } -int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, +static int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_message_context *message_context, const char *source_name, struct vkd3d_shader_desc *desc) { int ret; @@ -2063,6 +2027,42 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, return ret; } +int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser **parser) +{ + struct vkd3d_shader_desc *shader_desc; + struct vkd3d_shader_sm4_parser *sm4; + int ret; + + if (!(sm4 = vkd3d_calloc(1, sizeof(*sm4)))) + { + ERR("Failed to allocate parser.\n"); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + + shader_desc = &sm4->p.shader_desc; + if ((ret = shader_extract_from_dxbc(compile_info->source.code, compile_info->source.size, + message_context, compile_info->source_name, shader_desc)) < 0) + { + WARN("Failed to extract shader, vkd3d result %d.\n", ret); + vkd3d_free(sm4); + return ret; + } + + if (!shader_sm4_init(sm4, shader_desc->byte_code, shader_desc->byte_code_size, + compile_info->source_name, &shader_desc->output_signature, message_context)) + { + WARN("Failed to initialise shader parser.\n"); + free_shader_desc(shader_desc); + vkd3d_free(sm4); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + *parser = &sm4->p; + + return VKD3D_OK; +} + /* root signatures */ #define VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 62073cf..ffea91d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1045,8 +1045,6 @@ int vkd3d_shader_sm1_parser_create(const struct vkd3d_shader_compile_info *compi int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser **parser); -int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, - struct vkd3d_shader_message_context *message_context, const char *source_name, struct vkd3d_shader_desc *desc); void free_shader_desc(struct vkd3d_shader_desc *desc); int shader_parse_input_signature(const void *dxbc, size_t dxbc_length,

1 0

Zebediah Figura : include: Avoid using a field reference as a truth value.
by Alexandre Julliard 07 Jan '22

07 Jan '22

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 07 Jan '22

07 Jan '22

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 05 Jan '22

05 Jan '22

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: Silence some debug traces.
by Alexandre Julliard 05 Jan '22

05 Jan '22

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

Jacek Caban : urlmon/tests: Remove unreliable test.
by Alexandre Julliard 05 Jan '22

05 Jan '22

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

Jactry Zeng : po: Update Simplified Chinese translation.
by Alexandre Julliard 05 Jan '22

05 Jan '22

Module: wine Branch: master Commit: 2bb3e58cd793a0067210c905752a382414c809e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bb3e58cd793a0067210c905… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Jan 5 02:06:22 2022 -0600 po: Update Simplified Chinese translation. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 249 ++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 207 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2bb3e58cd793a0067210…

1 0

Jactry Zeng : po: Update Japanese translation.
by Alexandre Julliard 05 Jan '22

05 Jan '22

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

Huw Davies : iphlpapi: Always populate the friendly name.
by Alexandre Julliard 05 Jan '22

05 Jan '22

Module: wine Branch: master Commit: c1bbfe17a5e542a989c1831b18f1f4f36cf00b0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1bbfe17a5e542a989c1831b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 5 12:55:19 2022 +0000 iphlpapi: Always populate the friendly name. The GAA_FLAG_SKIP_FRIENDLY_NAME flag is essentially ignored. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48084 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 11 ++++------- dlls/iphlpapi/tests/iphlpapi.c | 8 +++++++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 15c4f067105..c94f869c9f9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1221,7 +1221,7 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD if (err) return err; needed = count * (sizeof(*aa) + ((CHARS_IN_GUID + 1) & ~1) + sizeof(stat->descr.String)); - if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) needed += count * sizeof(rw->alias.String); + needed += count * sizeof(rw->alias.String); /* GAA_FLAG_SKIP_FRIENDLY_NAME is ignored */ aa = heap_alloc_zero( needed ); if (!aa) @@ -1243,12 +1243,9 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD if_counted_string_copy( (WCHAR *)str_ptr, ARRAY_SIZE(stat[i].descr.String), &stat[i].descr ); aa[i].Description = (WCHAR *)str_ptr; str_ptr += sizeof(stat[i].descr.String); - if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) - { - if_counted_string_copy( (WCHAR *)str_ptr, ARRAY_SIZE(rw[i].alias.String), &rw[i].alias ); - aa[i].FriendlyName = (WCHAR *)str_ptr; - str_ptr += sizeof(rw[i].alias.String); - } + if_counted_string_copy( (WCHAR *)str_ptr, ARRAY_SIZE(rw[i].alias.String), &rw[i].alias ); + aa[i].FriendlyName = (WCHAR *)str_ptr; + str_ptr += sizeof(rw[i].alias.String); aa[i].PhysicalAddressLength = rw[i].phys_addr.Length; if (aa[i].PhysicalAddressLength > sizeof(aa[i].PhysicalAddress)) aa[i].PhysicalAddressLength = 0; memcpy( aa[i].PhysicalAddress, rw[i].phys_addr.Address, aa[i].PhysicalAddressLength ); diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 2adacd36b48..12da629c30c 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1580,6 +1580,12 @@ static void test_GetAdaptersAddresses(void) ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); if (ret != ERROR_BUFFER_OVERFLOW) return; + /* GAA_FLAG_SKIP_FRIENDLY_NAME is ignored */ + osize = 0x7fffffff; + ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_SKIP_FRIENDLY_NAME, NULL, NULL, &osize); + ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); + ok(osize == size, "expected %d, got %d\n", size, osize); + ptr = HeapAlloc(GetProcessHeap(), 0, size); ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &size); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); @@ -1589,7 +1595,7 @@ static void test_GetAdaptersAddresses(void) size *= 2; osize = size; ptr = HeapAlloc(GetProcessHeap(), 0, osize); - ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, NULL, ptr, &osize); + ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX | GAA_FLAG_SKIP_FRIENDLY_NAME, NULL, ptr, &osize); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); ok(osize == size, "expected %d, got %d\n", size, osize);

1 0