February 2012 - Wine-commits

Francois Gouget : po: Add a missing linefeed to a Chinese (Taiwan) translation.
by Alexandre Julliard 29 Feb '12

29 Feb '12

Module: wine Branch: master Commit: ac98b1efffeedd6da0b1040ecb3307caf642532d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac98b1efffeedd6da0b1040ec… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 29 11:09:18 2012 +0100 po: Add a missing linefeed to a Chinese (Taiwan) translation. --- po/zh_TW.po | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 0a04c2c..04dce50 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -122,6 +122,7 @@ msgid "" msgstr "" "Wine 需要安裝 Gecko 套件才能正確顯示嵌在應用程式中的 HTML 網頁。Wine 可以自動" "幫您下載並安裝 Gecko。\n" +"\n" "備註：建議您使用發行版所附的套件。詳情請見 <a href=\"http://wiki.winehq.org/" "Gecko\">http://wiki.winehq.org/Gecko</a>"

1 0

Francois Gouget : po: Remove some invalid Portuguese (Portugal) shell folder name translations.
by Alexandre Julliard 29 Feb '12

29 Feb '12

Module: wine Branch: master Commit: c6cdcbded34b4e6e62e6511e61faeeaba49ecefb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6cdcbded34b4e6e62e6511e6… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 29 11:13:25 2012 +0100 po: Remove some invalid Portuguese (Portugal) shell folder name translations. --- po/pt_PT.po | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index 97a0abf..c3b4f2c 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -8190,19 +8190,22 @@ msgstr "Os Meus Documentos" #: shell32.rc:217 #, fuzzy msgid "Administrative Tools" -msgstr "Menu Iniciar\\Programas\\Ferramentas Administrativas" +msgstr "Ferramentas Administrativas" #: shell32.rc:218 +#, fuzzy msgid "Music" -msgstr "Os Meus Documentos\\As Minhas Músicas" +msgstr "As Minhas Músicas" #: shell32.rc:219 +#, fuzzy msgid "Pictures" -msgstr "Os Meus Documentos\\As Minhas Imagens" +msgstr "As Minhas Imagens" #: shell32.rc:220 +#, fuzzy msgid "Videos" -msgstr "Os Meus Documentos\\Os Meus Vídeos" +msgstr "Os Meus Vídeos" #: shell32.rc:213 msgid "Program Files (x86)" @@ -8219,12 +8222,12 @@ msgstr "Ligações" #: shell32.rc:223 #, fuzzy msgid "Slide Shows" -msgstr "Imagens\\Apresentações" +msgstr "Apresentações" #: shell32.rc:224 #, fuzzy msgid "Playlists" -msgstr "Músicas\\Listas de reprodução" +msgstr "Listas de reprodução" #: shell32.rc:148 taskmgr.rc:326 msgid "Status" @@ -8241,22 +8244,22 @@ msgstr "Modelo" #: shell32.rc:225 #, fuzzy msgid "Sample Music" -msgstr "Músicas\\Amostra de músicas" +msgstr "Amostra de músicas" #: shell32.rc:226 #, fuzzy msgid "Sample Pictures" -msgstr "Imagens\\Amostra de imagens" +msgstr "Amostra de imagens" #: shell32.rc:227 #, fuzzy msgid "Sample Playlists" -msgstr "Músicas\\Amostra de listas de reprodução" +msgstr "Amostra de listas de reprodução" #: shell32.rc:228 #, fuzzy msgid "Sample Videos" -msgstr "Videos\\Amostra de vídeos" +msgstr "Amostra de vídeos" #: shell32.rc:229 msgid "Saved Games"

1 0

Francois Gouget : po: Fix the Directory key mapping and Yes/No/ All questions in the Hungarian translation.
by Alexandre Julliard 29 Feb '12

29 Feb '12

Module: wine Branch: master Commit: 4b7eb348e1b486c571fe040fb650ca52027e5520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b7eb348e1b486c571fe040fb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 29 11:17:50 2012 +0100 po: Fix the Directory key mapping and Yes/No/All questions in the Hungarian translation. --- po/hu.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/hu.po b/po/hu.po index 6587676..72897f7 100644 --- a/po/hu.po +++ b/po/hu.po @@ -9759,11 +9759,11 @@ msgstr "%1!c! kötetnek nincs címkéje.\n" #: cmd.rc:344 msgid " (Yes|No)" -msgstr "(Igen|Nem)" +msgstr " (Igen|Nem)" #: cmd.rc:345 msgid " (Yes|No|All)" -msgstr "(Igen|Nem|Mind)" +msgstr " (Igen|Nem|Mind)" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -13826,7 +13826,7 @@ msgstr "F" #: xcopy.rc:44 msgctxt "Directory key" msgid "D" -msgstr "D" +msgstr "M" #: xcopy.rc:77 msgid ""

