February 2012 - Wine-Commits

Francois Gouget : po: Tweak the wrapping o f the cmd MOVE Norwegian Bokmål usage message translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 216359c6fb4754b47bdf28ff6fcecb39b7c0c9ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=216359c6fb4754b47bdf28ff6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 26 17:42:45 2012 +0100 po: Tweak the wrapping of the cmd MOVE Norwegian Bokmål usage message translation. --- po/nb_NO.po | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index abd3a87..11a4ac9 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -9706,8 +9706,7 @@ msgid "" "\n" "MOVE fails if the old and new locations are on different DOS drive letters.\n" msgstr "" -"MOVE flytter en fil eller katalog til et nytt sted innenfor\n" -"filsystemet.\n" +"MOVE flytter en fil eller katalog til et nytt sted innenfor filsystemet.\n" "\n" "Hvis elementet som flyttes er en katalog, flyttes også filene og\n" "underkatalogene i den.\n"

1 0

Francois Gouget : po: Remove a duplicate space after a comma in the German translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 3a696054583e42e492e6e333e4a9b7817c49b269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a696054583e42e492e6e333e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 26 17:32:36 2012 +0100 po: Remove a duplicate space after a comma in the German translation. --- po/de.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/de.po b/po/de.po index ad79df5..7eebab5 100644 --- a/po/de.po +++ b/po/de.po @@ -8646,7 +8646,7 @@ msgid "" "The specified command requires an alias, file, driver, or device name. " "Please supply one." msgstr "" -"Der angegebene Befehl erfordert einen Alias-, Datei-, Treiber- oder " +"Der angegebene Befehl erfordert einen Alias-, Datei-, Treiber- oder " "Gerätenamen. Bitte geben Sie einen an." #: winmm.rc:88

1 0

Francois Gouget : po: Remove or mark as fuzzy the invalid Danish shell folder names.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 77e7c01ea3bf3914597f2ca00b4dfa54028a0e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e7c01ea3bf3914597f2ca00… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 26 17:31:57 2012 +0100 po: Remove or mark as fuzzy the invalid Danish shell folder names. --- po/da.po | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/po/da.po b/po/da.po index b3ff75e..3d8d591 100644 --- a/po/da.po +++ b/po/da.po @@ -8053,7 +8053,7 @@ msgstr "" #: shell32.rc:204 msgid "Start Menu" -msgstr "Start Menu" +msgstr "" #: shell32.rc:205 msgid "My Music" @@ -8071,7 +8071,7 @@ msgstr "Skrivebord" #: shell32.rc:208 msgid "NetHood" -msgstr "NetHood" +msgstr "" #: shell32.rc:209 msgid "Templates" @@ -8079,15 +8079,15 @@ msgstr "Skabeloner" #: shell32.rc:210 msgid "PrintHood" -msgstr "PrintHood" +msgstr "" #: shell32.rc:211 winhlp32.rc:45 msgid "History" -msgstr "History" +msgstr "" #: shell32.rc:212 msgid "Program Files" -msgstr "Program Files" +msgstr "" #: shell32.rc:214 msgid "My Pictures" @@ -8105,24 +8105,26 @@ msgstr "Documenter" #: shell32.rc:217 #, fuzzy msgid "Administrative Tools" -msgstr "Start MenuProgrammerAdministrative Værktøjer" +msgstr "Administrative Værktøjer" #: shell32.rc:218 +#, fuzzy msgid "Music" -msgstr "Dokumenter\\Min Musik" +msgstr "Min Musik" #: shell32.rc:219 +#, fuzzy msgid "Pictures" -msgstr "Dokumenter\\Mine Billeder" +msgstr "Mine Billeder" #: shell32.rc:220 +#, fuzzy msgid "Videos" -msgstr "Dokumenter\\Mine Film" +msgstr "Mine Film" #: shell32.rc:213 -#, fuzzy msgid "Program Files (x86)" -msgstr "Program Files" +msgstr "" #: shell32.rc:221 #, fuzzy

1 0

