June 2017 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Added IHTMLInputTextElement2:: selectionStart property implementation.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: 03febf448e989afa92317e2ec045358a31c683cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=03febf448e989afa92317e2ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 15 13:47:37 2017 +0200 mshtml: Added IHTMLInputTextElement2::selectionStart property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index c89dad6..00f714d 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1263,15 +1263,34 @@ static HRESULT WINAPI HTMLInputTextElement2_Invoke(IHTMLInputTextElement2 *iface static HRESULT WINAPI HTMLInputTextElement2_put_selectionStart(IHTMLInputTextElement2 *iface, LONG v) { HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - FIXME("(%p)->(%d)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%d)\n", This, v); + + nsres = nsIDOMHTMLInputElement_SetSelectionStart(This->nsinput, v); + if(NS_FAILED(nsres)) { + ERR("SetSelectionStart failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLInputTextElement2_get_selectionStart(IHTMLInputTextElement2 *iface, LONG *p) { HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 selection_start; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLInputElement_GetSelectionStart(This->nsinput, &selection_start); + if(NS_FAILED(nsres)) { + ERR("GetSelectionStart failed: %08x\n", nsres); + return E_FAIL; + } + + *p = selection_start; + return S_OK; } static HRESULT WINAPI HTMLInputTextElement2_put_selectionEnd(IHTMLInputTextElement2 *iface, LONG v)

1 0

Thomas Faber : advapi32/tests: Properly restore privileges in test_AdjustTokenPrivileges.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: c7f0777fc55229d910461a7a38e21f1e17c8913a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f0777fc55229d910461a7a3… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Jun 15 12:56:48 2017 +0200 advapi32/tests: Properly restore privileges in test_AdjustTokenPrivileges. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 0c145a4..09c6a72 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6081,7 +6081,7 @@ static void test_default_dacl_owner_sid(void) static void test_AdjustTokenPrivileges(void) { - TOKEN_PRIVILEGES tp, prev; + TOKEN_PRIVILEGES tp; HANDLE token; DWORD len; LUID luid; @@ -6109,7 +6109,8 @@ static void test_AdjustTokenPrivileges(void) tp.PrivilegeCount = 1; tp.Privileges[0].Luid = luid; tp.Privileges[0].Attributes = 0; - AdjustTokenPrivileges(token, FALSE, &tp, sizeof(TOKEN_PRIVILEGES), &prev, NULL); + ret = AdjustTokenPrivileges(token, FALSE, &tp, sizeof(TOKEN_PRIVILEGES), NULL, NULL); + ok(ret, "got %d\n", ret); CloseHandle(token); }

1 0

Jacek Caban : mshtml: Added IHTMLInputTextElement2:: setSelectionRange implementation.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: 5dee1a3f8917dfa82b4365280292177c4b8c59e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dee1a3f8917dfa82b4365280… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 15 13:47:57 2017 +0200 mshtml: Added IHTMLInputTextElement2::setSelectionRange implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 3dcded9..06b0d09 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1329,8 +1329,21 @@ static HRESULT WINAPI HTMLInputTextElement2_get_selectionEnd(IHTMLInputTextEleme static HRESULT WINAPI HTMLInputTextElement2_setSelectionRange(IHTMLInputTextElement2 *iface, LONG start, LONG end) { HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - FIXME("(%p)->(%d %d)\n", This, start, end); - return E_NOTIMPL; + nsAString none_str; + nsresult nsres; + + static const WCHAR noneW[] = {'n','o','n','e',0}; + + TRACE("(%p)->(%d %d)\n", This, start, end); + + nsAString_InitDepend(&none_str, noneW); + nsres = nsIDOMHTMLInputElement_SetSelectionRange(This->nsinput, start, end, &none_str); + nsAString_Finish(&none_str); + if(NS_FAILED(nsres)) { + ERR("SetSelectionRange failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static const IHTMLInputTextElement2Vtbl HTMLInputTextElement2Vtbl = {

1 0

Jacek Caban : mshtml: Added IHTMLInputTextElement2:: selectionEnd property implementation.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: aebefe17bf0a2c5f54b82f05a7d671b8aacb66f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aebefe17bf0a2c5f54b82f05a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 15 13:47:47 2017 +0200 mshtml: Added IHTMLInputTextElement2::selectionEnd property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 00f714d..3dcded9 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1296,15 +1296,34 @@ static HRESULT WINAPI HTMLInputTextElement2_get_selectionStart(IHTMLInputTextEle static HRESULT WINAPI HTMLInputTextElement2_put_selectionEnd(IHTMLInputTextElement2 *iface, LONG v) { HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - FIXME("(%p)->(%d)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%d)\n", This, v); + + nsres = nsIDOMHTMLInputElement_SetSelectionEnd(This->nsinput, v); + if(NS_FAILED(nsres)) { + ERR("SetSelectionEnd failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLInputTextElement2_get_selectionEnd(IHTMLInputTextElement2 *iface, LONG *p) { HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 selection_end; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLInputElement_GetSelectionEnd(This->nsinput, &selection_end); + if(NS_FAILED(nsres)) { + ERR("GetSelectionEnd failed: %08x\n", nsres); + return E_FAIL; + } + + *p = selection_end; + return S_OK; } static HRESULT WINAPI HTMLInputTextElement2_setSelectionRange(IHTMLInputTextElement2 *iface, LONG start, LONG end)

1 0

Jacek Caban : mshtml.idl: Added IHTMLInputTextElement2 declaration.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: dadad569f30bea93f9bcf5086b8c861fb3bb62ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=dadad569f30bea93f9bcf5086… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 15 13:47:14 2017 +0200 mshtml.idl: Added IHTMLInputTextElement2 declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 5 +++++ include/mshtml.idl | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 9393b84..947e1b8 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2767,6 +2767,11 @@ #define DISPID_IHTMLINPUTTEXTELEMENT_READONLY DISPID_INPUT+5 #define DISPID_IHTMLINPUTTEXTELEMENT_CREATETEXTRANGE DISPID_INPUT+6 +/* IHTMLInputTextElement2 */ +#define DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONSTART DISPID_INPUT+25 +#define DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONEND DISPID_INPUT+26 +#define DISPID_IHTMLINPUTTEXTELEMENT2_SETSELECTIONRANGE DISPID_INPUT+27 + /* IHTMLSelectElement */ #define DISPID_IHTMLSELECTELEMENT_SIZE DISPID_SELECT+2 #define DISPID_IHTMLSELECTELEMENT_MULTIPLE DISPID_SELECT+3 diff --git a/include/mshtml.idl b/include/mshtml.idl index 4a8913f..10aa69d 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -10955,6 +10955,33 @@ interface IHTMLInputTextElement : IDispatch HRESULT createTextRange([retval, out] IHTMLTxtRange **range); } +/***************************************************************************** + * IHTMLInputTextElement2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f2d2-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLInputTextElement2 : IDispatch +{ + [propput, id(DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONSTART)] + HRESULT selectionStart([in] long v); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONSTART)] + HRESULT selectionStart([out, retval] long *p); + + [propput, id(DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONEND)] + HRESULT selectionEnd([in] long v); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONEND)] + HRESULT selectionEnd([out, retval] long *p); + + [id(DISPID_IHTMLINPUTTEXTELEMENT2_SETSELECTIONRANGE)] + HRESULT setSelectionRange([in] long start, [in] long end); +} + [ hidden, uuid(3050f57d-98b5-11cf-bb82-00aa00bdce0b) @@ -11162,6 +11189,21 @@ methods: [propget, id(DISPID_IHTMLINPUTELEMENT2_USEMAP), displaybind, bindable] BSTR useMap(); + + [propput, id(DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONSTART)] + void selectionStart(long v); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONSTART)] + long selectionStart(); + + [propput, id(DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONEND)] + void selectionEnd(long v); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONEND)] + long selectionEnd(); + + [id(DISPID_IHTMLINPUTTEXTELEMENT2_SETSELECTIONRANGE)] + void setSelectionRange([in] long start, [in] long end); } /***************************************************************************** @@ -11183,7 +11225,7 @@ coclass HTMLInputElement interface IHTMLInputElement; /* interface IHTMLInputElement2; */ interface IHTMLInputTextElement; - /* interface IHTMLInputTextElement2; */ + interface IHTMLInputTextElement2; /* interface IHTMLInputHiddenElement; */ /* interface IHTMLInputButtonElement; */ /* interface IHTMLInputFileElement; */

1 0

Hugh McMaster : regedit: Free the stringValueData buffer before using it again (Coverity).
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: b1e48fb469c8bba38716b85a49965deefb79ec5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1e48fb469c8bba38716b85a4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 11:58:54 2017 +0000 regedit: Free the stringValueData buffer before using it again (Coverity). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index fcf2a60..d88061c 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -378,6 +378,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) { int index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); + HeapFree(GetProcessHeap(), 0, stringValueData); stringValueData = read_value(hwnd, hKey, valueName, &type, &len); format_value_data(g_pChildWnd->hListWnd, index, type, stringValueData, len); }

1 0

Hugh McMaster : reg/tests: Test whether "" is interpreted as the default registry value.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: 103c8bb6d40e64f50647847b37cdae10fa2e3321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=103c8bb6d40e64f50647847b3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 11:58:30 2017 +0000 reg/tests: Test whether "" is interpreted as the default registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 36ec730..2c1cc67 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1320,9 +1320,11 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Empty string\"=\"\"\n\n", &r); + "\"Empty string\"=\"\"\n" + "\"\"=\"Default Value Name\"\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Empty string", REG_SZ, "", 1, 0); + todo_wine verify_reg(hkey, NULL, REG_SZ, "Default Value Name", 19, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2160,9 +2162,11 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Empty string\"=\"\"\n\n", &r); + "\"Empty string\"=\"\"\n" + "\"\"=\"Default registry value\"\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Empty string", REG_SZ, "", 1, 0); + todo_wine verify_reg(hkey, NULL, REG_SZ, "Default registry value", 23, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : reg/tests: Output "(Default)" when referring to the default registry value.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: c882a064299a0ad39f6c91144138858961f903c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c882a064299a0ad39f6c91144… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 11:58:21 2017 +0000 reg/tests: Output "(Default)" when referring to the default registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index d285910..36ec730 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -88,7 +88,7 @@ static void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) err = RegQueryValueExA(hkey, value, NULL, NULL, NULL, NULL); lok(err == ERROR_FILE_NOT_FOUND, "registry value '%s' shouldn't exist; got %d, expected 2\n", - value, err); + (value && *value) ? value : "(Default)", err); } #define verify_key_exist(k,s) verify_key_exist_(__LINE__,k,s)

1 0

Alistair Leslie-Hughes : include/wmsdkidl.idl: Add IWMLanguageList, IWMReaderPlaylistBurn interfaces.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: fd6442f43116ccb56730fe9eac7c8c60ec15904a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd6442f43116ccb56730fe9ea… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 14 23:27:39 2017 +0000 include/wmsdkidl.idl: Add IWMLanguageList, IWMReaderPlaylistBurn interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index ea8d63b..b4bd600 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1571,6 +1571,51 @@ interface IWMReaderTypeNegotiation : IUnknown [in] IWMOutputMediaProps *props); }; +[ + object, + uuid(df683f00-2d49-4d8e-92b7-fb19f6a0dc57), + pointer_default(unique), + local +] +interface IWMLanguageList : IUnknown +{ + HRESULT GetLanguageCount( + [out] WORD *count); + + HRESULT GetLanguageDetails( + [in] WORD index, + [out, size_is( *length )] WCHAR *language, + [in, out] WORD *length); + + HRESULT AddLanguageByRFC1766String( + [in] LPCWSTR_WMSDK_TYPE_SAFE language, + [out] WORD *index); +}; + +[ + object, + uuid(f28c0300-9baa-4477-a846-1744d9cbf533), + pointer_default(unique), + local +] +interface IWMReaderPlaylistBurn : IUnknown +{ + HRESULT InitPlaylistBurn( + [in] DWORD count, + [in] LPCWSTR_WMSDK_TYPE_SAFE *filenames, + [in] IWMStatusCallback *callback, + [in] void *context); + + HRESULT GetInitResults( + [in] DWORD count, + [out] HRESULT *stat); + + HRESULT Cancel(); + + HRESULT EndPlaylistBurn([in] HRESULT result); +}; + + cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);")

1 0

Michael Müller : advapi32/tests: Add basic tests for token security descriptors.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: 3ef07ac9dd9eddb14a3e05e1be7ee0b2d188346d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ef07ac9dd9eddb14a3e05e1b… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 14 20:20:44 2017 +0200 advapi32/tests: Add basic tests for token security descriptors. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 82 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 7842d0e..0c145a4 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -229,6 +229,7 @@ static void init(void) pGetAce = (void *)GetProcAddress(hmod, "GetAce"); pGetWindowsAccountDomainSid = (void *)GetProcAddress(hmod, "GetWindowsAccountDomainSid"); pGetSidIdentifierAuthority = (void *)GetProcAddress(hmod, "GetSidIdentifierAuthority"); + pDuplicateTokenEx = (void *)GetProcAddress(hmod, "DuplicateTokenEx"); myARGC = winetest_get_mainargs( &myARGV ); } @@ -3012,7 +3013,6 @@ static void test_impersonation_level(void) HKEY hkey; DWORD error; - pDuplicateTokenEx = (void *)GetProcAddress(hmod, "DuplicateTokenEx"); if( !pDuplicateTokenEx ) { win_skip("DuplicateTokenEx is not available\n"); return; @@ -6715,6 +6715,85 @@ static void test_maximum_allowed(void) CloseHandle(handle); } +static void test_token_security_descriptor(void) +{ + char buffer_sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; + SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)&buffer_sd, *sd2; + char buffer_acl[256]; + ACL *acl = (ACL *)&buffer_acl, *acl2; + BOOL defaulted, present, ret; + ACCESS_ALLOWED_ACE *ace; + SECURITY_ATTRIBUTES sa; + HANDLE token, token2; + DWORD size; + PSID psid; + + if (!pDuplicateTokenEx || !pConvertStringSidToSidA || !pAddAccessAllowedAceEx || !pGetAce + || !pSetEntriesInAclW) + { + win_skip("Some functions not available\n"); + return; + } + + /* Test whether we can create tokens with security descriptors */ + ret = OpenProcessToken(GetCurrentProcess(), MAXIMUM_ALLOWED, &token); + ok(ret, "OpenProcessToken failed with error %u\n", GetLastError()); + + ret = InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION); + ok(ret, "InitializeSecurityDescriptor failed with error %u\n", GetLastError()); + + ret = InitializeAcl(acl, 256, ACL_REVISION); + ok(ret, "InitializeAcl failed with error %u\n", GetLastError()); + + ret = pConvertStringSidToSidA("S-1-5-6", &psid); + ok(ret, "ConvertStringSidToSidA failed with error %u\n", GetLastError()); + + ret = pAddAccessAllowedAceEx(acl, ACL_REVISION, NO_PROPAGATE_INHERIT_ACE, GENERIC_ALL, psid); + ok(ret, "AddAccessAllowedAceEx failed with error %u\n", GetLastError()); + + ret = SetSecurityDescriptorDacl(sd, TRUE, acl, FALSE); + ok(ret, "SetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + + sa.nLength = sizeof(SECURITY_ATTRIBUTES); + sa.lpSecurityDescriptor = sd; + sa.bInheritHandle = FALSE; + + ret = pDuplicateTokenEx(token, MAXIMUM_ALLOWED, &sa, SecurityImpersonation, TokenImpersonation, &token2); + ok(ret, "DuplicateTokenEx failed with error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(token2, DACL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd2 = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token2, DACL_SECURITY_INFORMATION, sd2, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + acl2 = (void *)0xdeadbeef; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorDacl(sd2, &present, &acl2, &defaulted); + ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + ok(present, "acl2 not present\n"); + ok(acl2 != (void *)0xdeadbeef, "acl2 not set\n"); + ok(acl2->AceCount == 1, "Expected 1 ACE, got %d\n", acl2->AceCount); + ok(!defaulted, "acl2 defaulted\n"); + + ret = pGetAce(acl2, 0, (void **)&ace); + ok(ret, "GetAce failed with error %u\n", GetLastError()); + ok(ace->Header.AceType == ACCESS_ALLOWED_ACE_TYPE, "Unexpected ACE type %#x\n", ace->Header.AceType); + ok(EqualSid(&ace->SidStart, psid), "Expected access allowed ACE\n"); + ok(ace->Header.AceFlags == NO_PROPAGATE_INHERIT_ACE, + "Expected NO_PROPAGATE_INHERIT_ACE as flags, got %x\n", ace->Header.AceFlags); + + HeapFree(GetProcessHeap(), 0, sd2); + + LocalFree(psid); + + CloseHandle(token2); + CloseHandle(token); +} + START_TEST(security) { init(); @@ -6764,4 +6843,5 @@ START_TEST(security) test_GetSidIdentifierAuthority(); test_pseudo_tokens(); test_maximum_allowed(); + test_token_security_descriptor(); }

1 0