February 2016 - Wine-Commits

Julian Rüger : German translation for release 1.8.1
by Jeremy Newman Feb. 29, 2016

Feb. 29, 2016

Module: website Branch: master Commit: 0bb9bbd566a537495179098e2305b39876643448 URL: http://source.winehq.org/git/website.git/?a=commit;h=0bb9bbd566a53749517909… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Feb 29 09:28:57 2016 +0100 German translation for release 1.8.1 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016020301.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2016020301.xml b/news/de/2016020301.xml new file mode 100644 index 0000000..2484b6e --- /dev/null +++ b/news/de/2016020301.xml @@ -0,0 +1,13 @@ +<news> +<date>3. Februar 2016</date> +<title>Wine 1.8.1 freigegeben</title> +<body> + Die Wartungsversion 1.8.1 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.8.1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen.</li> + <li>Kleinere Übersetzungsupdates.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.1.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 1.9.3
by Jeremy Newman Feb. 29, 2016

Feb. 29, 2016

Module: website Branch: master Commit: be0d789eadc49dbf6209415544ed1c6d73ec0f60 URL: http://source.winehq.org/git/website.git/?a=commit;h=be0d789eadc49dbf620941… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Feb 29 09:34:12 2016 +0100 German translation for release 1.9.3 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016020501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2016020501.xml b/news/de/2016020501.xml new file mode 100644 index 0000000..73a1cf3 --- /dev/null +++ b/news/de/2016020501.xml @@ -0,0 +1,17 @@ +<news> +<date>5. Februar 2016</date> +<title>Wine 1.9.3 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neue Version der Gecko-Engine, basierend auf Firefox 44.</li> + <li>JSON-Unterstützung in JavaScript.</li> + <li>Verbesserte Zeilenumbrüche in DirectWrite.</li> + <li>Etwas mehr Schreibunterstützung in den WebServices.</li> + <li>Noch weitere Shader-Model-4-Befehle.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.3.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Huw Davies : riched20: Add handling for a few more special characters.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: da7c4f97532de8cd16fedbe918bbee272022bbb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7c4f97532de8cd16fedbe91… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 29 12:06:26 2016 +0000 riched20: Add handling for a few more special characters. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/reader.c | 18 ++++++++++++++++++ dlls/riched20/tests/editor.c | 26 ++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 27d0182..2e5dafd 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -2544,6 +2544,12 @@ static void SpecialChar (RTF_Info *info) case rtfEnDash: RTFPutUnicodeChar (info, 0x2013); break; + case rtfEmSpace: + RTFPutUnicodeChar (info, ' '); + break; + case rtfEnSpace: + RTFPutUnicodeChar (info, ' '); + break; case rtfLQuote: RTFPutUnicodeChar (info, 0x2018); break; @@ -2556,6 +2562,18 @@ static void SpecialChar (RTF_Info *info) case rtfRDblQuote: RTFPutUnicodeChar (info, 0x201D); break; + case rtfLTRMark: + RTFPutUnicodeChar (info, 0x200E); + break; + case rtfRTLMark: + RTFPutUnicodeChar (info, 0x200F); + break; + case rtfNoWidthJoiner: + RTFPutUnicodeChar (info, 0x200D); + break; + case rtfNoWidthNonJoiner: + RTFPutUnicodeChar (info, 0x200C); + break; } } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 98b31ce..18d080c 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8278,6 +8278,31 @@ static void test_WM_GETTEXTLENGTH(void) DestroyWindow(hwndRichEdit); } +static void test_rtf_specials(void) +{ + const char *specials = "{\\rtf1\\emspace\\enspace\\bullet\\lquote" + "\\rquote\\ldblquote\\rdblquote\\ltrmark\\rtlmark\\zwj\\zwnj}"; + const WCHAR expect_specials[] = {' ',' ',0x2022,0x2018,0x2019,0x201c, + 0x201d,0x200e,0x200f,0x200d,0x200c}; + HWND edit = new_richeditW( NULL ); + EDITSTREAM es; + WCHAR buf[80]; + LRESULT result; + + es.dwCookie = (DWORD_PTR)&specials; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + result = SendMessageA( edit, EM_STREAMIN, SF_RTF, (LPARAM)&es ); + ok( result == 11, "got %ld\n", result ); + + result = SendMessageW( edit, WM_GETTEXT, sizeof(buf)/sizeof(buf[0]), (LPARAM)buf ); + ok( result == sizeof(expect_specials)/sizeof(expect_specials[0]), "got %ld\n", result ); + ok( !memcmp( buf, expect_specials, sizeof(expect_specials) ), "got %s\n", wine_dbgstr_w(buf) ); + + DestroyWindow( edit ); +} + + START_TEST( editor ) { BOOL ret; @@ -8347,6 +8372,7 @@ START_TEST( editor ) test_EM_SETREADONLY(); test_EM_SETFONTSIZE(); test_alignment_style(); + test_rtf_specials(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Jactry Zeng : kernel32/tests: Reset current directory of current process.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 846155f1531207a763c099defa90fc2c41135164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=846155f1531207a763c099def… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sat Feb 27 22:24:50 2016 +0800 kernel32/tests: Reset current directory of current process. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/directory.c | 7 +++++++ dlls/kernel32/tests/file.c | 4 +++- dlls/kernel32/tests/path.c | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c index 9baae47..a3af052 100644 --- a/dlls/kernel32/tests/directory.c +++ b/dlls/kernel32/tests/directory.c @@ -157,6 +157,7 @@ static void test_GetSystemDirectoryW(void) static void test_CreateDirectoryA(void) { char tmpdir[MAX_PATH]; + WCHAR curdir[MAX_PATH]; BOOL ret; ret = CreateDirectoryA(NULL, NULL); @@ -172,6 +173,7 @@ static void test_CreateDirectoryA(void) ret = GetSystemDirectoryA(tmpdir, MAX_PATH); ok(ret < MAX_PATH, "System directory should fit into MAX_PATH\n"); + GetCurrentDirectoryW(MAX_PATH, curdir); ret = SetCurrentDirectoryA(tmpdir); ok(ret == TRUE, "could not chdir to the System directory\n"); @@ -329,6 +331,7 @@ static void test_CreateDirectoryA(void) ret = RemoveDirectoryA(tmpdir); ok(ret == TRUE, "RemoveDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError()); + SetCurrentDirectoryW(curdir); } static void test_CreateDirectoryW(void) @@ -341,6 +344,7 @@ static void test_CreateDirectoryW(void) static const WCHAR slashW[] = {'/',0}; static const WCHAR dotdotW[] = {'.','.',0}; static const WCHAR questionW[] = {'?',0}; + WCHAR curdir[MAX_PATH]; ret = CreateDirectoryW(NULL, NULL); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) @@ -358,6 +362,7 @@ static void test_CreateDirectoryW(void) ret = GetSystemDirectoryW(tmpdir, MAX_PATH); ok(ret < MAX_PATH, "System directory should fit into MAX_PATH\n"); + GetCurrentDirectoryW(MAX_PATH, curdir); ret = SetCurrentDirectoryW(tmpdir); ok(ret == TRUE, "could not chdir to the System directory ret %u err %u\n", ret, GetLastError()); @@ -413,6 +418,8 @@ static void test_CreateDirectoryW(void) ret, GetLastError()); ret = RemoveDirectoryW(tmpdir); ok(ret == FALSE, "RemoveDirectoryW should have failed\n"); + + SetCurrentDirectoryW(curdir); } static void test_RemoveDirectoryA(void) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 63c5b47..8353c21 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1222,6 +1222,7 @@ static void test_CreateFileA(void) {NULL, 0, -1, 0, FALSE} }; BY_HANDLE_FILE_INFORMATION Finfo; + WCHAR curdir[MAX_PATH]; ret = GetTempPathA(MAX_PATH, temp_path); ok(ret != 0, "GetTempPathA error %d\n", GetLastError()); @@ -1286,6 +1287,7 @@ static void test_CreateFileA(void) ret = CreateDirectoryA(dirname, NULL); ok( ret, "Createdirectory failed, gle=%d\n", GetLastError() ); /* set current drive & directory to known location */ + GetCurrentDirectoryW( MAX_PATH, curdir); SetCurrentDirectoryA( temp_path ); i = 0; while (p[i].file) @@ -1340,7 +1342,7 @@ static void test_CreateFileA(void) } ret = RemoveDirectoryA(dirname); ok(ret, "RemoveDirectoryA: error %d\n", GetLastError()); - + SetCurrentDirectoryW(curdir); /* test opening directory as a directory */ hFile = CreateFileA( temp_path, GENERIC_READ, diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 830c93d..836d7ec 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1117,6 +1117,7 @@ static void test_GetTempPath(void) char save_TMP[MAX_PATH]; char windir[MAX_PATH]; char buf[MAX_PATH]; + WCHAR curdir[MAX_PATH]; if (!GetEnvironmentVariableA("TMP", save_TMP, sizeof(save_TMP))) save_TMP[0] = 0; @@ -1149,6 +1150,7 @@ static void test_GetTempPath(void) test_GetTempPathA(windir); test_GetTempPathW(windir); + GetCurrentDirectoryW(MAX_PATH, curdir); /* TMP=C: i.e. use current working directory of the specified drive */ GetWindowsDirectoryA(windir, sizeof(windir)); SetCurrentDirectoryA(windir); @@ -1162,6 +1164,7 @@ static void test_GetTempPath(void) test_GetTempPathW(windir); SetEnvironmentVariableA("TMP", save_TMP); + SetCurrentDirectoryW(curdir); } static void test_GetLongPathNameA(void) @@ -2116,9 +2119,11 @@ static void test_relative_path(void) char path[MAX_PATH], buf[MAX_PATH]; HANDLE file; int ret; + WCHAR curdir[MAX_PATH]; if (!pGetLongPathNameA) return; + GetCurrentDirectoryW(MAX_PATH, curdir); GetTempPathA(MAX_PATH, path); ret = SetCurrentDirectoryA(path); ok(ret, "SetCurrentDirectory error %d\n", GetLastError()); @@ -2176,6 +2181,7 @@ static void test_relative_path(void) DeleteFileA("foo\\file"); RemoveDirectoryA("foo"); RemoveDirectoryA("bar"); + SetCurrentDirectoryW(curdir); } static void test_CheckNameLegalDOS8Dot3(void)

