wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

André Hentschel : winedbg: Add German translation.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 426e541ba5ffe64a36c41bf5e6ed9c6c57df9acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=426e541ba5ffe64a36c41bf5e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 31 18:18:33 2009 +0200 winedbg: Add German translation. --- programs/winedbg/rsrc.rc | 1 + programs/winedbg/rsrc_De.rc | 57 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/rsrc.rc b/programs/winedbg/rsrc.rc index 745ab61..50c5efb 100644 --- a/programs/winedbg/rsrc.rc +++ b/programs/winedbg/rsrc.rc @@ -23,6 +23,7 @@ #include "resource.h" +#include "rsrc_De.rc" #include "rsrc_En.rc" #include "rsrc_Ko.rc" #include "rsrc_Lt.rc" diff --git a/programs/winedbg/rsrc_De.rc b/programs/winedbg/rsrc_De.rc new file mode 100644 index 0000000..ccc616b --- /dev/null +++ b/programs/winedbg/rsrc_De.rc @@ -0,0 +1,57 @@ +/* + * English Language Support + * + * Copyright 2009 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Debug", ID_DEBUG + END +END + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Programm Fehler" +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "Im Programm %s traten schwerwiegende Fehler auf \ + und es muss beendet werden. Wir entschuldigen uns für die Unannehmlichkeit.", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "Die Ursache kann ein Problem im Programm oder ein Fehler in Wine sein. \ + Sie können unter http://appdb.winehq.org Tipps zum ausführen \ + der Anwendung einholen.\n\n\ + Tritt dieses Problem unter Windows nicht auf und wurde es noch nicht \ + gemeldet, können Sie unter http://bugs.winehq.org einen Eintrag hinterlassen.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "Schließen", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "Wine Programm absturz" + IDS_INVALID_PARAMS "Interne Fehler - ungültige Parameter empfangen" + IDS_UNIDENTIFIED "(unbekannt)" +END + +#pragma code_page(default)

1 0

