October 2009 - Wine-commits

Paul Vriens : advapi32/tests: Fix a test failure on Vista and higher.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 133c0f5401c79189d5b3696cbba45db7acc0ba17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=133c0f5401c79189d5b3696cb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 13 21:03:26 2009 +0200 advapi32/tests: Fix a test failure on Vista and higher. --- dlls/advapi32/tests/security.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a60136e..d226017 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2666,6 +2666,7 @@ static void test_ConvertStringSecurityDescriptor(void) DWORD revision; BOOL ret; DWORD GLE; + DWORD altGLE; } cssd[] = { { "D:(A;;GA;;;WD)", 0xdeadbeef, FALSE, ERROR_UNKNOWN_REVISION }, @@ -2673,11 +2674,11 @@ static void test_ConvertStringSecurityDescriptor(void) { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(D;;GA;;;WD)", SDDL_REVISION_1, TRUE }, { "ERROR:(D;;GA;;;WD)", SDDL_REVISION_1, FALSE, ERROR_INVALID_PARAMETER }, - /* test ACE string type with spaces */ + /* test ACE string with spaces */ { " D:(D;;GA;;;WD)", SDDL_REVISION_1, TRUE }, { "D: (D;;GA;;;WD)", SDDL_REVISION_1, TRUE }, { "D:( D;;GA;;;WD)", SDDL_REVISION_1, TRUE }, - { "D:(D ;;GA;;;WD)", SDDL_REVISION_1, FALSE, RPC_S_INVALID_STRING_UUID }, + { "D:(D ;;GA;;;WD)", SDDL_REVISION_1, FALSE, RPC_S_INVALID_STRING_UUID, ERROR_INVALID_ACL }, /* Vista+ */ { "D:(D; ;GA;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(D;; GA;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(D;;GA ;;;WD)", SDDL_REVISION_1, FALSE, ERROR_INVALID_ACL }, @@ -2699,7 +2700,8 @@ static void test_ConvertStringSecurityDescriptor(void) /* test behaviour with empty strings */ { "", SDDL_REVISION_1, TRUE }, /* test ACE string SID */ - { "D:(D;;GA;;;S-1-0-0)", SDDL_REVISION_1, TRUE } + { "D:(D;;GA;;;S-1-0-0)", SDDL_REVISION_1, TRUE }, + { "D:(D;;GA;;;Nonexistent account)", SDDL_REVISION_1, FALSE, ERROR_INVALID_ACL, ERROR_INVALID_SID } /* W2K */ }; if (!pConvertStringSecurityDescriptorToSecurityDescriptorA) @@ -2718,7 +2720,9 @@ static void test_ConvertStringSecurityDescriptor(void) GLE = GetLastError(); ok(ret == cssd[i].ret, "(%02d) Expected %s (%d)\n", i, cssd[i].ret ? "success" : "failure", GLE); if (!cssd[i].ret) - ok(GLE == cssd[i].GLE, "(%02d) Expected %d, got %d\n", i, cssd[i].GLE, GLE); + ok(GLE == cssd[i].GLE || + (cssd[i].altGLE && GLE == cssd[i].altGLE), + "(%02d) Unexpected last error %d\n", i, GLE); if (ret) LocalFree(pSD); } @@ -2759,13 +2763,6 @@ static void test_ConvertStringSecurityDescriptor(void) Blank, SDDL_REVISION_1, &pSD, NULL); ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - /* test ACE string SID */ - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(D;;GA;;;Nonexistent account)", SDDL_REVISION_1, &pSD, NULL); - ok(!ret, "Expected failure, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_ACL || GetLastError() == ERROR_INVALID_SID, - "Expected ERROR_INVALID_ACL or ERROR_INVALID_SID, got %d\n", GetLastError()); } static void test_ConvertSecurityDescriptorToString(void)

1 0

Vincent Povirk : ole32: Add test showing storage objects can' t be opened twice.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 657c8327659a2992b751c44b1f6c7c7fcb2a7c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=657c8327659a2992b751c44b1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Oct 12 16:26:01 2009 -0500 ole32: Add test showing storage objects can't be opened twice. --- dlls/ole32/tests/storage32.c | 85 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index cd62d72..5ec51cf 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1037,6 +1037,90 @@ static void test_transact(void) ok( r == TRUE, "deleted file\n"); } +static void test_substorage_share(void) +{ + IStorage *stg, *stg2, *stg3; + IStream *stm, *stm2; + HRESULT r; + static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + + DeleteFileA(filenameA); + + /* create the file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + /* create a read/write storage and try to open it again */ + r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + if (r == S_OK) + { + r = IStorage_OpenStorage(stg, stgname, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); + todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStorage should fail %08x\n", r); + + if (r == S_OK) + IStorage_Release(stg3); + + r = IStorage_OpenStorage(stg, stgname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); + todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStorage should fail %08x\n", r); + + if (r == S_OK) + IStorage_Release(stg3); + +#if 0 + /* This crashes on Wine. */ + + /* destroying an object while it's open invalidates it */ + r = IStorage_DestroyElement(stg, stgname); + ok(r==S_OK, "IStorage->DestroyElement failed, hr=%08x\n", r); + + r = IStorage_CreateStream(stg2, stmname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + todo_wine ok(r==STG_E_REVERTED, "IStorage->CreateStream failed, hr=%08x\n", r); + + if (r == S_OK) + IStorage_Release(stm); +#endif + + IStorage_Release(stg2); + } + + /* create a read/write stream and try to open it again */ + r = IStorage_CreateStream(stg, stmname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + ok(r==S_OK, "IStorage->CreateStream failed, hr=%08x\n", r); + + if (r == S_OK) + { + r = IStorage_OpenStream(stg, stmname, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm2); + todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStream should fail %08x\n", r); + + if (r == S_OK) + IStorage_Release(stm2); + + r = IStorage_OpenStream(stg, stmname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm2); + todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStream should fail %08x\n", r); + + if (r == S_OK) + IStorage_Release(stm2); + + /* destroying an object while it's open invalidates it */ + r = IStorage_DestroyElement(stg, stmname); + ok(r==S_OK, "IStorage->DestroyElement failed, hr=%08x\n", r); + + r = IStream_Write(stm, "this shouldn't work\n", 20, NULL); + todo_wine ok(r==STG_E_REVERTED, "IStream_Write should fail %08x\n", r); + + IStorage_Release(stm); + } + + IStorage_Release(stg); + + r = DeleteFileA(filenameA); + ok( r == TRUE, "deleted file\n"); +} + static void test_revert(void) { IStorage *stg = NULL, *stg2 = NULL, *stg3 = NULL; @@ -2254,6 +2338,7 @@ START_TEST(storage32) test_storage_refcount(); test_streamenum(); test_transact(); + test_substorage_share(); test_revert(); test_nonroot_transacted(); test_ReadClassStm();

1 0

Aric Stewart : wininet: Cache basic authentication values based on realm and host.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: fc5089349de7ec440a31a12cc1bf4199e76f4650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5089349de7ec440a31a12cc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 12 14:24:18 2009 -0500 wininet: Cache basic authentication values based on realm and host. --- dlls/wininet/http.c | 221 +++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 177 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc5089349de7ec440a31a…

1 0

Alexandre Julliard : winetest: Improve the native dll check to catch . NET dlls too.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 33d91a861a989a138403c4cbde25a7c91fcb5cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d91a861a989a138403c4cbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 13 14:51:39 2009 +0200 winetest: Improve the native dll check to catch .NET dlls too. --- programs/winetest/main.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index bab7f11..2c9a57d 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -158,18 +158,20 @@ static int running_on_visible_desktop (void) return IsWindowVisible(desktop); } -/* check for wine fake dll module */ -static BOOL is_fake_dll( HMODULE module ) +/* check for native dll when running under wine */ +static BOOL is_native_dll( HMODULE module ) { static const char fakedll_signature[] = "Wine placeholder DLL"; const IMAGE_DOS_HEADER *dos; + if (!running_under_wine()) return FALSE; if (!((ULONG_PTR)module & 1)) return FALSE; /* not loaded as datafile */ + /* builtin dlls can't be loaded as datafile, so we must have native or fake dll */ dos = (const IMAGE_DOS_HEADER *)((const char *)module - 1); if (dos->e_magic != IMAGE_DOS_SIGNATURE) return FALSE; if (dos->e_lfanew >= sizeof(*dos) + sizeof(fakedll_signature) && - !memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) )) return TRUE; - return FALSE; + !memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) )) return FALSE; + return TRUE; } /* check if Gecko is present, trying to trigger the install if not */ @@ -656,24 +658,16 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, if (!dll) dll = load_com_dll(dllname, &wine_tests[nr_of_files].maindllpath, filename); - if (dll && running_under_wine() && ((ULONG_PTR)dll & 1)) - { - /* builtin dlls can't be loaded as datafile, so we must have native or fake dll */ - if (!is_fake_dll(dll)) - { - FreeLibrary(dll); - xprintf (" %s=load error Configured as native\n", dllname); - return TRUE; - } - } - if (!dll && pLoadLibraryShim) { MultiByteToWideChar(CP_ACP, 0, dllname, -1, dllnameW, MAX_PATH); - if (FAILED( pLoadLibraryShim(dllnameW, NULL, NULL, &dll) )) - dll = 0; - else + if (SUCCEEDED( pLoadLibraryShim(dllnameW, NULL, NULL, &dll) ) && dll) + { get_dll_path(dll, &wine_tests[nr_of_files].maindllpath, filename); + FreeLibrary(dll); + dll = LoadLibraryExA(filename, NULL, LOAD_LIBRARY_AS_DATAFILE); + } + else dll = 0; } if (!dll) @@ -681,6 +675,12 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, xprintf (" %s=dll is missing\n", dllname); return TRUE; } + if (is_native_dll(dll)) + { + FreeLibrary(dll); + xprintf (" %s=load error Configured as native\n", dllname); + return TRUE; + } if (!strcmp( dllname, "mshtml" ) && running_under_wine() && !gecko_check()) { FreeLibrary(dll);

1 0

Paul Vriens : advapi32/tests: Make some tests table driven.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 69568dac914cbde0209a95d2336f2de57119633c URL: http://source.winehq.org/git/wine.git/?a=commit;h=69568dac914cbde0209a95d23… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 13 13:34:34 2009 +0200 advapi32/tests: Make some tests table driven. --- dlls/advapi32/tests/security.c | 129 +++++++++++++-------------------------- 1 files changed, 43 insertions(+), 86 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 1a2e39d..b1f5664 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2659,6 +2659,36 @@ static void test_ConvertStringSecurityDescriptor(void) BOOL ret; PSECURITY_DESCRIPTOR pSD; static const WCHAR Blank[] = { 0 }; + int i; + static const struct + { + const char *sidstring; + DWORD revision; + BOOL ret; + DWORD GLE; + } cssd[] = + { + { "D:(A;;GA;;;WD)", 0xdeadbeef, FALSE, ERROR_UNKNOWN_REVISION }, + /* test ACE string type */ + { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(D;;GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "ERROR:(D;;GA;;;WD)", SDDL_REVISION_1, FALSE, ERROR_INVALID_PARAMETER }, + /* test ACE string access rights */ + { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;RCSDWDWO;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;RPWPCCDCLCSWLODTCR;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;FAFRFWFX;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;KAKRKWKX;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, TRUE }, + { "S:(AU;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, TRUE }, + /* test ACE string access right error case */ + { "D:(A;;ROB;;;WD)", SDDL_REVISION_1, FALSE, ERROR_INVALID_ACL }, + /* test behaviour with empty strings */ + { "", SDDL_REVISION_1, TRUE }, + /* test ACE string SID */ + { "D:(D;;GA;;;S-1-0-0)", SDDL_REVISION_1, TRUE } + }; if (!pConvertStringSecurityDescriptorToSecurityDescriptorA) { @@ -2666,82 +2696,20 @@ static void test_ConvertStringSecurityDescriptor(void) return; } - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;GA;;;WD)", 0xdeadbeef, &pSD, NULL); - ok(!ret && GetLastError() == ERROR_UNKNOWN_REVISION, - "ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_UNKNOWN_REVISION instead of %d\n", - GetLastError()); - - /* test ACE string type */ - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;GA;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(D;;GA;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "ERROR:(D;;GA;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_INVALID_PARAMETER instead of %d\n", - GetLastError()); - - /* test ACE string access rights */ - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;GA;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;RCSDWDWO;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;RPWPCCDCLCSWLODTCR;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;FAFRFWFX;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;KAKRKWKX;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "S:(AU;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); + for (i = 0; i < sizeof(cssd)/sizeof(cssd[0]); i++) + { + DWORD GLE; - /* test ACE string access right error case */ - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;ROB;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_ACL, - "ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_INVALID_ACL instead of %d\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( + cssd[i].sidstring, cssd[i].revision, &pSD, NULL); + GLE = GetLastError(); + ok(ret == cssd[i].ret, "(%02d) Expected %s (%d)\n", i, cssd[i].ret ? "success" : "failure", GLE); + if (!cssd[i].ret) + ok(GLE == cssd[i].GLE, "(%02d) Expected %d, got %d\n", i, cssd[i].GLE, GLE); + if (ret) + LocalFree(pSD); + } /* test behaviour with NULL parameters */ SetLastError(0xdeadbeef); @@ -2775,11 +2743,6 @@ static void test_ConvertStringSecurityDescriptor(void) /* test behaviour with empty strings */ SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - - SetLastError(0xdeadbeef); ret = pConvertStringSecurityDescriptorToSecurityDescriptorW( Blank, SDDL_REVISION_1, &pSD, NULL); ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); @@ -2787,12 +2750,6 @@ static void test_ConvertStringSecurityDescriptor(void) /* test ACE string SID */ SetLastError(0xdeadbeef); ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(D;;GA;;;S-1-0-0)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(D;;GA;;;Nonexistent account)", SDDL_REVISION_1, &pSD, NULL); ok(!ret, "Expected failure, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_ACL || GetLastError() == ERROR_INVALID_SID,

1 0

Paul Vriens : advapi32: Skip leading spaces when parsing.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: e57edfea8bf0cd79ca0b7b3d42f5cceb97ab3439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e57edfea8bf0cd79ca0b7b3d4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 13 15:39:47 2009 +0200 advapi32: Skip leading spaces when parsing. --- dlls/advapi32/security.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 24c48c8..f89c12f 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3876,6 +3876,9 @@ static BYTE ParseAceStringType(LPCWSTR* StringAcl) LPCWSTR szAcl = *StringAcl; const ACEFLAG *lpaf = AceType; + while (*szAcl == ' ') + szAcl++; + while (lpaf->wstr && (len = strlenW(lpaf->wstr)) && strncmpW(lpaf->wstr, szAcl, len)) @@ -3884,7 +3887,7 @@ static BYTE ParseAceStringType(LPCWSTR* StringAcl) if (!lpaf->wstr) return 0; - *StringAcl += len; + *StringAcl = szAcl + len; return lpaf->value; } @@ -3910,6 +3913,9 @@ static BYTE ParseAceStringFlags(LPCWSTR* StringAcl) BYTE flags = 0; LPCWSTR szAcl = *StringAcl; + while (*szAcl == ' ') + szAcl++; + while (*szAcl != ';') { const ACEFLAG *lpaf = AceFlags; @@ -3974,6 +3980,9 @@ static DWORD ParseAceStringRights(LPCWSTR* StringAcl) DWORD rights = 0; LPCWSTR szAcl = *StringAcl; + while (*szAcl == ' ') + szAcl++; + if ((*szAcl == '0') && (*(szAcl + 1) == 'x')) { LPCWSTR p = szAcl; @@ -4029,6 +4038,7 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, DWORD acesize = 0; DWORD acecount = 0; PACCESS_ALLOWED_ACE pAce = NULL; /* pointer to current ACE */ + DWORD error = ERROR_INVALID_ACL; TRACE("%s\n", debugstr_w(StringAcl)); @@ -4051,7 +4061,10 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, if (pAce) pAce->Header.AceType = (BYTE) val; if (*StringAcl != ';') + { + error = RPC_S_INVALID_STRING_UUID; goto lerr; + } StringAcl++; /* Parse ACE flags */ @@ -4071,6 +4084,8 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, StringAcl++; /* Parse ACE object guid */ + while (*StringAcl == ' ') + StringAcl++; if (*StringAcl != ';') { FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); @@ -4079,6 +4094,8 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, StringAcl++; /* Parse ACE inherit object guid */ + while (*StringAcl == ' ') + StringAcl++; if (*StringAcl != ';') { FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); @@ -4126,7 +4143,7 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, return TRUE; lerr: - SetLastError(ERROR_INVALID_ACL); + SetLastError(error); WARN("Invalid ACE string format\n"); return FALSE; } @@ -4152,6 +4169,9 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( if (SecurityDescriptor) lpNext = (LPBYTE)(SecurityDescriptor + 1); + while (*StringSecurityDescriptor == ' ') + StringSecurityDescriptor++; + while (*StringSecurityDescriptor) { toktype = *StringSecurityDescriptor; @@ -5045,6 +5065,9 @@ static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes) return FALSE; } + while (*StringSid == ' ') + StringSid++; + *cBytes = ComputeStringSidSize(StringSid); if (!pisid) /* Simply compute the size */ {

1 0

Paul Vriens : advapi32/tests: Add some extra tests.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 17c1881953070a587676dff10b6f4240eeb0cb53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c1881953070a587676dff10… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 13 15:40:20 2009 +0200 advapi32/tests: Add some extra tests. --- dlls/advapi32/tests/security.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b1f5664..a60136e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2673,6 +2673,18 @@ static void test_ConvertStringSecurityDescriptor(void) { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(D;;GA;;;WD)", SDDL_REVISION_1, TRUE }, { "ERROR:(D;;GA;;;WD)", SDDL_REVISION_1, FALSE, ERROR_INVALID_PARAMETER }, + /* test ACE string type with spaces */ + { " D:(D;;GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "D: (D;;GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:( D;;GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(D ;;GA;;;WD)", SDDL_REVISION_1, FALSE, RPC_S_INVALID_STRING_UUID }, + { "D:(D; ;GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(D;; GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(D;;GA ;;;WD)", SDDL_REVISION_1, FALSE, ERROR_INVALID_ACL }, + { "D:(D;;GA; ;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(D;;GA;; ;WD)", SDDL_REVISION_1, TRUE }, + { "D:(D;;GA;;; WD)", SDDL_REVISION_1, TRUE }, + { "D:(D;;GA;;;WD )", SDDL_REVISION_1, TRUE }, /* test ACE string access rights */ { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, TRUE },

1 0

Matteo Bruni : wpp: Add I/O callbacks.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: e773c516baaf49b9aca0280be5a5bf3af3cca8cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e773c516baaf49b9aca0280be… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Sep 30 20:15:38 2009 +0200 wpp: Add I/O callbacks. --- include/wine/wpp.h | 17 +++++ libs/wpp/ppl.l | 70 +++++++++++++++++-- libs/wpp/ppy.y | 14 ++-- libs/wpp/preproc.c | 182 ++++++++++++++++++++++++++++-------------------- libs/wpp/wpp.c | 8 +- libs/wpp/wpp_private.h | 4 +- 6 files changed, 199 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e773c516baaf49b9aca02…

1 0

Sergey Khodych : riched20: Implement handling of WM_KEYDOWN VK_ESCAPE in the dialog mode.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: a50ca4ace0942cb8e251040c02513c870a687dc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a50ca4ace0942cb8e251040c0… Author: Sergey Khodych <khodych(a)gmail.com> Date: Sun Oct 4 22:50:50 2009 +0300 riched20: Implement handling of WM_KEYDOWN VK_ESCAPE in the dialog mode. --- dlls/riched20/editor.c | 4 ++++ dlls/riched20/tests/editor.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c49bb5d..d978ac5 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2289,6 +2289,10 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) return TRUE; } break; + case VK_ESCAPE: + if (editor->bDialogMode && editor->hwndParent) + PostMessageW(editor->hwndParent, WM_CLOSE, 0, 0); + return TRUE; case 'A': if (ctrl_is_down) { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 154b297..93f0041 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -6831,6 +6831,11 @@ static void test_dialogmode(void) ok(2 == lcount, "expected 2, got %d\n", lcount); memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 0); + + memset(&dm_messages, 0, sizeof(dm_messages)); r = SendMessage(hwRichEdit, WM_GETDLGCODE, 0, (LPARAM)&msg); ok(0x8f == r, "expected 0x8f, got 0x%x\n", r); test_dm_messages(0, 0, 0); @@ -6843,6 +6848,11 @@ static void test_dialogmode(void) lcount = SendMessage(hwRichEdit, EM_GETLINECOUNT, 0, 0); ok(2 == lcount, "expected 2, got %d\n", lcount); + memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 0); + hwButton = CreateWindow("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON, 100, 100, 50, 20, hwParent, (HMENU)ID_RICHEDITTESTDBUTTON, GetModuleHandleA(0), NULL); ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError()); @@ -6871,6 +6881,11 @@ static void test_dialogmode(void) ok(2 == lcount, "expected 2, got %d\n", lcount); memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 0); + + memset(&dm_messages, 0, sizeof(dm_messages)); r = SendMessage(hwRichEdit, WM_GETDLGCODE, 0, (LPARAM)&msg); ok(0x8f == r, "expected 0x8f, got 0x%x\n", r); test_dm_messages(0, 0, 0); @@ -6883,6 +6898,11 @@ static void test_dialogmode(void) lcount = SendMessage(hwRichEdit, EM_GETLINECOUNT, 0, 0); ok(3 == lcount, "expected 3, got %d\n", lcount); + memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 0); + hwButton = CreateWindow("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON, 100, 100, 50, 20, hwParent, (HMENU)ID_RICHEDITTESTDBUTTON, GetModuleHandleA(0), NULL); ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError()); @@ -6908,6 +6928,11 @@ static void test_dialogmode(void) test_dm_messages(0, 0, 0); memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 0); + + memset(&dm_messages, 0, sizeof(dm_messages)); r = SendMessage(hwRichEdit, WM_GETDLGCODE, 0, (LPARAM)&msg); ok(0x8b == r, "expected 0x8b, got 0x%x\n", r); test_dm_messages(0, 0, 0); @@ -6917,6 +6942,11 @@ static void test_dialogmode(void) ok(0 == r, "expected 0, got %d\n", r); test_dm_messages(0, 1, 0); + memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 0); + hwButton = CreateWindow("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON, 100, 100, 50, 20, hwParent, (HMENU)ID_RICHEDITTESTDBUTTON, GetModuleHandleA(0), NULL); ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError());

1 0

Sergey Khodych : riched20: Implement handling of WM_KEYDOWN VK_TAB in the dialog mode.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 12a417de8abcb678ef3fecb783b07027e0bd8cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a417de8abcb678ef3fecb78… Author: Sergey Khodych <khodych(a)gmail.com> Date: Sun Oct 4 23:16:08 2009 +0300 riched20: Implement handling of WM_KEYDOWN VK_TAB in the dialog mode. --- dlls/riched20/editor.c | 4 ++++ dlls/riched20/tests/editor.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d978ac5..b5ad21c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2293,6 +2293,10 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) if (editor->bDialogMode && editor->hwndParent) PostMessageW(editor->hwndParent, WM_CLOSE, 0, 0); return TRUE; + case VK_TAB: + if (editor->bDialogMode && editor->hwndParent) + SendMessageW(editor->hwndParent, WM_NEXTDLGCTL, shift_is_down, 0); + return TRUE; case 'A': if (ctrl_is_down) { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 93f0041..70c100a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -6816,6 +6816,11 @@ static void test_dialogmode(void) ok(0 == r, "expected 0, got %d\n", r); test_dm_messages(0, 1, 0); + memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 1); + DestroyWindow(hwRichEdit); /* Check messages from richedit(ES_MULTILINE) */ @@ -6836,6 +6841,11 @@ static void test_dialogmode(void) test_dm_messages(0, 0, 0); memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 0); + + memset(&dm_messages, 0, sizeof(dm_messages)); r = SendMessage(hwRichEdit, WM_GETDLGCODE, 0, (LPARAM)&msg); ok(0x8f == r, "expected 0x8f, got 0x%x\n", r); test_dm_messages(0, 0, 0); @@ -6853,6 +6863,11 @@ static void test_dialogmode(void) ok(0 == r, "expected 0, got %d\n", r); test_dm_messages(0, 0, 0); + memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 1); + hwButton = CreateWindow("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON, 100, 100, 50, 20, hwParent, (HMENU)ID_RICHEDITTESTDBUTTON, GetModuleHandleA(0), NULL); ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError()); @@ -6886,6 +6901,11 @@ static void test_dialogmode(void) test_dm_messages(0, 0, 0); memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 0); + + memset(&dm_messages, 0, sizeof(dm_messages)); r = SendMessage(hwRichEdit, WM_GETDLGCODE, 0, (LPARAM)&msg); ok(0x8f == r, "expected 0x8f, got 0x%x\n", r); test_dm_messages(0, 0, 0); @@ -6903,6 +6923,11 @@ static void test_dialogmode(void) ok(0 == r, "expected 0, got %d\n", r); test_dm_messages(0, 0, 0); + memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 1); + hwButton = CreateWindow("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON, 100, 100, 50, 20, hwParent, (HMENU)ID_RICHEDITTESTDBUTTON, GetModuleHandleA(0), NULL); ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError()); @@ -6933,6 +6958,11 @@ static void test_dialogmode(void) test_dm_messages(0, 0, 0); memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 0); + + memset(&dm_messages, 0, sizeof(dm_messages)); r = SendMessage(hwRichEdit, WM_GETDLGCODE, 0, (LPARAM)&msg); ok(0x8b == r, "expected 0x8b, got 0x%x\n", r); test_dm_messages(0, 0, 0); @@ -6947,6 +6977,11 @@ static void test_dialogmode(void) ok(0 == r, "expected 0, got %d\n", r); test_dm_messages(0, 0, 0); + memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 1); + hwButton = CreateWindow("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON, 100, 100, 50, 20, hwParent, (HMENU)ID_RICHEDITTESTDBUTTON, GetModuleHandleA(0), NULL); ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError());

1 0