wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Akihiro Sagawa : kernelbase: Improve Get{, Dynamic}TimeZoneInformation() performance.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 8be47c712a13947e60d3d1b7f25d9cdb501d885a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8be47c712a13947e60d3d1b7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 25 00:07:50 2020 +0900 kernelbase: Improve Get{, Dynamic}TimeZoneInformation() performance. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49808 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d5edadf35a40cb7238c2068db28b6c6abc7da800) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/locale.c | 47 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index da69e5a1f3e..f3121648f15 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3634,6 +3634,20 @@ INT WINAPI DECLSPEC_HOTPATCH GetCalendarInfoEx( const WCHAR *locale, CALID calen return GetCalendarInfoW( lcid, calendar, type, data, count, value ); } +static CRITICAL_SECTION tzname_section; +static CRITICAL_SECTION_DEBUG tzname_section_debug = +{ + 0, 0, &locale_section, + { &tzname_section_debug.ProcessLocksList, &tzname_section_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": tzname_section") } +}; +static CRITICAL_SECTION tzname_section = { &tzname_section_debug, -1, 0, 0, 0, 0 }; +static struct { + LCID lcid; + WCHAR key_name[128]; + WCHAR standard_name[32]; + WCHAR daylight_name[32]; +} cached_tzname; /*********************************************************************** * GetDynamicTimeZoneInformation (kernelbase.@) @@ -3646,15 +3660,34 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetDynamicTimeZoneInformation( DYNAMIC_TIME_ZONE_ if (!set_ntstatus( RtlQueryDynamicTimeZoneInformation( (RTL_DYNAMIC_TIME_ZONE_INFORMATION *)info ))) return TIME_ZONE_ID_INVALID; - if (!RegOpenKeyExW( tz_key, info->TimeZoneKeyName, 0, KEY_ALL_ACCESS, &key )) + RtlEnterCriticalSection( &tzname_section ); + if (cached_tzname.lcid == GetThreadLocale() && + !wcscmp( info->TimeZoneKeyName, cached_tzname.key_name )) + { + wcscpy( info->StandardName, cached_tzname.standard_name ); + wcscpy( info->DaylightName, cached_tzname.daylight_name ); + RtlLeaveCriticalSection( &tzname_section ); + } + else { - RegLoadMUIStringW( key, L"MUI_Std", info->StandardName, - sizeof(info->StandardName), NULL, 0, system_dir ); - RegLoadMUIStringW( key, L"MUI_Dlt", info->DaylightName, - sizeof(info->DaylightName), NULL, 0, system_dir ); - RegCloseKey( key ); + RtlLeaveCriticalSection( &tzname_section ); + if (!RegOpenKeyExW( tz_key, info->TimeZoneKeyName, 0, KEY_ALL_ACCESS, &key )) + { + RegLoadMUIStringW( key, L"MUI_Std", info->StandardName, + sizeof(info->StandardName), NULL, 0, system_dir ); + RegLoadMUIStringW( key, L"MUI_Dlt", info->DaylightName, + sizeof(info->DaylightName), NULL, 0, system_dir ); + RegCloseKey( key ); + } + else return TIME_ZONE_ID_INVALID; + + RtlEnterCriticalSection( &tzname_section ); + cached_tzname.lcid = GetThreadLocale(); + wcscpy( cached_tzname.key_name, info->TimeZoneKeyName ); + wcscpy( cached_tzname.standard_name, info->StandardName ); + wcscpy( cached_tzname.daylight_name, info->DaylightName ); + RtlLeaveCriticalSection( &tzname_section ); } - else return TIME_ZONE_ID_INVALID; NtQuerySystemTime( &now ); return get_timezone_id( (TIME_ZONE_INFORMATION *)info, now, FALSE );

1 0

Robert Wilhelm : jscript: Cc_parser_parse implement '&&' expression.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 0c1d6a6f174da3f5956ac77b19c842ac1eaa75f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c1d6a6f174da3f5956ac77b… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Oct 12 22:25:33 2020 +0200 jscript: Cc_parser_parse implement '&&' expression. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49450 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f586348deb97e8dea5f78ea3e45db39951ee8d30) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/jscript/cc_parser.y | 2 +- dlls/jscript/tests/cc.js | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index 4bc6260f194..dd72f61b03b 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -161,7 +161,7 @@ CCLogicalORExpression CCLogicalANDExpression : CCBitwiseORExpression { $$ = $1; } | CCBitwiseANDExpression tAND CCBitwiseORExpression - { FIXME("'&&' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccbool($1) && get_ccbool($3)); } CCBitwiseORExpression : CCBitwiseXORExpression { $$ = $1; } diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index 8f45a3dd331..2232d2fb689 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -180,6 +180,23 @@ expect(@test, true); @set @test = (1 >= true-1) expect(@test, true); +@set @test = (true && true) +expect(@test, true); + +@set @test = (false && true) +expect(@test, false); + +@set @test = (true && false) +expect(@test, false); + +@set @test = (false && false) +expect(@test, false); + +if(!isWin64) { +@set @test = (@_win32&&@_jscript_version>=5) +expect(@test, true); +} + @if (false) this wouldn not parse "@end

1 0

Robert Wilhelm : vbscript: Support class default sub.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 5675b9a2e206efc91ec4d4dd6fe83bc03793caaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=5675b9a2e206efc91ec4d4dd… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Oct 13 18:58:21 2020 +0200 vbscript: Support class default sub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35744 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 16fe2037fb2b3ddec1e6312b076cc76d88e9240a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/compile.c | 14 +++++++++++--- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 30 ++++++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 6 ++---- 4 files changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index fc0b22c65c8..0674f634078 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1644,6 +1644,7 @@ static BOOL lookup_class_funcs(class_desc_t *class_desc, const WCHAR *name) static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) { function_decl_t *func_decl, *func_prop_decl; + BOOL is_default, have_default = FALSE; class_desc_t *class_desc; dim_decl_t *prop_decl; unsigned i; @@ -1666,14 +1667,21 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) if(!class_desc->name) return E_OUTOFMEMORY; - class_desc->func_cnt = 1; /* always allocate slot for default getter */ + class_desc->func_cnt = 1; /* always allocate slot for default getter or method */ for(func_decl = class_decl->funcs; func_decl; func_decl = func_decl->next) { + is_default = FALSE; for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->is_default) + if(func_prop_decl->is_default) { + if(have_default) { + FIXME("multiple default getters or methods\n"); + return E_FAIL; + } + is_default = have_default = TRUE; break; + } } - if(!func_prop_decl) + if(!is_default) class_desc->func_cnt++; } diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 4a4708e7785..20ec89343af 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -995,7 +995,7 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, BOOL is_default = FALSE; if(storage_flags & STORAGE_IS_DEFAULT) { - if(type == FUNC_PROPGET) { + if(type == FUNC_PROPGET || type == FUNC_FUNCTION || type == FUNC_SUB) { is_default = TRUE; }else { FIXME("Invalid default property\n"); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 14761cf5a52..2cd4f3ef2f7 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1671,6 +1671,36 @@ call ok(x.getProp.prop.prop = 3, "x.getProp.prop.prop = " & x.getProp.prop.prop) ok getVT(x) = "VT_DISPATCH*", "getVT(x) = " & getVT(x) todo_wine_ok getVT(x()) = "VT_BSTR", "getVT(x()) = " & getVT(x()) +funcCalled = "" +class DefaultSubTest1 + Public default Sub init(a) + funcCalled = "init" & a + end sub +end class + +Set obj = New DefaultSubTest1 +obj.init(1) +call ok(funcCalled = "init1","funcCalled=" & funcCalled) +funcCalled = "" +obj(2) +call ok(funcCalled = "init2","funcCalled=" & funcCalled) + +class DefaultSubTest2 + Public Default Function init + funcCalled = "init" + end function +end class + +Set obj = New DefaultSubTest2 +funcCalled = "" +obj.init() +call ok(funcCalled = "init","funcCalled=" & funcCalled) +funcCalled = "" +' todo this is not yet supported +'funcCalled = "" +'obj() +'call ok(funcCalled = "init","funcCalled=" & funcCalled) + with nothing end with diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 7db333660d7..33366b9de51 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -38,19 +38,17 @@ static BOOL get_func_id(vbdisp_t *This, const WCHAR *name, vbdisp_invoke_type_t { unsigned i; - for(i = invoke_type == VBDISP_ANY ? 0 : 1; i < This->desc->func_cnt; i++) { + for(i = 0; i < This->desc->func_cnt; i++) { if(invoke_type == VBDISP_ANY) { if(!search_private && !This->desc->funcs[i].is_public) continue; - if(!i && !This->desc->funcs[0].name) /* default value may not exist */ - continue; }else { if(!This->desc->funcs[i].entries[invoke_type] || (!search_private && !This->desc->funcs[i].entries[invoke_type]->is_public)) continue; } - if(!wcsicmp(This->desc->funcs[i].name, name)) { + if(This->desc->funcs[i].name && !wcsicmp(This->desc->funcs[i].name, name)) { *id = i; return TRUE; }

1 0

Robert Wilhelm : vbscript: Add is_default flag to function_decl_t.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 3f5ca5b5b163a752e65454cefc980629f15d07e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f5ca5b5b163a752e65454ce… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Oct 13 18:58:06 2020 +0200 vbscript: Add is_default flag to function_decl_t. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 54740a5cb8dfb8ccedad988aaf46125893cebd15) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/compile.c | 6 ++---- dlls/vbscript/interp.c | 2 +- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 4 +++- dlls/vbscript/vbdisp.c | 2 +- dlls/vbscript/vbscript.h | 1 - 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index c76ba73bd8c..fc0b22c65c8 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1444,7 +1444,6 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f case FUNC_PROPGET: case FUNC_PROPLET: case FUNC_PROPSET: - case FUNC_DEFGET: ctx->prop_end_label = alloc_label(ctx); if(!ctx->prop_end_label) return E_OUTOFMEMORY; @@ -1606,7 +1605,6 @@ static HRESULT create_class_funcprop(compile_ctx_t *ctx, function_decl_t *func_d case FUNC_FUNCTION: case FUNC_SUB: case FUNC_PROPGET: - case FUNC_DEFGET: invoke_type = VBDISP_CALLGET; break; case FUNC_PROPLET: @@ -1672,7 +1670,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) for(func_decl = class_decl->funcs; func_decl; func_decl = func_decl->next) { for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->type == FUNC_DEFGET) + if(func_prop_decl->is_default) break; } if(!func_prop_decl) @@ -1686,7 +1684,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) for(func_decl = class_decl->funcs, i=1; func_decl; func_decl = func_decl->next, i++) { for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->type == FUNC_DEFGET) { + if(func_prop_decl->is_default) { i--; break; } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 66ad2068375..a3d37d23dd5 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -119,7 +119,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ DISPID id; HRESULT hres; - if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) + if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET) && !wcsicmp(name, ctx->func->name)) { ref->type = REF_VAR; ref->u.v = &ctx->ret_val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 4bf82cbedb3..a9875f2efec 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -183,6 +183,7 @@ typedef struct _function_decl_t { const WCHAR *name; function_type_t type; BOOL is_public; + BOOL is_default; arg_decl_t *args; statement_t *body; struct _function_decl_t *next; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 9507e97e8ca..4a4708e7785 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -992,10 +992,11 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, unsigned storage_flags, arg_decl_t *arg_decl, statement_t *body) { function_decl_t *decl; + BOOL is_default = FALSE; if(storage_flags & STORAGE_IS_DEFAULT) { if(type == FUNC_PROPGET) { - type = FUNC_DEFGET; + is_default = TRUE; }else { FIXME("Invalid default property\n"); ctx->hres = E_FAIL; @@ -1010,6 +1011,7 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, decl->name = name; decl->type = type; decl->is_public = !(storage_flags & STORAGE_IS_PRIVATE); + decl->is_default = is_default; decl->args = arg_decl; decl->body = body; decl->next = NULL; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index c14cd7b4c71..7db333660d7 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -177,7 +177,7 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern switch(flags) { case DISPATCH_PROPERTYGET: func = This->desc->funcs[id].entries[VBDISP_CALLGET]; - if(!func || (func->type != FUNC_PROPGET && func->type != FUNC_DEFGET)) { + if(!func || func->type != FUNC_PROPGET) { WARN("no getter\n"); return DISP_E_MEMBERNOTFOUND; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 19431e23c34..9b2d28050e2 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -310,7 +310,6 @@ typedef enum { FUNC_PROPGET, FUNC_PROPLET, FUNC_PROPSET, - FUNC_DEFGET } function_type_t; typedef struct {

1 0

Hirofumi Katayama : comctl32/ipaddress: Focus first field on WM_SETFOCUS.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: a16032898d25dc0869eac748a2bf4a3249d01a58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a16032898d25dc0869eac748… Author: Hirofumi Katayama <katayama.hirofumi.mz(a)gmail.com> Date: Thu Oct 8 17:03:27 2020 +0300 comctl32/ipaddress: Focus first field on WM_SETFOCUS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49924 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3c291085235b57bb1f2ef92ccde4ca8035928a1b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/ipaddress.c | 4 ++++ dlls/comctl32/tests/ipaddress.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 7c69d4ec01f..e8632d2dae3 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -638,6 +638,10 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case IPM_ISBLANK: return IPADDRESS_IsBlank (infoPtr); + case WM_SETFOCUS: + IPADDRESS_SetFocusToField (infoPtr, 0); + break; + default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam); diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index 5a5aafe7aa8..6e6512514d9 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -114,6 +114,37 @@ todo_wine DestroyWindow(hwnd); } +static void test_WM_SETFOCUS(void) +{ + struct child_enum child_enum = {{ 0 }}; + unsigned int ret, from, to, i; + HWND hwnd; + + hwnd = create_ipaddress_control(); + ok(!!hwnd, "Failed to create control.\n"); + + ret = SendMessageA(hwnd, IPM_SETADDRESS, 0, MAKEIPADDRESS(0, 1, 2, 3)); + ok(ret, "Unexpected return value %u.\n", ret); + + EnumChildWindows(hwnd, test_child_enum_proc, (LPARAM)&child_enum); + ok(child_enum.count == 4, "Unexpected child count %u.\n", child_enum.count); + + SetFocus(child_enum.fields[3]); + + for (i = 0; i < 3; ++i) + SendMessageA(child_enum.fields[i], EM_SETSEL, -1, 0); + + SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to); + ok(from == 0 && to == 0, "Unexpected selection %u x %u.\n", from, to); + + SetFocus(hwnd); + + SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to); + ok(from == 0 && to == 1, "Unexpected selection %u x %u.\n", from, to); + + DestroyWindow(hwnd); +} + START_TEST(ipaddress) { ULONG_PTR cookie; @@ -121,12 +152,14 @@ START_TEST(ipaddress) test_get_set_text(); test_IPM_SETFOCUS(); + test_WM_SETFOCUS(); if (!load_v6_module(&cookie, &ctxt)) return; test_get_set_text(); test_IPM_SETFOCUS(); + test_WM_SETFOCUS(); unload_v6_module(cookie, ctxt); }

1 0

Nikolay Sivov : comctl32/ipaddress: Select field contents on IPM_SETFOCUS.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 35c097f0abcc90bf3db7798e16ebaa6a6df227e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35c097f0abcc90bf3db7798e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 17:03:25 2020 +0300 comctl32/ipaddress: Select field contents on IPM_SETFOCUS. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6f8957156e4207cbce33be76eef7291c70075810) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/ipaddress.c | 1 + dlls/comctl32/tests/ipaddress.c | 54 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index d88cd88f31f..7c69d4ec01f 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -399,6 +399,7 @@ static void IPADDRESS_SetFocusToField (const IPADDRESS_INFO *infoPtr, INT index) if (index > 3 || index < 0) index=0; + SendMessageW (infoPtr->Part[index].EditHwnd, EM_SETSEL, 0, -1); SetFocus (infoPtr->Part[index].EditHwnd); } diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index cc79b7bf11b..5a5aafe7aa8 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -62,17 +62,71 @@ static void test_get_set_text(void) DestroyWindow(hwnd); } +struct child_enum +{ + HWND fields[4]; + unsigned int count; +}; + +static BOOL CALLBACK test_child_enum_proc(HWND hwnd, LPARAM param) +{ + struct child_enum *child_enum = (struct child_enum *)param; + char buff[16] = { 0 }; + unsigned int index; + + GetWindowTextA(hwnd, buff, ARRAY_SIZE(buff)); + index = atoi(buff); + ok(index < 4, "Unexpected index.\n"); + if (index < 4) + child_enum->fields[index] = hwnd; + + return ++child_enum->count < 4; +} + +static void test_IPM_SETFOCUS(void) +{ + struct child_enum child_enum = {{ 0 }}; + unsigned int ret, from, to, i; + HWND hwnd; + + hwnd = create_ipaddress_control(); + ok(!!hwnd, "Failed to create control.\n"); + + ret = SendMessageA(hwnd, IPM_SETADDRESS, 0, MAKEIPADDRESS(0, 1, 2, 3)); + ok(ret, "Unexpected return value %u.\n", ret); + + EnumChildWindows(hwnd, test_child_enum_proc, (LPARAM)&child_enum); + ok(child_enum.count == 4, "Unexpected child count %u.\n", child_enum.count); + + for (i = 0; i < 3; ++i) + SendMessageA(child_enum.fields[i], EM_SETSEL, -1, 0); + + SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to); + ok(from == 0 && to == 0, "Unexpected selection %u x %u.\n", from, to); + + ret = SendMessageA(hwnd, IPM_SETFOCUS, 0, 0); +todo_wine + ok(ret, "Unexpected return value %u.\n", ret); + + SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to); + ok(from == 0 && to == 1, "Unexpected selection %u x %u.\n", from, to); + + DestroyWindow(hwnd); +} + START_TEST(ipaddress) { ULONG_PTR cookie; HANDLE ctxt; test_get_set_text(); + test_IPM_SETFOCUS(); if (!load_v6_module(&cookie, &ctxt)) return; test_get_set_text(); + test_IPM_SETFOCUS(); unload_v6_module(cookie, ctxt); }

1 0

Esme Povirk : dism: Add version resource.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: a96b8675b48b28bd82926af9f0a15ba63ad2556a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a96b8675b48b28bd82926af9… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Sep 30 14:19:57 2020 -0500 dism: Add version resource. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49909 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a56b9733422ea6b276ae0a7e9bd6be0a4e641186) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/dism/Makefile.in | 2 ++ programs/dism/version.rc | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/programs/dism/Makefile.in b/programs/dism/Makefile.in index 61d9fa4512d..fed7a2d1470 100644 --- a/programs/dism/Makefile.in +++ b/programs/dism/Makefile.in @@ -2,4 +2,6 @@ MODULE = dism.exe EXTRADLLFLAGS = -mconsole -municode -mno-cygwin +RC_SRCS = version.rc + C_SRCS = dism.c diff --git a/programs/dism/version.rc b/programs/dism/version.rc new file mode 100644 index 00000000000..d0021b9b406 --- /dev/null +++ b/programs/dism/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2020 Esme Povirk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dism" +#define WINE_FILENAME_STR "dism.exe" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 10,0,18362,900 +#define WINE_FILEVERSION_STR "10.0.18362.900" +#define WINE_PRODUCTVERSION 10,0,18362,900 +#define WINE_PRODUCTVERSION_STR "10.0.18362.900" + +#include "wine/wine_common_ver.rc"

1 0

Hans Leidekker : crypt32: Add support for CRYPT_MACHINE_KEYSET in PFXImportCertStore.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: e3b72ea20451d88f03b5312aeba97265f3ee9e64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3b72ea20451d88f03b5312a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 23 12:07:57 2020 +0200 crypt32: Add support for CRYPT_MACHINE_KEYSET in PFXImportCertStore. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49857 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 547508e374b7e347488f8ce7a8fa40b333a79684) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/crypt32/pfx.c | 15 +++++++++------ dlls/crypt32/tests/store.c | 10 ++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index a5155855869..a0b12975efc 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -139,7 +139,7 @@ static HCRYPTPROV import_key( gnutls_x509_privkey_t key, DWORD flags ) HCRYPTPROV prov = 0; HCRYPTKEY cryptkey; BYTE *buf, *src, *dst; - DWORD size; + DWORD size, acquire_flags; if ((ret = pgnutls_x509_privkey_get_pk_algorithm2( key, &bitlen )) < 0) { @@ -209,17 +209,20 @@ static HCRYPTPROV import_key( gnutls_x509_privkey_t key, DWORD flags ) else src = d.data; for (i = bitlen / 8 - 1; i >= 0; i--) *dst++ = src[i]; - if (!CryptAcquireContextW( &prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, CRYPT_NEWKEYSET )) + acquire_flags = (flags & CRYPT_MACHINE_KEYSET) | CRYPT_NEWKEYSET; + if (!CryptAcquireContextW( &prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, acquire_flags )) { if (GetLastError() != NTE_EXISTS) goto done; - if (!CryptAcquireContextW( &prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, 0 )) + + acquire_flags &= ~CRYPT_NEWKEYSET; + if (!CryptAcquireContextW( &prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, acquire_flags )) { WARN( "CryptAcquireContextW failed %08x\n", GetLastError() ); goto done; } } - if (!CryptImportKey( prov, buf, size, 0, flags, &cryptkey )) + if (!CryptImportKey( prov, buf, size, 0, flags & CRYPT_EXPORTABLE, &cryptkey )) { WARN( "CryptImportKey failed %08x\n", GetLastError() ); CryptReleaseContext( prov, 0 ); @@ -277,7 +280,7 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor SetLastError( ERROR_INVALID_PARAMETER ); return NULL; } - if (flags & ~(CRYPT_EXPORTABLE|CRYPT_USER_KEYSET|PKCS12_NO_PERSIST_KEY)) + if (flags & ~(CRYPT_EXPORTABLE|CRYPT_USER_KEYSET|CRYPT_MACHINE_KEYSET|PKCS12_NO_PERSIST_KEY)) { FIXME( "flags %08x not supported\n", flags ); return NULL; @@ -304,7 +307,7 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor goto error; } - if (!(prov = import_key( key, flags & CRYPT_EXPORTABLE ))) goto error; + if (!(prov = import_key( key, flags ))) goto error; if (!(store = CertOpenStore( CERT_STORE_PROV_MEMORY, 0, 0, 0, NULL ))) { WARN( "CertOpenStore failed %08x\n", GetLastError() ); diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index b8d0ad6666b..8a511002acf 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -3330,6 +3330,16 @@ static void test_PFXImportCertStore(void) ok( !ret && GetLastError() == CRYPT_E_NOT_FOUND, "got %08x\n", GetLastError() ); CertCloseStore( store, 0 ); + + /* CRYPT_MACHINE_KEYSET */ + store = PFXImportCertStore( &pfx, NULL, CRYPT_MACHINE_KEYSET ); + ok( store != NULL, "got %u\n", GetLastError() ); + + cert = CertFindCertificateInStore( store, X509_ASN_ENCODING, 0, CERT_FIND_ANY, NULL, NULL ); + ok( cert != NULL, "got %08x\n", GetLastError() ); + + CertFreeCertificateContext( cert ); + CertCloseStore( store, 0 ); } static void test_CryptQueryObject(void)

1 0

Christian Costa : d3dx9: Ignore vertices reordering for D3DXMESHOPT_ATTRSORT in OptimizeInPlace().
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: fc03e947f7958b4b7c7493adf2fc0980dea329b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc03e947f7958b4b7c7493ad… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Sep 29 10:29:39 2020 +0200 d3dx9: Ignore vertices reordering for D3DXMESHOPT_ATTRSORT in OptimizeInPlace(). Not reordering vertices shouldn't have effects aside from performance. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48529 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1dcc3ab292151cd91ea4202b92107c3a91527c7a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 5e0bb98efc7..55493ad0a1c 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1689,11 +1689,7 @@ static HRESULT WINAPI d3dx9_mesh_OptimizeInplace(ID3DXMesh *iface, DWORD flags, if (FAILED(hr)) goto cleanup; } else if (flags & D3DXMESHOPT_ATTRSORT) { if (!(flags & D3DXMESHOPT_IGNOREVERTS)) - { FIXME("D3DXMESHOPT_ATTRSORT vertex reordering not implemented.\n"); - hr = E_NOTIMPL; - goto cleanup; - } hr = iface->lpVtbl->LockAttributeBuffer(iface, 0, &attrib_buffer); if (FAILED(hr)) goto cleanup;

1 0

Robert Wilhelm : vbscript: Fix vanishing statements.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 25491ebd2ac2fc5f0f1eff5f7211c8c493e23c7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=25491ebd2ac2fc5f0f1eff5f… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Sep 22 22:14:29 2020 +0200 vbscript: Fix vanishing statements. When adding multiple statements (e.g. colon separated SimpleStatements) in function source_add_statement(), tail of linked list was not adjusted. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fe59d1a5d35f4d0d9e2a262c25cbfefb91cdad3c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/parser.y | 5 +++++ dlls/vbscript/tests/lang.vbs | 3 +++ 2 files changed, 8 insertions(+) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 9a395f94961..9507e97e8ca 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -511,12 +511,17 @@ static void source_add_statement(parser_ctx_t *ctx, statement_t *stat) if(!stat) return; + /* concatenate both linked lists */ if(ctx->stats) { ctx->stats_tail->next = stat; ctx->stats_tail = stat; }else { ctx->stats = ctx->stats_tail = stat; } + /* find new tail */ + while(ctx->stats_tail->next) { + ctx->stats_tail=ctx->stats_tail->next; + } } static void source_add_class(parser_ctx_t *ctx, class_decl_t *class_decl) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 95988a4e1d9..14761cf5a52 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -62,6 +62,9 @@ Call ok(W = 5, "W = " & W & " expected " & 5) x = "xx" Call ok(x = "xx", "x = " & x & " expected ""xx""") +Dim public1 : public1 = 42 +Call ok(public1 = 42, "public1=" & public1 & " expected & " & 42) + Call ok(true <> false, "true <> false is false") Call ok(not (true <> true), "true <> true is true") Call ok(not ("x" <> "x"), """x"" <> ""x"" is true")

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021