Jeff Zaroyko : dmsynth: Fix a typo.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 93423aaa39f14b75df9c02dc0f870ce0a8fce164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93423aaa39f14b75df9c02dc0… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Mon Jun 1 22:04:31 2009 +1000 dmsynth: Fix a typo. --- dlls/dmsynth/synth.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index fe960ca..e14ae81 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -255,7 +255,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl (LPCGUID lpcGUID, LPVOID* ppobj obj->pCaps.dwMaxVoices = 1000; obj->pCaps.dwMaxAudioChannels = -1; obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB | DMUS_EFFECT_CHORUS | DMUS_EFFECT_DELAY; - MultiByteToWideChar (CP_ACP, 0, "Microsotf Synthesizer", -1, obj->pCaps.wszDescription, sizeof(obj->pCaps.wszDescription)/sizeof(WCHAR)); + MultiByteToWideChar (CP_ACP, 0, "Microsoft Synthesizer", -1, obj->pCaps.wszDescription, sizeof(obj->pCaps.wszDescription)/sizeof(WCHAR)); /* assign latency clock */ /*DMUSIC_CreateReferenceClockImpl (&IID_IReferenceClock, (LPVOID*)&This->pLatencyClock, NULL); */

1 0

Alexandre Julliard : user32/tests: Make some sysparams registry key optional, and fix some other failures on old Windows platforms.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 341cea514f83621cb038aab435c22d3d771a8876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=341cea514f83621cb038aab43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 15:03:51 2009 +0200 user32/tests: Make some sysparams registry key optional, and fix some other failures on old Windows platforms. --- dlls/user32/tests/sysparams.c | 59 +++++++++++++++++++++++----------------- 1 files changed, 34 insertions(+), 25 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 3c94441..d055fa0 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -245,11 +245,11 @@ static BOOL test_error_msg ( int rc, const char *name ) { if (last_error==0xdeadbeef || last_error==ERROR_INVALID_SPI_VALUE || last_error==ERROR_INVALID_PARAMETER) { - trace("%s not supported on this platform. Skipping test\n", name); + skip("%s not supported on this platform\n", name); } else if (last_error==ERROR_ACCESS_DENIED) { - trace("%s does not have privileges to run. Skipping test\n", name); + skip("%s does not have privileges to run\n", name); } else { @@ -274,7 +274,7 @@ static BOOL test_error_msg ( int rc, const char *name ) * lpsRegName - registry entry name * lpsTestValue - value to test */ -static void _test_reg_key( LPCSTR subKey1, LPCSTR subKey2, LPCSTR valName1, LPCSTR valName2, LPCSTR testValue ) +static void _test_reg_key( LPCSTR subKey1, LPCSTR subKey2, LPCSTR valName1, LPCSTR valName2, LPCSTR testValue, BOOL optional ) { CHAR value[MAX_PATH]; DWORD valueLen; @@ -360,16 +360,21 @@ static void _test_reg_key( LPCSTR subKey1, LPCSTR subKey2, LPCSTR valName1, LPCS } } } - ok(found,"Missing registry values: %s or %s in keys: %s or %s\n", + ok(found || optional, + "Missing registry values: %s or %s in keys: %s or %s\n", valName1, (valName2?valName2:"<n/a>"), subKey1, (subKey2?subKey2:"<n/a>") ); } #define test_reg_key( subKey, valName, testValue ) \ - _test_reg_key( subKey, NULL, valName, NULL, testValue ) + _test_reg_key( subKey, NULL, valName, NULL, testValue, FALSE ) +#define test_reg_key_optional( subKey, valName, testValue ) \ + _test_reg_key( subKey, NULL, valName, NULL, testValue, TRUE ) #define test_reg_key_ex( subKey1, subKey2, valName, testValue ) \ - _test_reg_key( subKey1, subKey2, valName, NULL, testValue ) + _test_reg_key( subKey1, subKey2, valName, NULL, testValue, FALSE ) #define test_reg_key_ex2( subKey1, subKey2, valName1, valName2, testValue ) \ - _test_reg_key( subKey1, subKey2, valName1, valName2, testValue ) + _test_reg_key( subKey1, subKey2, valName1, valName2, testValue, FALSE ) +#define test_reg_key_ex2_optional( subKey1, subKey2, valName1, valName2, testValue ) \ + _test_reg_key( subKey1, subKey2, valName1, valName2, testValue, TRUE ) /* get a metric from the registry. If the value is negative * it is assumed to be in twips and converted to pixels */ @@ -1800,10 +1805,10 @@ static void test_SPI_SETWORKAREA( void ) /* 47 */ test_change_message( SPI_SETWORKAREA, 0); eq( area.left, curr_val.left, "left", "%d" ); eq( area.top, curr_val.top, "top", "%d" ); - /* size may be rounded up */ - ok( area.right >= curr_val.right && area.right < curr_val.right + 16, + /* size may be rounded */ + ok( area.right >= curr_val.right - 16 && area.right < curr_val.right + 16, "right: got %d instead of %d\n", area.right, curr_val.right ); - ok( area.bottom >= curr_val.bottom && area.bottom < curr_val.bottom + 16, + ok( area.bottom >= curr_val.bottom - 16 && area.bottom < curr_val.bottom + 16, "bottom: got %d instead of %d\n", area.bottom, curr_val.bottom ); curr_val = area; rc=SystemParametersInfoA( SPI_SETWORKAREA, 0, &old_area, @@ -1815,10 +1820,10 @@ static void test_SPI_SETWORKAREA( void ) /* 47 */ test_change_message( SPI_SETWORKAREA, 0 ); eq( area.left, old_area.left, "left", "%d" ); eq( area.top, old_area.top, "top", "%d" ); - /* size may be rounded up */ - ok( area.right >= old_area.right && area.right < old_area.right + 16, + /* size may be rounded */ + ok( area.right >= old_area.right - 16 && area.right < old_area.right + 16, "right: got %d instead of %d\n", area.right, old_area.right ); - ok( area.bottom >= old_area.bottom && area.bottom < old_area.bottom + 16, + ok( area.bottom >= old_area.bottom - 16 && area.bottom < old_area.bottom + 16, "bottom: got %d instead of %d\n", area.bottom, old_area.bottom ); } @@ -1917,9 +1922,9 @@ static void test_SPI_SETSCREENREADER( void ) /* 71 */ if (!test_error_msg(rc,"SPI_SETSCREENREADER")) return; ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); test_change_message( SPI_SETSCREENREADER, 1 ); - test_reg_key_ex2( SPI_SETSCREENREADER_REGKEY, SPI_SETSCREENREADER_REGKEY_LEGACY, - SPI_SETSCREENREADER_VALNAME, SPI_SETSCREENREADER_VALNAME_LEGACY, - vals[i] ? "1" : "0" ); + test_reg_key_ex2_optional( SPI_SETSCREENREADER_REGKEY, SPI_SETSCREENREADER_REGKEY_LEGACY, + SPI_SETSCREENREADER_VALNAME, SPI_SETSCREENREADER_VALNAME_LEGACY, + vals[i] ? "1" : "0" ); rc=SystemParametersInfoA( SPI_GETSCREENREADER, 0, &v, 0 ); ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); @@ -1988,14 +1993,16 @@ static void test_SPI_SETLOWPOWERACTIVE( void ) /* 85 */ if (!test_error_msg(rc,"SPI_SETLOWPOWERACTIVE")) return; ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); test_change_message( SPI_SETLOWPOWERACTIVE, 1 ); - test_reg_key( SPI_SETLOWPOWERACTIVE_REGKEY, - SPI_SETLOWPOWERACTIVE_VALNAME, - vals[i] ? "1" : "0" ); + test_reg_key_optional( SPI_SETLOWPOWERACTIVE_REGKEY, + SPI_SETLOWPOWERACTIVE_VALNAME, + vals[i] ? "1" : "0" ); /* SPI_SETLOWPOWERACTIVE is not persistent in win2k3 and above */ + v = 0xdeadbeef; rc=SystemParametersInfoA( SPI_GETLOWPOWERACTIVE, 0, &v, 0 ); ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); ok(v == vals[i] || + broken(v == (0xdead0000 | vals[i])) || /* win98 only sets the low word */ v == 0, /* win2k3 */ "SPI_GETLOWPOWERACTIVE: got %d instead of 0 or %d\n", v, vals[i]); } @@ -2026,14 +2033,16 @@ static void test_SPI_SETPOWEROFFACTIVE( void ) /* 86 */ if (!test_error_msg(rc,"SPI_SETPOWEROFFACTIVE")) return; ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); test_change_message( SPI_SETPOWEROFFACTIVE, 1 ); - test_reg_key( SPI_SETPOWEROFFACTIVE_REGKEY, - SPI_SETPOWEROFFACTIVE_VALNAME, - vals[i] ? "1" : "0" ); + test_reg_key_optional( SPI_SETPOWEROFFACTIVE_REGKEY, + SPI_SETPOWEROFFACTIVE_VALNAME, + vals[i] ? "1" : "0" ); /* SPI_SETPOWEROFFACTIVE is not persistent in win2k3 and above */ + v = 0xdeadbeef; rc=SystemParametersInfoA( SPI_GETPOWEROFFACTIVE, 0, &v, 0 ); ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); ok(v == vals[i] || + broken(v == (0xdead0000 | vals[i])) || /* win98 only sets the low word */ v == 0, /* win2k3 */ "SPI_GETPOWEROFFACTIVE: got %d instead of 0 or %d\n", v, vals[i]); } @@ -2064,9 +2073,9 @@ static void test_SPI_SETSNAPTODEFBUTTON( void ) /* 95 */ if (!test_error_msg(rc,"SPI_SETSNAPTODEFBUTTON")) return; ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); test_change_message( SPI_SETSNAPTODEFBUTTON, 0 ); - test_reg_key( SPI_SETSNAPTODEFBUTTON_REGKEY, - SPI_SETSNAPTODEFBUTTON_VALNAME, - vals[i] ? "1" : "0" ); + test_reg_key_optional( SPI_SETSNAPTODEFBUTTON_REGKEY, + SPI_SETSNAPTODEFBUTTON_VALNAME, + vals[i] ? "1" : "0" ); rc=SystemParametersInfoA( SPI_GETSNAPTODEFBUTTON, 0, &v, 0 ); ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError());

1 0

Alexandre Julliard : user32/tests: Remove tests for internal DDE handle format, we don' t care how the handles are implemented.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 750fcebadbf9e27137dcf21ed2de022feb081a64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=750fcebadbf9e27137dcf21ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 14:39:48 2009 +0200 user32/tests: Remove tests for internal DDE handle format, we don't care how the handles are implemented. --- dlls/user32/tests/dde.c | 36 ------------------------------------ 1 files changed, 0 insertions(+), 36 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 840406e..6625837 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1615,12 +1615,6 @@ static void test_DdeCreateDataHandle(void) ok(hdata != NULL, "Expected non-NULL hdata\n"); ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); - ptr = GlobalLock(hdata); - todo_wine - { - ok(ptr == NULL, "Expected NULL, got %p\n", ptr); - } - ptr = DdeAccessData(hdata, &size); ok(ptr != NULL, "Expected non-NULL ptr\n"); ok(size == 260, "Expected 260, got %d\n", size); @@ -1638,12 +1632,6 @@ static void test_DdeCreateDataHandle(void) ok(hdata != NULL, "Expected non-NULL hdata\n"); ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); - ptr = GlobalLock(hdata); - todo_wine - { - ok(ptr == NULL, "Expected NULL, got %p\n", ptr); - } - ptr = DdeAccessData(hdata, &size); ok(ptr != NULL, "Expected non-NULL ptr\n"); ok(size == 0, "Expected 0, got %d\n", size); @@ -1661,12 +1649,6 @@ static void test_DdeCreateDataHandle(void) ok(hdata != NULL, "Expected non-NULL hdata\n"); ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); - ptr = GlobalLock(hdata); - todo_wine - { - ok(ptr == NULL, "Expected NULL, got %p\n", ptr); - } - ptr = DdeAccessData(hdata, &size); ok(ptr != NULL, "Expected non-NULL ptr\n"); ok(size == 262, "Expected 262, got %d\n", size); @@ -1688,12 +1670,6 @@ static void test_DdeCreateDataHandle(void) ok(hdata != NULL, "Expected non-NULL hdata\n"); ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); - ptr = GlobalLock(hdata); - todo_wine - { - ok(ptr == NULL, "Expected NULL, got %p\n", ptr); - } - ptr = DdeAccessData(hdata, &size); ok(ptr != NULL, "Expected non-NULL ptr\n"); ok(!lstrcmpA((LPSTR)ptr, "data"), "Expected data, got %s\n", ptr); @@ -1712,12 +1688,6 @@ static void test_DdeCreateDataHandle(void) ok(hdata != NULL, "Expected non-NULL hdata\n"); ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); - ptr = GlobalLock(hdata); - todo_wine - { - ok(ptr == NULL, "Expected NULL, got %p\n", ptr); - } - ptr = DdeAccessData(hdata, &size); ok(ptr != NULL, "Expected non-NULL ptr\n"); ok(!lstrcmpA((LPSTR)ptr, "data"), "Expected data, got %s\n", ptr); @@ -1736,12 +1706,6 @@ static void test_DdeCreateDataHandle(void) ok(hdata != NULL, "Expected non-NULL hdata\n"); ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); - ptr = GlobalLock(hdata); - todo_wine - { - ok(ptr == NULL, "Expected NULL, got %p\n", ptr); - } - ptr = DdeAccessData(hdata, &size); ok(ptr != NULL, "Expected non-NULL ptr\n"); ok(!lstrcmpA((LPSTR)ptr, "data"), "Expected data, got %s\n", ptr);

