January 2014 - Wine-commits

Francois Gouget : ws2_32/tests: Add a trailing '\n' to a win_skip() call.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: e8e97f165dec4aef18190e3be67111d387f78203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8e97f165dec4aef18190e3be… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 10 15:18:48 2014 +0100 ws2_32/tests: Add a trailing '\n' to a win_skip() call. --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f8dc5a5..0abf732 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7356,7 +7356,7 @@ static void test_WSALookupService(void) if (!pWSALookupServiceBeginW || !pWSALookupServiceEnd || !pWSALookupServiceNextW) { - win_skip("WSALookupServiceBeginW or WSALookupServiceEnd or WSALookupServiceNextW not found"); + win_skip("WSALookupServiceBeginW or WSALookupServiceEnd or WSALookupServiceNextW not found\n"); return; }

1 0

Jacek Caban : mshtml: Added more traces to nsDocumentObserver_BindToDocument.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: c345023efe0c7e7927bee00f6dcbdde711cad4d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c345023efe0c7e7927bee00f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 10 16:27:58 2014 +0100 mshtml: Added more traces to nsDocumentObserver_BindToDocument. --- dlls/mshtml/mutation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 7eb53d3..23b37b5 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -642,7 +642,7 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, nsIDOMElement *nselem; nsresult nsres; - TRACE("(%p)\n", This); + TRACE("(%p)->(%p %p)\n", This, aDocument, aContent); nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMElement, (void**)&nselem); if(NS_SUCCEEDED(nsres)) {

1 0

Hans Leidekker : advapi32: PP_USE_HARDWARE_RNG is a parameter, not a flag.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 2722c451732f83f4569d603fd8cf71bc65be54f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2722c451732f83f4569d603fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 10 16:50:40 2014 +0100 advapi32: PP_USE_HARDWARE_RNG is a parameter, not a flag. --- dlls/advapi32/crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index d6454ea..2c5e411 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2172,7 +2172,7 @@ BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, const BYTE *pbDa SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (dwFlags & PP_USE_HARDWARE_RNG) + if (dwParam == PP_USE_HARDWARE_RNG) { FIXME("PP_USE_HARDWARE_RNG: What do I do with this?\n"); FIXME("\tLetting the CSP decide.\n");

1 0

Hans Leidekker : advapi32: Don' t shadow keychain_item in mac_write_credential.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 8953c74e349928a5c81d3cea9ffe264c81c3ab65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8953c74e349928a5c81d3cea9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 10 16:51:24 2014 +0100 advapi32: Don't shadow keychain_item in mac_write_credential. --- dlls/advapi32/cred.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 218c84f..b806019 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -580,8 +580,6 @@ static DWORD mac_write_credential(const CREDENTIALW *credential, BOOL preserve_b ERR("SecKeychainAddInternetPassword returned %ld\n", status); if (status == errSecDuplicateItem) { - SecKeychainItemRef keychain_item; - status = SecKeychainFindInternetPassword(NULL, strlen(servername), servername, domain ? strlen(domain) : 0, domain, strlen(username), username,

1 0

Dmitry Timoshkov : advapi32/tests: Add more file access tests, add access tests for a directory.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: fa0b745d3fef0e2962d84e256a68c9022e072d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa0b745d3fef0e2962d84e256… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 10 18:26:06 2014 +0900 advapi32/tests: Add more file access tests, add access tests for a directory. --- dlls/advapi32/tests/security.c | 81 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index df02d85..274aee7 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4776,7 +4776,7 @@ todo_wine static void test_file_security(HANDLE token) { - DWORD ret, i, access; + DWORD ret, i, access, bytes; HANDLE file, dup; static const struct { @@ -4791,10 +4791,12 @@ static void test_file_security(HANDLE token) }; char temp_path[MAX_PATH]; char file_name[MAX_PATH]; + char buf[16]; GetTempPathA(MAX_PATH, temp_path); GetTempFileNameA(temp_path, "tmp", 0, file_name); + /* file */ SetLastError(0xdeadbeef); file = CreateFileA(file_name, GENERIC_ALL, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); @@ -4816,7 +4818,84 @@ static void test_file_security(HANDLE token) } CloseHandle(file); + + SetLastError(0xdeadbeef); + file = CreateFileA(file_name, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + access = get_obj_access(file); +todo_wine + ok(access == (FILE_READ_ATTRIBUTES | SYNCHRONIZE), "expected FILE_READ_ATTRIBUTES | SYNCHRONIZE, got %#x\n", access); + + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(file, buf, sizeof(buf), &bytes, NULL); + ok(!ret, "ReadFile should fail\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + ok(bytes == 0, "expected 0, got %u\n", bytes); + + CloseHandle(file); + + SetLastError(0xdeadbeef); + file = CreateFileA(file_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + access = get_obj_access(file); +todo_wine + ok(access == (FILE_GENERIC_WRITE | FILE_READ_ATTRIBUTES), "expected FILE_GENERIC_WRITE | FILE_READ_ATTRIBUTES, got %#x\n", access); + + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(file, buf, sizeof(buf), &bytes, NULL); + ok(!ret, "ReadFile should fail\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + ok(bytes == 0, "expected 0, got %u\n", bytes); + + CloseHandle(file); DeleteFileA(file_name); + + /* directory */ + SetLastError(0xdeadbeef); + file = CreateFileA(temp_path, GENERIC_ALL, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + access = get_obj_access(file); + ok(access == FILE_ALL_ACCESS, "expected FILE_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), file, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + + CloseHandle(dup); + } + + CloseHandle(file); + + SetLastError(0xdeadbeef); + file = CreateFileA(temp_path, 0, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + access = get_obj_access(file); +todo_wine + ok(access == (FILE_READ_ATTRIBUTES | SYNCHRONIZE), "expected FILE_READ_ATTRIBUTES | SYNCHRONIZE, got %#x\n", access); + + CloseHandle(file); + + SetLastError(0xdeadbeef); + file = CreateFileA(temp_path, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + access = get_obj_access(file); +todo_wine + ok(access == (FILE_GENERIC_WRITE | FILE_READ_ATTRIBUTES), "expected FILE_GENERIC_WRITE | FILE_READ_ATTRIBUTES, got %#x\n", access); + + CloseHandle(file); } static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type)

1 0

Dmitry Timoshkov : advapi32/tests: Add access tests for a file mapping.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 4229da7caecac5f906e13b1d472f0b77f10cedf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4229da7caecac5f906e13b1d4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 10 18:26:11 2014 +0900 advapi32/tests: Add access tests for a file mapping. --- dlls/advapi32/tests/security.c | 53 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 274aee7..e6ae638 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4898,6 +4898,58 @@ todo_wine CloseHandle(file); } +static void test_filemap_security(void) +{ + DWORD ret, i, access; + HANDLE mapping, dup; + static const struct + { + int generic, mapped; + } map[] = + { + { 0, 0 }, + { GENERIC_READ, STANDARD_RIGHTS_READ | SECTION_QUERY | SECTION_MAP_READ }, + { GENERIC_WRITE, STANDARD_RIGHTS_WRITE | SECTION_MAP_WRITE }, + { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SECTION_MAP_EXECUTE }, + { GENERIC_ALL, STANDARD_RIGHTS_REQUIRED | SECTION_ALL_ACCESS } + }; + + SetLastError(0xdeadbeef); + mapping = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_EXECUTE_READWRITE, 0, 4096, NULL); + if (mapping) + { + access = get_obj_access(mapping); +todo_wine + ok(access == (STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE), + "expected STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE, got %#x\n", access); + } + else /* win2k fails to create EXECUTE mapping using system page file */ + { + SetLastError(0xdeadbeef); + mapping = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, NULL); + ok(mapping != 0, "CreateFileMapping error %d\n", GetLastError()); + + access = get_obj_access(mapping); + ok(access == (STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE), + "expected STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE, got %#x\n", access); + } + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), mapping, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + + CloseHandle(dup); + } + + CloseHandle(mapping); +} + static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) { DWORD ret, needed; @@ -4973,6 +5025,7 @@ static void test_kernel_objects_security(void) test_named_pipe_security(token); test_semaphore_security(token); test_file_security(token); + test_filemap_security(); /* FIXME: test other kernel object types */ CloseHandle(process_token);

1 0

Dmitry Timoshkov : advapi32/tests: Add access tests for a thread.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: eb96f7a5a3752843f5ad4308c741e2f518979768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb96f7a5a3752843f5ad4308c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 10 18:26:16 2014 +0900 advapi32/tests: Add access tests for a thread. --- dlls/advapi32/tests/security.c | 73 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e6ae638..034cf23 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -46,6 +46,14 @@ #define SEMAPHORE_QUERY_STATE 0x0001 #endif +#ifndef THREAD_SET_LIMITED_INFORMATION +#define THREAD_SET_LIMITED_INFORMATION 0x0400 +#define THREAD_QUERY_LIMITED_INFORMATION 0x0800 +#endif + +#define THREAD_ALL_ACCESS_NT4 (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3ff) +#define THREAD_ALL_ACCESS_VISTA (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xffff) + /* copied from Wine winternl.h - not included in the Windows SDK */ typedef enum _OBJECT_INFORMATION_CLASS { ObjectBasicInformation, @@ -4950,6 +4958,70 @@ todo_wine CloseHandle(mapping); } +static void test_thread_security(void) +{ + DWORD ret, i, access; + HANDLE thread, dup; + static const struct + { + int generic, mapped; + } map[] = + { + { 0, 0 }, + { GENERIC_READ, STANDARD_RIGHTS_READ | THREAD_QUERY_INFORMATION | THREAD_GET_CONTEXT }, + { GENERIC_WRITE, STANDARD_RIGHTS_WRITE | THREAD_SET_INFORMATION | THREAD_SET_CONTEXT | THREAD_TERMINATE | THREAD_SUSPEND_RESUME | 0x4 }, + { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, + { GENERIC_ALL, THREAD_ALL_ACCESS_NT4 } + }; + + SetLastError(0xdeadbeef); + thread = CreateThread(NULL, 0, (void *)0xdeadbeef, NULL, CREATE_SUSPENDED, &ret); + ok(thread != 0, "CreateThread error %d\n", GetLastError()); + + access = get_obj_access(thread); + ok(access == THREAD_ALL_ACCESS_NT4 || access == THREAD_ALL_ACCESS_VISTA, "expected THREAD_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), thread, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + switch (map[i].generic) + { + case GENERIC_READ: +todo_wine + ok(access == map[i].mapped || access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + case GENERIC_WRITE: +todo_wine + ok(access == map[i].mapped || access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION) /* Vista+ */, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + case GENERIC_EXECUTE: +todo_wine + ok(access == map[i].mapped || access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + case GENERIC_ALL: + ok(access == map[i].mapped || access == THREAD_ALL_ACCESS_VISTA, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + default: + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + } + + CloseHandle(dup); + } + + TerminateThread(thread, 0); + CloseHandle(thread); +} + static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) { DWORD ret, needed; @@ -5026,6 +5098,7 @@ static void test_kernel_objects_security(void) test_semaphore_security(token); test_file_security(token); test_filemap_security(); + test_thread_security(); /* FIXME: test other kernel object types */ CloseHandle(process_token);

1 0

Dmitry Timoshkov : advapi32/tests: Add access tests for a process.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 615319ebd025cb2c09fefe321b522c458bf2dd91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=615319ebd025cb2c09fefe321… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 10 18:26:20 2014 +0900 advapi32/tests: Add access tests for a process. --- dlls/advapi32/tests/security.c | 79 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 034cf23..2efe80e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -35,8 +35,13 @@ #include "wine/test.h" +#ifndef PROCESS_QUERY_LIMITED_INFORMATION +#define PROCESS_QUERY_LIMITED_INFORMATION 0x1000 +#endif + /* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ #define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000) +#define PROCESS_ALL_ACCESS_VISTA (PROCESS_ALL_ACCESS | 0xf000) #ifndef EVENT_QUERY_STATE #define EVENT_QUERY_STATE 0x0001 @@ -5022,6 +5027,79 @@ todo_wine CloseHandle(thread); } +static void test_process_access(void) +{ + DWORD ret, i, access; + HANDLE process, dup; + STARTUPINFOA sti; + PROCESS_INFORMATION pi; + char cmdline[] = "winver.exe"; + static const struct + { + int generic, mapped; + } map[] = + { + { 0, 0 }, + { GENERIC_READ, STANDARD_RIGHTS_READ | PROCESS_QUERY_INFORMATION | PROCESS_VM_READ }, + { GENERIC_WRITE, STANDARD_RIGHTS_WRITE | PROCESS_SET_QUOTA | PROCESS_SET_INFORMATION | PROCESS_SUSPEND_RESUME | + PROCESS_VM_WRITE | PROCESS_DUP_HANDLE | PROCESS_CREATE_PROCESS | PROCESS_CREATE_THREAD | PROCESS_VM_OPERATION }, + { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, + { GENERIC_ALL, PROCESS_ALL_ACCESS_NT4 } + }; + + memset(&sti, 0, sizeof(sti)); + sti.cb = sizeof(sti); + SetLastError(0xdeadbeef); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &sti, &pi); + ok(ret, "CreateProcess() error %d\n", GetLastError()); + + CloseHandle(pi.hThread); + process = pi.hProcess; + + access = get_obj_access(process); + ok(access == PROCESS_ALL_ACCESS_NT4 || access == PROCESS_ALL_ACCESS_VISTA, "expected PROCESS_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), process, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + switch (map[i].generic) + { + case GENERIC_READ: +todo_wine + ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_QUERY_LIMITED_INFORMATION) /* Vista+ */, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + case GENERIC_WRITE: +todo_wine + ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_TERMINATE) /* before Vista */, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + case GENERIC_EXECUTE: +todo_wine + ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_QUERY_LIMITED_INFORMATION | PROCESS_TERMINATE) /* Vista+ */, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + case GENERIC_ALL: + ok(access == map[i].mapped || access == PROCESS_ALL_ACCESS_VISTA, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + default: + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + } + + CloseHandle(dup); + } + + TerminateProcess(process, 0); + CloseHandle(process); +} + static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) { DWORD ret, needed; @@ -5099,6 +5177,7 @@ static void test_kernel_objects_security(void) test_file_security(token); test_filemap_security(); test_thread_security(); + test_process_access(); /* FIXME: test other kernel object types */ CloseHandle(process_token);

1 0

Jacek Caban : mshtml: Fixed double release in NPP_New.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 519166a4482e22a6bbe584b2acb8c488cd3b22e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=519166a4482e22a6bbe584b2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 10 16:22:17 2014 +0100 mshtml: Fixed double release in NPP_New. --- dlls/mshtml/npplugin.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index e681568..57bb772 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -671,7 +671,6 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I HRESULT hres; hres = create_plugin_host(window->doc, nselem, obj, &clsid, &host); - nsIDOMElement_Release(nselem); IUnknown_Release(obj); if(SUCCEEDED(hres)) instance->pdata = host;

1 0

Stefan Dösinger : wined3d: Add a map_binding field to surfaces.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 1046551c347ceaf357a0fc2095d529dc4472b3f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1046551c347ceaf357a0fc209… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 10 12:40:40 2014 +0100 wined3d: Add a map_binding field to surfaces. Buffers, heap memory, user memory and DIBs will have their own locations. This field specifies which location is used when the surface is mapped. --- dlls/wined3d/surface.c | 100 +++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 64 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 832caa5..b6dcb95 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -797,47 +797,55 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR { TRACE("WINED3D_MAP_DISCARD flag passed, marking SYSMEM as up to date.\n"); surface_prepare_system_memory(surface); - surface_validate_location(surface, SFLAG_INSYSMEM); + surface_validate_location(surface, surface->map_binding); } else { if (surface->resource.usage & WINED3DUSAGE_DYNAMIC) WARN_(d3d_perf)("Mapping a dynamic surface without WINED3D_MAP_DISCARD.\n"); - surface_load_location(surface, SFLAG_INSYSMEM); + surface_load_location(surface, surface->map_binding); } if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); + surface_invalidate_location(surface, ~surface->map_binding); - if (surface->flags & SFLAG_PBO) + switch (surface->map_binding) { - BYTE *ret; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + case SFLAG_INSYSMEM: + if (surface->flags & SFLAG_PBO) + { + BYTE *ret; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; - context = context_acquire(device, NULL); - gl_info = context->gl_info; + context = context_acquire(device, NULL); + gl_info = context->gl_info; - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); - checkGLcall("glBindBufferARB"); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); + checkGLcall("glBindBufferARB"); - ret = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); - checkGLcall("glMapBufferARB"); + ret = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); + checkGLcall("glMapBufferARB"); - /* Make sure the PBO isn't set anymore in order not to break non-PBO - * calls. */ - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); + /* Make sure the PBO isn't set anymore in order not to break non-PBO + * calls. */ + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB"); - context_release(context); - return ret; - } + context_release(context); + return ret; + } - if (surface->user_memory) - return surface->user_memory; + if (surface->user_memory) + return surface->user_memory; + + return surface->resource.allocatedMemory; - return surface->resource.allocatedMemory; + default: + ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); + return NULL; + } } static void surface_unmap(struct wined3d_surface *surface) @@ -848,21 +856,29 @@ static void surface_unmap(struct wined3d_surface *surface) memset(&surface->lockedRect, 0, sizeof(surface->lockedRect)); - if (surface->flags & SFLAG_PBO) + switch (surface->map_binding) { - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + case SFLAG_INSYSMEM: + if (surface->flags & SFLAG_PBO) + { + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; - TRACE("Freeing PBO memory.\n"); + TRACE("Freeing PBO memory.\n"); - context = context_acquire(device, NULL); - gl_info = context->gl_info; + context = context_acquire(device, NULL); + gl_info = context->gl_info; - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); - GL_EXTCALL(glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB)); - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glUnmapBufferARB"); - context_release(context); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); + GL_EXTCALL(glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("glUnmapBufferARB"); + context_release(context); + } + break; + + default: + ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); } TRACE("dirtyfied %u.\n", surface->flags & (SFLAG_INDRAWABLE | SFLAG_INTEXTURE) ? 0 : 1); @@ -1497,10 +1513,18 @@ static BYTE *gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, TRACE("surface %p, rect %s, flags %#x.\n", surface, wine_dbgstr_rect(rect), flags); - if (surface->user_memory) - return surface->user_memory; + switch (surface->map_binding) + { + case SFLAG_INSYSMEM: + if (surface->user_memory) + return surface->user_memory; - return surface->resource.allocatedMemory; + return surface->resource.allocatedMemory; + + default: + ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); + return NULL; + } } static void gdi_surface_unmap(struct wined3d_surface *surface) @@ -6397,6 +6421,8 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text surface->resource.allocatedMemory = surface->dib.bitmap_data; } + surface->map_binding = SFLAG_INSYSMEM; + return hr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b985745..3dc735d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2192,7 +2192,7 @@ struct wined3d_surface struct wined3d_texture *container; struct wined3d_swapchain *swapchain; struct wined3d_palette *palette; /* D3D7 style palette handling */ - DWORD draw_binding; + DWORD draw_binding, map_binding; void *user_memory; DWORD flags;

1 0