June 2015 - Wine-commits - list.winehq.org

Michael Müller : rpcrt4: Fix arguments of HttpAddRequestHeaders.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: ab82b446a0e771e5dd261975eb58937f78c99cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab82b446a0e771e5dd261975e… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jun 25 12:27:43 2015 +0200 rpcrt4: Fix arguments of HttpAddRequestHeaders. --- dlls/rpcrt4/rpc_transport.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 8c0263b..fbc2ad7 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2275,7 +2275,7 @@ static RPC_STATUS insert_content_length_header(HINTERNET request, DWORD len) WCHAR header[sizeof(fmtW) / sizeof(fmtW[0]) + 10]; sprintfW(header, fmtW, len); - if ((HttpAddRequestHeadersW(request, header, -1, HTTP_ADDREQ_FLAG_REPLACE))) return RPC_S_OK; + if ((HttpAddRequestHeadersW(request, header, -1, HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD))) return RPC_S_OK; return RPC_S_SERVER_UNAVAILABLE; } @@ -2867,7 +2867,7 @@ static RPC_STATUS authorize_request(RpcConnection_http *httpc, HINTERNET request } if (info->scheme != RPC_C_HTTP_AUTHN_SCHEME_BASIC) - HttpAddRequestHeadersW(request, authW, -1, HTTP_ADDREQ_FLAG_REPLACE); + HttpAddRequestHeadersW(request, authW, -1, HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); destroy_authinfo(info); return status;

1 0

Michael Müller : wininet: Fix arguments of HttpAddRequestHeaders.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: efd41e4f2b1c784d4939aa10d869f87f2384f10c URL: http://source.winehq.org/git/wine.git/?a=commit;h=efd41e4f2b1c784d4939aa10d… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jun 25 12:28:02 2015 +0200 wininet: Fix arguments of HttpAddRequestHeaders. --- dlls/wininet/http.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3be88b7..dc54820 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1671,7 +1671,8 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn TRACE("Inserting authorization: %s\n", debugstr_w(authorization)); - HTTP_ProcessHeader(request, header, authorization, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); + HTTP_ProcessHeader(request, header, authorization, + HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); heap_free(authorization); } else if (!strcmpW(header, szAuthorization) && (host = get_host_header(request))) @@ -1692,7 +1693,8 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn TRACE("Inserting authorization: %s\n", debugstr_w(authorization)); - HTTP_ProcessHeader(request, header, authorization, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); + HTTP_ProcessHeader(request, header, authorization, + HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD); heap_free(data); heap_free(authorization); } @@ -3413,7 +3415,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, HTTP_ProcessHeader(request, HTTP_ACCEPT, lpszAcceptTypes[i], HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA | HTTP_ADDHDR_FLAG_REQ | - (i == 0 ? HTTP_ADDHDR_FLAG_REPLACE : 0)); + (i == 0 ? (HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD) : 0)); } } @@ -4253,7 +4255,8 @@ static void HTTP_InsertCookies(http_request_t *request) if(res != ERROR_SUCCESS || !cookies) return; - HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), HTTP_ADDREQ_FLAG_REPLACE); + HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), + HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); heap_free(cookies); } @@ -4974,7 +4977,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, HTTP_FixURL(request); if (request->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION) { - HTTP_ProcessHeader(request, szConnection, szKeepAlive, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); + HTTP_ProcessHeader(request, szConnection, szKeepAlive, + HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD); } HTTP_InsertAuthorization(request, request->authInfo, szAuthorization); HTTP_InsertAuthorization(request, request->proxyAuthInfo, szProxy_Authorization); @@ -5991,7 +5995,7 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) /* Add status code */ HTTP_ProcessHeader(request, szStatus, status_code, - HTTP_ADDHDR_FLAG_REPLACE); + HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD); heap_free(request->version); heap_free(request->statusText);

1 0

Jared Smudde : winhlp32: Move Always on top to Options.
by Alexandre Julliard 24 Jun '15

24 Jun '15