1 0

Huw Davies : riched20: Don' t apply paragraph formatting until the end of paragraph.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 372a16af63717cc2a66a5a981e39079b854bcda6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=372a16af63717cc2a66a5a981… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 29 12:06:25 2016 +0000 riched20: Don't apply paragraph formatting until the end of paragraph. Specifically this means that if the final paragraph does not end in a trailing \par, then new formatting is not applied to that paragraph. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 252 ++++++++++++++++++------------------------- dlls/riched20/reader.c | 7 ++ dlls/riched20/rtf.h | 2 + dlls/riched20/tests/editor.c | 27 ++++- 4 files changed, 140 insertions(+), 148 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=372a16af63717cc2a66a5…

1 0

Huw Davies : riched20/tests: wAlignment should be compared to the PFA_ values.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: aec411ed3e45e466b710644641a1e6a74c70b00c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec411ed3e45e466b71064464… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 29 12:06:24 2016 +0000 riched20/tests: wAlignment should be compared to the PFA_ values. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 85f057e..6e0585a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8220,7 +8220,7 @@ static void test_alignment_style(void) pf.cbSize = sizeof(PARAFORMAT2); pf.dwMask = -1; SendMessageW(richedit, EM_GETPARAFORMAT, SCF_SELECTION, (LPARAM)&pf); - ok(pf.wAlignment == ES_CENTER, "got %d expected ES_CENTER\n", pf.wAlignment); + ok(pf.wAlignment == PFA_LEFT, "got %d expected PFA_LEFT\n", pf.wAlignment); DestroyWindow(richedit); }

