September 2020 - Wine-commits

Zebediah Figura : kernelbase: Implement CreateRestrictedToken().
by Alexandre Julliard 23 Sep '20

23 Sep '20

Module: wine Branch: master Commit: 6946d78ed9e88536951357ae5574e251f0007006 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6946d78ed9e88536951357ae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 22 17:31:16 2020 -0500 kernelbase: Implement CreateRestrictedToken(). Based on a patch by Michael Müller. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 26 ++++++++++----------- dlls/kernelbase/security.c | 51 +++++++++++++++++++++++++++++------------- 2 files changed, 48 insertions(+), 29 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 957ebc3036..6919ea64ce 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5237,7 +5237,7 @@ static void test_CreateRestrictedToken(void) is_member = TRUE; ret = pCheckTokenMembership(r_token, removed_sid, &is_member); ok(ret, "got error %d\n", GetLastError()); - todo_wine ok(!is_member, "not a member\n"); + ok(!is_member, "not a member\n"); ret = GetTokenInformation(r_token, TokenGroups, NULL, 0, &size); ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d with error %d\n", @@ -5251,8 +5251,8 @@ static void test_CreateRestrictedToken(void) if (EqualSid(groups2->Groups[i].Sid, removed_sid)) { DWORD attr = groups2->Groups[i].Attributes; - todo_wine ok(attr & SE_GROUP_USE_FOR_DENY_ONLY, "got wrong attributes %#x\n", attr); - todo_wine ok(!(attr & SE_GROUP_ENABLED), "got wrong attributes %#x\n", attr); + ok(attr & SE_GROUP_USE_FOR_DENY_ONLY, "got wrong attributes %#x\n", attr); + ok(!(attr & SE_GROUP_ENABLED), "got wrong attributes %#x\n", attr); break; } } @@ -5307,7 +5307,7 @@ static void test_CreateRestrictedToken(void) priv_set.Privilege[0].Attributes = 0; ret = PrivilegeCheck(r_token, &priv_set, &is_member); ok(ret, "got error %u\n", GetLastError()); - todo_wine ok(!is_member, "privilege should not be enabled\n"); + ok(!is_member, "privilege should not be enabled\n"); ret = GetTokenInformation(r_token, TokenPrivileges, privs, sizeof(privs_buffer), &size); ok(ret, "got error %u\n", GetLastError()); @@ -5318,7 +5318,7 @@ static void test_CreateRestrictedToken(void) if (!memcmp(&privs->Privileges[i].Luid, &luid, sizeof(luid))) is_member = TRUE; } - todo_wine ok(!is_member, "disabled privilege should not be present\n"); + ok(!is_member, "disabled privilege should not be present\n"); CloseHandle(r_token); @@ -7679,8 +7679,8 @@ static void test_duplicate_handle_access(void) SetLastError(0xdeadbeef); event2 = OpenEventA(EVENT_MODIFY_STATE, FALSE, "test_dup"); - todo_wine ok(!event2, "expected failure\n"); - todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + ok(!event2, "expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); ret = DuplicateHandle(GetCurrentProcess(), all_event, GetCurrentProcess(), &event2, EVENT_MODIFY_STATE, FALSE, 0); ok(ret, "got error %u\n", GetLastError()); @@ -7688,8 +7688,8 @@ static void test_duplicate_handle_access(void) SetLastError(0xdeadbeef); ret = DuplicateHandle(GetCurrentProcess(), sync_event, GetCurrentProcess(), &event2, EVENT_MODIFY_STATE, FALSE, 0); - todo_wine ok(!ret, "expected failure\n"); - todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); ret = RevertToSelf(); ok(ret, "got error %u\n", GetLastError()); @@ -7751,13 +7751,13 @@ static void test_duplicate_handle_access_child(void) SetLastError(0xdeadbeef); ret = DuplicateHandle(process, event, process, &event2, EVENT_MODIFY_STATE, FALSE, 0); - todo_wine ok(!ret, "expected failure\n"); - todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = DuplicateHandle(process, event, GetCurrentProcess(), &event2, EVENT_MODIFY_STATE, FALSE, 0); - todo_wine ok(!ret, "expected failure\n"); - todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); ret = RevertToSelf(); ok(ret, "failed to revert, error %u\n", GetLastError()); diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 72bb5892d3..97943048b0 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -646,27 +646,46 @@ exit: * CreateRestrictedToken (kernelbase.@) */ BOOL WINAPI CreateRestrictedToken( HANDLE token, DWORD flags, - DWORD disable_count, PSID_AND_ATTRIBUTES disable_sids, - DWORD delete_count, PLUID_AND_ATTRIBUTES delete_privs, - DWORD restrict_count, PSID_AND_ATTRIBUTES restrict_sids, PHANDLE ret ) + DWORD disable_sid_count, SID_AND_ATTRIBUTES *disable_sids, + DWORD delete_priv_count, LUID_AND_ATTRIBUTES *delete_privs, + DWORD restrict_sid_count, SID_AND_ATTRIBUTES *restrict_sids, HANDLE *ret ) { - TOKEN_TYPE type; - SECURITY_IMPERSONATION_LEVEL level = SecurityAnonymous; - DWORD size; + TOKEN_PRIVILEGES *nt_privs = NULL; + TOKEN_GROUPS *nt_disable_sids = NULL, *nt_restrict_sids = NULL; + NTSTATUS status = STATUS_NO_MEMORY; - FIXME("(%p, 0x%x, %u, %p, %u, %p, %u, %p, %p): stub\n", - token, flags, disable_count, disable_sids, delete_count, delete_privs, - restrict_count, restrict_sids, ret ); + TRACE("token %p, flags %#x, disable_sids %u %p, delete_privs %u %p, restrict_sids %u %p, ret %p\n", + token, flags, disable_sid_count, disable_sids, delete_priv_count, delete_privs, + restrict_sid_count, restrict_sids, ret); - size = sizeof(type); - if (!GetTokenInformation( token, TokenType, &type, size, &size )) return FALSE; - if (type == TokenImpersonation) + if (disable_sid_count) { - size = sizeof(level); - if (!GetTokenInformation( token, TokenImpersonationLevel, &level, size, &size )) - return FALSE; + if (!(nt_disable_sids = heap_alloc( offsetof( TOKEN_GROUPS, Groups[disable_sid_count] ) ))) goto out; + nt_disable_sids->GroupCount = disable_sid_count; + memcpy( nt_disable_sids->Groups, disable_sids, disable_sid_count * sizeof(SID_AND_ATTRIBUTES) ); + } + + if (delete_priv_count) + { + if (!(nt_privs = heap_alloc( offsetof( TOKEN_GROUPS, Groups[delete_priv_count] ) ))) goto out; + nt_privs->PrivilegeCount = delete_priv_count; + memcpy( nt_privs->Privileges, delete_privs, delete_priv_count * sizeof(SID_AND_ATTRIBUTES) ); } - return DuplicateTokenEx( token, MAXIMUM_ALLOWED, NULL, level, type, ret ); + + if (restrict_sid_count) + { + if (!(nt_restrict_sids = heap_alloc( offsetof( TOKEN_GROUPS, Groups[restrict_sid_count] ) ))) goto out; + nt_restrict_sids->GroupCount = restrict_sid_count; + memcpy( nt_restrict_sids->Groups, restrict_sids, restrict_sid_count * sizeof(SID_AND_ATTRIBUTES) ); + } + + status = NtFilterToken(token, flags, nt_disable_sids, nt_privs, nt_restrict_sids, ret); + +out: + heap_free(nt_disable_sids); + heap_free(nt_privs); + heap_free(nt_restrict_sids); + return set_ntstatus( status ); } /******************************************************************************

