February 2012 - Wine-Commits

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

Feb. 29, 2012

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

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

Feb. 29, 2012

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: Fix the Directory key mapping and Yes/No/ All questions in the Hungarian translation.
by Alexandre Julliard Feb. 29, 2012

Feb. 29, 2012

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 some invalid Portuguese (Portugal) shell folder name translations.
by Alexandre Julliard Feb. 29, 2012

Feb. 29, 2012

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: Add a missing linefeed to a Chinese (Taiwan) translation.
by Alexandre Julliard Feb. 29, 2012

Feb. 29, 2012

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 a couple of duplicate spaces in the Hungarian translation.
by Alexandre Julliard Feb. 29, 2012

Feb. 29, 2012

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

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

Feb. 29, 2012

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

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

Feb. 29, 2012

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 Feb. 29, 2012

Feb. 29, 2012

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

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard Feb. 29, 2012

Feb. 29, 2012

Module: wine Branch: master Commit: fc09657d88a45e43cd33a188526da449a14699bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc09657d88a45e43cd33a1885… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Feb 29 21:39:28 2012 +0900 po: Update Korean translation. --- po/ko.po | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index 5a1b9b8..f488809 100644 --- a/po/ko.po +++ b/po/ko.po @@ -13257,7 +13257,6 @@ msgid "Sort by &Date" msgstr "날짜로 정렬(&D)" #: winefile.rc:56 -#, fuzzy msgid "Filter by&..." msgstr "...(&.)로 걸려내기" @@ -13558,9 +13557,8 @@ msgid "Always on &top" msgstr "항상 위(&T)" #: winhlp32.rc:56 -#, fuzzy msgid "&About Wine Help" -msgstr "Wine 도움말 정보(&I)" +msgstr "Wine 도움말 정보(&A)" #: winhlp32.rc:64 msgid "Annotation..."

1 0

Jacek Caban : ieframe: Fixed reallocation size.
by Alexandre Julliard Feb. 29, 2012

Feb. 29, 2012