1 0

Stefan Dösinger : d3d8/tests: Test multisample flip.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 9307474f1d49881aa72032d38489a77f4d1ada55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9307474f1d49881aa72032d38… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Feb 24 22:28:10 2016 +0000 d3d8/tests: Test multisample flip. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index bb644d3..8ba6ccd 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -8067,6 +8067,51 @@ static void test_flip(void) refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + if (FAILED(IDirect3D8_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES))) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisample flip test.\n"); + goto done; + } + + present_parameters.BackBufferCount = 2; + present_parameters.MultiSampleType = D3DMULTISAMPLE_2_SAMPLES; + present_parameters.Flags = 0; + hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); + + for (i = 0; i < present_parameters.BackBufferCount; ++i) + { + hr = IDirect3DDevice8_GetBackBuffer(device, i, D3DBACKBUFFER_TYPE_MONO, &back_buffers[i]); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + } + + hr = IDirect3DDevice8_SetRenderTarget(device, back_buffers[1], NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff808080, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, TRUE, &test_surface); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirect3DDevice8_CopyRects(device, back_buffers[0], NULL, 0, test_surface, NULL); + ok(SUCCEEDED(hr), "CopyRects failed, hr %#x.\n", hr); + + color = get_surface_color(test_surface, 1, 1); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + + IDirect3DSurface8_Release(test_surface); + for (i = 0; i < present_parameters.BackBufferCount; ++i) + IDirect3DSurface8_Release(back_buffers[i]); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + +done: IDirect3D8_Release(d3d); DestroyWindow(window); }