1 0

Robert Wilhelm : vbscript: Fix vanishing statements.
by Alexandre Julliard 23 Sep '20

23 Sep '20

Module: wine Branch: master Commit: fe59d1a5d35f4d0d9e2a262c25cbfefb91cdad3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe59d1a5d35f4d0d9e2a262c… 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> --- 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 80f8699bd8..924d0b973b 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -516,12 +516,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 621b390523..9f254f502b 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -67,6 +67,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

Gijs Vermeulen : mshtml: Implement IOleObject::[Get|Set]Extent.
by Alexandre Julliard 23 Sep '20

23 Sep '20

Module: wine Branch: master Commit: 86dfc6ad275e4290cf2c56c204c5b16ea48a7872 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86dfc6ad275e4290cf2c56c2… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Sep 23 16:47:07 2020 +0200 mshtml: Implement IOleObject::[Get|Set]Extent. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45797 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 3 +- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/oleobj.c | 22 ++++++++-- dlls/mshtml/tests/htmldoc.c | 99 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 120 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index bc3427c30f..0fd039bfa6 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -6014,10 +6014,11 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii doc->IUnknown_inner.lpVtbl = &HTMLDocumentObjVtbl; doc->ICustomDoc_iface.lpVtbl = &CustomDocVtbl; + doc->basedoc.doc_obj = doc; + init_dispex(&doc->dispex, (IUnknown*)&doc->ICustomDoc_iface, &HTMLDocumentObj_dispex); init_doc(&doc->basedoc, outer ? outer : &doc->IUnknown_inner, &doc->dispex.IDispatchEx_iface); TargetContainer_Init(doc); - doc->basedoc.doc_obj = doc; doc->is_mhtml = is_mhtml; doc->task_magic = get_task_target_magic(); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2c14ec0bec..066169b749 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -711,6 +711,7 @@ struct HTMLDocumentObj { DWORD update; LONG task_magic; + SIZEL extent; }; typedef struct nsWeakReference nsWeakReference; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 1d8d62669e..00e937223a 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -606,15 +606,27 @@ static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD dwFormOfTyp static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD dwDrawAspect, SIZEL *psizel) { HTMLDocument *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); + + if (dwDrawAspect != DVASPECT_CONTENT) + return E_INVALIDARG; + + This->doc_obj->extent = *psizel; + return S_OK; } static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect, SIZEL *psizel) { HTMLDocument *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); + + if (dwDrawAspect != DVASPECT_CONTENT) + return E_INVALIDARG; + + *psizel = This->doc_obj->extent; + return S_OK; } static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, DWORD *pdwConnection) @@ -1473,4 +1485,6 @@ void HTMLDocument_OleObj_Init(HTMLDocument *This) This->IObjectWithSite_iface.lpVtbl = &ObjectWithSiteVtbl; This->IOleContainer_iface.lpVtbl = &OleContainerVtbl; This->IObjectSafety_iface.lpVtbl = &ObjectSafetyVtbl; + This->doc_obj->extent.cx = 1; + This->doc_obj->extent.cy = 1; } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index dee448144e..89311c5d8c 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6922,6 +6922,104 @@ static void test_OnAmbientPropertyChange(IHTMLDocument2 *doc) +static void test_GetSetExtent(IHTMLDocument2 *doc) +{ + IOleObject *oleobj = NULL; + HRESULT hres; + SIZE extent; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); + if(FAILED(hres)) + return; + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + extent.cx, extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, 0, &extent); + ok(hres == E_INVALIDARG, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 0xdeadbeef && extent.cy == 0xdeadbeef, "size = {%d %d}\n", extent.cx, extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, 7, &extent); + ok(hres == E_INVALIDARG, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 0xdeadbeef && extent.cy == 0xdeadbeef, "size = {%d %d}\n", extent.cx, extent.cy); + + extent.cx = 800; + extent.cy = 700; + hres = IOleObject_SetExtent(oleobj, 0, &extent); + ok(hres == E_INVALIDARG, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + extent.cx, extent.cy); + + extent.cx = 800; + extent.cy = 700; + hres = IOleObject_SetExtent(oleobj, 7, &extent); + ok(hres == E_INVALIDARG, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + extent.cx, extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_SetExtent(oleobj, 0, &extent); + todo_wine ok(hres == E_FAIL, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + extent.cx, extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_SetExtent(oleobj, 7, &extent); + todo_wine ok(hres == E_FAIL, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + extent.cx, extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &extent); + todo_wine ok(hres == E_FAIL, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + todo_wine ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + extent.cx, extent.cy); + + extent.cx = 800; + extent.cy = 700; + hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 800 && extent.cy == 700, "size = {%d %d} (expected {800 700})\n", + extent.cx, extent.cy ); + + extent.cx = 1; + extent.cy = 1; + hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "SetExtent failed: %08x\n", hres); + + IOleObject_Release(oleobj); +} + static void test_OnAmbientPropertyChange2(IHTMLDocument2 *doc) { IOleControl *control = NULL; @@ -7605,6 +7703,7 @@ static void test_HTMLDocument(BOOL do_load, BOOL mime) doc_unk = (IUnknown*)doc; test_QueryInterface(doc); + test_GetSetExtent(doc); test_Advise(doc); test_IsDirty(doc, S_FALSE); test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED);