Francois Gouget : po: Fix the trailing ellipses in the Japanese translation .
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 85b58b7eba6165ca6a3549bc727bbc9c8af25c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b58b7eba6165ca6a3549bc7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 26 17:33:31 2012 +0100 po: Fix the trailing ellipses in the Japanese translation. --- po/ja.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ja.po b/po/ja.po index fa128ec..43ea2a5 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6735,7 +6735,7 @@ msgstr "設定(&F)..." #: msvfw32.rc:40 msgid "&About" -msgstr "情報(&A)..." +msgstr "情報(&A)" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -7682,7 +7682,7 @@ msgstr "終了(&X)" #: shell32.rc:127 msgid "&About Control Panel" -msgstr "バージョン情報(&A)..." +msgstr "バージョン情報(&A)" #: shell32.rc:270 shell32.rc:285 msgid "Browse for Folder" @@ -12510,7 +12510,7 @@ msgstr "既存のオーバーライド(&O):" #: winecfg.rc:190 msgid "&Edit..." -msgstr "編集(&E)" +msgstr "編集(&E)..." #: winecfg.rc:196 msgid "Edit Override" @@ -13498,7 +13498,7 @@ msgstr "上級(&E)" #: winemine.rc:42 msgid "&Custom..." -msgstr "盤面の変更(&C)" +msgstr "盤面の変更(&C)..." #: winemine.rc:44 msgid "&Fastest Times"

1 0

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

Feb. 27, 2012

Module: wine Branch: master Commit: 3a7c9ad92e1bad6c1d986384f465e32211153aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7c9ad92e1bad6c1d986384f… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Feb 27 13:18:05 2012 +0200 po: Update Swedish translation. --- po/sv.po | 755 +++++++++++++++++++++++--------------------------------------- 1 files changed, 278 insertions(+), 477 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a7c9ad92e1bad6c1d986…

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: cdac8cb17664947153f05093c0980a39bb75a45c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdac8cb17664947153f05093c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 25 13:37:10 2012 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw1.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 9f2b394..02c3b4d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -160,15 +160,15 @@ static void emit_tquad(void **ptr, WORD base_idx) inst->bSize = sizeof(*tri); inst->wCount = 2; - tri->v1 = base_idx; - tri->v2 = base_idx + 1; - tri->v3 = base_idx + 2; + U1(*tri).v1 = base_idx; + U2(*tri).v2 = base_idx + 1; + U3(*tri).v3 = base_idx + 2; tri->wFlags = D3DTRIFLAG_START; ++tri; - tri->v1 = base_idx + 2; - tri->v2 = base_idx + 1; - tri->v3 = base_idx + 3; + U1(*tri).v1 = base_idx + 2; + U2(*tri).v2 = base_idx + 1; + U3(*tri).v3 = base_idx + 3; tri->wFlags = D3DTRIFLAG_ODD; ++tri;

1 0

Alexander Morozov : msvcr90: realloc can move memory block.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 35a4b7dc0e78c8447ef1b0f28f8f3006bc49fd2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a4b7dc0e78c8447ef1b0f28… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Feb 27 15:39:11 2012 +0400 msvcr90: realloc can move memory block. --- dlls/msvcr90/msvcr90.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 6b97e2f..663dd37 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -192,7 +192,7 @@ void* CDECL _recalloc(void* mem, size_t num, size_t size) } if(size>old_size) - memset((BYTE*)mem+old_size, 0, size-old_size); + memset((BYTE*)ret+old_size, 0, size-old_size); return ret; }

1 0