1 0

Alexandre Julliard : rpcrt4/tests: Fix a few more broken tests on NT4.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 2c1b94bde2722b8592f9c5b23ae2f1eaf72964a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c1b94bde2722b8592f9c5b23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 14:36:10 2009 +0200 rpcrt4/tests: Fix a few more broken tests on NT4. --- dlls/rpcrt4/tests/ndr_marshall.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index a4f8bb4..c48f7de 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1444,7 +1444,8 @@ static void test_conformant_array(void) mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; NdrConformantArrayUnmarshall( &StubMsg, &mem, fmtstr_conf_array, 0); - ok(mem == StubMsg.BufferStart + 4, "mem not pointing at buffer\n"); + ok(mem == StubMsg.BufferStart + 4 || broken(!mem), /* win9x, nt4 */ + "mem not pointing at buffer %p/%p\n", mem, StubMsg.BufferStart + 4); ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); my_alloc_called = 0; mem = NULL; @@ -1493,6 +1494,7 @@ static void test_conformant_string(void) StubDesc = Object_StubDesc; StubDesc.pFormatTypes = fmtstr_conf_str; + memset( &StubMsg, 0, sizeof(StubMsg) ); /* needed on win9x and nt4 */ NdrClientInitializeNew( &RpcMessage, &StubMsg, @@ -1553,7 +1555,8 @@ todo_wine { mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; NdrPointerUnmarshall( &StubMsg, &mem, fmtstr_conf_str, 0); - ok(mem == StubMsg.BufferStart + 12, "mem not pointing at buffer\n"); + ok(mem == StubMsg.BufferStart + 12 || broken(!mem), /* win9x, nt4 */ + "mem not pointing at buffer %p/%p\n", mem, StubMsg.BufferStart + 12 ); ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); my_alloc_called = 0; @@ -1561,7 +1564,8 @@ todo_wine { StubMsg.Buffer = StubMsg.BufferStart; NdrPointerUnmarshall( &StubMsg, &mem, fmtstr_conf_str, 1); todo_wine { - ok(mem == StubMsg.BufferStart + 12, "mem not pointing at buffer\n"); + ok(mem == StubMsg.BufferStart + 12 || broken(!mem), /* win9x, nt4 */ + "mem not pointing at buffer %p/%p\n", mem, StubMsg.BufferStart + 12 ); ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); } @@ -1569,7 +1573,8 @@ todo_wine { mem = mem_orig; StubMsg.Buffer = StubMsg.BufferStart; NdrPointerUnmarshall( &StubMsg, &mem, fmtstr_conf_str, 0); - ok(mem == StubMsg.BufferStart + 12, "mem not pointing at buffer\n"); + ok(mem == StubMsg.BufferStart + 12 || broken(!mem), /* win9x, nt4 */ + "mem not pointing at buffer %p/%p\n", mem, StubMsg.BufferStart + 12 ); ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); my_alloc_called = 0; @@ -1577,7 +1582,8 @@ todo_wine { StubMsg.Buffer = StubMsg.BufferStart; NdrPointerUnmarshall( &StubMsg, &mem, fmtstr_conf_str, 1); todo_wine { - ok(mem == StubMsg.BufferStart + 12, "mem not pointing at buffer\n"); + ok(mem == StubMsg.BufferStart + 12 || broken(!mem), /* win9x, nt4 */ + "mem not pointing at buffer %p/%p\n", mem, StubMsg.BufferStart + 12 ); ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); }

1 0

Aurimas Fišeras : winedbg: Add Lithuanian translation.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: fca0d3c5cf19c3552227d5487068f87cc7efd545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca0d3c5cf19c3552227d5487… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun May 31 20:18:28 2009 +0300 winedbg: Add Lithuanian translation. --- programs/winedbg/rsrc.rc | 1 + programs/winedbg/rsrc_Lt.rc | 58 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/rsrc.rc b/programs/winedbg/rsrc.rc index 9963bbf..745ab61 100644 --- a/programs/winedbg/rsrc.rc +++ b/programs/winedbg/rsrc.rc @@ -25,5 +25,6 @@ #include "rsrc_En.rc" #include "rsrc_Ko.rc" +#include "rsrc_Lt.rc" #include "rsrc_Nl.rc" #include "rsrc_Ru.rc" diff --git a/programs/winedbg/rsrc_Lt.rc b/programs/winedbg/rsrc_Lt.rc new file mode 100644 index 0000000..7b49d8d --- /dev/null +++ b/programs/winedbg/rsrc_Lt.rc @@ -0,0 +1,58 @@ +/* + * Lithuanian Language Support + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Derinti", ID_DEBUG + END +END + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Programos klaida" +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "Programa %s susidūrė su rimta problema ir turi \ + būti uždaryta. Atsiprašome dėl nepatogumų.", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "Programos problemos ar Wine trūkumai gali būti to priežastimi. \ + Jūs turbūt norėsite patikrinti http://appdb.winehq.org dėl patarimų apie šios \ + programos vykdymą.\n\n\ + Jei šios problemos nėra Windows sistemoje ir apie ją dar nebuvo pranešta, \ + galite pranešti http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "Užverti", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "Wine programos strigtis" + IDS_INVALID_PARAMS "Vidinės klaidos - gauti neteisingi parametrai" + IDS_UNIDENTIFIED "(nenustatytas)" +END + +#pragma code_page(default)

1 0

Detlef Riekenberg : mlang: Avoid unneeded HeapReAlloc.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 722bc5a864339eba58c454144b85937ec4246b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=722bc5a864339eba58c454144… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat May 30 00:29:53 2009 +0200 mlang: Avoid unneeded HeapReAlloc. Our current code enumerates 145 Rfc1766 entries, so use a more resonable start value. --- dlls/mlang/mlang.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 733aac9..4d2f7be 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2490,7 +2490,7 @@ static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum) rfc->total = 0; data.total = 0; - data.allocated = 32; + data.allocated = 160; data.info = HeapAlloc(GetProcessHeap(), 0, data.allocated * sizeof(RFC1766INFO)); if (!data.info) {

1 0

Detlef Riekenberg : mlang/tests: Add tests for LcidToRfc1766.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 6eec51179819217137365ef5190698a71416bacf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eec51179819217137365ef51… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 29 23:51:23 2009 +0200 mlang/tests: Add tests for LcidToRfc1766. --- dlls/mlang/mlang.c | 5 +++ dlls/mlang/tests/mlang.c | 84 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 87 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 501ccfc..733aac9 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -4,6 +4,7 @@ * Copyright 2002 Lionel Ulmer * Copyright 2003,2004 Mike McCormack * Copyright 2004,2005 Dmitry Timoshkov + * Copyright 2009 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1195,6 +1196,8 @@ HRESULT WINAPI LcidToRfc1766A( INT nChar) { TRACE("%04x %p %u\n", lcid, pszRfc1766, nChar); + if (!pszRfc1766) + return E_INVALIDARG; return lcid_to_rfc1766A(lcid, pszRfc1766, nChar); } @@ -1205,6 +1208,8 @@ HRESULT WINAPI LcidToRfc1766W( INT nChar) { TRACE("%04x %p %u\n", lcid, pszRfc1766, nChar); + if (!pszRfc1766) + return E_INVALIDARG; return lcid_to_rfc1766W(lcid, pszRfc1766, nChar); } diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 829af24..d646d39 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2,6 +2,7 @@ * Unit test suite for MLANG APIs. * * Copyright 2004 Dmitry Timoshkov + * Copyright 2009 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -54,18 +55,48 @@ typedef struct lcid_tag_table { HRESULT hr; } lcid_table_entry; +/* en, ar and zh use SUBLANG_NEUTRAL for the rfc1766 name without the country + all others suppress the country with SUBLANG_DEFAULT. + For 3 letter language codes, the rfc1766 is to small for the country */ + static const lcid_table_entry lcid_table[] = { {"e", -1, E_FAIL}, {"", -1, E_FAIL}, {"-", -1, E_FAIL}, {"e-", -1, E_FAIL}, - {"en", 9, S_OK}, /* only en is special (using PRIMARYLANGID) */ + {"ar", 1, S_OK}, + {"zh", 4, S_OK}, + + {"de", 0x0407, S_OK}, + {"de-ch", 0x0807, S_OK}, + {"de-at", 0x0c07, S_OK}, + {"de-lu", 0x1007, S_OK}, + {"de-li", 0x1407, S_OK}, + + {"en", 9, S_OK}, {"en-gb", 0x809, S_OK}, {"en-GB", 0x809, S_OK}, {"EN-GB", 0x809, S_OK}, {"en-US", 0x409, S_OK}, - {"en-us", 0x409, S_OK} + {"en-us", 0x409, S_OK}, + + {"fr", 0x040c, S_OK}, + {"fr-be", 0x080c, S_OK}, + {"fr-ca", 0x0c0c, S_OK}, + {"fr-ch", 0x100c, S_OK}, + {"fr-lu", 0x140c, S_OK}, + {"fr-mc", 0x180c, S_OK}, + + {"it", 0x0410, S_OK}, + {"it-ch", 0x0810, S_OK}, + + {"nl", 0x0413, S_OK}, + {"nl-be", 0x0813, S_OK}, + {"pl", 0x0415, S_OK}, + {"ru", 0x0419, S_OK}, + + {"kok", 0x0457, S_OK} }; @@ -971,6 +1002,54 @@ static void test_GetRfc1766FromLcid(IMultiLanguage2 *iML2) ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); } +static void test_LcidToRfc1766(void) +{ + CHAR expected[MAX_RFC1766_NAME]; + CHAR buffer[MAX_RFC1766_NAME * 2]; + HRESULT hr; + DWORD i; + + for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { + + memset(buffer, '#', sizeof(buffer)-1); + buffer[sizeof(buffer)-1] = '\0'; + + hr = LcidToRfc1766A(lcid_table[i].lcid, buffer, MAX_RFC1766_NAME); + + ok(hr == lcid_table[i].hr, + "#%02d: HRESULT 0x%x (expected 0x%x)\n", i, hr, lcid_table[i].hr); + + if (hr != S_OK) + continue; + + LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, lcid_table[i].rfc1766, + lstrlenA(lcid_table[i].rfc1766) + 1, expected, MAX_RFC1766_NAME); + + ok(!lstrcmpA(buffer, expected), + "#%02d: got '%s' (expected '%s')\n", i, buffer, expected); + + } + + memset(buffer, '#', sizeof(buffer)-1); + buffer[sizeof(buffer)-1] = '\0'; + hr = LcidToRfc1766A(-1, buffer, MAX_RFC1766_NAME); + ok(hr == E_FAIL, "got 0x%08x and '%s' (expected E_FAIL)\n", hr, buffer); + + hr = LcidToRfc1766A(LANG_ENGLISH, NULL, MAX_RFC1766_NAME); + ok(hr == E_INVALIDARG, "got 0x%08x (expected E_INVALIDARG)\n", hr); + + memset(buffer, '#', sizeof(buffer)-1); + buffer[sizeof(buffer)-1] = '\0'; + hr = LcidToRfc1766A(LANG_ENGLISH, buffer, -1); + ok(hr == E_INVALIDARG, "got 0x%08x and '%s' (expected E_INVALIDARG)\n", hr, buffer); + + memset(buffer, '#', sizeof(buffer)-1); + buffer[sizeof(buffer)-1] = '\0'; + hr = LcidToRfc1766A(LANG_ENGLISH, buffer, 0); + ok(hr == E_INVALIDARG, "got 0x%08x and '%s' (expected E_INVALIDARG)\n", hr, buffer); + +} + static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2) { CHAR dest[MAX_PATH]; @@ -1533,6 +1612,7 @@ START_TEST(mlang) CoInitialize(NULL); test_Rfc1766ToLcid(); + test_LcidToRfc1766(); ret = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, &IID_IMultiLanguage2, (void **)&iML2);

