November 2013 - Wine-Commits

Frédéric Delanoy : twain_32: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 26, 2013

Nov. 26, 2013

Module: wine Branch: master Commit: 6a847bd9cd814eb0160bf3673e514937f1359775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a847bd9cd814eb0160bf3673… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 25 22:27:36 2013 +0100 twain_32: Use BOOL type where appropriate. --- dlls/twain_32/dsm_ctrl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index db57d08..09e49c8 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -100,12 +100,12 @@ twain_add_onedriver(const char *dsname) { FreeLibrary (hmod); } -static int detectionrun = 0; +static BOOL detectionrun = FALSE; static void twain_autodetect(void) { if (detectionrun) return; - detectionrun = 1; + detectionrun = TRUE; twain_add_onedriver("sane.ds"); twain_add_onedriver("gphoto2.ds");

1 0

Ričardas Barkauskas : wininet: Reset data stream for existing request connections.
by Alexandre Julliard Nov. 26, 2013

Nov. 26, 2013

Module: wine Branch: master Commit: 992c2bd3e5e3383fe2f39d585fcc1c666a9b7773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992c2bd3e5e3383fe2f39d585… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue Nov 26 01:12:34 2013 +0200 wininet: Reset data stream for existing request connections. --- dlls/wininet/http.c | 13 ++++++++++--- dlls/wininet/tests/http.c | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 52b64f8..bca1101 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4936,10 +4936,17 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, loop_next = FALSE; - if (request->netconn && !NETCON_is_alive(request->netconn)) + if (request->netconn) { - free_netconn(request->netconn); - request->netconn = NULL; + if (!NETCON_is_alive(request->netconn)) + { + free_netconn(request->netconn); + request->netconn = NULL; + } + else + { + reset_data_stream(request); + } } reusing_connection = request->netconn != NULL; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 3bad0e3..4793bc6 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3019,7 +3019,7 @@ static void test_successive_HttpSendRequest(int port) CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); - test_status_code_todo(req, 200); + test_status_code(req, 200); SET_WINE_ALLOW(INTERNET_STATUS_CLOSING_CONNECTION); SET_WINE_ALLOW(INTERNET_STATUS_CONNECTION_CLOSED);

1 0

Ričardas Barkauskas : wininet/tests: Test successive HttpSendRequest calls.
by Alexandre Julliard Nov. 26, 2013

Nov. 26, 2013

Module: wine Branch: master Commit: 920a261d35710a2da34becbd713ee69f7415971d URL: http://source.winehq.org/git/wine.git/?a=commit;h=920a261d35710a2da34becbd7… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue Nov 26 01:12:04 2013 +0200 wininet/tests: Test successive HttpSendRequest calls. --- dlls/wininet/tests/http.c | 99 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ffb5fdf..3bad0e3 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1927,14 +1927,14 @@ static const char page1[] = static const char ok_with_length[] = "HTTP/1.1 200 OK\r\n" "Connection: Keep-Alive\r\n" -"Content-Length: 23\r\n\r\n" -"abc\r\nHTTP/1.1 211 OK\r\n\r\n"; +"Content-Length: 18\r\n\r\n" +"HTTP/1.1 211 OK\r\n\r\n"; static const char ok_with_length2[] = "HTTP/1.1 210 OK\r\n" "Connection: Keep-Alive\r\n" -"Content-Length: 24\r\n\r\n" -"abc\r\nHTTP/1.1 211 OK\r\n\r\n"; +"Content-Length: 19\r\n\r\n" +"HTTP/1.1 211 OK\r\n\r\n"; struct server_info { HANDLE hEvent; @@ -2147,6 +2147,12 @@ static DWORD CALLBACK server_thread(LPVOID param) count = 0; } } + if (strstr(buffer, "GET /testH")) + { + send(c, ok_with_length2, sizeof(ok_with_length2)-1, 0); + recvfrom(c, buffer, sizeof(buffer), 0, NULL, NULL); + send(c, ok_with_length, sizeof(ok_with_length)-1, 0); + } if (strstr(buffer, "GET /test_no_content")) { @@ -2937,6 +2943,90 @@ static void test_connection_closing(int port) CloseHandle(hCompleteEvent); } +static void test_successive_HttpSendRequest(int port) +{ + HINTERNET session, connection, req; + DWORD res; + + hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + + session = InternetOpenA("", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, INTERNET_FLAG_ASYNC); + ok(session != NULL,"InternetOpen failed with error %u\n", GetLastError()); + + pInternetSetStatusCallbackA(session, callback); + + SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); + connection = InternetConnectA(session, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); + ok(connection != NULL,"InternetConnect failed with error %u\n", GetLastError()); + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + + SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); + req = HttpOpenRequestA(connection, "GET", "/testH", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0xdeadbeaf); + ok(req != NULL, "HttpOpenRequest failed: %u\n", GetLastError()); + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + SET_OPTIONAL(INTERNET_STATUS_DETECTING_PROXY); + SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); + SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); + SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); + SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + res = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(!res && (GetLastError() == ERROR_IO_PENDING), + "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); + WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); + + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + + test_status_code(req, 210); + + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + SET_OPTIONAL(INTERNET_STATUS_DETECTING_PROXY); + SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); + SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); + SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); + SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); + SET_OPTIONAL(INTERNET_STATUS_CLOSING_CONNECTION); + SET_OPTIONAL(INTERNET_STATUS_CONNECTION_CLOSED); + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + res = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(!res && (GetLastError() == ERROR_IO_PENDING), + "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); + WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); + + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); + CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + CLEAR_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + + test_status_code_todo(req, 200); + + SET_WINE_ALLOW(INTERNET_STATUS_CLOSING_CONNECTION); + SET_WINE_ALLOW(INTERNET_STATUS_CONNECTION_CLOSED); + + close_async_handle(session, hCompleteEvent, 2); + CloseHandle(hCompleteEvent); +} static void test_no_content(int port) { @@ -3912,6 +4002,7 @@ static void test_http_connection(void) test_premature_disconnect(si.port); test_connection_closing(si.port); test_cache_control_verb(si.port); + test_successive_HttpSendRequest(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