Stefan Dösinger : ddraw/tests: LONG/ ULONG and error checking fixes.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: f8d6d0300b026d39ac1ad82e3e8a2ed1fd1f5616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d6d0300b026d39ac1ad82e3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 27 12:11:15 2012 +0100 ddraw/tests: LONG/ULONG and error checking fixes. --- dlls/ddraw/tests/ddraw1.c | 26 ++++++++++++++------------ dlls/ddraw/tests/ddraw2.c | 22 +++++++++++----------- dlls/ddraw/tests/ddraw4.c | 22 +++++++++++----------- 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 02c3b4d..3d173d9 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -884,7 +884,7 @@ static void test_coop_level_threaded(void) destroy_window_thread(&p); } -static LONG get_refcount(IUnknown *test_iface) +static ULONG get_refcount(IUnknown *test_iface) { IUnknown_AddRef(test_iface); return IUnknown_Release(test_iface); @@ -895,7 +895,7 @@ static void test_viewport_interfaces(void) IDirectDraw *ddraw; IDirect3D *d3d; HRESULT hr; - LONG ref; + ULONG ref; IDirect3DViewport *viewport; IDirect3DViewport2 *viewport2; IDirect3DViewport3 *viewport3; @@ -921,9 +921,9 @@ static void test_viewport_interfaces(void) hr = IDirect3D_CreateViewport(d3d, &viewport, NULL); ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport); - ok(ref == 1, "Initial IDirect3DViewport refcount is %d\n", ref); + ok(ref == 1, "Initial IDirect3DViewport refcount is %u\n", ref); ref = get_refcount((IUnknown *)d3d); - ok(ref == 2, "IDirect3D refcount is %d\n", ref); + ok(ref == 2, "IDirect3D refcount is %u\n", ref); /* E_FAIL return values are returned by Winetestbot Windows NT machines. While not supporting * newer interfaces is legitimate for old ddraw versions, E_FAIL violates Microsoft's rules @@ -936,25 +936,27 @@ static void test_viewport_interfaces(void) /* NULL iid: Segfaults */ hr = IDirect3DViewport_QueryInterface(viewport, &IID_IDirect3DViewport2, (void **)&viewport2); - ok(SUCCEEDED(hr) || broken(hr == E_FAIL), "Failed to QI IDirect3DViewport2, hr %#x.\n", hr); + ok(SUCCEEDED(hr) || hr == E_NOINTERFACE || broken(hr == E_FAIL), + "Failed to QI IDirect3DViewport2, hr %#x.\n", hr); if (viewport2) { ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); IDirect3DViewport2_Release(viewport2); viewport2 = NULL; } hr = IDirect3DViewport_QueryInterface(viewport, &IID_IDirect3DViewport3, (void **)&viewport3); - ok(SUCCEEDED(hr) || broken(hr == E_FAIL), "Failed to QI IDirect3DViewport3, hr %#x.\n", hr); + ok(SUCCEEDED(hr) || hr == E_NOINTERFACE || broken(hr == E_FAIL), + "Failed to QI IDirect3DViewport3, hr %#x.\n", hr); if (viewport3) { ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); IDirect3DViewport3_Release(viewport3); } @@ -963,9 +965,9 @@ static void test_viewport_interfaces(void) if (unknown) { ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); ref = get_refcount(unknown); - ok(ref == 2, "IUnknown refcount is %d\n", ref); + ok(ref == 2, "IUnknown refcount is %u\n", ref); IUnknown_Release(unknown); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 35c3a7b..ba8d3b6 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1179,7 +1179,7 @@ done: if (ddraw) IDirectDraw2_Release(ddraw); } -static LONG get_refcount(IUnknown *test_iface) +static ULONG get_refcount(IUnknown *test_iface) { IUnknown_AddRef(test_iface); return IUnknown_Release(test_iface); @@ -1190,7 +1190,7 @@ static void test_viewport_interfaces(void) IDirectDraw2 *ddraw; IDirect3D2 *d3d; HRESULT hr; - LONG ref, old_d3d_ref; + ULONG ref, old_d3d_ref; IDirect3DViewport *viewport; IDirect3DViewport2 *viewport2; IDirect3DViewport3 *viewport3; @@ -1216,9 +1216,9 @@ static void test_viewport_interfaces(void) hr = IDirect3D2_CreateViewport(d3d, &viewport2, NULL); ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport2); - ok(ref == 1, "Initial IDirect3DViewport2 refcount is %d\n", ref); + ok(ref == 1, "Initial IDirect3DViewport2 refcount is %u\n", ref); ref = get_refcount((IUnknown *)d3d); - ok(ref == old_d3d_ref, "IDirect3D2 refcount is %d\n", ref); + ok(ref == old_d3d_ref, "IDirect3D2 refcount is %u\n", ref); gamma = (IDirectDrawGammaControl *)0xdeadbeef; hr = IDirect3DViewport2_QueryInterface(viewport2, &IID_IDirectDrawGammaControl, (void **)&gamma); @@ -1232,21 +1232,21 @@ static void test_viewport_interfaces(void) if (viewport) { ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); IDirect3DViewport_Release(viewport); viewport = NULL; } hr = IDirect3DViewport2_QueryInterface(viewport2, &IID_IDirect3DViewport3, (void **)&viewport3); - ok(SUCCEEDED(hr), "Failed to QI IDirect3DViewport3, hr %#x.\n", hr); + ok(SUCCEEDED(hr) || hr == E_NOINTERFACE, "Failed to QI IDirect3DViewport3, hr %#x.\n", hr); if (viewport3) { ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); IDirect3DViewport3_Release(viewport3); } @@ -1255,9 +1255,9 @@ static void test_viewport_interfaces(void) if (unknown) { ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); ref = get_refcount(unknown); - ok(ref == 2, "IUnknown refcount is %d\n", ref); + ok(ref == 2, "IUnknown refcount is %u\n", ref); IUnknown_Release(unknown); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 89d5799..d9ed90d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1310,7 +1310,7 @@ static void test_texture_load_ckey(void) IDirectDraw4_Release(ddraw); } -static LONG get_refcount(IUnknown *test_iface) +static ULONG get_refcount(IUnknown *test_iface) { IUnknown_AddRef(test_iface); return IUnknown_Release(test_iface); @@ -1321,7 +1321,7 @@ static void test_viewport_interfaces(void) IDirectDraw4 *ddraw; IDirect3D3 *d3d; HRESULT hr, old_d3d_ref; - LONG ref; + ULONG ref; IDirect3DViewport *viewport; IDirect3DViewport2 *viewport2; IDirect3DViewport3 *viewport3; @@ -1346,9 +1346,9 @@ static void test_viewport_interfaces(void) hr = IDirect3D3_CreateViewport(d3d, &viewport3, NULL); ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport3); - ok(ref == 1, "Initial IDirect3DViewport3 refcount is %d\n", ref); + ok(ref == 1, "Initial IDirect3DViewport3 refcount is %u\n", ref); ref = get_refcount((IUnknown *)d3d); - ok(ref == old_d3d_ref, "IDirect3D3 refcount is %d\n", ref); + ok(ref == old_d3d_ref, "IDirect3D3 refcount is %u\n", ref); gamma = (IDirectDrawGammaControl *)0xdeadbeef; hr = IDirect3DViewport2_QueryInterface(viewport3, &IID_IDirectDrawGammaControl, (void **)&gamma); @@ -1362,9 +1362,9 @@ static void test_viewport_interfaces(void) if (viewport) { ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); IDirect3DViewport_Release(viewport); viewport = NULL; } @@ -1374,20 +1374,20 @@ static void test_viewport_interfaces(void) if (viewport2) { ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); IDirect3DViewport3_Release(viewport2); } - hr = IDirect3DViewport3_QueryInterface(viewport2, &IID_IUnknown, (void **)&unknown); + hr = IDirect3DViewport3_QueryInterface(viewport3, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Failed to QI IUnknown, hr %#x.\n", hr); if (unknown) { ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); ref = get_refcount(unknown); - ok(ref == 2, "IUnknown refcount is %d\n", ref); + ok(ref == 2, "IUnknown refcount is %u\n", ref); IUnknown_Release(unknown); }

1 0

Christian Costa : d3dxof: Empty arrays can have the semicolon at the end or not so handle both cases and add tests for them .
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 6ee15adf4d607558827e467e4da37fb111fe783c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee15adf4d607558827e467e4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sat Feb 25 12:36:51 2012 +0100 d3dxof: Empty arrays can have the semicolon at the end or not so handle both cases and add tests for them. This fixes a regression introduced by commit 07931f73f0544e067c5a86b4ac92723c11600dd3. --- dlls/d3dxof/parsing.c | 6 +++++- dlls/d3dxof/tests/d3dxof.c | 31 ++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index b2f51bb..f40c202 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1315,7 +1315,11 @@ static BOOL parse_object_members_list(parse_buffer * buf) } } - if (buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE) && (check_TOKEN(buf) != TOKEN_NAME)) + /* Empty arrays can have the semicolon at the end or not so remove it if any and skip next check */ + if (!nb_elems && (check_TOKEN(buf) == TOKEN_SEMICOLON)) + get_TOKEN(buf); + + if (nb_elems && buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE) && (check_TOKEN(buf) != TOKEN_NAME)) { token = get_TOKEN(buf); if ((token != TOKEN_SEMICOLON) && (token != TOKEN_COMMA)) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index c166054..0c3a295 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -101,7 +101,7 @@ static char template_syntax_empty_array[] = "DWORD dummy;\n" "}\n"; -static char object_syntax_empty_array[] = +static char object_syntax_empty_array_semicolon[] = "xof 0302txt 0064\n" "Buffer\n" "{\n" @@ -110,6 +110,15 @@ static char object_syntax_empty_array[] = "1234;\n" "}\n"; +static char object_syntax_empty_array_nosemicolon[] = +"xof 0302txt 0064\n" +"Buffer\n" +"{\n" +"0;\n" +"1234;\n" +"}\n"; + + static void init_function_pointers(void) { /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ @@ -502,8 +511,23 @@ static void test_syntax(void) hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template_syntax_empty_array, sizeof(template_syntax_empty_array) - 1); ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); - dxflm.lpMemory = &object_syntax_empty_array; - dxflm.dSize = sizeof(object_syntax_empty_array) - 1; + dxflm.lpMemory = &object_syntax_empty_array_semicolon; + dxflm.dSize = sizeof(object_syntax_empty_array_semicolon) - 1; + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); + ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + + ref = IDirectXFileEnumObject_Release(lpdxfeo); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + if (hr == DXFILE_OK) + { + ref = IDirectXFileData_Release(lpdxfd); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + } + + dxflm.lpMemory = &object_syntax_empty_array_nosemicolon; + dxflm.dSize = sizeof(object_syntax_empty_array_nosemicolon) - 1; hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); @@ -516,6 +540,7 @@ static void test_syntax(void) ref = IDirectXFileData_Release(lpdxfd); ok(ref == 0, "Got refcount %d, expected 0\n", ref); } + ref = IDirectXFile_Release(lpDirectXFile); ok(ref == 0, "Got refcount %d, expected 0\n", ref); }