Module: wine Branch: master Commit: 49b6b60e2311f85ddfa86fc68bcb2d85d4e68160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49b6b60e2311f85ddfa86fc68… Author: Jared Smudde <computerwhiz02(a)hotmail.com> Date: Mon Jun 22 08:36:11 2015 -0500 winhlp32: Move Always on top to Options. --- po/ar.po | 22 +++++++++++----------- po/bg.po | 22 +++++++++++----------- po/ca.po | 22 +++++++++++----------- po/cs.po | 22 +++++++++++----------- po/da.po | 22 +++++++++++----------- po/de.po | 22 +++++++++++----------- po/el.po | 22 +++++++++++----------- po/en.po | 22 +++++++++++----------- po/en_US.po | 22 +++++++++++----------- po/eo.po | 22 +++++++++++----------- po/es.po | 22 +++++++++++----------- po/fa.po | 22 +++++++++++----------- po/fi.po | 22 +++++++++++----------- po/fr.po | 22 +++++++++++----------- po/he.po | 22 +++++++++++----------- po/hi.po | 24 ++++++++++++------------ po/hr.po | 22 +++++++++++----------- po/hu.po | 22 +++++++++++----------- po/it.po | 22 +++++++++++----------- po/ja.po | 22 +++++++++++----------- po/ko.po | 22 +++++++++++----------- po/lt.po | 22 +++++++++++----------- po/ml.po | 24 ++++++++++++------------ po/nb_NO.po | 22 +++++++++++----------- po/nl.po | 22 +++++++++++----------- po/or.po | 24 ++++++++++++------------ po/pa.po | 24 ++++++++++++------------ po/pl.po | 22 +++++++++++----------- po/pt_BR.po | 22 +++++++++++----------- po/pt_PT.po | 22 +++++++++++----------- po/rm.po | 22 +++++++++++----------- po/ro.po | 22 +++++++++++----------- po/ru.po | 22 +++++++++++----------- po/sk.po | 22 +++++++++++----------- po/sl.po | 22 +++++++++++----------- po/sr_RS(a)cyrillic.po | 24 ++++++++++++------------ po/sr_RS(a)latin.po | 22 +++++++++++----------- po/sv.po | 22 +++++++++++----------- po/te.po | 24 ++++++++++++------------ po/th.po | 24 ++++++++++++------------ po/tr.po | 22 +++++++++++----------- po/uk.po | 22 +++++++++++----------- po/wa.po | 22 +++++++++++----------- po/wine.pot | 22 +++++++++++----------- po/zh_CN.po | 22 +++++++++++----------- po/zh_TW.po | 22 +++++++++++----------- programs/winhlp32/winhlp32.rc | 2 +- 47 files changed, 514 insertions(+), 514 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49b6b60e2311f85ddfa86…

1 0

Hans Leidekker : winhttp: Fix a couple of corner cases in header processing.
by Alexandre Julliard 24 Jun '15

24 Jun '15

Module: wine Branch: master Commit: 2516fb7807453df39448a14995d349641cdb6894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2516fb7807453df39448a1499… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 24 14:16:59 2015 +0200 winhttp: Fix a couple of corner cases in header processing. --- dlls/winhttp/request.c | 98 +++++++++++++++++++------------------------- dlls/winhttp/tests/winhttp.c | 61 ++++++++++++++++++++++++++- 2 files changed, 103 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2516fb7807453df39448a…

1 0

Hans Leidekker : winhttp: Coalesce cookie headers.
by Alexandre Julliard 24 Jun '15

24 Jun '15