Module: wine Branch: master Commit: 981d18464f80ca87c4d1aaf394226c6c3ffda8d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=981d18464f80ca87c4d1aaf39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 29 10:44:58 2012 +0100 ieframe: Fixed reallocation size. --- dlls/ieframe/dochost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 1b24dd2..9f22514 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -340,7 +340,7 @@ static void update_travellog(DocHost *This) }else if(This->travellog_size < This->travellog_position+1) { travellog_entry_t *new_travellog; - new_travellog = heap_realloc(This->travellog, This->travellog_size*2); + new_travellog = heap_realloc(This->travellog, This->travellog_size*2*sizeof(*This->travellog)); if(!new_travellog) return;

1 0

Luca Bennati : readme: Update Italian translation.
by Alexandre Julliard Feb. 29, 2012

Feb. 29, 2012

Module: wine Branch: master Commit: 6c73daab3a901be6dde9d78bdd6e002c0d837926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c73daab3a901be6dde9d78bd… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Feb 28 16:15:18 2012 +0100 readme: Update Italian translation. --- documentation/README.it | 218 ++++++++++++++++++++++++----------------------- 1 files changed, 111 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c73daab3a901be6dde9d…

1 0

Fernando Martins : po: Update Portuguese translation.
by Alexandre Julliard Feb. 29, 2012

Feb. 29, 2012

Module: wine Branch: master Commit: 7f2a7792f981a6b3fda4836dca70723e32912c14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f2a7792f981a6b3fda4836dc… Author: Fernando Martins <fernano(a)cmartins.nl> Date: Tue Feb 28 16:25:52 2012 +0100 po: Update Portuguese translation. --- po/pt_PT.po | 144 +++++++++++++++++++++++++++------------------------------- 1 files changed, 67 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f2a7792f981a6b3fda48…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Feb. 29, 2012

Feb. 29, 2012

Module: wine Branch: master Commit: 3d59ad8a7d1f4cbf94a0925c211c67a51ed460e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d59ad8a7d1f4cbf94a0925c2… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Feb 28 23:01:59 2012 +0200 po: Update Finnish translation. --- po/fi.po | 218 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 109 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d59ad8a7d1f4cbf94a09…

1 0

Ivan Vojtko : po: Update Slovak translation.
by Alexandre Julliard Feb. 29, 2012

Feb. 29, 2012

Module: wine Branch: master Commit: 58ec4366762d014ee3679150e8bdf4677d22df07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ec4366762d014ee3679150e… Author: Ivan Vojtko <ivan.vojtko(a)gmail.com> Date: Tue Feb 28 23:24:08 2012 +0100 po: Update Slovak translation. --- po/sk.po | 634 +++++++++++++++++++++++++++----------------------------------- 1 files changed, 275 insertions(+), 359 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58ec4366762d014ee3679…

1 0

Francois Gouget : po: Add full stops to the VERIFY ON / OFF usage lists.
by Alexandre Julliard Feb. 29, 2012

Feb. 29, 2012

Module: wine Branch: master Commit: 280274ee09e8cca34292e542b2782ff4f1d6393d URL: http://source.winehq.org/git/wine.git/?a=commit;h=280274ee09e8cca34292e542b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 29 10:54:41 2012 +0100 po: Add full stops to the VERIFY ON / OFF usage lists. --- po/cs.po | 4 ++-- po/da.po | 4 ++-- po/ko.po | 6 +++--- po/nb_NO.po | 4 ++-- po/nl.po | 4 ++-- po/pl.po | 4 ++-- po/pt_BR.po | 4 ++-- po/pt_PT.po | 4 ++-- po/sl.po | 4 ++-- po/tr.po | 4 ++-- po/uk.po | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/po/cs.po b/po/cs.po index 18c308a..e4a8522 100644 --- a/po/cs.po +++ b/po/cs.po @@ -9826,8 +9826,8 @@ msgstr "" "VERIFY je používán k nastavení nebo zjištění stavu příznaku verify.\n" "Syntaxe:\n" "\n" -"VERIFY ON\tNastaví příznak\n" -"VERIFY OFF\tZruší příznak\n" +"VERIFY ON\tNastaví příznak.\n" +"VERIFY OFF\tZruší příznak.\n" "VERIFY\t\tZobrazí aktuální stav.\n" "\n" "Příznak verify nemá ve Wine žádnou funkci.\n" diff --git a/po/da.po b/po/da.po index 4215fdd..4ad0158 100644 --- a/po/da.po +++ b/po/da.po @@ -9806,8 +9806,8 @@ msgstr "" "VERIFY bruges til at aktivere, deaktivere eller teste «verify»-flagget.\n" "Gyldige måder er:\n" "\n" -"VERIFY ON\tAktiverer flagget\n" -"VERIFY OFF\tDeaktiverer flagget\n" +"VERIFY ON\tAktiverer flagget.\n" +"VERIFY OFF\tDeaktiverer flagget.\n" "VERIFY\t\tViser ON hvis på ellers OFF.\n" "\n" "«Verify»-flagget har ingen funksion i Wine.\n" diff --git a/po/ko.po b/po/ko.po index f488809..447afa2 100644 --- a/po/ko.po +++ b/po/ko.po @@ -9597,9 +9597,9 @@ msgstr "" "VERIFY는 검증 플래그를 설정하고 제거하거나 테스트하는데 사용됩니다. 올바른 형" "식은:\n" "\n" -"VERIFY ON\t플래그 설정\n" -"VERIFY OFF\t플래그 제거\n" -"VERIFY\t\tON 이나 OF 같이 적절하게 보여줌.\n" +"VERIFY ON\t플래그 설정.\n" +"VERIFY OFF\t플래그 제거.\n" +"VERIFY\t\tON 이나 OFF 같이 적절하게 보여줌.\n" "\n" "이 검증 플래그는 Wine에서는 아무 기능을 안함.\n" diff --git a/po/nb_NO.po b/po/nb_NO.po index e0a2e8d..77ec049 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -9949,8 +9949,8 @@ msgstr "" "VERIFY brukes til å aktivere, deaktivere eller teste «verify»-flagget.\n" " Gyldige måter er:\n" "\n" -"VERIFY ON\tAktiverer flagget\n" -"VERIFY OFF\tDeaktiverer flagget\n" +"VERIFY ON\tAktiverer flagget.\n" +"VERIFY OFF\tDeaktiverer flagget.\n" "VERIFY\t\tViser ON hvis på ellerr OFF hvis av.\n" "\n" "«Verify»-flagget har ingen funksjon i Wine.\n" diff --git a/po/nl.po b/po/nl.po index 63c754e..b48bd1e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -9746,8 +9746,8 @@ msgstr "" "VERIFY wordt gebruikt om de VERIFY-schakelaar aan of uit te zetten of\n" "om hem te testen. Geldige aanroepen zijn:\n" "\n" -"VERIFY ON\tZet de schakelaar aan\n" -"VERIFY OFF\tZet de schakelaar uit\n" +"VERIFY ON\tZet de schakelaar aan.\n" +"VERIFY OFF\tZet de schakelaar uit.\n" "VERIFY\t\tToont ON of OFF naar gelang de stand.\n" "\n" "De verify-schakelaar heeft geen functie binnen Wine.\n" diff --git a/po/pl.po b/po/pl.po index 52d9bbe..cd4970b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9682,8 +9682,8 @@ msgstr "" "VERIFY jest używane do ustawienia wartości flagi verify. Prawidłowa " "składnia:\n" "\n" -"VERIFY ON\tUstawia flagę\n" -"VERIFY OFF\tUsuwa flagę\n" +"VERIFY ON\tUstawia flagę.\n" +"VERIFY OFF\tUsuwa flagę.\n" "VERIFY\t\tWyświetla ON lub OFF w zależności od stanu flagi.\n" "\n" "Flaga verify nie ma funkcji w Wine.\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 4f592c9..9a53524 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -9681,8 +9681,8 @@ msgstr "" "VERIFY é usado para configurar, limpar e testar a flag de verificação. As " "formas válidas são>\n" "\n" -"VERIFY ON\tAciona a flag\n" -"VERIFY OFF\tLimpa a flag\n" +"VERIFY ON\tAciona a flag.\n" +"VERIFY OFF\tLimpa a flag.\n" "VERIFY\t\tMostra ON ou OFF como apropriado.\n" "\n" "A flag de verificação não tem função nenhuma no Wine.\n" diff --git a/po/pt_PT.po b/po/pt_PT.po index 0aff53b..97a0abf 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -9988,8 +9988,8 @@ msgstr "" "VERIFY é usado para configurar, limpar e testar o 'flag' de verificação. As\n" "formas válidas são>\n" "\n" -"VERIFY ON\tConfigura o flag\n" -"VERIFY OFF\tLimpa o flag\n" +"VERIFY ON\tConfigura o flag.\n" +"VERIFY OFF\tLimpa o flag.\n" "VERIFY\t\tMostra ON ou OFF qdo apropriado.\n" "\n" "O flag de verificação não tem função no Wine.\n" diff --git a/po/sl.po b/po/sl.po index ba933a3..75092ea 100644 --- a/po/sl.po +++ b/po/sl.po @@ -9635,8 +9635,8 @@ msgstr "" "VERIFY uporabimo za nastavljanje, brisanje ali preizkušanje zastavice\n" " preverjanja. Veljavne oblike ukaza so:\n" "\n" -"VERIFY ON\tVključi zastavico\n" -"VERIFY OFF\tIzključi zastavico\n" +"VERIFY ON\tVključi zastavico.\n" +"VERIFY OFF\tIzključi zastavico.\n" "VERIFY\t\tPrikaže ON ali. OFF.\n" "\n" "Zastavica preverjanja v Wine nima nobene zmožnosti.\n" diff --git a/po/tr.po b/po/tr.po index bdf384f..1206953 100644 --- a/po/tr.po +++ b/po/tr.po @@ -9476,8 +9476,8 @@ msgid "" msgstr "" "VERIFY doğrulama bayrağını açar, kapatır veya sınar. Geçerli biçimler:\n" "\n" -"VERIFY ON\tBayrağı aç\n" -"VERIFY OFF\tBayrağı kaldır\n" +"VERIFY ON\tBayrağı aç.\n" +"VERIFY OFF\tBayrağı kaldır.\n" "VERIFY\t\tBayrağın durumunu gösterir.\n" "\n" "Doğrulama bayrağının Wine'da bir işlevi yoktur.\n" diff --git a/po/uk.po b/po/uk.po index 9f61aa3..6b597d5 100644 --- a/po/uk.po +++ b/po/uk.po @@ -9683,8 +9683,8 @@ msgstr "" "VERIFY пизначена для задання, скидання чи тестування прапора перевірки. " "Діючі форми:\n" "\n" -"VERIFY ON\tЗадати прапор\n" -"VERIFY OFF\tСкинути прапор\n" +"VERIFY ON\tЗадати прапор.\n" +"VERIFY OFF\tСкинути прапор.\n" "VERIFY\t\tВідображає відповідні значення ON чи OFF.\n" "\n" "Прапор перевірки не має функцій в Wine.\n"

1 0

Lauri Kenttä : po: Update Swedish translation.
by Alexandre Julliard Feb. 29, 2012

Feb. 29, 2012

Module: wine Branch: master Commit: a6b12cfc09dc71767dae967fd92ff9c856c30ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6b12cfc09dc71767dae967fd… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Feb 29 17:18:21 2012 +0200 po: Update Swedish translation. --- po/sv.po | 34 ++++++++++++++-------------------- 1 files changed, 14 insertions(+), 20 deletions(-) diff --git a/po/sv.po b/po/sv.po index 9816f4b..c275dba 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-02-27 12:30+0200\n" +"PO-Revision-Date: 2012-02-29 17:17+0200\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: none\n" "Language: Swedish\n" @@ -246,7 +246,7 @@ msgstr "&Interfoliera varje" #: avifil32.rc:48 msvfw32.rc:48 msgid "frames" -msgstr "frames" +msgstr "bildrutor" #: avifil32.rc:49 msgid "Current format:" @@ -561,7 +561,7 @@ msgstr "&Egendefinierade färger:" #: comdlg32.rc:281 comdlg32.rc:304 msgid "Color | Sol&id" -msgstr "Enfärgat" +msgstr "Färg | Enfärgat" #: comdlg32.rc:282 msgid "&Red:" @@ -3390,7 +3390,7 @@ msgstr "Låg" #: inetcpl.rc:34 msgid "Medium" -msgstr "Medium" +msgstr "Medel" #: inetcpl.rc:35 msgid "Increased" @@ -9205,11 +9205,9 @@ msgid "" "called procedure are inherited by the caller.\n" msgstr "" "CALL <batchfilename> används inom en batchfil för att exekvera kommandon\n" -"från en annan batchfil. När den anropade batchfilen stängs ner, så återfår " -"den\n" -"anropande batchfilen återigen kontrollen. Med CALL går det även att skicka " -"med\n" -"parametrar till den anropade metoden.\n" +"från en annan batchfil. När den anropade batchfilen stängs ner, så återfår\n" +"den anropande batchfilen återigen kontrollen. Med CALL går det även att\n" +"skicka med parametrar till den anropade metoden.\n" "\n" "Ändringar av standardsökväg, miljövariabler o.s.v. som görs inom en anropad\n" "process ärvs av den som anropar processen.\n" @@ -9382,7 +9380,7 @@ msgstr "" "Om du flyttar på en mapp, så flyttas allting under mappen med.\n" "\n" "MOVE misslyckas om den gamla och det den nya stället är på olika\n" -"DOS-enhetsbokstäver. Till exempel från C: till D:.\n" +"DOS-enhetsbokstäver.\n" #: cmd.rc:122 msgid "" @@ -9527,11 +9525,9 @@ msgid "" "the list, so parameter 2 becomes parameter 1 and so on. It has no effect\n" "if called from the command line.\n" msgstr "" -"SHIFT används i batchfiler för att ta bort en parameter högst upp på " -"listan.\n" -"Parametrar i turordning flyttas ner ett steg, parameter 2 blir parameter 1 o." -"s.v.\n" -"SHIFT har ingen effekt om det anropas ifrån kommandoraden.\n" +"SHIFT används i batchfiler för att ta bort en parameter högst upp på\n" +"listan så att parameter 2 blir parameter 1 o.s.v. SHIFT har ingen effekt\n" +"om det anropas ifrån kommandoraden.\n" #: cmd.rc:176 msgid "" @@ -9669,9 +9665,7 @@ msgstr "" #: cmd.rc:259 msgid "MORE displays output of files or piped input in pages.\n" -msgstr "" -"MORE skriver ut filers utskrift eller vidarebefodrade förfrågningar på " -"sidor.\n" +msgstr "MORE visar filer eller inmatad text på sidor.\n" #: cmd.rc:263 msgid "" @@ -10122,7 +10116,7 @@ msgstr "Kopplat ifrån" #: net.rc:47 msgid "A network error occurred" -msgstr "Ett nätverksfel inträffade." +msgstr "Ett nätverksfel inträffade" #: net.rc:48 msgid "Connection is being made" @@ -13696,7 +13690,7 @@ msgstr "&Om Wine Wordpad" #: wordpad.rc:130 msgid "Automatic" -msgstr "Automatic" +msgstr "Automatisk" #: wordpad.rc:199 msgid "Date and time"

1 0

Henri Verbeet : ddraw/tests: Add tests for color keyed texturing with an alpha channel.
by Alexandre Julliard Feb. 29, 2012

Feb. 29, 2012

Module: wine Branch: master Commit: 3c5a2549c504ccf31b88193b96e3ac2ff878c829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c5a2549c504ccf31b88193b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 28 19:48:41 2012 +0100 ddraw/tests: Add tests for color keyed texturing with an alpha channel. --- dlls/ddraw/tests/ddraw1.c | 247 ++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 208 ++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 191 ++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 158 +++++++++++++++++++++++++++++ 4 files changed, 801 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c5a2549c504ccf31b881…

1 0

Francois Gouget : po: A linefeed was missing in the Russian translation.
by Alexandre Julliard Feb. 29, 2012

Feb. 29, 2012

Module: wine Branch: master Commit: 01e856b00f5a5eb12bf0a40c36650a73ff0dd612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e856b00f5a5eb12bf0a40c3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 29 10:52:40 2012 +0100 po: A linefeed was missing in the Russian translation. --- po/ru.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/ru.po b/po/ru.po index 5d7fb90..258f9b1 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9828,7 +9828,7 @@ msgstr "" "MOVE\t\tПеремещает файл, несколько файлов или дерево каталогов\n" "PATH\t\tПоказывает или изменяет путь поиска программ\n" "PAUSE\t\tОстанавливает исполнение bat-файлa\n" -"POPD\t\tВосстанавливает предыдущий текущий каталог, сохранённый с помощью " +"POPD\t\tВосстанавливает предыдущий текущий каталог, сохранённый с помощью\n" "PROMPT\t\tИзменяет приглашение командной строки\n" "PUSHD\t\tСохраняет текущий каталог и переходит в другой\n" "REN (RENAME)\tПереименовывает файл\n"

1 0

Julian Rüger : readme: Update German translation.
by Alexandre Julliard Feb. 29, 2012

Feb. 29, 2012

Module: wine Branch: master Commit: fd28db3f83768ea396010bac337046cbaa553c83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd28db3f83768ea396010bac3… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Feb 29 18:29:59 2012 +0100 readme: Update German translation. --- documentation/README.de | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index 42722f9..1c59315 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -32,25 +32,18 @@ Um Wine kompilieren und ausführen zu können, brauchen Sie eines der folgenden Betriebssysteme: Linux version 2.0.36 oder neuer - FreeBSD 6.3 oder neuer + FreeBSD 7.0 oder neuer Solaris x86 9 oder neuer NetBSD-current Mac OS X 10.4 oder neuer -Da Wine Thread-Support auf Kernelebene benötigt, werden nur die oben +Da Wine Thread-Unterstützung auf Kernelebene benötigt, werden nur die oben aufgeführten Betriebssysteme unterstützt. Andere Betriebssysteme, die Kernel-Threads unterstützen, werden unter Umständen in der Zukunft unterstützt. -Linux-Info: - Obwohl Linux 2.2.x immer noch funktionieren sollte und Linux 2.0.x - vielleicht auch noch funktioniert (ältere 2.0.x-Versionen verzeichneten - Abstürze im Zusammenhang mit Threads), sollte man am besten einen - aktuellen Kernel wie 2.4.x oder 2.6.x verwenden. - FreeBSD-Info: - Wine läuft prinzipiell erst ab FreeBSD 6.3 oder 7.0 richtig, wobei für - FreeBSD 6.3 zusätzliche Patches erhältlich sind. Siehe dazu auch + Wine läuft prinzipiell erst ab FreeBSD 7.0 richtig. Siehe dazu auch http://wiki.freebsd.org/Wine für weitere Informationen. Solaris-Info: @@ -68,11 +61,10 @@ Mac OS X Info: Sie benötigen mindestens Xcode 2.4 um richtig unter x86 kompilieren zu können. Unterstützte Dateisysteme: - Wine sollte auf den meisten Dateisystemen laufen. Ein paar - Kompatibilitäts-Probleme wurden auch gemeldet beim Dateizugriff über Samba. + Wine sollte auf den meisten Dateisystemen laufen. Kompatibilitätsprobleme + wurden allerdings beim Dateizugriff über Samba gemeldet. Weiterhin bietet NTFS nicht alle Dateisystemfunktionen, die von einigen - Programmen benötigt werden. Ein natives Linux Dateisystem wie ext3 wird - empfohlen. + Programmen benötigt werden. Ein natives Unix-Dateisystem wird empfohlen. Grundsätzliche Voraussetzungen: Sie müssen die Include-Dateien für X11-Entwicklung installiert haben

1 0

Nikolay Sivov : comctl32/tests: Fix test failures running on February 29.
by Alexandre Julliard Feb. 29, 2012

Feb. 29, 2012

Module: wine Branch: master Commit: 0cae0842b93ebc34344e2ea95a65c252e04aebbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cae0842b93ebc34344e2ea95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 29 10:02:27 2012 +0300 comctl32/tests: Fix test failures running on February 29. --- dlls/comctl32/tests/monthcal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 0585bb4..1fe2e61 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -385,6 +385,7 @@ static void test_monthcal(void) /* set both limits, then set max < min */ GetSystemTime(&st[0]); + st[0].wDay = 25; st[1] = st[0]; st[1].wYear++; ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN|GDTR_MAX, (LPARAM)st), "Failed to set limits\n");

