August 2008 - Wine-Commits - list.winehq.org

Ismael Barros : dplayx: Tests for CreateGroup.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 58837a6ceb3112d046f19b272c6b0bd788edd122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58837a6ceb3112d046f19b272… Author: Ismael Barros <razielmine(a)gmail.com> Date: Tue Aug 5 03:56:37 2008 +0200 dplayx: Tests for CreateGroup. --- dlls/dplayx/dplay.c | 10 ++ dlls/dplayx/tests/dplayx.c | 340 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 350 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58837a6ceb3112d046f19…

1 0

Ismael Barros : dplayx: Tests for EnumPlayers.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 44fe844edf01ecf4d7a9a7aabea822aafcc30753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fe844edf01ecf4d7a9a7aab… Author: Ismael Barros <razielmine(a)gmail.com> Date: Tue Aug 5 03:56:20 2008 +0200 dplayx: Tests for EnumPlayers. --- dlls/dplayx/tests/dplayx.c | 391 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 367 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44fe844edf01ecf4d7a9a…

1 0

Ismael Barros : dplayx: Tests for EnumGroups.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: ce3bd3b6f33f36b4811f0592082bb1e88e918850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce3bd3b6f33f36b4811f05920… Author: Ismael Barros <razielmine(a)gmail.com> Date: Tue Aug 5 03:56:35 2008 +0200 dplayx: Tests for EnumGroups. --- dlls/dplayx/tests/dplayx.c | 323 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 323 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce3bd3b6f33f36b4811f0…

1 0

Ismael Barros : dplayx: Tests for EnumGroupsInGroup.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: c235bba66b1f3e98fb77eae8330d2fce243bc948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c235bba66b1f3e98fb77eae83… Author: Ismael Barros <razielmine(a)gmail.com> Date: Tue Aug 5 03:56:30 2008 +0200 dplayx: Tests for EnumGroupsInGroup. --- dlls/dplayx/dplay.c | 10 ++ dlls/dplayx/tests/dplayx.c | 243 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 253 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c235bba66b1f3e98fb77e…

1 0