1 0

Nikolay Sivov : widl: Enable [hidden] attribute for enums.
by Alexandre Julliard 23 Sep '20

23 Sep '20

Module: wine Branch: master Commit: 8eb756c6993e8931059ac51bff668fb6a546123e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eb756c6993e8931059ac51b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 23 18:10:17 2020 +0300 widl: Enable [hidden] attribute for enums. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 7d5aaebf33..b6cd33dd6b 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2153,7 +2153,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_HELPSTRING */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "helpstring" }, /* ATTR_HELPSTRINGCONTEXT */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "helpstringcontext" }, /* ATTR_HELPSTRINGDLL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "helpstringdll" }, - /* ATTR_HIDDEN */ { 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, "hidden" }, + /* ATTR_HIDDEN */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, "hidden" }, /* ATTR_ID */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, "id" }, /* ATTR_IDEMPOTENT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "idempotent" }, /* ATTR_IGNORE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "ignore" },

1 0

Nikolay Sivov : widl: Allow [hidden] attribute on enum members.
by Alexandre Julliard 23 Sep '20

23 Sep '20

Module: wine Branch: master Commit: 0a49202109e29bd18daaf746cb9493e385511e13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a49202109e29bd18daaf746… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 23 18:10:18 2020 +0300 widl: Allow [hidden] attribute on enum members. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 226 ++++++++++++++++++++++++++++------------------------ 1 file changed, 123 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a49202109e29bd18daa…

1 0

Alexandre Julliard : server: Pass all creation arguments to the device creation functions.
by Alexandre Julliard 23 Sep '20

23 Sep '20

Module: wine Branch: master Commit: 5c4d6cf8375b69f15df4e79b23a8c95c634b7421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c4d6cf8375b69f15df4e79b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 23 11:32:47 2020 +0200 server: Pass all creation arguments to the device creation functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 5 +++-- server/device.c | 3 ++- server/directory.c | 10 +++++----- server/file.h | 14 +++++++++----- server/mailslot.c | 5 +++-- server/mapping.c | 4 ++-- server/named_pipe.c | 5 +++-- server/sock.c | 5 +++-- 8 files changed, 30 insertions(+), 21 deletions(-) diff --git a/server/console.c b/server/console.c index 4ed14a2d3f..b0b6de2eef 100644 --- a/server/console.c +++ b/server/console.c @@ -2540,9 +2540,10 @@ static struct object *console_device_open_file( struct object *obj, unsigned int return is_output ? grab_object( current->process->console->active ) : grab_object( current->process->console ); } -struct object *create_console_device( struct object *root, const struct unicode_str *name ) +struct object *create_console_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ) { - return create_named_object( root, &console_device_ops, name, 0, NULL ); + return create_named_object( root, &console_device_ops, name, attr, sd ); } /* allocate a console for the renderer */ diff --git a/server/device.c b/server/device.c index 371943acee..652da83e1e 100644 --- a/server/device.c +++ b/server/device.c @@ -720,11 +720,12 @@ static struct device *create_device( struct object *root, const struct unicode_s } struct object *create_unix_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd, const char *unix_path ) { struct device *device; - if ((device = create_named_object( root, &device_ops, name, 0, NULL ))) + if ((device = create_named_object( root, &device_ops, name, attr, sd ))) { device->unix_path = strdup( unix_path ); device->manager = NULL; /* no manager, requests go straight to the Unix device */ diff --git a/server/directory.c b/server/directory.c index ef0a1038a5..cae75d2b69 100644 --- a/server/directory.c +++ b/server/directory.c @@ -423,11 +423,11 @@ void init_directories(void) make_object_static( &dir_objtype->obj ); /* devices */ - named_pipe_device = create_named_pipe_device( &dir_device->obj, &named_pipe_str ); - mailslot_device = create_mailslot_device( &dir_device->obj, &mailslot_str ); - console_device = create_console_device( &dir_device->obj, &condrv_str ); - socket_device = create_socket_device( &dir_device->obj, &afd_str ); - null_device = create_unix_device( &dir_device->obj, &null_str, "/dev/null" ); + named_pipe_device = create_named_pipe_device( &dir_device->obj, &named_pipe_str, 0, NULL ); + mailslot_device = create_mailslot_device( &dir_device->obj, &mailslot_str, 0, NULL ); + console_device = create_console_device( &dir_device->obj, &condrv_str, 0, NULL ); + socket_device = create_socket_device( &dir_device->obj, &afd_str, 0, NULL ); + null_device = create_unix_device( &dir_device->obj, &null_str, 0, NULL, "/dev/null" ); make_object_static( named_pipe_device ); make_object_static( mailslot_device ); make_object_static( null_device ); diff --git a/server/file.h b/server/file.h index 5fb4e5614b..477720f8b1 100644 --- a/server/file.h +++ b/server/file.h @@ -176,12 +176,16 @@ extern struct object *create_user_data_mapping( struct object *root, const struc /* device functions */ -extern struct object *create_named_pipe_device( struct object *root, const struct unicode_str *name ); -extern struct object *create_mailslot_device( struct object *root, const struct unicode_str *name ); -extern struct object *create_console_device( struct object *root, const struct unicode_str *name ); -extern struct object *create_socket_device( struct object *root, const struct unicode_str *name ); +extern struct object *create_named_pipe_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ); +extern struct object *create_mailslot_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ); +extern struct object *create_console_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ); +extern struct object *create_socket_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ); extern struct object *create_unix_device( struct object *root, const struct unicode_str *name, - const char *unix_path ); + unsigned int attr, const struct security_descriptor *sd, const char *unix_path ); /* change notification functions */ diff --git a/server/mailslot.c b/server/mailslot.c index 9c58ed77a5..e0294d946e 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -433,11 +433,12 @@ static void mailslot_device_destroy( struct object *obj ) free( device->mailslots ); } -struct object *create_mailslot_device( struct object *root, const struct unicode_str *name ) +struct object *create_mailslot_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ) { struct mailslot_device *dev; - if ((dev = create_named_object( root, &mailslot_device_ops, name, 0, NULL )) && + if ((dev = create_named_object( root, &mailslot_device_ops, name, attr, sd )) && get_error() != STATUS_OBJECT_NAME_EXISTS) { dev->mailslots = NULL; diff --git a/server/mapping.c b/server/mapping.c index 8955df7ec2..769a986ae2 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -964,8 +964,8 @@ struct object *create_user_data_mapping( struct object *root, const struct unico void *ptr; struct mapping *mapping; - if (!(mapping = create_mapping( root, name, OBJ_OPENIF, sizeof(KSHARED_USER_DATA), - SEC_COMMIT, 0, FILE_READ_DATA | FILE_WRITE_DATA, NULL ))) return NULL; + if (!(mapping = create_mapping( root, name, attr, sizeof(KSHARED_USER_DATA), + SEC_COMMIT, 0, FILE_READ_DATA | FILE_WRITE_DATA, sd ))) return NULL; ptr = mmap( NULL, mapping->size, PROT_WRITE, MAP_SHARED, get_unix_fd( mapping->fd ), 0 ); if (ptr != MAP_FAILED) { diff --git a/server/named_pipe.c b/server/named_pipe.c index 1ac35cf118..07a14502b3 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -507,11 +507,12 @@ static void named_pipe_device_destroy( struct object *obj ) free( device->pipes ); } -struct object *create_named_pipe_device( struct object *root, const struct unicode_str *name ) +struct object *create_named_pipe_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ) { struct named_pipe_device *dev; - if ((dev = create_named_object( root, &named_pipe_device_ops, name, 0, NULL )) && + if ((dev = create_named_object( root, &named_pipe_device_ops, name, attr, sd )) && get_error() != STATUS_OBJECT_NAME_EXISTS) { dev->pipes = NULL; diff --git a/server/sock.c b/server/sock.c index c9cf2d56da..3f19c77964 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1247,9 +1247,10 @@ static struct object *socket_device_open_file( struct object *obj, unsigned int return &sock->obj; } -struct object *create_socket_device( struct object *root, const struct unicode_str *name ) +struct object *create_socket_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ) { - return create_named_object( root, &socket_device_ops, name, 0, NULL ); + return create_named_object( root, &socket_device_ops, name, attr, sd ); } /* accept a socket */

1 0

Alexandre Julliard : server: Use OBJ_PERMANENT for permanent objects.
by Alexandre Julliard 23 Sep '20

23 Sep '20

Module: wine Branch: master Commit: 82c84548ebee6f2577f65e0a5df21fef898b6990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c84548ebee6f2577f65e0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 23 11:42:27 2020 +0200 server: Use OBJ_PERMANENT for permanent objects. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 137 ++++++++++++++++++++++------------------------------- server/object.c | 14 +++--- server/process.c | 4 +- 3 files changed, 66 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=82c84548ebee6f2577f6…

1 0

Alexandre Julliard : server: Rename make_object_static() to make_object_permanent().
by Alexandre Julliard 23 Sep '20

23 Sep '20

Module: wine Branch: master Commit: 25692223f1cf1f451e4283a2d07a89d1dd7cd3eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=25692223f1cf1f451e4283a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 23 15:26:10 2020 +0200 server: Rename make_object_static() to make_object_permanent(). This makes it clear that it's the same as the OBJ_PERMANENT flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/atom.c | 2 +- server/handle.c | 2 +- server/object.c | 8 ++++---- server/object.h | 2 +- server/registry.c | 4 ++-- server/request.c | 2 +- server/signal.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/server/atom.c b/server/atom.c index e14650bde2..b61fa27666 100644 --- a/server/atom.c +++ b/server/atom.c @@ -304,7 +304,7 @@ static struct atom_table *get_global_table( struct winstation *winstation, int c else { global_table = table; - make_object_static( &global_table->obj ); + make_object_permanent( &global_table->obj ); } } else set_error( STATUS_OBJECT_NAME_NOT_FOUND ); diff --git a/server/handle.c b/server/handle.c index b2c7371e69..90f9ea63d6 100644 --- a/server/handle.c +++ b/server/handle.c @@ -298,7 +298,7 @@ static obj_handle_t alloc_global_handle_no_access_check( void *obj, unsigned int { if (!(global_table = alloc_handle_table( NULL, 0 ))) return 0; - make_object_static( &global_table->obj ); + make_object_permanent( &global_table->obj ); } return handle_local_to_global( alloc_entry( global_table, obj, access )); } diff --git a/server/object.c b/server/object.c index 51a9017e30..27c1aa58ad 100644 --- a/server/object.c +++ b/server/object.c @@ -347,7 +347,7 @@ void *create_named_object( struct object *parent, const struct object_ops *ops, done: if (attributes & OBJ_PERMANENT) { - make_object_static( new_obj ); + make_object_permanent( new_obj ); grab_object( new_obj ); } return new_obj; @@ -406,8 +406,8 @@ void unlink_named_object( struct object *obj ) free( name_ptr ); } -/* mark an object as being stored statically, i.e. only released at shutdown */ -void make_object_static( struct object *obj ) +/* mark an object as being permanent, i.e. only released at shutdown */ +void make_object_permanent( struct object *obj ) { obj->is_permanent = 1; #ifdef DEBUG_OBJECTS @@ -416,7 +416,7 @@ void make_object_static( struct object *obj ) #endif } -/* mark an object as no longer static */ +/* mark an object as no longer permanent */ void make_object_temporary( struct object *obj ) { obj->is_permanent = 0; diff --git a/server/object.h b/server/object.h index 53e37b61a2..f8a3a971d6 100644 --- a/server/object.h +++ b/server/object.h @@ -145,7 +145,7 @@ extern void *create_named_object( struct object *parent, const struct object_ops extern void *open_named_object( struct object *parent, const struct object_ops *ops, const struct unicode_str *name, unsigned int attributes ); extern void unlink_named_object( struct object *obj ); -extern void make_object_static( struct object *obj ); +extern void make_object_permanent( struct object *obj ); extern void make_object_temporary( struct object *obj ); extern struct namespace *create_namespace( unsigned int hash_size ); extern void free_kernel_objects( struct object *obj ); diff --git a/server/registry.c b/server/registry.c index 438ec6c6fc..3b2d59fc72 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1742,7 +1742,7 @@ static int load_init_registry_from_file( const char *filename, struct key *key ) save_branch_info[save_branch_count].path = filename; save_branch_info[save_branch_count++].key = (struct key *)grab_object( key ); - make_object_static( &key->obj ); + make_object_permanent( &key->obj ); return (f != NULL); } @@ -1813,7 +1813,7 @@ void init_registry(void) /* create the root key */ root_key = alloc_key( &root_name, current_time ); assert( root_key ); - make_object_static( &root_key->obj ); + make_object_permanent( &root_key->obj ); /* load system.reg into Registry\Machine */ diff --git a/server/request.c b/server/request.c index 45076d90e2..3ef4a244b8 100644 --- a/server/request.c +++ b/server/request.c @@ -871,7 +871,7 @@ static void acquire_lock(void) !(master_socket->fd = create_anonymous_fd( &master_socket_fd_ops, fd, &master_socket->obj, 0 ))) fatal_error( "out of memory\n" ); set_fd_events( master_socket->fd, POLLIN ); - make_object_static( &master_socket->obj ); + make_object_permanent( &master_socket->obj ); } /* open the master server socket and start waiting for new clients */ diff --git a/server/signal.c b/server/signal.c index 8a9cbdd0ed..7c2bf2cc15 100644 --- a/server/signal.c +++ b/server/signal.c @@ -127,7 +127,7 @@ static struct handler *create_handler( signal_callback callback ) return NULL; } set_fd_events( handler->fd, POLLIN ); - make_object_static( &handler->obj ); + make_object_permanent( &handler->obj ); return handler; }

1 0

Michael Stefaniuc : advapi32: Remove superfluous cast to self.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: d6c4efec1ab726b70a660b8a3195eb43003793b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6c4efec1ab726b70a660b8a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Sep 22 20:52:39 2020 +0200 advapi32: Remove superfluous cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 846a2b8d45..8a1024ff80 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -179,12 +179,12 @@ EnumServicesStatusW( SC_HANDLE manager, DWORD type, DWORD state, ENUM_SERVICE_ST for (i = 0; i < *ret_count; i++) { lstrcpyW( p, status_ex[i].lpServiceName ); - status[i].lpServiceName = (WCHAR *)p; + status[i].lpServiceName = p; p += lstrlenW( p ) + 1; if (status_ex[i].lpDisplayName) { lstrcpyW( p, status_ex[i].lpDisplayName ); - status[i].lpDisplayName = (WCHAR *)p; + status[i].lpDisplayName = p; p += lstrlenW( p ) + 1; } else status[i].lpDisplayName = NULL;

1 0

Jiangyi Chen : iphlpapi: Rename local variables shadowing the flags parameters.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: f6ae4d167048fcd121475fe25031194fc3f19dc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6ae4d167048fcd121475fe2… Author: Jiangyi Chen <chenjiangyi(a)uniontech.com> Date: Tue Sep 22 10:18:27 2020 +0000 iphlpapi: Rename local variables shadowing the flags parameters. Signed-off-by: Jiangyi Chen <chenjiangyi(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index d8c2ce029b..0fa446c21a 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1402,7 +1402,7 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw if ((fp = fopen("/proc/net/route", "r"))) { char buf[512], *ptr; - DWORD flags; + DWORD rtf_flags; /* skip header line */ ptr = fgets(buf, sizeof(buf), fp); @@ -1417,10 +1417,10 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw row.dwForwardDest = strtoul(ptr, &ptr, 16); row.dwForwardNextHop = strtoul(ptr + 1, &ptr, 16); - flags = strtoul(ptr + 1, &ptr, 16); + rtf_flags = strtoul(ptr + 1, &ptr, 16); - if (!(flags & RTF_UP)) row.u1.ForwardType = MIB_IPROUTE_TYPE_INVALID; - else if (flags & RTF_GATEWAY) row.u1.ForwardType = MIB_IPROUTE_TYPE_INDIRECT; + if (!(rtf_flags & RTF_UP)) row.u1.ForwardType = MIB_IPROUTE_TYPE_INVALID; + else if (rtf_flags & RTF_GATEWAY) row.u1.ForwardType = MIB_IPROUTE_TYPE_INDIRECT; else row.u1.ForwardType = MIB_IPROUTE_TYPE_DIRECT; strtoul(ptr + 1, &ptr, 16); /* refcount, skip */ @@ -1664,7 +1664,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO if ((fp = fopen("/proc/net/arp", "r"))) { char buf[512], *ptr; - DWORD flags; + DWORD atf_flags; /* skip header line */ ptr = fgets(buf, sizeof(buf), fp); @@ -1675,14 +1675,14 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO row.dwAddr = inet_addr(ptr); while (*ptr && !isspace(*ptr)) ptr++; strtoul(ptr + 1, &ptr, 16); /* hw type (skip) */ - flags = strtoul(ptr + 1, &ptr, 16); + atf_flags = strtoul(ptr + 1, &ptr, 16); #ifdef ATF_COM - if (flags & ATF_COM) row.u.Type = MIB_IPNET_TYPE_DYNAMIC; + if (atf_flags & ATF_COM) row.u.Type = MIB_IPNET_TYPE_DYNAMIC; else #endif #ifdef ATF_PERM - if (flags & ATF_PERM) row.u.Type = MIB_IPNET_TYPE_STATIC; + if (atf_flags & ATF_PERM) row.u.Type = MIB_IPNET_TYPE_STATIC; else #endif row.u.Type = MIB_IPNET_TYPE_OTHER;

1 0