Module: wine Branch: master Commit: 7e121e48714d376bbbd37dc5d1e9b085dcdcce09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e121e48714d376bbbd37dc5d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 24 14:17:31 2015 +0200 winhttp: Coalesce cookie headers. --- dlls/winhttp/cookie.c | 3 ++- dlls/winhttp/tests/winhttp.c | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 4bf0808..d6dd498 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -270,7 +270,8 @@ BOOL add_cookie_headers( request_t *request ) } TRACE("%s\n", debugstr_w(header)); - add_request_headers( request, header, len, WINHTTP_ADDREQ_FLAG_ADD ); + add_request_headers( request, header, len, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_COALESCE_WITH_SEMICOLON ); heap_free( header ); } } diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 30115ef..2cf60b7 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2014,6 +2014,11 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, headmsg, sizeof headmsg - 1, 0); continue; } + if (strstr(buffer, "GET /cookie3")) + { + if (strstr(buffer, "Cookie: name=value2; name=value\r\n")) send(c, okmsg, sizeof(okmsg) - 1, 0); + else send(c, notokmsg, sizeof(notokmsg) - 1, 0); + } if (strstr(buffer, "GET /cookie2")) { if (strstr(buffer, "Cookie: name=value\r\n")) send(c, okmsg, sizeof(okmsg) - 1, 0); @@ -2621,6 +2626,9 @@ static void test_cookies( int port ) { static const WCHAR cookieW[] = {'/','c','o','o','k','i','e',0}; static const WCHAR cookie2W[] = {'/','c','o','o','k','i','e','2',0}; + static const WCHAR cookie3W[] = {'/','c','o','o','k','i','e','3',0}; + static const WCHAR cookieheaderW[] = + {'C','o','o','k','i','e',':',' ','n','a','m','e','=','v','a','l','u','e','2','\r','\n',0}; HINTERNET ses, con, req; DWORD status, size; BOOL ret; @@ -2685,6 +2693,23 @@ static void test_cookies( int port ) ok( status == 200, "request failed unexpectedly %u\n", status ); WinHttpCloseHandle( req ); + + req = WinHttpOpenRequest( con, NULL, cookie3W, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, cookieheaderW, ~0u, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( status == 200 || broken(status == 400), "request failed unexpectedly %u\n", status ); + + WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses );

1 0

Hans Leidekker : winhttp: Perform a case sensitive match on cookie names.
by Alexandre Julliard 24 Jun '15

24 Jun '15

Module: wine Branch: master Commit: 3c5cb7f8dc451697f67017e28f35675c463c03a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c5cb7f8dc451697f67017e28… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 24 14:17:53 2015 +0200 winhttp: Perform a case sensitive match on cookie names. --- dlls/winhttp/cookie.c | 2 +- dlls/winhttp/tests/winhttp.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index d6dd498..b598baa 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -54,7 +54,7 @@ static cookie_t *find_cookie( domain_t *domain, const WCHAR *path, const WCHAR * LIST_FOR_EACH( item, &domain->cookies ) { cookie = LIST_ENTRY( item, cookie_t, entry ); - if (!strcmpW( cookie->path, path ) && !strcmpiW( cookie->name, name )) + if (!strcmpW( cookie->path, path ) && !strcmpW( cookie->name, name )) { TRACE("found %s=%s\n", debugstr_w(cookie->name), debugstr_w(cookie->value)); return cookie; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2cf60b7..15d7fa2 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1893,6 +1893,7 @@ static const char notokmsg[] = static const char cookiemsg[] = "HTTP/1.1 200 OK\r\n" "Set-Cookie: name = value \r\n" +"Set-Cookie: NAME = value \r\n" "\r\n"; static const char nocontentmsg[] = @@ -2016,12 +2017,14 @@ static DWORD CALLBACK server_thread(LPVOID param) } if (strstr(buffer, "GET /cookie3")) { - if (strstr(buffer, "Cookie: name=value2; name=value\r\n")) send(c, okmsg, sizeof(okmsg) - 1, 0); + if (strstr(buffer, "Cookie: name=value2; NAME=value; name=value\r\n") || + strstr(buffer, "Cookie: name=value2; name=value; NAME=value\r\n")) send(c, okmsg, sizeof(okmsg) - 1, 0); else send(c, notokmsg, sizeof(notokmsg) - 1, 0); } if (strstr(buffer, "GET /cookie2")) { - if (strstr(buffer, "Cookie: name=value\r\n")) send(c, okmsg, sizeof(okmsg) - 1, 0); + if (strstr(buffer, "Cookie: NAME=value; name=value\r\n") || + strstr(buffer, "Cookie: name=value; NAME=value\r\n")) send(c, okmsg, sizeof(okmsg) - 1, 0); else send(c, notokmsg, sizeof(notokmsg) - 1, 0); } else if (strstr(buffer, "GET /cookie"))

1 0

Hans Leidekker : winhttp: Store cookies in reverse order.
by Alexandre Julliard 24 Jun '15

24 Jun '15

Module: wine Branch: master Commit: b9557e9227490b22464e584c9609e24c9b1b8411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9557e9227490b22464e584c9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 24 14:18:27 2015 +0200 winhttp: Store cookies in reverse order. This matches more recent versions of Windows. --- dlls/winhttp/cookie.c | 2 +- dlls/winhttp/tests/winhttp.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index b598baa..769055b 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -121,7 +121,7 @@ static BOOL add_cookie( session_t *session, cookie_t *cookie, WCHAR *domain_name else if ((old_cookie = find_cookie( domain, path, cookie->name ))) delete_cookie( old_cookie ); cookie->path = strdupW( path ); - list_add_tail( &domain->cookies, &cookie->entry ); + list_add_head( &domain->cookies, &cookie->entry ); TRACE("domain %s path %s <- %s=%s\n", debugstr_w(domain_name), debugstr_w(cookie->path), debugstr_w(cookie->name), debugstr_w(cookie->value)); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 15d7fa2..cdde303 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2018,14 +2018,18 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "GET /cookie3")) { if (strstr(buffer, "Cookie: name=value2; NAME=value; name=value\r\n") || - strstr(buffer, "Cookie: name=value2; name=value; NAME=value\r\n")) send(c, okmsg, sizeof(okmsg) - 1, 0); - else send(c, notokmsg, sizeof(notokmsg) - 1, 0); + broken(strstr(buffer, "Cookie: name=value2; name=value; NAME=value\r\n") != NULL)) + send(c, okmsg, sizeof(okmsg) - 1, 0); + else + send(c, notokmsg, sizeof(notokmsg) - 1, 0); } if (strstr(buffer, "GET /cookie2")) { if (strstr(buffer, "Cookie: NAME=value; name=value\r\n") || - strstr(buffer, "Cookie: name=value; NAME=value\r\n")) send(c, okmsg, sizeof(okmsg) - 1, 0); - else send(c, notokmsg, sizeof(notokmsg) - 1, 0); + broken(strstr(buffer, "Cookie: name=value; NAME=value\r\n") != NULL)) + send(c, okmsg, sizeof(okmsg) - 1, 0); + else + send(c, notokmsg, sizeof(notokmsg) - 1, 0); } else if (strstr(buffer, "GET /cookie")) {

1 0

Piotr Caban : msvcrt: Cache locale string to LCID conversion results.
by Alexandre Julliard 24 Jun '15

24 Jun '15

Module: wine Branch: master Commit: e9eec98d5c74fb816ee4615d437aefb0d336de92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9eec98d5c74fb816ee4615d4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 24 15:13:07 2015 +0200 msvcrt: Cache locale string to LCID conversion results. --- dlls/msvcrt/locale.c | 13 +++++++++++++ dlls/msvcrt/msvcrt.h | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index bd919e6..ad06b1a 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -217,10 +217,17 @@ extern int atoi(const char *); /* Internal: Find the LCID for a locale specification */ LCID MSVCRT_locale_to_LCID(const char *locale, unsigned short *codepage) { + thread_data_t *data = msvcrt_get_thread_data(); LCID lcid; locale_search_t search; const char *cp, *region; + if (!strcmp(locale, data->cached_locale)) { + if (codepage) + *codepage = data->cached_cp; + return data->cached_lcid; + } + memset(&search, 0, sizeof(locale_search_t)); cp = strchr(locale, '.'); @@ -292,6 +299,12 @@ LCID MSVCRT_locale_to_LCID(const char *locale, unsigned short *codepage) if (codepage) *codepage = atoi(search.found_codepage); + if (strlen(locale) < sizeof(data->cached_locale)) { + strcpy(data->cached_locale, locale); + data->cached_lcid = lcid; + data->cached_cp = codepage ? *codepage : atoi(search.found_codepage); + } + return lcid; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index d85c9ec..19f3c10 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -237,7 +237,12 @@ struct __thread_data { void *unk6[3]; int unk7; EXCEPTION_RECORD *exc_record; - void *unk8[100]; + void *unk8[7]; + LCID cached_lcid; + int unk9[3]; + DWORD cached_cp; + char cached_locale[131]; + void *unk10[100]; }; typedef struct __thread_data thread_data_t;

1 0

Sebastian Lackner : advapi32/tests: Explicitly check return value of GetTokenInformation.
by Alexandre Julliard 24 Jun '15

24 Jun '15

Module: wine Branch: master Commit: a176655414af616517bb57594179a40e491c2357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a176655414af616517bb57594… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jun 24 02:34:00 2015 +0200 advapi32/tests: Explicitly check return value of GetTokenInformation. --- dlls/advapi32/tests/security.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f141b3e..0cb4d7f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4290,7 +4290,8 @@ static void test_GetSecurityInfo(void) win_skip("Failed to get current user token\n"); return; } - GetTokenInformation(token, TokenUser, b, l, &l); + bret = GetTokenInformation(token, TokenUser, b, l, &l); + ok(bret, "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); CloseHandle( token ); user_sid = ((TOKEN_USER *)b)->User.Sid;

1 0

Michael Müller : advapi32/tests: Add tests for GetWindowsAccountDomainSid.
by Alexandre Julliard 24 Jun '15

24 Jun '15

Module: wine Branch: master Commit: 54b3973ee055cef2c8939b8c231933ee008ee534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b3973ee055cef2c8939b8c2… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 24 02:34:35 2015 +0200 advapi32/tests: Add tests for GetWindowsAccountDomainSid. --- dlls/advapi32/tests/security.c | 82 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 0cb4d7f..898ddba 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -129,6 +129,7 @@ static NTSTATUS (WINAPI *pNtSetSecurityObject)(HANDLE,SECURITY_INFORMATION,PSECU static NTSTATUS (WINAPI *pNtCreateFile)(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,PLARGE_INTEGER,ULONG,ULONG,ULONG,ULONG,PVOID,ULONG); static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR,PUNICODE_STRING,PWSTR*,CURDIR*); static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING,PCANSI_STRING,BOOLEAN); +static BOOL (WINAPI *pGetWindowsAccountDomainSid)(PSID,PSID,DWORD*); static HMODULE hmod; static int myARGC; @@ -190,6 +191,7 @@ static void init(void) pConvertStringSidToSidA = (void *)GetProcAddress(hmod, "ConvertStringSidToSidA"); pGetAclInformation = (void *)GetProcAddress(hmod, "GetAclInformation"); pGetAce = (void *)GetProcAddress(hmod, "GetAce"); + pGetWindowsAccountDomainSid = (void *)GetProcAddress(hmod, "GetWindowsAccountDomainSid"); myARGC = winetest_get_mainargs( &myARGV ); } @@ -5922,6 +5924,85 @@ static void test_system_security_access(void) CloseHandle( token ); } +static void test_GetWindowsAccountDomainSid(void) +{ + char *user, buffer1[SECURITY_MAX_SID_SIZE], buffer2[SECURITY_MAX_SID_SIZE]; + SID_IDENTIFIER_AUTHORITY domain_ident = { SECURITY_NT_AUTHORITY }; + PSID domain_sid = (PSID *)&buffer1; + PSID domain_sid2 = (PSID *)&buffer2; + DWORD sid_size; + PSID user_sid; + HANDLE token; + BOOL bret = TRUE; + int i; + + if (!pGetWindowsAccountDomainSid) + { + skip("GetWindowsAccountDomainSid not available\n"); + return; + } + + if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token)) + { + if (GetLastError() != ERROR_NO_TOKEN) bret = FALSE; + else if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token)) bret = FALSE; + } + if (!bret) + { + win_skip("Failed to get current user token\n"); + return; + } + + bret = GetTokenInformation(token, TokenUser, NULL, 0, &sid_size); + ok(!bret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); + user = HeapAlloc(GetProcessHeap(), 0, sid_size); + bret = GetTokenInformation(token, TokenUser, user, sid_size, &sid_size); + ok(bret, "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); + CloseHandle(token); + user_sid = ((TOKEN_USER *)user)->User.Sid; + + SetLastError(0xdeadbeef); + bret = pGetWindowsAccountDomainSid(0, 0, 0); + ok(!bret, "GetWindowsAccountDomainSid succeeded\n"); + ok(GetLastError() == ERROR_INVALID_SID, "expected ERROR_INVALID_SID, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + bret = pGetWindowsAccountDomainSid(user_sid, 0, 0); + ok(!bret, "GetWindowsAccountDomainSid succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + sid_size = SECURITY_MAX_SID_SIZE; + SetLastError(0xdeadbeef); + bret = pGetWindowsAccountDomainSid(user_sid, 0, &sid_size); + ok(!bret, "GetWindowsAccountDomainSid succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(sid_size == GetSidLengthRequired(4), "expected size %d, got %d\n", GetSidLengthRequired(4), sid_size); + + SetLastError(0xdeadbeef); + bret = pGetWindowsAccountDomainSid(user_sid, domain_sid, 0); + ok(!bret, "GetWindowsAccountDomainSid succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + sid_size = 1; + SetLastError(0xdeadbeef); + bret = pGetWindowsAccountDomainSid(user_sid, domain_sid, &sid_size); + ok(!bret, "GetWindowsAccountDomainSid succeeded\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(sid_size == GetSidLengthRequired(4), "expected size %d, got %d\n", GetSidLengthRequired(4), sid_size); + + sid_size = SECURITY_MAX_SID_SIZE; + bret = pGetWindowsAccountDomainSid(user_sid, domain_sid, &sid_size); + ok(bret, "GetWindowsAccountDomainSid failed with error %d\n", GetLastError()); + ok(sid_size == GetSidLengthRequired(4), "expected size %d, got %d\n", GetSidLengthRequired(4), sid_size); + InitializeSid(domain_sid2, &domain_ident, 4); + for (i = 0; i < 4; i++) + *GetSidSubAuthority(domain_sid2, i) = *GetSidSubAuthority(user_sid, i); + ok(EqualSid(domain_sid, domain_sid2), "unexpected domain sid\n"); + + HeapFree(GetProcessHeap(), 0, user); +} + START_TEST(security) { init(); @@ -5953,6 +6034,7 @@ START_TEST(security) test_ConvertSecurityDescriptorToString(); test_PrivateObjectSecurity(); test_acls(); + test_GetWindowsAccountDomainSid(); test_GetSecurityInfo(); test_GetSidSubAuthority(); test_CheckTokenMembership();

1 0