1 0

Detlef Riekenberg : mlang: Check output pointer for NULL.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 68e1735acf8c5ae8ad9cfeedcd8690b88d9a0b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e1735acf8c5ae8ad9cfeedc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 29 23:31:44 2009 +0200 mlang: Check output pointer for NULL. --- dlls/mlang/mlang.c | 4 ++++ dlls/mlang/tests/mlang.c | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 4144ef5..501ccfc 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2257,6 +2257,8 @@ static HRESULT WINAPI fnIMultiLanguage_GetRfc1766FromLcid( WCHAR buf[MAX_RFC1766_NAME]; TRACE("%p %04x %p\n", iface, lcid, pbstrRfc1766); + if (!pbstrRfc1766) + return E_INVALIDARG; if (!lcid_to_rfc1766W( lcid, buf, MAX_RFC1766_NAME )) { @@ -2812,6 +2814,8 @@ static HRESULT WINAPI fnIMultiLanguage2_GetRfc1766FromLcid( WCHAR buf[MAX_RFC1766_NAME]; TRACE("%p %04x %p\n", iface, lcid, pbstrRfc1766); + if (!pbstrRfc1766) + return E_INVALIDARG; if (!lcid_to_rfc1766W( lcid, buf, MAX_RFC1766_NAME )) { diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index bf21146..829af24 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -966,6 +966,9 @@ static void test_GetRfc1766FromLcid(IMultiLanguage2 *iML2) SysFreeString(rfcstr); } + + hr = IMultiLanguage2_GetRfc1766FromLcid(iML2, MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), NULL); + ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); } static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2)