1 0

Stefan Dösinger : wined3d: Rotate through swapchain buffers.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: d71f452c4d70a9fa6513322a5751f1eb0f46b4e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71f452c4d70a9fa6513322a5… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Feb 24 22:28:08 2016 +0000 wined3d: Rotate through swapchain buffers. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 10 +++++----- dlls/d3d9/tests/visual.c | 10 +++++----- dlls/wined3d/swapchain.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 58 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 856df5d..bb644d3 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -8041,9 +8041,9 @@ static void test_flip(void) /* Contents were changed. */ color = get_surface_color(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); color = get_surface_color(back_buffers[1], 1, 1); - todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff808080, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); @@ -8052,15 +8052,15 @@ static void test_flip(void) ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); color = get_surface_color(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); color = get_surface_color(back_buffers[1], 1, 1); - todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); color = get_surface_color(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) IDirect3DSurface8_Release(back_buffers[i]); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 274777b..b96ccd1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -20185,9 +20185,9 @@ static void test_flip(void) /* Contents were changed. */ color = getPixelColorFromSurface(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); color = getPixelColorFromSurface(back_buffers[1], 1, 1); - todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff808080, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); @@ -20196,15 +20196,15 @@ static void test_flip(void) ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); color = getPixelColorFromSurface(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); color = getPixelColorFromSurface(back_buffers[1], 1, 1); - todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); color = getPixelColorFromSurface(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) IDirect3DSurface9_Release(back_buffers[i]); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6e56def..becad97 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -422,6 +422,51 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, } } +/* Context activation is done by the caller. */ +static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct wined3d_context *context) +{ + struct gl_texture tex0; + GLuint rb0; + DWORD locations0; + struct wined3d_surface *surface, *surface_prev; + unsigned int i; + static const DWORD supported_locations = WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_RB_MULTISAMPLE; + + if (swapchain->desc.backbuffer_count < 2 || !swapchain->render_to_fbo) + return; + + surface_prev = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->back_buffers[0], 0)); + + /* Back buffer 0 is already in the draw binding. */ + tex0 = swapchain->back_buffers[0]->texture_rgb; + rb0 = surface_prev->rb_multisample; + locations0 = surface_prev->locations; + + for (i = 1; i < swapchain->desc.backbuffer_count; ++i) + { + surface = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->back_buffers[i], 0)); + + if (!(surface->locations & supported_locations)) + surface_load_location(surface, context, swapchain->back_buffers[i]->resource.draw_binding); + + swapchain->back_buffers[i - 1]->texture_rgb = swapchain->back_buffers[i]->texture_rgb; + surface_prev->rb_multisample = surface->rb_multisample; + + surface_validate_location(surface_prev, surface->locations & supported_locations); + surface_invalidate_location(surface_prev, ~(surface->locations & supported_locations)); + + surface_prev = surface; + } + + swapchain->back_buffers[i - 1]->texture_rgb = tex0; + surface_prev->rb_multisample = rb0; + + surface_validate_location(surface_prev, locations0 & supported_locations); + surface_invalidate_location(surface_prev, ~(locations0 & supported_locations)); + + device_invalidate_state(swapchain->device, STATE_FRAMEBUFFER); +} + static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, const RECT *dst_rect_in, const RGNDATA *dirty_region, DWORD flags) { @@ -549,7 +594,9 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT gl_info->gl_ops.gl.p_glFinish(); /* call wglSwapBuffers through the gl table to avoid confusing the Steam overlay */ - gl_info->gl_ops.wgl.p_wglSwapBuffers(context->hdc); /* TODO: cycle through the swapchain buffers */ + gl_info->gl_ops.wgl.p_wglSwapBuffers(context->hdc); + + wined3d_swapchain_rotate(swapchain, context); TRACE("SwapBuffers called, Starting new frame\n"); /* FPS support */

1 0

Sebastian Lackner : wined3d: Fix transposed lines in WARN message.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 85f088f252997e3f593a710ba3a0220ec8d322f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f088f252997e3f593a710ba… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 26 07:59:52 2016 +0100 wined3d: Fix transposed lines in WARN message. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b7b8648..d0deff9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -486,9 +486,9 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, != render_targets[0]->resource.multisample_quality) { WARN("Color multisample type %u and quality %u, depth stencil has %u and %u, disabling ds buffer.\n", - render_targets[0]->resource.multisample_quality, render_targets[0]->resource.multisample_type, - depth_stencil->resource.multisample_quality, depth_stencil->resource.multisample_type); + render_targets[0]->resource.multisample_quality, + depth_stencil->resource.multisample_type, depth_stencil->resource.multisample_quality); depth_stencil = NULL; } else

