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

Michael Stefaniuc : dmcompos/tests: Add some basic IDirectMusicTrack8 tests.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: 1e421a26fbb458b3383d8df0e85b56ce8d40dc19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e421a26fbb458b3383d8df0e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:39:44 2015 +0200 dmcompos/tests: Add some basic IDirectMusicTrack8 tests. --- dlls/dmcompos/tests/dmcompos.c | 75 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index c4cf386..b0646a7 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -273,6 +273,42 @@ static void test_chordmaptrack(void) &IID_IDirectMusicTrack8, (void**)&dmt8); ok(hr == S_OK, "DirectMusicChordMapTrack create failed: %08x, expected S_OK\n", hr); + /* IDirectMusicTrack8 */ + hr = IDirectMusicTrack8_Init(dmt8, NULL); + ok(hr == S_OK, "IDirectMusicTrack8_Init failed: %08x\n", hr); + hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); + ok(hr == S_OK, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + hr = IDirectMusicTrack8_EndPlay(dmt8, NULL); + ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == S_OK, "IDirectMusicTrack8_Play failed: %08x\n", hr); + todo_wine { + hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + todo_wine { + hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); @@ -304,6 +340,45 @@ static void test_signposttrack(void) &IID_IDirectMusicTrack8, (void**)&dmt8); ok(hr == S_OK, "DirectMusicSignPostTrack create failed: %08x, expected S_OK\n", hr); + /* IDirectMusicTrack8 */ + hr = IDirectMusicTrack8_Init(dmt8, NULL); + ok(hr == S_OK, "IDirectMusicTrack8_Init failed: %08x\n", hr); + if (0) { + /* Crashes on Windows */ + hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_EndPlay(dmt8, NULL); + ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == S_OK, "IDirectMusicTrack8_Play failed: %08x\n", hr); + hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + todo_wine { + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + todo_wine { + hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + } + /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);

1 0