Ismael Barros : dplayx: Tests for GroupOwner.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 1278ea3aea523027bb079f3800117aa5641b2396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1278ea3aea523027bb079f380… Author: Ismael Barros <razielmine(a)gmail.com> Date: Tue Aug 5 03:56:28 2008 +0200 dplayx: Tests for GroupOwner. --- dlls/dplayx/tests/dplayx.c | 77 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 95b1d0e..0205994 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -3398,6 +3398,82 @@ static void test_CreateGroup(void) } +/* GroupOwner */ + +static void test_GroupOwner(void) +{ + + LPDIRECTPLAY4 pDP[2]; + DPSESSIONDESC2 dpsd; + DPID dpid[2], idGroup, idOwner; + HRESULT hr; + UINT i; + + + for (i=0; i<2; i++) + { + CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, + &IID_IDirectPlay4A, (LPVOID*) &pDP[i] ); + } + ZeroMemory( &dpsd, sizeof(DPSESSIONDESC2) ); + dpsd.dwSize = sizeof(DPSESSIONDESC2); + dpsd.guidApplication = appGuid; + dpsd.dwMaxPlayers = 10; + idGroup = 0; + idOwner = 0; + + /* Service provider not initialized */ + hr = IDirectPlayX_GetGroupOwner( pDP[0], idGroup, &idOwner ); + todo_wine checkHR( DPERR_UNINITIALIZED, hr ); + check( 0, idOwner ); + + if ( hr == DP_OK ) + { + skip( "GetGroupOwner not implemented\n" ); + return; + } + + + for (i=0; i<2; i++) + init_TCPIP_provider( pDP[i], "127.0.0.1", 0 ); + + hr = IDirectPlayX_Open( pDP[0], &dpsd, DPOPEN_CREATE ); + checkHR( DP_OK, hr ); + hr = IDirectPlayX_EnumSessions( pDP[1], &dpsd, 0, EnumSessions_cb_join, + (LPVOID) pDP[1], 0 ); + checkHR( DP_OK, hr ); + + for (i=0; i<2; i++) + { + hr = IDirectPlayX_CreatePlayer( pDP[i], &dpid[i], + NULL, NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + } + + /* Invalid group */ + hr = IDirectPlayX_GetGroupOwner( pDP[0], idGroup, &idOwner ); + checkHR( DPERR_INVALIDGROUP, hr ); + + hr = IDirectPlayX_CreateGroup( pDP[0], &idGroup, NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + + /* Fails, because we need a lobby session */ + hr = IDirectPlayX_GetGroupOwner( pDP[0], idGroup, &idOwner ); + checkHR( DPERR_UNSUPPORTED, hr ); + + + /* TODO: + * - Make this work + * - Check migration of the ownership of a group + * when the owner leaves + */ + + + IDirectPlayX_Release( pDP[0] ); + IDirectPlayX_Release( pDP[1] ); + +} + START_TEST(dplayx) { @@ -3421,6 +3497,7 @@ START_TEST(dplayx) test_GetPlayerFlags(); test_CreateGroup(); + test_GroupOwner(); CoUninitialize(); }

1 0

Hans Leidekker : winhttp: Add some tests for WinHttpAddRequestHeaders.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 6603ad725a4f6f504f49cd587bc408268aa9d61f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6603ad725a4f6f504f49cd587… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 20 11:37:53 2008 +0200 winhttp: Add some tests for WinHttpAddRequestHeaders. --- dlls/winhttp/tests/winhttp.c | 38 +++++++++++++++++++++++++++++++++++++- 1 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 4374056..527794d 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -204,6 +204,9 @@ static void test_WinHttpAddHeaders(void) static const WCHAR test_flag_coalesce_semicolon[] = {'t','e','s','t','2',',',' ','t','e','s','t','4',',',' ','t','e','s','t','5',';',' ','t','e','s','t','6',0}; + static const WCHAR field[] = {'f','i','e','l','d',0}; + static const WCHAR value[] = {'v','a','l','u','e',' ',0}; + static const WCHAR test_headers[][14] = { {'W','a','r','n','i','n','g',':','t','e','s','t','1',0}, @@ -212,7 +215,14 @@ static void test_WinHttpAddHeaders(void) {'W','a','r','n','i','n','g',':','t','e','s','t','4',0}, {'W','a','r','n','i','n','g',':','t','e','s','t','5',0}, {'W','a','r','n','i','n','g',':','t','e','s','t','6',0}, - {'W','a','r','n','i','n','g',':','t','e','s','t','7',0} + {'W','a','r','n','i','n','g',':','t','e','s','t','7',0}, + {0}, + {':',0}, + {'a',':',0}, + {':','b',0}, + {'c','d',0}, + {' ','e',' ',':','f',0}, + {'f','i','e','l','d',':',' ','v','a','l','u','e',' ',0} }; static const WCHAR test_indices[][6] = { @@ -481,6 +491,32 @@ static void test_WinHttpAddHeaders(void) test_header_name, buffer, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders succeeded unexpectedly, found third header.\n"); + ret = WinHttpAddRequestHeaders(request, test_headers[8], ~0UL, WINHTTP_ADDREQ_FLAG_ADD); + ok(!ret, "WinHttpAddRequestHeaders failed\n"); + + ret = WinHttpAddRequestHeaders(request, test_headers[9], ~0UL, WINHTTP_ADDREQ_FLAG_ADD); + ok(ret, "WinHttpAddRequestHeaders failed\n"); + + ret = WinHttpAddRequestHeaders(request, test_headers[10], ~0UL, WINHTTP_ADDREQ_FLAG_ADD); + ok(!ret, "WinHttpAddRequestHeaders failed\n"); + + ret = WinHttpAddRequestHeaders(request, test_headers[11], ~0UL, WINHTTP_ADDREQ_FLAG_ADD); + ok(!ret, "WinHttpAddRequestHeaders failed\n"); + + ret = WinHttpAddRequestHeaders(request, test_headers[12], ~0UL, WINHTTP_ADDREQ_FLAG_ADD); + ok(!ret, "WinHttpAddRequestHeaders failed\n"); + + ret = WinHttpAddRequestHeaders(request, test_headers[13], ~0UL, WINHTTP_ADDREQ_FLAG_ADD); + ok(ret, "WinHttpAddRequestHeaders failed\n"); + + index = 0; + buffer[0] = 0; + len = sizeof(buffer); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + field, buffer, &len, &index); + ok(ret, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(!memcmp(buffer, value, sizeof(value)), "unexpected result\n"); + ret = WinHttpCloseHandle(request); ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); done:

1 0

Gerald Pfeifer : Add return statements to avoid gcc warnings.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: e375b0c4a24050efa2927c7e25d7304302ab8b2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e375b0c4a24050efa2927c7e2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Aug 11 00:44:31 2008 +0200 Add return statements to avoid gcc warnings. --- dlls/ntdll/threadpool.c | 1 + dlls/winedos/vga.c | 1 + dlls/winedos/vxd.c | 2 ++ dlls/wineoss.drv/audio.c | 2 ++ 4 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 18baeee..9c0dafe 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -258,6 +258,7 @@ static DWORD CALLBACK iocp_poller(LPVOID Arg) callback( err, transferred, overlapped ); } } + return 0; } /*********************************************************************** diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index fd52689..9afbc4c 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -295,6 +295,7 @@ static void CALLBACK set_timer_rate( ULONG_PTR arg ) static DWORD CALLBACK VGA_TimerThread( void *dummy ) { for (;;) SleepEx( INFINITE, TRUE ); + return 0; } static void VGA_DeinstallTimer(void) diff --git a/dlls/winedos/vxd.c b/dlls/winedos/vxd.c index 0b3602a..a719c30 100644 --- a/dlls/winedos/vxd.c +++ b/dlls/winedos/vxd.c @@ -407,6 +407,8 @@ static DWORD CALLBACK timer_thread( void *arg ) *system_time = GetTickCount(); Sleep( 55 ); } + + return 0; } diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 2e22d14..460c1f5 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -1923,6 +1923,8 @@ static DWORD CALLBACK wodPlayer(LPVOID pmt) dwNextFeedTime = dwNextNotifyTime = INFINITE; } } + + return 0; } /**************************************************************************

1 0

Hans Leidekker : winhttp: Use default values for verb, object and version parameters in WinHttpOpenRequest.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 70fb4ef523d1d42181560f0660ec8365fae5eb9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=70fb4ef523d1d42181560f066… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 20 11:37:17 2008 +0200 winhttp: Use default values for verb, object and version parameters in WinHttpOpenRequest. --- dlls/winhttp/session.c | 14 +++++++++++--- dlls/winhttp/tests/winhttp.c | 18 ++++++++---------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 01ab33d..d2bb340 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -230,6 +230,10 @@ static const object_vtbl_t request_vtbl = HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR object, LPCWSTR version, LPCWSTR referrer, LPCWSTR *types, DWORD flags ) { + static const WCHAR get[] = {'G','E','T',0}; + static const WCHAR slash[] = {'/',0}; + static const WCHAR http1_1[] = {'H','T','T','P','/','1','.','1',0}; + request_t *request; connect_t *connect; HINTERNET hrequest = NULL; @@ -264,9 +268,13 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o request->connect = connect; list_add_head( &connect->hdr.children, &request->hdr.entry ); - if (verb && !(request->verb = strdupW( verb ))) goto end; - if (object && !(request->path = strdupW( object ))) goto end; - if (version && !(request->version = strdupW( version ))) goto end; + if (!verb) verb = get; + if (!object) object = slash; + if (!version) version = http1_1; + + if (!(request->verb = strdupW( verb ))) goto end; + if (!(request->path = strdupW( object ))) goto end; + if (!(request->version = strdupW( version ))) goto end; if (!(hrequest = alloc_handle( &request->hdr ))) goto end; request->hdr.handle = hrequest; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 0fa89bd..4374056 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #include <stdarg.h> #include <stdlib.h> #include <windef.h> @@ -277,7 +278,7 @@ static void test_WinHttpAddHeaders(void) test_header_name, NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - todo_wine ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); + ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); ok(index == 0, "WinHttpQueryHeaders incorrectly incremented header index.\n"); /* Try with a NULL buffer and a length thats too small */ @@ -289,7 +290,7 @@ static void test_WinHttpAddHeaders(void) ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICENT_BUFFER, go %u\n", GetLastError()); - todo_wine ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); + ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); ok(index == 0, "WinHttpQueryHeaders incorrectly incremented header index.\n"); index = 0; @@ -300,7 +301,7 @@ static void test_WinHttpAddHeaders(void) ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - todo_wine ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); + ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); ok(index == 0, "WinHttpQueryHeaders failed: index was incremented.\n"); /* valid query */ @@ -314,13 +315,10 @@ static void test_WinHttpAddHeaders(void) ok(len + sizeof(WCHAR) <= oldlen, "WinHttpQueryHeaders resulting length longer than advertized.\n"); ok((len < sizeof(buffer) - sizeof(WCHAR)) && buffer[len / sizeof(WCHAR)] == 0, "WinHttpQueryHeaders did not append NULL terminator\n"); ok(len == lstrlenW(buffer) * sizeof(WCHAR), "WinHttpQueryHeaders returned incorrect length.\n"); - todo_wine - { - ok(memcmp(buffer, test_header_begin, sizeof(test_header_begin)) == 0, - "WinHttpQueryHeaders returned invalid beginning of header string.\n"); - ok(memcmp(buffer + lstrlenW(buffer) - 4, test_header_end, sizeof(test_header_end)) == 0, - "WinHttpQueryHeaders returned invalid end of header string.\n"); - } + ok(memcmp(buffer, test_header_begin, sizeof(test_header_begin)) == 0, + "WinHttpQueryHeaders returned invalid beginning of header string.\n"); + ok(memcmp(buffer + lstrlenW(buffer) - 4, test_header_end, sizeof(test_header_end)) == 0, + "WinHttpQueryHeaders returned invalid end of header string.\n"); ok(index == 0, "WinHttpQueryHeaders incremented header index.\n"); /* tests for more indices */