1 0

Henri Verbeet : wined3d: Support color keyed WINED3DFMT_B8G8R8A8_UNORM surfaces.
by Alexandre Julliard Feb. 29, 2012

Feb. 29, 2012

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

Lucas Zawacki : dinput: Search for device objects of the correct type in BuildActionMap.
by Alexandre Julliard Feb. 29, 2012

Feb. 29, 2012

Module: wine Branch: master Commit: 07f583478e0d5b182dff9dac14fbd96ba30773c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07f583478e0d5b182dff9dac1… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Feb 28 15:22:20 2012 -0300 dinput: Search for device objects of the correct type in BuildActionMap. --- dlls/dinput/joystick.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 8dd1566..dfcaeb7 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -456,7 +456,7 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, if (type & object_types[j]) { /* Assure that the object exists */ - LPDIOBJECTDATAFORMAT odf = dataformat_to_odf_by_type(This->base.data_format.wine_df, inst, DIDFT_BUTTON); + LPDIOBJECTDATAFORMAT odf = dataformat_to_odf_by_type(This->base.data_format.wine_df, inst, object_types[j]); if (odf != NULL) {

1 0

Martin Jesper Low Madsen : po: Update Danish translation.
by Alexandre Julliard Feb. 28, 2012

Feb. 28, 2012

Module: wine Branch: master Commit: b3f12f0a8b2467122db871e553199abe84655bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3f12f0a8b2467122db871e55… Author: Martin Jesper Low Madsen <martinjlowm(a)gmail.com> Date: Mon Feb 27 00:06:42 2012 +0100 po: Update Danish translation. --- po/da.po | 1921 ++++++++++++++++++++++++++++---------------------------------- 1 files changed, 872 insertions(+), 1049 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3f12f0a8b2467122db87…

1 0

Lauri Kenttä : readme: Update Swedish translation.
by Alexandre Julliard Feb. 28, 2012

Feb. 28, 2012

Module: wine Branch: master Commit: e4a855d2f39fb7e3f0a074dc0599b8da62189987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a855d2f39fb7e3f0a074dc0… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Feb 27 23:47:50 2012 +0200 readme: Update Swedish translation. --- documentation/README.sv | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/documentation/README.sv b/documentation/README.sv index bb12f7c..fe62928 100644 --- a/documentation/README.sv +++ b/documentation/README.sv @@ -27,7 +27,7 @@ information och tips om hur problem kan l F�r att kompilera och k�ra Wine kr�vs ett av f�ljande: Linux version 2.0.36 eller senare - FreeBSD 6.3 eller senare + FreeBSD 7.0 eller senare Solaris x86 9 eller senare NetBSD-current Mac OS X 10.4 eller senare @@ -36,15 +36,9 @@ Wine kr operativsystemen ovan som st�ds. Andra operativsystem som st�der kerneltr�dar kommer eventuellt att st�djas i framtiden. -Information f�r Linux - �ven om Linux 2.2.x antagligen fortfarande fungerar, och Linux 2.0.x kanske - fungerar (tidiga 2.0.x-versioner uppvisade tr�drelaterade problem), s� �r - det b�st att ha en aktuell kernel som 2.4.x eller 2.6.x. - Information f�r FreeBSD - Wine kommer i regel inte fungera p� FreeBSD-versioner �ldre �n 6.3 eller 7.0. - FreeBSD 6.3 kan uppdateras for att st�dja Wine. Se - http://wiki.freebsd.org/Wine f�r mer information. + Wine kommer i regel inte att fungera p� FreeBSD-versioner �ldre �n 7.0. + Se http://wiki.freebsd.org/Wine f�r mer information. Information f�r Solaris Wine m�ste antagligen byggas med GNU toolchain (gcc, gas etc.). @@ -63,8 +57,7 @@ St Wine kan k�ra p� de flesta filsystem, men det har rapporterats problem vad g�ller kompatibilitet d� samba anv�nds f�r att ansluta till filer. NTFS tillhandah�ller inte heller alla filsystemsfunktioner som beh�vs av alla - program. Det rekommenderas att anv�nda ett Linux-filsystem som exempelvis - ext3. + program. Det rekommenderas att anv�nda ett riktigt Unix-filsystem. Grundl�ggande krav: Utvecklingsfilerna f�r X11 m�ste vara installerade (de kallas xlib6g-dev i

1 0