1 0

Henri Verbeet : ddraw: Use wined3d_texture_get_sub_resource_desc() in ddraw_surface_create().
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 48580ccd42ff99a732939d9d6d19d9e592a03041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48580ccd42ff99a732939d9d6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 11:38:26 2016 +0100 ddraw: Use wined3d_texture_get_sub_resource_desc() in ddraw_surface_create(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 78d3b11..e9c9c65 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5686,10 +5686,10 @@ static HRESULT CDECL ddraw_reset_enum_callback(struct wined3d_resource *resource HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, struct ddraw_surface **surface, IUnknown *outer_unknown, unsigned int version) { - struct wined3d_resource_desc wined3d_desc, wined3d_mip_desc; + struct wined3d_sub_resource_desc wined3d_mip_desc; struct ddraw_surface *root, *mip, **attach; + struct wined3d_resource_desc wined3d_desc; struct wined3d_texture *wined3d_texture; - struct wined3d_resource *resource; struct wined3d_display_mode mode; DDSURFACEDESC2 *desc, *mip_desc; struct ddraw_texture *texture; @@ -6145,8 +6145,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if (j) { - resource = wined3d_texture_get_sub_resource(wined3d_texture, i * levels + j); - wined3d_resource_get_desc(resource, &wined3d_mip_desc); + wined3d_texture_get_sub_resource_desc(wined3d_texture, i * levels + j, &wined3d_mip_desc); mip_desc->dwWidth = wined3d_mip_desc.width; mip_desc->dwHeight = wined3d_mip_desc.height;

1 0