February 2020 - Wine-commits

Jacek Caban : jscript: Directly return error code instead of using throw_reference_error.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: c372e79e256c30d0bc7a587c9cfc02c8d11fc564 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c372e79e256c30d0bc7a587c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 31 17:23:05 2020 +0100 jscript: Directly return error code instead of using throw_reference_error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 8 ++++---- dlls/jscript/error.c | 5 ----- dlls/jscript/jscript.h | 1 - 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2fa171764b..b700988f55 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -898,7 +898,7 @@ static HRESULT interp_throw_ref(script_ctx_t *ctx) TRACE("%08x\n", arg); - return throw_reference_error(ctx, arg, NULL); + return arg; } static HRESULT interp_throw_type(script_ctx_t *ctx) @@ -1161,7 +1161,7 @@ static HRESULT interp_refval(script_ctx_t *ctx) TRACE("\n"); if(!stack_topn_exprval(ctx, 0, &ref)) - return throw_reference_error(ctx, JS_E_ILLEGAL_ASSIGN, NULL); + return JS_E_ILLEGAL_ASSIGN; hres = exprval_propget(ctx, &ref, &v); if(FAILED(hres)) @@ -2527,7 +2527,7 @@ static HRESULT interp_assign(script_ctx_t *ctx) if(!stack_pop_exprval(ctx, &ref)) { jsval_release(v); - return throw_reference_error(ctx, JS_E_ILLEGAL_ASSIGN, NULL); + return JS_E_ILLEGAL_ASSIGN; } hres = exprval_propput(ctx, &ref, v); @@ -2551,7 +2551,7 @@ static HRESULT interp_assign_call(script_ctx_t *ctx) TRACE("%u\n", argc); if(!stack_topn_exprval(ctx, argc+1, &ref)) - return throw_reference_error(ctx, JS_E_ILLEGAL_ASSIGN, NULL); + return JS_E_ILLEGAL_ASSIGN; hres = exprval_call(ctx, &ref, DISPATCH_PROPERTYPUT, argc+1, stack_args(ctx, argc+1), NULL); if(FAILED(hres)) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 13bc0e6ba4..8a49c973dc 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -435,11 +435,6 @@ static HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str, j return error; } -HRESULT throw_reference_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str) -{ - return throw_error(ctx, error, str, ctx->reference_error_constr); -} - HRESULT throw_regexp_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str) { return throw_error(ctx, error, str, ctx->regexp_error_constr); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index fa7058d201..678c02acf6 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -312,7 +312,6 @@ HRESULT Function_get_value(script_ctx_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; struct _function_code_t *Function_get_code(jsdisp_t*) DECLSPEC_HIDDEN; #define DEFAULT_FUNCTION_VALUE {NULL, Function_value,0, Function_get_value} -HRESULT throw_reference_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT throw_regexp_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT throw_syntax_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT throw_type_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Directly return error code instead of using throw_regexp_error.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 0167f4a7dd08b288a89973df5bb9e92e5ae03cc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0167f4a7dd08b288a89973df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 31 17:23:10 2020 +0100 jscript: Directly return error code instead of using throw_regexp_error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/error.c | 5 ----- dlls/jscript/jscript.h | 1 - dlls/jscript/jsregexp.c | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 8a49c973dc..084e8ce953 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -435,11 +435,6 @@ static HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str, j return error; } -HRESULT throw_regexp_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str) -{ - return throw_error(ctx, error, str, ctx->regexp_error_constr); -} - HRESULT throw_syntax_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str) { return throw_error(ctx, error, str, ctx->syntax_error_constr); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 678c02acf6..cf5870f8a1 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -312,7 +312,6 @@ HRESULT Function_get_value(script_ctx_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; struct _function_code_t *Function_get_code(jsdisp_t*) DECLSPEC_HIDDEN; #define DEFAULT_FUNCTION_VALUE {NULL, Function_value,0, Function_get_value} -HRESULT throw_regexp_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT throw_syntax_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT throw_type_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT throw_uri_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 9a6ad0e37e..fc9255e1a1 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -935,7 +935,7 @@ static HRESULT RegExpConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(is_class(jsdisp, JSCLASS_REGEXP)) { if(argc > 1 && !is_undefined(argv[1])) { jsdisp_release(jsdisp); - return throw_regexp_error(ctx, JS_E_REGEXP_SYNTAX, NULL); + return JS_E_REGEXP_SYNTAX; } if(r)

1 0

Jacek Caban : jscript: Directly return error code instead of using throw_uri_error.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 22247369677c9f5c56dbdcbeda9b2749e76011cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=22247369677c9f5c56dbdcbe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 31 17:23:16 2020 +0100 jscript: Directly return error code instead of using throw_uri_error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/error.c | 5 ----- dlls/jscript/global.c | 6 +++--- dlls/jscript/jscript.h | 1 - 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 084e8ce953..5071096016 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -445,11 +445,6 @@ HRESULT throw_type_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str) return throw_error(ctx, error, str, ctx->type_error_constr); } -HRESULT throw_uri_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str) -{ - return throw_error(ctx, error, str, ctx->uri_error_constr); -} - jsdisp_t *create_builtin_error(script_ctx_t *ctx) { jsdisp_t *constr = ctx->error_constr, *r; diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 2b5f3894ca..e2758bfc66 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -632,7 +632,7 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags i = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, ptr, 1, NULL, 0, NULL, NULL)*3; if(!i) { jsstr_release(str); - return throw_uri_error(ctx, JS_E_INVALID_URI_CHAR, NULL); + return JS_E_INVALID_URI_CHAR; } len += i; @@ -710,7 +710,7 @@ static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(!res) { jsstr_release(str); - return throw_uri_error(ctx, JS_E_INVALID_URI_CODING, NULL); + return JS_E_INVALID_URI_CODING; } ptr += i*3+2; @@ -783,7 +783,7 @@ static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W size = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, ptr, 1, NULL, 0, NULL, NULL); if(!size) { jsstr_release(str); - return throw_uri_error(ctx, JS_E_INVALID_URI_CHAR, NULL); + return JS_E_INVALID_URI_CHAR; } len += size*3; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index cf5870f8a1..ec5cd08e4d 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -314,7 +314,6 @@ struct _function_code_t *Function_get_code(jsdisp_t*) DECLSPEC_HIDDEN; HRESULT throw_syntax_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT throw_type_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; -HRESULT throw_uri_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; jsdisp_t *create_builtin_error(script_ctx_t *ctx) DECLSPEC_HIDDEN; HRESULT create_object(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Directly return error code instead of using throw_syntax_error.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: df70647b007feff7156de84378a4301fdaa890dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=df70647b007feff7156de843… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 31 17:23:21 2020 +0100 jscript: Directly return error code instead of using throw_syntax_error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/enumerator.c | 2 +- dlls/jscript/jscript.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index 5f5b135cb5..753c29c9cd 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -303,7 +303,7 @@ static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD fl switch(flags) { case DISPATCH_CONSTRUCT: { if (argc > 1) - return throw_syntax_error(ctx, JS_E_INVALIDARG, NULL); + return JS_E_INVALIDARG; hres = create_enumerator(ctx, (argc == 1) ? &argv[0] : 0, &obj); if(FAILED(hres)) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index ec5cd08e4d..9933347950 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -312,7 +312,6 @@ HRESULT Function_get_value(script_ctx_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; struct _function_code_t *Function_get_code(jsdisp_t*) DECLSPEC_HIDDEN; #define DEFAULT_FUNCTION_VALUE {NULL, Function_value,0, Function_get_value} -HRESULT throw_syntax_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT throw_type_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; jsdisp_t *create_builtin_error(script_ctx_t *ctx) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Directly return error code instead of using throw_type_error in date.c.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: b6e91906d3d5d8b3ed3581c3b7f79e139c21fdb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6e91906d3d5d8b3ed3581c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 31 17:23:30 2020 +0100 jscript: Directly return error code instead of using throw_type_error in date.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/date.c | 120 ++++++++++++++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6e91906d3d5d8b3ed35…

1 0

Jacek Caban : jscript: Directly return error code instead of using throw_type_error where possible.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 8b836797e24a32bd398ab639c71cb8c59bcbfa82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b836797e24a32bd398ab639… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 31 17:23:33 2020 +0100 jscript: Directly return error code instead of using throw_type_error where possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 4 ++-- dlls/jscript/bool.c | 6 +++--- dlls/jscript/dispex.c | 2 +- dlls/jscript/engine.c | 22 +++++++++++----------- dlls/jscript/enumerator.c | 8 ++++---- dlls/jscript/error.c | 2 +- dlls/jscript/function.c | 8 ++++---- dlls/jscript/jsregexp.c | 2 +- dlls/jscript/jsutils.c | 4 ++-- dlls/jscript/number.c | 14 +++++++------- dlls/jscript/object.c | 10 +++++----- dlls/jscript/vbarray.c | 14 +++++++------- 12 files changed, 48 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b836797e24a32bd398a…

1 0

Jacek Caban : mshtml/tests: Get rid of strcmp_wa from dom.c.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 993108c129720126d3f79dfaa115b9a0d8334f75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=993108c129720126d3f79dfa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 31 19:21:09 2020 +0100 mshtml/tests: Get rid of strcmp_wa from dom.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 1329 +++++++++++++++++++++++------------------------ 1 file changed, 660 insertions(+), 669 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=993108c129720126d3f7…

1 0

Zebediah Figura : advapi32/tests: Clean up and expand tests for LsaLookupSids().
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: e291fb4dc9ee25db58cab6bbf224f8c2849eef9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e291fb4dc9ee25db58cab6bb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 1 12:10:16 2020 -0600 advapi32/tests: Clean up and expand tests for LsaLookupSids(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/lsa.c | 83 +++++++++++++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 32 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 451bee92e9..7b8f6b8e84 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -319,74 +319,93 @@ static void test_LsaLookupNames2(void) ok(status == STATUS_SUCCESS, "LsaClose() failed, returned 0x%08x\n", status); } +static void check_unicode_string_(int line, const LSA_UNICODE_STRING *string, const WCHAR *expect) +{ + ok_(__FILE__, line)(string->Length == wcslen(string->Buffer) * sizeof(WCHAR), + "expected %u, got %u\n", wcslen(string->Buffer) * sizeof(WCHAR), string->Length); + ok_(__FILE__, line)(string->MaximumLength == string->Length + sizeof(WCHAR), + "expected %u, got %u\n", string->Length + sizeof(WCHAR), string->MaximumLength); + ok_(__FILE__, line)(!wcsicmp(string->Buffer, expect), "expected %s, got %s\n", + debugstr_w(expect), debugstr_w(string->Buffer)); +} +#define check_unicode_string(a, b) check_unicode_string_(__LINE__, a, b) + static void test_LsaLookupSids(void) { + char user_buffer[64]; + LSA_OBJECT_ATTRIBUTES attrs = {.Length = sizeof(attrs)}; + TOKEN_USER *user = (TOKEN_USER *)user_buffer; + WCHAR computer_name[64], user_name[64]; LSA_REFERENCED_DOMAIN_LIST *list; - LSA_OBJECT_ATTRIBUTES attrs; LSA_TRANSLATED_NAME *names; LSA_HANDLE policy; - TOKEN_USER *user; NTSTATUS status; HANDLE token; DWORD size; BOOL ret; PSID sid; - memset(&attrs, 0, sizeof(attrs)); - attrs.Length = sizeof(attrs); - status = LsaOpenPolicy(NULL, &attrs, POLICY_LOOKUP_NAMES, &policy); ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); ret = OpenProcessToken(GetCurrentProcess(), MAXIMUM_ALLOWED, &token); - ok(ret, "got %d\n", ret); + ok(ret, "OpenProcessToken() failed, error %u\n", GetLastError()); + + ret = GetTokenInformation(token, TokenUser, user, sizeof(user_buffer), &size); + ok(ret, "GetTokenInformation() failed, error %u\n", GetLastError()); - ret = GetTokenInformation(token, TokenUser, NULL, 0, &size); - ok(!ret, "got %d\n", ret); + size = ARRAY_SIZE(computer_name); + ret = GetComputerNameW(computer_name, &size); + ok(ret, "GetComputerName() failed, error %u\n", GetLastError()); - user = HeapAlloc(GetProcessHeap(), 0, size); - ret = GetTokenInformation(token, TokenUser, user, size, &size); - ok(ret, "got %d\n", ret); + size = ARRAY_SIZE(user_name); + ret = GetUserNameW(user_name, &size); + ok(ret, "GetUserName() failed, error %u\n", GetLastError()); status = LsaLookupSids(policy, 1, &user->User.Sid, &list, &names); ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - ok(list->Entries > 0, "got %d\n", list->Entries); - if (list->Entries) - { - ok((char*)list->Domains - (char*)list > 0, "%p, %p\n", list, list->Domains); - ok((char*)list->Domains[0].Sid - (char*)list->Domains > 0, "%p, %p\n", list->Domains, list->Domains[0].Sid); - ok(list->Domains[0].Name.MaximumLength > list->Domains[0].Name.Length, "got %d, %d\n", list->Domains[0].Name.MaximumLength, - list->Domains[0].Name.Length); - } + ok(list->Entries == 1, "got %d\n", list->Entries); + check_unicode_string(&list->Domains[0].Name, computer_name); + + ok(names[0].Use == SidTypeUser, "got type %u\n", names[0].Use); + ok(!names[0].DomainIndex, "got index %u\n", names[0].DomainIndex); + check_unicode_string(&names[0].Name, user_name); LsaFreeMemory(names); LsaFreeMemory(list); - - HeapFree(GetProcessHeap(), 0, user); - CloseHandle(token); ret = ConvertStringSidToSidA("S-1-1-0", &sid); - ok(ret == TRUE, "ConvertStringSidToSidA returned false\n"); + ok(ret, "ConvertStringSidToSidA() failed, error %u\n", GetLastError()); status = LsaLookupSids(policy, 1, &sid, &list, &names); ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - ok(list->Entries > 0, "got %d\n", list->Entries); + ok(list->Entries == 1, "got %d\n", list->Entries); + check_unicode_string(&list->Domains[0].Name, L""); - if (list->Entries) - { - ok((char*)list->Domains - (char*)list > 0, "%p, %p\n", list, list->Domains); - ok((char*)list->Domains[0].Sid - (char*)list->Domains > 0, "%p, %p\n", list->Domains, list->Domains[0].Sid); - ok(list->Domains[0].Name.MaximumLength > list->Domains[0].Name.Length, "got %d, %d\n", list->Domains[0].Name.MaximumLength, - list->Domains[0].Name.Length); - ok(list->Domains[0].Name.Buffer != NULL, "domain[0] name buffer is null\n"); - } + ok(names[0].Use == SidTypeWellKnownGroup, "got type %u\n", names[0].Use); + ok(!names[0].DomainIndex, "got index %u\n", names[0].DomainIndex); + check_unicode_string(&names[0].Name, L"Everyone"); LsaFreeMemory(names); LsaFreeMemory(list); + FreeSid(sid); + + ret = ConvertStringSidToSidA("S-1-1234-5678-1234-5678", &sid); + ok(ret, "ConvertStringSidToSidA() failed, error %u\n", GetLastError()); + status = LsaLookupSids(policy, 1, &sid, &list, &names); + ok(status == STATUS_NONE_MAPPED, "got 0x%08x\n", status); + + ok(!list->Entries, "got %d\n", list->Entries); + + ok(names[0].Use == SidTypeUnknown, "got type %u\n", names[0].Use); + ok(names[0].DomainIndex == -1, "got index %u\n", names[0].DomainIndex); + + LsaFreeMemory(names); + LsaFreeMemory(list); FreeSid(sid); status = LsaClose(policy);

1 0

Zebediah Figura : advapi32: Return the string SID if LookupAccountSid() fails.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: ee012444340cc753485698059b474f6e2ad24ec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee012444340cc75348569805… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 1 12:10:17 2020 -0600 advapi32: Return the string SID if LookupAccountSid() fails. Based on a patch by Qian Hong. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/lsa.c | 20 ++++++++++++++++++-- dlls/advapi32/tests/lsa.c | 1 + 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 793d791949..d63142f730 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "winreg.h" #include "winternl.h" +#include "sddl.h" #include "advapi32_misc.h" #include "wine/debug.h" @@ -486,6 +487,7 @@ NTSTATUS WINAPI LsaLookupSids( WCHAR *name_buffer; char *domain_data; SID_NAME_USE use; + WCHAR *strsid; TRACE("(%p, %u, %p, %p, %p)\n", PolicyHandle, Count, Sids, ReferencedDomains, Names); @@ -561,6 +563,14 @@ NTSTATUS WINAPI LsaLookupSids( domain.MaximumLength = sizeof(WCHAR); } } + else if (ConvertSidToStringSidW(Sids[i], &strsid)) + { + (*Names)[i].Name.Length = strlenW(strsid) * sizeof(WCHAR); + (*Names)[i].Name.MaximumLength = (strlenW(strsid) + 1) * sizeof(WCHAR); + name_fullsize += (strlenW(strsid) + 1) * sizeof(WCHAR); + + LocalFree(strsid); + } } /* now we have full length needed for both */ @@ -577,6 +587,8 @@ NTSTATUS WINAPI LsaLookupSids( { name_size = domain_size = 0; + (*Names)[i].Name.Buffer = name_buffer; + if (!LookupAccountSidW(NULL, Sids[i], NULL, &name_size, NULL, &domain_size, &use) && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { @@ -596,15 +608,19 @@ NTSTATUS WINAPI LsaLookupSids( domain.Buffer = heap_alloc(domain.MaximumLength); - (*Names)[i].Name.Buffer = name_buffer; LookupAccountSidW(NULL, Sids[i], (*Names)[i].Name.Buffer, &name_size, domain.Buffer, &domain_size, &use); (*Names)[i].Use = use; (*Names)[i].DomainIndex = lsa_reflist_add_domain(*ReferencedDomains, &domain, &domain_data); heap_free(domain.Buffer); } + else if (ConvertSidToStringSidW(Sids[i], &strsid)) + { + strcpyW((*Names)[i].Name.Buffer, strsid); + LocalFree(strsid); + } - name_buffer += name_size; + name_buffer += strlenW(name_buffer) + 1; } TRACE("mapped %u out of %u\n", mapped, Count); diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 7b8f6b8e84..57ec8994eb 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -403,6 +403,7 @@ static void test_LsaLookupSids(void) ok(names[0].Use == SidTypeUnknown, "got type %u\n", names[0].Use); ok(names[0].DomainIndex == -1, "got index %u\n", names[0].DomainIndex); + check_unicode_string(&names[0].Name, L"S-1-1234-5678-1234-5678"); LsaFreeMemory(names); LsaFreeMemory(list);

1 0

Qian Hong : advapi32: Fix the name and use of DOMAIN_GROUP_RID_USERS.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 0024d18430db6d2ee44ec92973ab65d7744dc768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0024d18430db6d2ee44ec929… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat Feb 1 12:10:57 2020 -0600 advapi32: Fix the name and use of DOMAIN_GROUP_RID_USERS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 5 +++-- dlls/advapi32/tests/security.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a7707f15d3..700ee7d8ea 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -187,7 +187,7 @@ static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m',' static const WCHAR Domain_Computers[] = { 'D','o','m','a','i','n',' ','C','o','m','p','u','t','e','r','s',0 }; static const WCHAR Domain_Controllers[] = { 'D','o','m','a','i','n',' ','C','o','n','t','r','o','l','l','e','r','s',0 }; static const WCHAR Domain_Guests[] = { 'D','o','m','a','i','n',' ','G','u','e','s','t','s',0 }; -static const WCHAR Domain_Users[] = { 'D','o','m','a','i','n',' ','U','s','e','r','s',0 }; +static const WCHAR None[] = { 'N','o','n','e',0 }; static const WCHAR Enterprise_Admins[] = { 'E','n','t','e','r','p','r','i','s','e',' ','A','d','m','i','n','s',0 }; static const WCHAR ENTERPRISE_DOMAIN_CONTROLLERS[] = { 'E','N','T','E','R','P','R','I','S','E',' ','D','O','M','A','I','N',' ','C','O','N','T','R','O','L','L','E','R','S',0 }; static const WCHAR Everyone[] = { 'E','v','e','r','y','o','n','e',0 }; @@ -1185,7 +1185,8 @@ LookupAccountSidW( ac = Domain_Admins; break; case DOMAIN_GROUP_RID_USERS: - ac = Domain_Users; + ac = None; + use = SidTypeGroup; break; case DOMAIN_GROUP_RID_GUESTS: ac = Domain_Guests; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6d73300c1d..afcdb6328e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2928,11 +2928,11 @@ static void test_process_security(void) dom_size = sizeof(domain); ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use ); ok(ret, "LookupAccountSid failed with %d\n", ret); - todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use); + ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use); if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH) skip("Non-English locale (test with hardcoded 'None')\n"); else - todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account); + ok(!strcmp(account, "None"), "expect None, got %s\n", account); res = GetTokenInformation( token, TokenUser, NULL, 0, &size ); ok(!res, "Expected failure, got %d\n", res);

1 0