Michael Stefaniuc : dmcompos: IsParamSupported of DMChordMapTrack doesn' t crashes on NULL.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: d9aa14c5e07a01177a2f5493ae7746f157231992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9aa14c5e07a01177a2f5493a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:36:13 2015 +0200 dmcompos: IsParamSupported of DMChordMapTrack doesn't crashes on NULL. --- dlls/dmcompos/chordmaptrack.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index cac652c..9077c88 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -139,6 +139,10 @@ static HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_SetParam (LPDI static HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_IsParamSupported (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType) { ICOM_THIS_MULTI(IDirectMusicChordMapTrack, TrackVtbl, iface); TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); + + if (!rguidType) + return E_POINTER; + if (IsEqualGUID (rguidType, &GUID_IDirectMusicChordMap)) { TRACE("param supported\n"); return S_OK;

1 0

Sebastian Lackner : advapi32/tests: Explicitly check return value of GetTokenInformation.
by Alexandre Julliard June 24, 2015

June 24, 2015

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: Add initial implementation for GetWindowsAccountDomainSid.
by Alexandre Julliard June 24, 2015

June 24, 2015

Module: wine Branch: master Commit: 4f3acf31deef5893b057778695fa5691ccac32df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3acf31deef5893b05777869… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 24 02:35:27 2015 +0200 advapi32: Add initial implementation for GetWindowsAccountDomainSid. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 46 ++++++++++++++++++++++ dlls/advapi32/tests/security.c | 2 +- .../api-ms-win-security-base-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-2-0.spec | 2 +- 5 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 4600142..ec27440 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -363,7 +363,7 @@ @ stdcall GetTrusteeTypeW(ptr) @ stdcall GetUserNameA(ptr ptr) @ stdcall GetUserNameW(ptr ptr) -# @ stub GetWindowsAccountDomainSid +@ stdcall GetWindowsAccountDomainSid(ptr ptr ptr) # @ stub I_QueryTagInformation # @ stub I_ScGetCurrentGroupStateW # @ stub I_ScIsSecurityProcess diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 028dcc6..c2ce1e1 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1538,6 +1538,52 @@ BOOL WINAPI SetSecurityDescriptorControl( PSECURITY_DESCRIPTOR pSecurityDescript pSecurityDescriptor, ControlBitsOfInterest, ControlBitsToSet ) ); } +/****************************************************************************** + * GetWindowsAccountDomainSid [ADVAPI32.@] + */ +BOOL WINAPI GetWindowsAccountDomainSid( PSID sid, PSID domain_sid, DWORD *size ) +{ + SID_IDENTIFIER_AUTHORITY domain_ident = { SECURITY_NT_AUTHORITY }; + DWORD required_size; + int i; + + FIXME( "(%p %p %p): semi-stub\n", sid, domain_sid, size ); + + if (!sid || !IsValidSid( sid )) + { + SetLastError( ERROR_INVALID_SID ); + return FALSE; + } + + if (!size) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + if (*GetSidSubAuthorityCount( sid ) < 4) + { + SetLastError( ERROR_INVALID_SID ); + return FALSE; + } + + required_size = GetSidLengthRequired( 4 ); + if (*size < required_size || !domain_sid) + { + *size = required_size; + SetLastError( domain_sid ? ERROR_INSUFFICIENT_BUFFER : + ERROR_INVALID_PARAMETER ); + return FALSE; + } + + InitializeSid( domain_sid, &domain_ident, 4 ); + for (i = 0; i < 4; i++) + *GetSidSubAuthority( domain_sid, i ) = *GetSidSubAuthority( sid, i ); + + *size = required_size; + return TRUE; +} + /* ############################## ###### ACL FUNCTIONS ###### ############################## diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 898ddba..098fa8f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5938,7 +5938,7 @@ static void test_GetWindowsAccountDomainSid(void) if (!pGetWindowsAccountDomainSid) { - skip("GetWindowsAccountDomainSid not available\n"); + win_skip("GetWindowsAccountDomainSid not available\n"); return; } diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec index 4277706..edae6d1 100644 --- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec +++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec @@ -57,7 +57,7 @@ @ stdcall GetSidSubAuthority(ptr long) advapi32.GetSidSubAuthority @ stdcall GetSidSubAuthorityCount(ptr) advapi32.GetSidSubAuthorityCount @ stdcall GetTokenInformation(long long ptr long ptr) advapi32.GetTokenInformation -@ stub GetWindowsAccountDomainSid +@ stdcall GetWindowsAccountDomainSid(ptr ptr ptr) advapi32.GetWindowsAccountDomainSid @ stdcall ImpersonateAnonymousToken(long) advapi32.ImpersonateAnonymousToken @ stdcall ImpersonateLoggedOnUser(long) advapi32.ImpersonateLoggedOnUser @ stdcall ImpersonateSelf(long) advapi32.ImpersonateSelf diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec index 3adef23..e19fe53 100644 --- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec +++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec @@ -63,7 +63,7 @@ @ stdcall GetSidSubAuthority(ptr long) advapi32.GetSidSubAuthority @ stdcall GetSidSubAuthorityCount(ptr) advapi32.GetSidSubAuthorityCount @ stdcall GetTokenInformation(long long ptr long ptr) advapi32.GetTokenInformation -@ stub GetWindowsAccountDomainSid +@ stdcall GetWindowsAccountDomainSid(ptr ptr ptr) advapi32.GetWindowsAccountDomainSid @ stdcall ImpersonateAnonymousToken(long) advapi32.ImpersonateAnonymousToken @ stdcall ImpersonateLoggedOnUser(long) advapi32.ImpersonateLoggedOnUser @ stdcall ImpersonateSelf(long) advapi32.ImpersonateSelf

1 0

Michael Müller : advapi32/tests: Add tests for GetWindowsAccountDomainSid.
by Alexandre Julliard June 24, 2015

June 24, 2015

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

Hans Leidekker : winhttp: Perform a case sensitive match on cookie names.
by Alexandre Julliard June 24, 2015

June 24, 2015

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: Fix a couple of corner cases in header processing.
by Alexandre Julliard June 24, 2015

June 24, 2015

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

Jared Smudde : winhlp32: Move Always on top to Options.
by Alexandre Julliard June 24, 2015

June 24, 2015

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: Store cookies in reverse order.
by Alexandre Julliard June 24, 2015

June 24, 2015

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 June 24, 2015

June 24, 2015

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