André Hentschel : wininet/tests: Fix boolean checks.
by Alexandre Julliard Nov. 26, 2013

Nov. 26, 2013

Module: wine Branch: master Commit: f34ba03277ba307ff789dd398e10ce4a0d94ebb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f34ba03277ba307ff789dd398… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 26 00:17:25 2013 +0100 wininet/tests: Fix boolean checks. --- dlls/wininet/tests/urlcache.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index e093d4b..07800e0 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -217,16 +217,16 @@ static void test_IsUrlCacheEntryExpiredA(void) * is NULL. */ ret = IsUrlCacheEntryExpiredA(NULL, 0, NULL); - ok(ret == !ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); + ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); ft.dwLowDateTime = 0xdeadbeef; ft.dwHighDateTime = 0xbaadf00d; ret = IsUrlCacheEntryExpiredA(NULL, 0, &ft); - ok(ret == !ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); + ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); ok(ft.dwLowDateTime == 0xdeadbeef && ft.dwHighDateTime == 0xbaadf00d, "expected time to be unchanged, got (%u,%u)\n", ft.dwLowDateTime, ft.dwHighDateTime); ret = IsUrlCacheEntryExpiredA(test_url, 0, NULL); - ok(ret == !ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); + ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); /* The return value should indicate whether the URL is expired, * and the filetime indicates the last modified time, but a cache entry @@ -309,7 +309,7 @@ static void test_IsUrlCacheEntryExpiredA(void) ft.dwLowDateTime = 0xdeadbeef; ft.dwHighDateTime = 0xbaadf00d; ret = IsUrlCacheEntryExpiredA(uncached_url, 0, &ft); - ok(ret == !ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); + ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); ok(!ft.dwLowDateTime && !ft.dwHighDateTime, "expected time (0,0), got (%u,%u)\n", ft.dwLowDateTime, ft.dwHighDateTime);

1 0

André Hentschel : winedbg: Update minidump output.
by Alexandre Julliard Nov. 26, 2013

Nov. 26, 2013

Module: wine Branch: master Commit: 74046af7eb0497a873504eee4fd0634adbb2d671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74046af7eb0497a873504eee4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 26 01:08:26 2013 +0100 winedbg: Update minidump output. --- programs/winedbg/tgt_minidump.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index b374f42..50801c7 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -289,6 +289,12 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) case PROCESSOR_ARCHITECTURE_ARM: str = "ARM"; break; + case PROCESSOR_ARCHITECTURE_MSIL: + str = "MSIL"; + break; + case PROCESSOR_ARCHITECTURE_NEUTRAL: + str = "Neutral"; + break; default: str = "???"; break; @@ -311,7 +317,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) case 0: str = (msi->PlatformId == VER_PLATFORM_WIN32_NT) ? "NT 4.0" : "95"; break; case 10: str = "98"; break; case 90: str = "ME"; break; - default: str = "5-????"; break; + default: str = "4-????"; break; } break; case 5: @@ -319,10 +325,30 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) { case 0: str = "2000"; break; case 1: str = "XP"; break; - case 2: str = "Server 2003"; break; + case 2: + if (msi->u.s.ProductType == 1) str = "XP"; + else if (msi->u.s.ProductType == 3) str = "Server 2003"; + else str = "5-????"; + break; default: str = "5-????"; break; } break; + case 6: + switch (msi->MinorVersion) + { + case 0: + if (msi->u.s.ProductType == 1) str = "Vista"; + else if (msi->u.s.ProductType == 3) str = "Server 2008"; + else str = "6-????"; + break; + case 1: + if (msi->u.s.ProductType == 1) str = "Win7"; + else if (msi->u.s.ProductType == 3) str = "Server 2008"; + else str = "6-????"; + case 2: str = "Win8"; break; + default: str = "6-????"; break; + } + break; default: str = "???"; break; } dbg_printf(" on Windows %s (%u)\n", str, msi->BuildNumber);

1 0

Viktor Zozulyak : Updated Ukrainian translation of Download->Debian page
by Jeremy Newman Nov. 25, 2013

Nov. 25, 2013

Module: website Branch: master Commit: e9064becf572bebf117b22e54ac103cd8d0f0419 URL: http://source.winehq.org/git/website.git/?a=commit;h=e9064becf572bebf117b22… Author: Viktor Zozulyak <zozulyakviktor(a)gmail.com> Date: Mon Nov 25 23:35:03 2013 +0200 Updated Ukrainian translation of Download->Debian page Recently installed wine on Ubuntu 12.04 and realized that there is some white spots and mistakes in Ukrainian translations. Made some updates and corrections. --- templates/uk/download/debian.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/uk/download/debian.template b/templates/uk/download/debian.template index 34f10fb..9fdeb40 100644 --- a/templates/uk/download/debian.template +++ b/templates/uk/download/debian.template @@ -5,14 +5,14 @@ Wine для Debian <a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a></h1> -Дистрибутиви сімейства Debian використовують спеціальний інструмент для управління пакунками, відомий як APT. APT здатний автоматично встановити всі необхідні залежності для пакету, а також слідкувати за оновленнями для надання актуальності. Дистрибутиви сімейства Debian мають власні репозиторії програмного забезпечення в яких є Wine, але попри це, ми все ж таки маємо свій власний репозиторій для розробницьких пакунків. +Дистрибутиви сімейства Debian використовують спеціальний інструмент для управління пакунками, відомий як APT. APT здатний автоматично встановити всі необхідні залежності для пакету, а також слідкувати за оновленнями для підтримання актуальності. Дистрибутиви сімейства Debian мають власні репозиторії програмного забезпечення в яких є Wine, але попри це, ми все ж таки маємо свій власний репозиторій для розробницьких пакунків. Попередження: Розробницькі пакунки Це означає, що вони періодично можуть містити <a href="http://wiki.winehq.org/Regression">регресії</a> і в разі оновлень може постраждати функціональність. Якщо останній стабільний реліз Wine (поточний Wine {$config_stable_release}) добре працює, тоді ви можете не використовувати ці розробницькі пакунки. Цей веб-сайт має пакунки для i386 та amd64 архітектур. -Щоб встановити пакунки, ви повинні завантажити файли .deb та встановити іх вручну. Для більш подробних деталей дивіться сторінку. +Щоб встановити пакунки, ви повинні завантажити файли .deb та встановити іх вручну. За більш детальною інформацією зверніться до сторінки нижче. Домашня сторінка: <a href="http://dev.carbon-project.org/debian/wine-unstable/" target="_blank">http://dev.carbon-project.org/debian/wine-unstable/</a>

1 0

Viktor Zozulyak : Updated Ukrainian translation of Download page
by Jeremy Newman Nov. 25, 2013

Nov. 25, 2013

Module: website Branch: master Commit: fb36fa55f3cbf884bd5b1fa18aa3aafeb4225ad6 URL: http://source.winehq.org/git/website.git/?a=commit;h=fb36fa55f3cbf884bd5b1f… Author: Viktor Zozulyak <zozulyakviktor(a)gmail.com> Date: Mon Nov 25 23:34:18 2013 +0200 Updated Ukrainian translation of Download page Recently installed wine on Ubuntu 12.04 and realized that there is some white spots and mistakes in Ukrainian translations. Made some updates and corrections. --- templates/uk/download.template | 61 +++++++++++++++++++++------------------- 1 files changed, 32 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=fb36fa55f3cbf884bd…

1 0

Daniel Lehman : msvcrt: Return wall-clock time from clock().
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: 15b35f4d37e4bdd8d2b44b772e800a8ffade7ab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b35f4d37e4bdd8d2b44b772… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jul 27 16:42:53 2011 -0700 msvcrt: Return wall-clock time from clock(). --- dlls/msvcrt/tests/time.c | 17 +++++++++++++++++ dlls/msvcrt/time.c | 25 +++++++++++++++---------- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index a3e5c07..71e58ba 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -852,6 +852,22 @@ static void test__tzset(void) _putenv(TZ_env); } +static void test_clock(void) +{ + static const int THRESH = 50; + clock_t s, e; + int i; + + for (i = 0; i < 10; i++) + { + s = clock(); + Sleep(1000); + e = clock(); + + ok(abs((e-s) - 1000) < THRESH, "clock off on loop %i: %i\n", i, e-s); + } +} + START_TEST(time) { init(); @@ -870,4 +886,5 @@ START_TEST(time) test_localtime64_s(); test_daylight(); test_asctime(); + test_clock(); } diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index e227b84..2b5fe8d 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -30,6 +30,7 @@ #include "mtdll.h" #include "winbase.h" #include "winnls.h" +#include "winternl.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -709,19 +710,23 @@ int CDECL _wstrtime_s(MSVCRT_wchar_t* time, MSVCRT_size_t size) */ MSVCRT_clock_t CDECL MSVCRT_clock(void) { - FILETIME ftc, fte, ftk, ftu; - ULONGLONG utime, ktime; - - MSVCRT_clock_t clock; + static LONGLONG start_time; + LARGE_INTEGER systime; - GetProcessTimes(GetCurrentProcess(), &ftc, &fte, &ftk, &ftu); + if(!start_time) { + KERNEL_USER_TIMES pti; - ktime = ((ULONGLONG)ftk.dwHighDateTime << 32) | ftk.dwLowDateTime; - utime = ((ULONGLONG)ftu.dwHighDateTime << 32) | ftu.dwLowDateTime; - - clock = (utime + ktime) / (TICKSPERSEC / MSVCRT_CLOCKS_PER_SEC); + /* while Linux's clock returns user time, Windows' clock + * returns wall-clock time from process start. cache the + * process start time since it won't change and to avoid + * wineserver round-trip overhead */ + if(NtQueryInformationProcess(GetCurrentProcess(), ProcessTimes, &pti, sizeof(pti), NULL)) + return -1; + start_time = pti.CreateTime.QuadPart; + } - return clock; + NtQuerySystemTime(&systime); + return (systime.QuadPart - start_time) * MSVCRT_CLOCKS_PER_SEC / TICKSPERSEC; } /*********************************************************************

1 0

Stefan Dösinger : d3d8/tests: Read the result before swapping in volume_v16u16_test.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: f65f951cbab91c407dd97f2a7b983f72734f0a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f65f951cbab91c407dd97f2a7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 24 00:18:57 2013 +0100 d3d8/tests: Read the result before swapping in volume_v16u16_test. --- dlls/d3d8/tests/visual.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index d963a73..1913e6e 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4283,9 +4283,6 @@ static void volume_v16u16_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); - color = getPixelColor(device, 120, 160); ok (color_match(color, 0x000080ff, 2), "Expected color 0x000080ff, got 0x%08x, V16U16 input -32768, 0.\n", color); @@ -4299,6 +4296,9 @@ static void volume_v16u16_test(IDirect3DDevice8 *device) ok (color_match(color, 0x0040c0ff, 2), "Expected color 0x0040c0ff, got 0x%08x, V16U16 input -16384, 16384.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + IDirect3DVolumeTexture8_Release(texture); }

1 0

Stefan Dösinger : d3d9/tests: Read the result before swapping in volume_v16u16_test.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: c96092f83130e79561d7ed4a1a26f6d4fab9005d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c96092f83130e79561d7ed4a1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 24 00:18:56 2013 +0100 d3d9/tests: Read the result before swapping in volume_v16u16_test. --- dlls/d3d9/tests/visual.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7f750bb..522ac50 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14759,9 +14759,6 @@ static void volume_v16u16_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); - color = getPixelColor(device, 120, 160); ok (color_match(color, 0x000080ff, 2), "Expected color 0x000080ff, got 0x%08x, V16U16 input -32768, 0.\n", color); @@ -14775,6 +14772,9 @@ static void volume_v16u16_test(IDirect3DDevice9 *device) ok (color_match(color, 0x0040c0ff, 2), "Expected color 0x0040c0ff, got 0x%08x, V16U16 input -16384, 16384.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + IDirect3DVolumeTexture9_Release(texture); }

1 0