wine-commits March 2014

wine-commits@winehq.org

2 participants
530 discussions

Jacek Caban : ws2_32: Improved WSAIoctl debug messages.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: 35f164fac86ac1377552beb456c6d0f6ddf1dd30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f164fac86ac1377552beb45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 6 14:57:13 2014 +0100 ws2_32: Improved WSAIoctl debug messages. --- dlls/ws2_32/socket.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2a2c809..42044e6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3682,8 +3682,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID int fd; DWORD status = 0, total = 0; - TRACE("%ld, 0x%08x, %p, %d, %p, %d, %p, %p, %p\n", - s, code, in_buff, in_size, out_buff, out_size, ret_size, overlapped, completion); + TRACE("%ld, %s, %p, %d, %p, %d, %p, %p, %p\n", + s, debugstr_wsaioctl(code), in_buff, in_size, out_buff, out_size, ret_size, overlapped, completion); switch (code) { @@ -3693,6 +3693,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } + TRACE("-> FIONBIO (%x)\n", *(WS_u_long*)in_buff); if (_get_sock_mask(s)) { /* AsyncSelect()'ed sockets are always nonblocking */

1 0

Jacek Caban : atl/tests: Use HKCU instead of HKCR for registrar tests.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: 2871b4f6cd251de953e4dad3e6cab98279e076b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2871b4f6cd251de953e4dad3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 6 14:56:04 2014 +0100 atl/tests: Use HKCU instead of HKCR for registrar tests. --- dlls/atl/tests/registrar.c | 39 ++++----------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c index c05b672..4ecb092 100644 --- a/dlls/atl/tests/registrar.c +++ b/dlls/atl/tests/registrar.c @@ -37,36 +37,8 @@ #include <initguid.h> #include <atliface.h> - -static BOOL is_process_limited(void) -{ - static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE) = NULL; - HANDLE token; - - if (!pOpenProcessToken) - { - HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); - pOpenProcessToken = (void*)GetProcAddress(hadvapi32, "OpenProcessToken"); - if (!pOpenProcessToken) - return FALSE; - } - - if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) - { - BOOL ret; - TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; - DWORD size; - - ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); - CloseHandle(token); - return (ret && type == TokenElevationTypeLimited); - } - return FALSE; -} - - static const char textA[] = -"HKCR \n" +"HKCU \n" "{ \n" " ForceRemove eebf73c4-50fd-478f-bbcf-db212221227a \n" " { \n" @@ -96,7 +68,7 @@ static void test_registrar(void) hr = CoCreateInstance(&CLSID_Registrar, NULL, CLSCTX_INPROC_SERVER, &IID_IRegistrar, (void**)&registrar); if (FAILED(hr)) { - skip("creating IRegistrar failed, hr = 0x%08X\n", hr); + win_skip("creating IRegistrar failed, hr = 0x%08X\n", hr); return; } @@ -112,17 +84,14 @@ static void test_registrar(void) MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, count); hr = IRegistrar_StringRegister(registrar, textW); + ok(hr == S_OK, "StringRegister failed: %08x\n", hr); if (FAILED(hr)) { - BOOL is_limited = is_process_limited(); - ok(hr == DISP_E_EXCEPTION && is_limited, - "IRegistrar_StringRegister failed, hr = 0x%08X, is_limited=%d\n", hr, is_limited); - skip("Skipping registrar tests\n"); IRegistrar_Release(registrar); return; } - lret = RegOpenKeyA(HKEY_CLASSES_ROOT, "eebf73c4-50fd-478f-bbcf-db212221227a", &key); + lret = RegOpenKeyA(HKEY_CURRENT_USER, "eebf73c4-50fd-478f-bbcf-db212221227a", &key); ok(lret == ERROR_SUCCESS, "error %d opening registry key\n", lret); size = sizeof(dword);

1 0

André Hentschel : ws2_32/tests: Get rid of the do_oob_send helper function.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: b05a3e999cc42ec4042ba981644b43d1a064def6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05a3e999cc42ec4042ba9816… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 6 00:27:55 2014 +0100 ws2_32/tests: Get rid of the do_oob_send helper function. --- dlls/ws2_32/tests/sock.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index af30e8e..3843252 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -297,22 +297,12 @@ static void read_zero_bytes ( SOCKET s ) ok ( n <= 0, "garbage data received: %d bytes\n", n ); } -static int do_oob_send ( SOCKET s, char *buf, int buflen, int sendlen ) +static int do_synchronous_send ( SOCKET s, char *buf, int buflen, int sendlen, int flags ) { char* last = buf + buflen, *p; int n = 1; for ( p = buf; n > 0 && p < last; p += n ) - n = send ( s, p, min ( sendlen, last - p ), MSG_OOB ); - wsa_ok ( n, 0 <=, "do_oob_send (%x): error %d\n" ); - return p - buf; -} - -static int do_synchronous_send ( SOCKET s, char *buf, int buflen, int sendlen ) -{ - char* last = buf + buflen, *p; - int n = 1; - for ( p = buf; n > 0 && p < last; p += n ) - n = send ( s, p, min ( sendlen, last - p ), 0 ); + n = send ( s, p, min ( sendlen, last - p ), flags ); wsa_ok ( n, 0 <=, "do_synchronous_send (%x): error %d\n" ); return p - buf; } @@ -551,7 +541,7 @@ static VOID WINAPI simple_server ( server_params *par ) ok ( pos == -1, "simple_server (%x): test pattern error: %d\n", id, pos); /* Echo data back */ - n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); + n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen, 0 ); ok ( n_sent == n_expected, "simple_server (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); @@ -610,7 +600,7 @@ static VOID WINAPI oob_server ( server_params *par ) ok ( pos == -1, "oob_server (%x): test pattern error: %d\n", id, pos); /* Echo data back */ - n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); + n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen, 0 ); ok ( n_sent == n_expected, "oob_server (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); @@ -801,7 +791,7 @@ static VOID WINAPI simple_client ( client_params *par ) trace ( "simple_client (%x) connected\n", id ); /* send data to server */ - n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen ); + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen, 0 ); ok ( n_sent == n_expected, "simple_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); @@ -851,7 +841,7 @@ static VOID WINAPI oob_client ( client_params *par ) trace ( "oob_client (%x) connected\n", id ); /* send data to server */ - n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen ); + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen, 0 ); ok ( n_sent == n_expected, "oob_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); @@ -863,7 +853,7 @@ static VOID WINAPI oob_client ( client_params *par ) ok ( pos == -1, "simple_client (%x): test pattern error: %d\n", id, pos); /* send out-of-band data to server */ - n_sent = do_oob_send ( mem->s, mem->send_buf, n_expected, par->buflen ); + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen, MSG_OOB ); ok ( n_sent == n_expected, "oob_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); @@ -906,7 +896,7 @@ static VOID WINAPI simple_mixed_client ( client_params *par ) trace ( "simple_client (%x) connected\n", id ); /* send data to server */ - n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen ); + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen, 0 ); ok ( n_sent == n_expected, "simple_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected );

1 0

André Hentschel : ws2_32/tests: Test OOB data more sequential by sending bidirectional.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: ec7c5907f7f193cdc1aad5800cec1c1f3ab22212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7c5907f7f193cdc1aad5800… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 6 00:27:26 2014 +0100 ws2_32/tests: Test OOB data more sequential by sending bidirectional. --- dlls/ws2_32/tests/sock.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2252245..af30e8e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -573,7 +573,7 @@ static VOID WINAPI oob_server ( server_params *par ) test_params *gen = par->general; server_memory *mem; u_long atmark = 0; - int pos, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, tmp, + int pos, n_sent, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, tmp, id = GetCurrentThreadId(); trace ( "oob_server (%x) starting\n", id ); @@ -598,17 +598,23 @@ static VOID WINAPI oob_server ( server_params *par ) ok ( mem->sock[0].peer.sin_addr.s_addr == inet_addr ( gen->inet_addr ), "oob_server (%x): strange peer address\n", id ); - /* check atmark state */ + /* check initial atmark state */ ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); ok ( atmark == 1, "oob_server (%x): unexpectedly at the OOB mark: %i\n", id, atmark ); - /* Receive normal data and check atmark state */ + /* Receive normal data */ n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); ok ( n_recvd == n_expected, - "simple_server (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); + "oob_server (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); pos = test_buffer ( mem->sock[0].buf, gen->chunk_size, gen->n_chunks ); - ok ( pos == -1, "simple_server (%x): test pattern error: %d\n", id, pos); + ok ( pos == -1, "oob_server (%x): test pattern error: %d\n", id, pos); + + /* Echo data back */ + n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); + ok ( n_sent == n_expected, + "oob_server (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); + /* check atmark state */ ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); ok ( atmark == 1, "oob_server (%x): unexpectedly at the OOB mark: %i\n", id, atmark ); @@ -824,7 +830,7 @@ static VOID WINAPI oob_client ( client_params *par ) { test_params *gen = par->general; client_memory *mem; - int n_sent, n_expected = gen->n_chunks * gen->chunk_size, id; + int pos, n_sent, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, id; id = GetCurrentThreadId(); trace ( "oob_client (%x): starting\n", id ); @@ -849,6 +855,13 @@ static VOID WINAPI oob_client ( client_params *par ) ok ( n_sent == n_expected, "oob_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); + /* Receive data echoed back & check it */ + n_recvd = do_synchronous_recv ( mem->s, mem->recv_buf, n_expected, par->buflen ); + ok ( n_recvd == n_expected, + "simple_client (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); + pos = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); + ok ( pos == -1, "simple_client (%x): test pattern error: %d\n", id, pos); + /* send out-of-band data to server */ n_sent = do_oob_send ( mem->s, mem->send_buf, n_expected, par->buflen ); ok ( n_sent == n_expected,

1 0

Dmitry Timoshkov : kernel32/tests: Add a test for CreateFile called with TRUNCATE_EXISTING/ FILE_WRITE_DATA parameters.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: 6670bbf56f9294893217da9262e317a07490b14a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6670bbf56f9294893217da926… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 6 14:26:07 2014 +0900 kernel32/tests: Add a test for CreateFile called with TRUNCATE_EXISTING/FILE_WRITE_DATA parameters. --- dlls/kernel32/tests/file.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index bc9ee1f..492a34f 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3550,7 +3550,8 @@ static void test_CreateFile(void) /* 22*/ { TRUNCATE_EXISTING, 0, ERROR_INVALID_PARAMETER, 0 }, /* 23*/ { TRUNCATE_EXISTING, GENERIC_READ, ERROR_INVALID_PARAMETER, 0 }, /* 24*/ { TRUNCATE_EXISTING, GENERIC_WRITE, 0, 0 }, - /* 25*/ { TRUNCATE_EXISTING, GENERIC_READ|GENERIC_WRITE, 0, 0 } + /* 25*/ { TRUNCATE_EXISTING, GENERIC_READ|GENERIC_WRITE, 0, 0 }, + /* 26*/ { TRUNCATE_EXISTING, FILE_WRITE_DATA, ERROR_INVALID_PARAMETER, 0 } }; char temp_path[MAX_PATH]; char file_name[MAX_PATH]; @@ -3611,7 +3612,7 @@ else SetLastError(0xdeadbeef); ret = WriteFile(hfile, &td[i].error, sizeof(td[i].error), &written, NULL); if (td[i].access & GENERIC_WRITE) - ok(ret, "%d: WriteFile error %d\n", i, GetLastError()); + ok(ret, "%d: WriteFile error %d\n", i, GetLastError()); else { ok(!ret, "%d: WriteFile should fail\n", i);

1 0

Dmitry Timoshkov : kernel32/tests: Add some tests for CreateFile called on a directory instead of a file.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: d97e7baa661b1465d8d38c096239c200567553fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d97e7baa661b1465d8d38c096… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 6 14:25:54 2014 +0900 kernel32/tests: Add some tests for CreateFile called on a directory instead of a file. --- dlls/kernel32/tests/file.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index b1b36bb..bc9ee1f 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3560,6 +3560,46 @@ static void test_CreateFile(void) GetTempPathA(MAX_PATH, temp_path); GetTempFileNameA(temp_path, "tmp", 0, file_name); + i = strlen(temp_path); + if (i && temp_path[i - 1] == '\\') temp_path[i - 1] = 0; + + for (i = 0; i <= 5; i++) + { + SetLastError(0xdeadbeef); + hfile = CreateFileA(temp_path, GENERIC_READ, 0, NULL, i, 0, 0); + ok(hfile == INVALID_HANDLE_VALUE, "CreateFile should fail\n"); + if (i == 0 || i == 5) + { +/* FIXME: remove once Wine is fixed */ +if (i == 5) todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); +else + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); + } + else + { +/* FIXME: remove once Wine is fixed */ +if (i == 1) todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); +else + ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); + } + + SetLastError(0xdeadbeef); + hfile = CreateFileA(temp_path, GENERIC_WRITE, 0, NULL, i, 0, 0); + ok(hfile == INVALID_HANDLE_VALUE, "CreateFile should fail\n"); + if (i == 0) + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); + else + { +/* FIXME: remove once Wine is fixed */ +if (i == 1) todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); +else + ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); + } + } + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { SetLastError(0xdeadbeef);

1 0

Dmitry Timoshkov : gdiplus/tests: Mark some GdipGetPropertyItem test results as broken under XP.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: 865b503af832e6ae2c2f27683217f4d95c6b8fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=865b503af832e6ae2c2f27683… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 6 14:25:46 2014 +0900 gdiplus/tests: Mark some GdipGetPropertyItem test results as broken under XP. --- dlls/gdiplus/tests/image.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index c4e61cc..db0bc6a 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3213,8 +3213,10 @@ static void test_tiff_properties(void) ok(td[i].id == prop_item->id, "%u: expected id %#x, got %#x\n", i, td[i].id, prop_item->id); prop_size -= sizeof(*prop_item); ok(prop_item->length == prop_size, "%u: expected length %u, got %u\n", i, prop_size, prop_item->length); - ok(td[i].length == prop_item->length, "%u: expected length %u, got %u\n", i, td[i].length, prop_item->length); - ok(td[i].length == prop_size, "%u: expected length %u, got %u\n", i, td[i].length, prop_size); + ok(td[i].length == prop_item->length || broken(td[i].id == 0xf00f && td[i].length == prop_item->length+1) /* XP */, + "%u: expected length %u, got %u\n", i, td[i].length, prop_item->length); + ok(td[i].length == prop_size || broken(td[i].id == 0xf00f && td[i].length == prop_size+1) /* XP */, + "%u: expected length %u, got %u\n", i, td[i].length, prop_size); if (td[i].length == prop_item->length) { int match = memcmp(td[i].value, prop_item->value, td[i].length) == 0;

1 0

Dmitry Timoshkov : taskschd/tests: Add more ITaskFolder:: RegisterTask tests.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: e06bac6ad8a97e548e58656b95b3be8bf20c2371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06bac6ad8a97e548e58656b9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 6 14:25:36 2014 +0900 taskschd/tests: Add more ITaskFolder::RegisterTask tests. --- dlls/taskschd/tests/scheduler.c | 53 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index d554779..0f89021 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -702,6 +702,26 @@ static void test_GetTask(void) " </Exec>\n" " </Actions>\n" "</Task>\n"; + static const struct + { + DWORD flags, hr; + } create_new_task[] = + { + { 0, S_OK }, + { TASK_CREATE, S_OK }, + { TASK_UPDATE, 0x80070002 /* HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) */ }, + { TASK_CREATE | TASK_UPDATE, S_OK } + }; + static const struct + { + DWORD flags, hr; + } open_existing_task[] = + { + { 0, 0x800700b7 /* HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS) */ }, + { TASK_CREATE, 0x800700b7 /* HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS) */ }, + { TASK_UPDATE, S_OK }, + { TASK_CREATE | TASK_UPDATE, S_OK } + }; WCHAR xmlW[sizeof(xml1)]; HRESULT hr; BSTR bstr; @@ -712,6 +732,7 @@ static void test_GetTask(void) ITaskFolder *root, *folder; IRegisteredTask *task1, *task2; IID iid; + int i; hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); if (hr != S_OK) @@ -746,14 +767,34 @@ static void test_GetTask(void) hr = ITaskFolder_GetTask(root, Wine, &task1); ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); } + MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + for (i = 0; i < sizeof(create_new_task)/sizeof(create_new_task[0]); i++) + { + hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, create_new_task[i].flags, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); +/* FIXME: Remove once Wine is fixed */ +if (create_new_task[i].hr != S_OK) todo_wine + ok(hr == create_new_task[i].hr, "%d: expected %#x, got %#x\n", i, create_new_task[i].hr, hr); +else + ok(hr == create_new_task[i].hr, "%d: expected %#x, got %#x\n", i, create_new_task[i].hr, hr); + if (hr == S_OK) + { + hr = ITaskFolder_DeleteTask(root, Wine_Task1, 0); +todo_wine + ok(hr == S_OK, "DeleteTask error %#x\n", hr); + } + } + hr = ITaskFolder_RegisterTask(root, Wine_Task1, NULL, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "expected RPC_X_NULL_REF_POINTER, got %#x\n", hr); + hr = ITaskFolder_RegisterTask(root, Wine, xmlW, TASK_VALIDATE_ONLY, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); + ok(hr == S_OK, "RegisterTask error %#x\n", hr); + hr = ITaskFolder_RegisterTask(root, Wine, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); todo_wine - ok(hr == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED), "expected ERROR_ACCESS_DENIED, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || broken(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS)) /* Vista */, "expected ERROR_ACCESS_DENIED, got %#x\n", hr); hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); ok(hr == S_OK, "RegisterTask error %#x\n", hr); @@ -769,6 +810,16 @@ todo_wine hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE_OR_UPDATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); ok(hr == S_OK, "RegisterTask error %#x\n", hr); + for (i = 0; i < sizeof(open_existing_task)/sizeof(open_existing_task[0]); i++) + { + hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, open_existing_task[i].flags, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); +/* FIXME: Remove once Wine is fixed */ +if (open_existing_task[i].hr != S_OK) todo_wine + ok(hr == open_existing_task[i].hr, "%d: expected %#x, got %#x\n", i, open_existing_task[i].hr, hr); +else + ok(hr == open_existing_task[i].hr, "%d: expected %#x, got %#x\n", i, open_existing_task[i].hr, hr); + } + hr = IRegisteredTask_get_Name(task1, NULL); todo_wine ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr);

1 0

Henri Verbeet : d3d9/tests: Don't bother handling Direct3DCreate9() failures, we verified it works earlier.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: b50235ab3518a9011213623f7f58504d96e6c623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b50235ab3518a9011213623f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 6 11:06:08 2014 +0100 d3d9/tests: Don't bother handling Direct3DCreate9() failures, we verified it works earlier. --- dlls/d3d9/tests/device.c | 716 ++++++++++++++++------------------------------ 1 file changed, 244 insertions(+), 472 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b50235ab3518a90112136…

1 0

Henri Verbeet : d3d8/tests: Don't bother handling Direct3DCreate8() failures, we verified it works earlier.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: db34ccd7f2cb6d509921ca3903636045338cd3df URL: http://source.winehq.org/git/wine.git/?a=commit;h=db34ccd7f2cb6d509921ca390… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 6 11:06:07 2014 +0100 d3d8/tests: Don't bother handling Direct3DCreate8() failures, we verified it works earlier. --- dlls/d3d8/tests/device.c | 582 +++++++++++++++++----------------------------- 1 file changed, 214 insertions(+), 368 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db34ccd7f2cb6d509921c…

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2014