1 0

Ruei-Yuan Lu : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 177cb59538f14cffb7a4ac53ac05d24f8dc849a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177cb59538f14cffb7a4ac53a… Author: Ruei-Yuan Lu <rueiyuan.lu(a)gmail.com> Date: Mon Feb 27 12:16:15 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 83 ++++++++++++++++++++++++++++------------------------------ 1 files changed, 40 insertions(+), 43 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index e87e058..0a04c2c 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2125,11 +2125,11 @@ msgstr "" #: cryptui.rc:277 cryptui.rc:288 cryptui.rc:305 cryptui.rc:319 cryptui.rc:68 msgid "Certificate Import Wizard" -msgstr "" +msgstr "憑證匯入精靈" #: cryptui.rc:280 msgid "Welcome to the Certificate Import Wizard" -msgstr "" +msgstr "歡迎使用憑證匯入精靈" #: cryptui.rc:283 msgid "" @@ -2186,11 +2186,11 @@ msgstr "" #: cryptui.rc:322 msgid "Completing the Certificate Import Wizard" -msgstr "" +msgstr "正在完成憑證匯入精靈" #: cryptui.rc:324 msgid "You have successfully completed the Certificate Import Wizard." -msgstr "" +msgstr "您已經成功地完成憑證匯入精靈。" #: cryptui.rc:326 cryptui.rc:440 msgid "You have specified the following settings:" @@ -2246,11 +2246,11 @@ msgstr "" #: cryptui.rc:367 cryptui.rc:378 cryptui.rc:391 cryptui.rc:401 cryptui.rc:424 #: cryptui.rc:433 cryptui.rc:147 msgid "Certificate Export Wizard" -msgstr "" +msgstr "憑證匯出精靈" #: cryptui.rc:370 msgid "Welcome to the Certificate Export Wizard" -msgstr "" +msgstr "歡迎使用憑證匯出精靈" #: cryptui.rc:373 msgid "" @@ -2289,7 +2289,7 @@ msgstr "確認密碼(&C)：" #: cryptui.rc:404 msgid "Select the format you want to use:" -msgstr "" +msgstr "請選擇您要使用的格式：" #: cryptui.rc:405 msgid "&DER-encoded X.509 (.cer)" @@ -2325,11 +2325,11 @@ msgstr "" #: cryptui.rc:436 msgid "Completing the Certificate Export Wizard" -msgstr "" +msgstr "正在完成憑證匯出精靈" #: cryptui.rc:438 msgid "You have successfully completed the Certificate Export Wizard." -msgstr "" +msgstr "您已經成功地完成憑證匯出精靈" #: cryptui.rc:27 cryptui.rc:90 msgid "Certificate" @@ -2433,7 +2433,7 @@ msgstr "" #: cryptui.rc:52 msgid "Serial number" -msgstr "" +msgstr "序號" #: cryptui.rc:53 msgid "Issuer" @@ -2457,7 +2457,7 @@ msgstr "" #: cryptui.rc:58 msgid "%1 (%2!d! bits)" -msgstr "" +msgstr "%1 (%2!d! 位元)" #: cryptui.rc:59 msgid "SHA1 hash" @@ -2565,7 +2565,7 @@ msgstr "" #: cryptui.rc:87 msgid "Automatically determined by the program" -msgstr "" +msgstr "由程式自動決定" #: cryptui.rc:88 shell32.rc:134 msgid "File" @@ -2787,7 +2787,7 @@ msgstr "" #: cryptui.rc:162 msgid "Export keys" -msgstr "" +msgstr "匯出密鑰" #: cryptui.rc:165 msgid "The export was successful." @@ -3331,7 +3331,7 @@ msgstr "" #: jscript.rc:28 msgid "Object required" -msgstr "" +msgstr "需要物件" #: jscript.rc:29 msgid "Automation server can't create object" @@ -3343,7 +3343,7 @@ msgstr "" #: jscript.rc:31 msgid "Object doesn't support this action" -msgstr "" +msgstr "物件不支援此動作" #: jscript.rc:32 msgid "Argument not optional" @@ -3379,7 +3379,7 @@ msgstr "" #: jscript.rc:40 msgid "Label redefined" -msgstr "" +msgstr "標籤重複定義" #: jscript.rc:41 msgid "Label not found" @@ -3387,7 +3387,7 @@ msgstr "找不到標籤" #: jscript.rc:42 msgid "Conditional compilation is turned off" -msgstr "" +msgstr "條件編譯已被關閉" #: jscript.rc:45 msgid "Number expected" @@ -3451,7 +3451,7 @@ msgstr "" #: winerror.mc:26 msgid "Success.\n" -msgstr "" +msgstr "成功。\n" #: winerror.mc:31 msgid "Invalid function.\n" @@ -3499,7 +3499,7 @@ msgstr "" #: winerror.mc:86 msgid "Invalid access.\n" -msgstr "" +msgstr "無效的存取。\n" #: winerror.mc:91 msgid "Invalid data.\n" @@ -3699,11 +3699,11 @@ msgstr "檔案已存在。\n" #: winerror.mc:336 msgid "Cannot create.\n" -msgstr "" +msgstr "無法建立。\n" #: winerror.mc:341 msgid "Int24 failure.\n" -msgstr "" +msgstr "中斷 24H 失敗。\n" #: winerror.mc:346 msgid "Out of structures.\n" @@ -3711,11 +3711,11 @@ msgstr "" #: winerror.mc:351 msgid "Already assigned.\n" -msgstr "" +msgstr "已經指定。\n" #: winerror.mc:356 winerror.mc:1711 msgid "Invalid password.\n" -msgstr "" +msgstr "無效的密碼。\n" #: winerror.mc:361 msgid "Invalid parameter.\n" @@ -3763,7 +3763,7 @@ msgstr "" #: winerror.mc:416 msgid "Drive locked.\n" -msgstr "" +msgstr "已鎖定儲存裝置。\n" #: winerror.mc:421 msgid "Broken pipe.\n" @@ -3907,7 +3907,7 @@ msgstr "" #: winerror.mc:606 msgid "Path is busy.\n" -msgstr "" +msgstr "該路徑忙碌中。\n" #: winerror.mc:611 msgid "Already a SUBST target.\n" @@ -3971,7 +3971,7 @@ msgstr "" #: winerror.mc:686 msgid "Lock failed.\n" -msgstr "" +msgstr "鎖定失敗。\n" #: winerror.mc:691 msgid "Resource in use.\n" @@ -4075,7 +4075,7 @@ msgstr "" #: winerror.mc:816 msgid "File name is too long.\n" -msgstr "" +msgstr "檔案名稱過長。\n" #: winerror.mc:821 msgid "Ring 2 stack in use.\n" @@ -11810,10 +11810,8 @@ msgid "" "Free Software Foundation; either version 2.1 of the License, or (at your " "option) any later version." msgstr "" -"這個程式是自由軟體﹐您可以遵照\n" -"自由軟體基金會出版的 GNU LGPL 2.1\n" -"版或新版的許可條款來修改和重新\n" -"散佈這個程式。" +"這個程式是自由軟體；您可以遵照自由軟體基金會所制定的 GNU LGPL 2.1 版或者更新" +"版本的許可條款來修改和重新散佈這個程式。" #: winecfg.rc:134 msgid "Windows registration information" @@ -11837,9 +11835,8 @@ msgid "" "linked to the Libraries and Graphics tabs to allow you to change systemwide " "or per-application settings in those tabs as well." msgstr "" -"Wine 可以對不同程式偽裝成不同版本的 Windows。\n" -"「函式庫」與「顯示」分頁將連結到這個分頁，除了調整預設設定，\n" -"也能調整個別程式的設定。" +"Wine 可以對不同程式偽裝成不同版本的 Windows。「函式庫」與「顯示」分頁將連結到" +"這個分頁，除了調整預設設定，也能調整個別程式的設定。" #: winecfg.rc:150 msgid "&Add application..." @@ -12066,7 +12063,7 @@ msgstr "隱藏進階選項(&A)" #: winecfg.rc:36 msgid "(No Theme)" -msgstr "（無佈景主題）" +msgstr "(無佈景主題)" #: winecfg.rc:37 msgid "Graphics" @@ -12765,7 +12762,7 @@ msgstr "隱藏(&I)" #: winefile.rc:177 msgid "&Archive" -msgstr "" +msgstr "保存(&A)" #: winefile.rc:178 msgid "&System" @@ -12794,7 +12791,7 @@ msgstr "" #: winefile.rc:95 msgid "Wine File Manager" -msgstr "" +msgstr "Wine 檔案管理員" #: winefile.rc:97 msgid "root fs" @@ -13272,7 +13269,7 @@ msgstr "統一碼文字文件" #: wordpad.rc:143 msgid "Printer files (*.prn)" -msgstr "列印檔案 (*.prn)" +msgstr "印表機檔案 (*.prn)" #: wordpad.rc:150 msgid "Center" @@ -13385,7 +13382,7 @@ msgstr "您沒有開啟檔案的權限。" #: wordpad.rc:193 msgid "Printing not implemented." -msgstr "" +msgstr "列印功能尚未實作。" #: wordpad.rc:194 msgid "Cannot add more than 32 tab stops." @@ -13405,7 +13402,7 @@ msgstr "" #: xcopy.rc:29 msgid "Press <Enter> to begin copying\n" -msgstr "" +msgstr "請按 <Enter> 鍵開始複製\n" #: xcopy.rc:30 msgid "%1!d! file(s) would be copied\n" @@ -13413,7 +13410,7 @@ msgstr "" #: xcopy.rc:31 msgid "%1!d! file(s) copied\n" -msgstr "" +msgstr "已複製 %1!d! 個檔案\n" #: xcopy.rc:34 msgid "" @@ -13424,11 +13421,11 @@ msgstr "" #: xcopy.rc:35 msgid "%1? (Yes|No)\n" -msgstr "" +msgstr "%1？ (是｜否)\n" #: xcopy.rc:36 msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "" +msgstr "是否覆蓋 %1？ (是｜否｜全部皆是)\n" #: xcopy.rc:37 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n"

1 0