1 0

Francois Gouget : po: Remove a couple of duplicate spaces in the Hungarian translation.
by Alexandre Julliard 29 Feb '12

29 Feb '12

Module: wine Branch: master Commit: 4a34c0a9868004a596e2ec056423a1123361bbdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a34c0a9868004a596e2ec056… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 29 11:24:17 2012 +0100 po: Remove a couple of duplicate spaces in the Hungarian translation. --- po/hu.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/hu.po b/po/hu.po index 72897f7..1fd5bc8 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8906,7 +8906,7 @@ msgstr "Kimeneti &fájlnév:" #: winspool.rc:28 msgid "The output file already exists. Click OK to overwrite." -msgstr "A kimeneti fájl már létezik. Kattintson az OK gombra a felülíráshoz." +msgstr "A kimeneti fájl már létezik. Kattintson az OK gombra a felülíráshoz." #: winspool.rc:29 msgid "Unable to create the output file." @@ -12183,7 +12183,7 @@ msgid "" "linked to the Libraries and Graphics tabs to allow you to change systemwide " "or per-application settings in those tabs as well." msgstr "" -"A Wine különböző Windows verzióként tud viselkedni alkalmazásonként. Ez a " +"A Wine különböző Windows verzióként tud viselkedni alkalmazásonként. Ez a " "fül összeköttetésben áll a Függvénykönyvtár és Grafika füllel, hogy lehetővé " "tegye a rendszerszintű vagy alkalmazásonkénti beállításokat ezeken a füleken " "is."

1 0

Francois Gouget : po: Use semicolons for the Slovenian comdlg32 printer status enumeration.
by Alexandre Julliard 29 Feb '12

29 Feb '12

Module: wine Branch: master Commit: b5ec4156a5271c60d6df01e3fa0ae95f943cb85d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ec4156a5271c60d6df01e3f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 29 11:33:00 2012 +0100 po: Use semicolons for the Slovenian comdlg32 printer status enumeration. --- po/sl.po | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/po/sl.po b/po/sl.po index 75092ea..545588d 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1023,7 +1023,7 @@ msgstr "Pripravljen" #: comdlg32.rc:80 msgid "Paused; " -msgstr "V premoru, " +msgstr "V premoru; " #: comdlg32.rc:81 msgid "Error; " @@ -1031,43 +1031,43 @@ msgstr "Napaka; " #: comdlg32.rc:82 msgid "Pending deletion; " -msgstr "Brisanje je na čakanju, " +msgstr "Brisanje je na čakanju; " #: comdlg32.rc:83 msgid "Paper jam; " -msgstr "Papir se je zataknil, " +msgstr "Papir se je zataknil; " #: comdlg32.rc:84 msgid "Out of paper; " -msgstr "Zmanjkalo je papirja, " +msgstr "Zmanjkalo je papirja; " #: comdlg32.rc:85 msgid "Feed paper manual; " -msgstr "Podajanje papirja je ročno, " +msgstr "Podajanje papirja je ročno; " #: comdlg32.rc:86 msgid "Paper problem; " -msgstr "Težava s papirjem, " +msgstr "Težava s papirjem; " #: comdlg32.rc:87 msgid "Printer offline; " -msgstr "Tiskalnik ni povezan, " +msgstr "Tiskalnik ni povezan; " #: comdlg32.rc:88 msgid "I/O Active; " -msgstr "V/I je dejaven, " +msgstr "V/I je dejaven; " #: comdlg32.rc:89 msgid "Busy; " -msgstr "Zaposleno, " +msgstr "Zaposleno; " #: comdlg32.rc:90 msgid "Printing; " -msgstr "Tiskanje, " +msgstr "Tiskanje; " #: comdlg32.rc:91 msgid "Output tray is full; " -msgstr "Izhodni pladenj je poln, " +msgstr "Izhodni pladenj je poln; " #: comdlg32.rc:92 msgid "Not available; " @@ -1075,51 +1075,51 @@ msgstr "Ni na voljo; " #: comdlg32.rc:93 msgid "Waiting; " -msgstr "Čakanje, " +msgstr "Čakanje; " #: comdlg32.rc:94 msgid "Processing; " -msgstr "Obdelovanje, " +msgstr "Obdelovanje; " #: comdlg32.rc:95 msgid "Initialising; " -msgstr "Začenjanje, " +msgstr "Začenjanje; " #: comdlg32.rc:96 msgid "Warming up; " -msgstr "Ogrevanje, " +msgstr "Ogrevanje; " #: comdlg32.rc:97 msgid "Toner low; " -msgstr "Zmanjkuje črnila, " +msgstr "Zmanjkuje črnila; " #: comdlg32.rc:98 msgid "No toner; " -msgstr "Ni črnila, " +msgstr "Ni črnila; " #: comdlg32.rc:99 msgid "Page punt; " -msgstr "Upor strani, " +msgstr "Upor strani; " #: comdlg32.rc:100 msgid "Interrupted by user; " -msgstr "Preklic s strani uporabnika, " +msgstr "Preklic s strani uporabnika; " #: comdlg32.rc:101 msgid "Out of memory; " -msgstr "Zmanjkalo je pomnilnika, " +msgstr "Zmanjkalo je pomnilnika; " #: comdlg32.rc:102 msgid "The printer door is open; " -msgstr "Ohišje tiskalnika je odprto, " +msgstr "Ohišje tiskalnika je odprto; " #: comdlg32.rc:103 msgid "Print server unknown; " -msgstr "Strežnik za tiskanje ni znan, " +msgstr "Strežnik za tiskanje ni znan; " #: comdlg32.rc:104 msgid "Power save mode; " -msgstr "Način varčevanja z energijo, " +msgstr "Način varčevanja z energijo; " #: comdlg32.rc:73 msgid "Default Printer; "