1 0

Detlef Riekenberg : mlang: Suppress country data in rfc1766, with tests.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 596f8d67a0d63375dddaf393210afeaad6685fd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=596f8d67a0d63375dddaf3932… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 29 23:24:30 2009 +0200 mlang: Suppress country data in rfc1766, with tests. --- dlls/mlang/mlang.c | 51 ++++++++++++++++++++++++++++++++++----------- dlls/mlang/tests/mlang.c | 33 +++++++++++++++++------------ 2 files changed, 57 insertions(+), 27 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index bac4e48..4144ef5 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1137,29 +1137,54 @@ HRESULT WINAPI IsConvertINetStringAvailable( static inline HRESULT lcid_to_rfc1766A( LCID lcid, LPSTR rfc1766, INT len ) { - INT n = GetLocaleInfoA( lcid, LOCALE_SISO639LANGNAME, rfc1766, len ); + CHAR buffer[MAX_RFC1766_NAME]; + INT n = GetLocaleInfoA(lcid, LOCALE_SISO639LANGNAME, buffer, MAX_RFC1766_NAME); + INT i; + if (n) { - rfc1766[n - 1] = '-'; - n += GetLocaleInfoA( lcid, LOCALE_SISO3166CTRYNAME, rfc1766 + n, len - n ); - LCMapStringA( LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, rfc1766, n, rfc1766, len ); - return S_OK; + i = PRIMARYLANGID(lcid); + if ((((i == LANG_ENGLISH) || (i == LANG_CHINESE) || (i == LANG_ARABIC)) && + (SUBLANGID(lcid) == SUBLANG_DEFAULT)) || + (SUBLANGID(lcid) > SUBLANG_DEFAULT)) { + + buffer[n - 1] = '-'; + i = GetLocaleInfoA(lcid, LOCALE_SISO3166CTRYNAME, buffer + n, MAX_RFC1766_NAME - n); + if (!i) + buffer[n - 1] = '\0'; + } + else + i = 0; + + LCMapStringA( LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, buffer, n + i, rfc1766, len ); + return ((n + i) > len) ? E_INVALIDARG : S_OK; } return E_FAIL; } static inline HRESULT lcid_to_rfc1766W( LCID lcid, LPWSTR rfc1766, INT len ) { - INT n = GetLocaleInfoW( lcid, LOCALE_SISO639LANGNAME, rfc1766, len ); - INT save = n; + WCHAR buffer[MAX_RFC1766_NAME]; + INT n = GetLocaleInfoW(lcid, LOCALE_SISO639LANGNAME, buffer, MAX_RFC1766_NAME); + INT i; + if (n) { - rfc1766[n - 1] = '-'; - n += GetLocaleInfoW( lcid, LOCALE_SISO3166CTRYNAME, rfc1766 + n, len - n ); - if (n == save) - rfc1766[n - 1] = '\0'; - LCMapStringW( LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, rfc1766, n, rfc1766, len ); - return S_OK; + i = PRIMARYLANGID(lcid); + if ((((i == LANG_ENGLISH) || (i == LANG_CHINESE) || (i == LANG_ARABIC)) && + (SUBLANGID(lcid) == SUBLANG_DEFAULT)) || + (SUBLANGID(lcid) > SUBLANG_DEFAULT)) { + + buffer[n - 1] = '-'; + i = GetLocaleInfoW(lcid, LOCALE_SISO3166CTRYNAME, buffer + n, MAX_RFC1766_NAME - n); + if (!i) + buffer[n - 1] = '\0'; + } + else + i = 0; + + LCMapStringW(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, buffer, n + i, rfc1766, len); + return ((n + i) > len) ? E_INVALIDARG : S_OK; } return E_FAIL; } diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 2ae7c74..bf21146 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -940,25 +940,30 @@ static void test_Rfc1766ToLcid(void) static void test_GetRfc1766FromLcid(IMultiLanguage2 *iML2) { + CHAR expected[MAX_RFC1766_NAME]; + CHAR buffer[MAX_RFC1766_NAME + 1]; + DWORD i; HRESULT hr; BSTR rfcstr; - LCID lcid; - static WCHAR kok[] = {'k','o','k',0}; + for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { + buffer[0] = '\0'; - hr = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, kok); - /* - * S_FALSE happens when 'kok' instead matches to a different Rfc1766 name - * for example 'ko' so it is not a failure but does not give us what - * we are looking for - */ - if (hr != S_FALSE) - { - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + rfcstr = NULL; + hr = IMultiLanguage2_GetRfc1766FromLcid(iML2, lcid_table[i].lcid, &rfcstr); + ok(hr == lcid_table[i].hr, + "#%02d: HRESULT 0x%x (expected 0x%x)\n", i, hr, lcid_table[i].hr); + + if (hr != S_OK) + continue; /* no result-string created */ + + WideCharToMultiByte(CP_ACP, 0, rfcstr, -1, buffer, sizeof(buffer), NULL, NULL); + LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, lcid_table[i].rfc1766, + lstrlenA(lcid_table[i].rfc1766) + 1, expected, MAX_RFC1766_NAME); + + ok(!lstrcmpA(buffer, expected), + "#%02d: got '%s' (expected '%s')\n", i, buffer, expected); - hr = IMultiLanguage2_GetRfc1766FromLcid(iML2, lcid, &rfcstr); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"n", kok, rfcstr); SysFreeString(rfcstr); } }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009