1 0

Hans Leidekker : winhttp: Implement WinHttpQueryHeaders.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: f14b6afb9c63dd555bae6f28da9e14a36d98acaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f14b6afb9c63dd555bae6f28d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 20 11:36:23 2008 +0200 winhttp: Implement WinHttpQueryHeaders. --- dlls/winhttp/main.c | 12 --- dlls/winhttp/request.c | 195 +++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/tests/winhttp.c | 198 +++++++++++++++--------------------------- 3 files changed, 267 insertions(+), 138 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f14b6afb9c63dd555bae6…

1 0

Roy Shea : mstask/test: Conformance test for CreateTrigger.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 5b3b540d8b0e9cfd5bf18740d88bc2d477f0d99f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b3b540d8b0e9cfd5bf18740d… Author: Roy Shea <royshea(a)gmail.com> Date: Tue Aug 19 15:01:07 2008 -0700 mstask/test: Conformance test for CreateTrigger. --- dlls/mstask/tests/task.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 708c5a3..48f87f2 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -202,9 +202,38 @@ static void test_SetApplicationName_GetApplicationName(void) return; } +static void test_CreateTrigger(void) +{ + BOOL setup; + HRESULT hres; + WORD trigger_index; + ITaskTrigger *test_trigger; + + setup = setup_task(); + ok(setup, "Failed to setup test_task\n"); + if (!setup) + { + skip("Failed to create task. Skipping tests.\n"); + return; + } + + hres = ITask_CreateTrigger(test_task, &trigger_index, &test_trigger); + todo_wine ok(hres == S_OK, "Failed to create trigger: 0x%08x\n", hres); + if (hres != S_OK) + { + cleanup_task(); + return; + } + + ITaskTrigger_Release(test_trigger); + cleanup_task(); + return; +} + START_TEST(task) { CoInitialize(NULL); test_SetApplicationName_GetApplicationName(); + test_CreateTrigger(); CoUninitialize(); }

1 0