1 0

Francois Gouget : po: Use commas in the Greek translation of comdlg32' s printer status enumeration.
by Alexandre Julliard 29 Feb '12

29 Feb '12

Module: wine Branch: master Commit: 88348b24d0af6a3c9a06cb9fd3bbe72e7a253286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88348b24d0af6a3c9a06cb9fd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 29 11:35:31 2012 +0100 po: Use commas in the Greek translation of comdlg32's printer status enumeration. --- po/el.po | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/po/el.po b/po/el.po index 736e214..2747c1b 100644 --- a/po/el.po +++ b/po/el.po @@ -1009,11 +1009,11 @@ msgstr "Έτοιμο" #: comdlg32.rc:80 msgid "Paused; " -msgstr "Σταματημένος; " +msgstr "Σταματημένος, " #: comdlg32.rc:81 msgid "Error; " -msgstr "Σφάλμα; " +msgstr "Σφάλμα, " #: comdlg32.rc:82 msgid "Pending deletion; " @@ -1025,7 +1025,7 @@ msgstr "" #: comdlg32.rc:84 msgid "Out of paper; " -msgstr "Τέλος χαρτιού; " +msgstr "Τέλος χαρτιού, " #: comdlg32.rc:85 msgid "Feed paper manual; " @@ -1033,11 +1033,11 @@ msgstr "" #: comdlg32.rc:86 msgid "Paper problem; " -msgstr "Πρόβλημα χαρτιού; " +msgstr "Πρόβλημα χαρτιού, " #: comdlg32.rc:87 msgid "Printer offline; " -msgstr "Εκτυπωτής αποσυνδεδεμένος; " +msgstr "Εκτυπωτής αποσυνδεδεμένος, " #: comdlg32.rc:88 msgid "I/O Active; " @@ -1045,11 +1045,11 @@ msgstr "" #: comdlg32.rc:89 msgid "Busy; " -msgstr "Απασχολημένος; " +msgstr "Απασχολημένος, " #: comdlg32.rc:90 msgid "Printing; " -msgstr "Γίνεται εκτύπωση; " +msgstr "Γίνεται εκτύπωση, " #: comdlg32.rc:91 msgid "Output tray is full; " @@ -1057,11 +1057,11 @@ msgstr "" #: comdlg32.rc:92 msgid "Not available; " -msgstr "ΜΗ διαθέσιμος; " +msgstr "ΜΗ διαθέσιμος, " #: comdlg32.rc:93 msgid "Waiting; " -msgstr "Αναμονή; " +msgstr "Αναμονή, " #: comdlg32.rc:94 msgid "Processing; " @@ -1069,19 +1069,19 @@ msgstr "" #: comdlg32.rc:95 msgid "Initialising; " -msgstr "Εκκίνηση; " +msgstr "Εκκίνηση, " #: comdlg32.rc:96 msgid "Warming up; " -msgstr "Γίνεται προθέρμανση; " +msgstr "Γίνεται προθέρμανση, " #: comdlg32.rc:97 msgid "Toner low; " -msgstr "Τόνερ χαμηλό; " +msgstr "Τόνερ χαμηλό, " #: comdlg32.rc:98 msgid "No toner; " -msgstr "Δεν υπάρχει τόνερ; " +msgstr "Δεν υπάρχει τόνερ, " #: comdlg32.rc:99 msgid "Page punt; " @@ -1109,7 +1109,7 @@ msgstr "" #: comdlg32.rc:73 msgid "Default Printer; " -msgstr "Προεπιλεγμένος εκτυπωτής; " +msgstr "Προεπιλεγμένος εκτυπωτής, " #: comdlg32.rc:74 msgid "There are %d documents in the queue"

1 0

Henri Verbeet : wined3d: Implement resetting the device window in wined3d_device_reset().
by Alexandre Julliard 29 Feb '12

29 Feb '12

Module: wine Branch: master Commit: 90739d9474451f336101184610bf9c99ddd093e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90739d9474451f33610118461… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 29 17:22:32 2012 +0100 wined3d: Implement resetting the device window in wined3d_device_reset(). --- dlls/wined3d/device.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 17560c6..8c99533 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5357,7 +5357,13 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (swapchain_desc->device_window && swapchain_desc->device_window != swapchain->desc.device_window) - FIXME("Cannot change the device window yet.\n"); + { + TRACE("Changing the device window from %p to %p.\n", + swapchain->desc.device_window, swapchain_desc->device_window); + swapchain->desc.device_window = swapchain_desc->device_window; + swapchain->device_window = swapchain_desc->device_window; + wined3d_swapchain_set_window(swapchain, NULL); + } if (swapchain_desc->enable_auto_depth_stencil && !device->auto_depth_stencil) {

1 0

Henri Verbeet : d3d8/tests: Add some tests for resetting the device window.
by Alexandre Julliard 29 Feb '12

29 Feb '12

Module: wine Branch: master Commit: 6b0d878f1854fd4d3ad1a515a004aa54c38da215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b0d878f1854fd4d3ad1a515a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 29 17:22:33 2012 +0100 d3d8/tests: Add some tests for resetting the device window. --- dlls/d3d8/tests/device.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index bf4e1ea..cfac2cd 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3004,6 +3004,93 @@ done: ok(devmode.dmPelsHeight == screen_height, "Got unexpect height %u.\n", devmode.dmPelsHeight); } +static void test_device_window_reset(void) +{ + RECT fullscreen_rect, device_rect, r; + IDirect3DDevice8 *device; + WNDCLASSA wc = {0}; + IDirect3D8 *d3d8; + LONG_PTR proc; + HRESULT hr; + ULONG ref; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D8 object, skipping tests.\n"); + return; + } + + wc.lpfnWndProc = test_proc; + wc.lpszClassName = "d3d8_test_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + focus_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, screen_width / 2, screen_height / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, screen_width / 2, screen_height / 2, 0, 0, 0, 0); + + SetRect(&fullscreen_rect, 0, 0, screen_width, screen_height); + GetWindowRect(device_window, &device_rect); + + proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + device = create_device(d3d8, NULL, focus_window, FALSE); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + GetWindowRect(focus_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + GetWindowRect(device_window, &r); + ok(EqualRect(&r, &device_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + device_rect.left, device_rect.top, device_rect.right, device_rect.bottom, + r.left, r.top, r.right, r.bottom); + + proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + hr = reset_device(device, device_window, FALSE); + ok(SUCCEEDED(hr), "Failed to reset device.\n"); + + GetWindowRect(focus_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + GetWindowRect(device_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + + proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + ref = IDirect3DDevice8_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + +done: + IDirect3D8_Release(d3d8); + DestroyWindow(device_window); + DestroyWindow(focus_window); + UnregisterClassA("d3d8_test_wndproc_wc", GetModuleHandleA(NULL)); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -3057,6 +3144,7 @@ START_TEST(device) test_window_style(); test_wrong_shader(); test_mode_change(); + test_device_window_reset(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Henri Verbeet : d3d9/tests: Add some tests for resetting the device window.
by Alexandre Julliard 29 Feb '12

29 Feb '12

Module: wine Branch: master Commit: 9ad6f2e1f4407d4ced2d27cd69b91689670c62bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ad6f2e1f4407d4ced2d27cd6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 29 17:22:34 2012 +0100 d3d9/tests: Add some tests for resetting the device window. --- dlls/d3d9/tests/device.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index e3767bb..607eced 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3338,6 +3338,93 @@ done: ok(devmode.dmPelsHeight == screen_height, "Got unexpect height %u.\n", devmode.dmPelsHeight); } +static void test_device_window_reset(void) +{ + RECT fullscreen_rect, device_rect, r; + IDirect3DDevice9 *device; + WNDCLASSA wc = {0}; + IDirect3D9 *d3d9; + LONG_PTR proc; + HRESULT hr; + ULONG ref; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + wc.lpfnWndProc = test_proc; + wc.lpszClassName = "d3d9_test_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + focus_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, screen_width / 2, screen_height / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, screen_width / 2, screen_height / 2, 0, 0, 0, 0); + + SetRect(&fullscreen_rect, 0, 0, screen_width, screen_height); + GetWindowRect(device_window, &device_rect); + + proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + device = create_device(d3d9, NULL, focus_window, FALSE); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + GetWindowRect(focus_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + GetWindowRect(device_window, &r); + ok(EqualRect(&r, &device_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + device_rect.left, device_rect.top, device_rect.right, device_rect.bottom, + r.left, r.top, r.right, r.bottom); + + proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + hr = reset_device(device, device_window, FALSE); + ok(SUCCEEDED(hr), "Failed to reset device.\n"); + + GetWindowRect(focus_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + GetWindowRect(device_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + + proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + ref = IDirect3DDevice9_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + +done: + IDirect3D9_Release(d3d9); + DestroyWindow(device_window); + DestroyWindow(focus_window); + UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL)); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -3393,6 +3480,7 @@ START_TEST(device) test_wndproc_windowed(); test_window_style(); test_mode_change(); + test_device_window_reset(); } out:

1 0

Henri Verbeet : wined3d: Support color keyed WINED3DFMT_B8G8R8A8_UNORM surfaces.
by Alexandre Julliard 29 Feb '12

29 Feb '12

Module: wine Branch: master Commit: 9c2575865625360b12b74360a0652199b299934f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c2575865625360b12b74360a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 28 19:48:40 2012 +0100 wined3d: Support color keyed WINED3DFMT_B8G8R8A8_UNORM surfaces. Color keying and alpha channels aren't mutually exclusive. --- dlls/wined3d/state.c | 7 +------ dlls/wined3d/surface.c | 28 ++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6974321..a5d748a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -538,12 +538,7 @@ static void state_alpha(struct wined3d_context *context, const struct wined3d_st struct wined3d_surface *surf = surface_from_resource(texture->sub_resources[0]); if (surf->CKeyFlags & WINEDDSD_CKSRCBLT) - { - /* The surface conversion does not do color keying conversion for surfaces that have an alpha - * channel on their own. Likewise, the alpha test shouldn't be set up for color keying if the - * surface has alpha bits */ - if (!surf->resource.format->alpha_mask) enable_ckey = TRUE; - } + enable_ckey = TRUE; } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d293940..9ec3db3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4554,6 +4554,14 @@ HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_c } break; + case WINED3DFMT_B8G8R8A8_UNORM: + if (colorkey_active) + { + *conversion_type = WINED3D_CT_CK_ARGB32; + format->conv_byte_count = 4; + } + break; + default: break; } @@ -4765,6 +4773,26 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI } break; + case WINED3D_CT_CK_ARGB32: + { + unsigned int x, y; + for (y = 0; y < height; ++y) + { + source = src + pitch * y; + dest = dst + outpitch * y; + for (x = 0; x < width; ++x) + { + DWORD color = *(const DWORD *)source; + if (color_in_range(&surface->src_blt_color_key, color)) + color &= ~0xff000000; + *(DWORD*)dest = color; + source += 4; + dest += 4; + } + } + } + break; + default: ERR("Unsupported conversion type %#x.\n", conversion_type); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index df817af..cd9690c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2192,6 +2192,7 @@ enum wined3d_conversion_type WINED3D_CT_CK_5551, WINED3D_CT_CK_RGB24, WINED3D_CT_RGB32_888, + WINED3D_CT_CK_ARGB32, }; HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing,

1 0