June 2009 - Wine-Commits - list.winehq.org

Aurimas Fišeras : winedbg: Add Lithuanian translation.
by Alexandre Julliard June 1, 2009

June 1, 2009

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: Check output pointer for NULL.
by Alexandre Julliard June 1, 2009

June 1, 2009

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

Gerald Pfeifer : msxml3: Tweak two assertions.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: 875f0c2470c862bba1d54ff9bf0b337989ded830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=875f0c2470c862bba1d54ff9b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 31 23:51:44 2009 +0200 msxml3: Tweak two assertions. --- dlls/msxml3/node.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index f33f6f8..19fa4c5 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -369,8 +369,8 @@ static HRESULT WINAPI xmlnode_get_nodeType( TRACE("%p %p\n", This, type); - assert( NODE_ELEMENT == XML_ELEMENT_NODE ); - assert( NODE_NOTATION == XML_NOTATION_NODE ); + assert( (int)NODE_ELEMENT == (int)XML_ELEMENT_NODE ); + assert( (int)NODE_NOTATION == (int)XML_NOTATION_NODE ); *type = This->node->type;

1 0

Eric Pouech : winhlp32: Correctly set the window' s title when no window information is present.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: d67df82636ac5897ba908193b76e6a0f33c9b716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d67df82636ac5897ba908193b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 31 21:13:59 2009 +0200 winhlp32: Correctly set the window's title when no window information is present. --- programs/winhlp32/winhelp.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 027bf65..a0177ee 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -274,7 +274,15 @@ HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name) { strcpy(mwi.type, "primary"); strcpy(mwi.name, "main"); - LoadString(Globals.hInstance, STID_WINE_HELP, mwi.caption, sizeof(mwi.caption)); + if (hlpfile->lpszTitle[0]) + { + char tmp[128]; + LoadString(Globals.hInstance, STID_WINE_HELP, tmp, sizeof(tmp)); + snprintf(mwi.caption, sizeof(mwi.caption), "%s %s - %s", + hlpfile->lpszTitle, tmp, hlpfile->lpszPath); + } + else + LoadString(Globals.hInstance, STID_WINE_HELP, mwi.caption, sizeof(mwi.caption)); mwi.origin.x = mwi.origin.y = mwi.size.cx = mwi.size.cy = CW_USEDEFAULT; mwi.style = SW_SHOW; mwi.win_style = WS_OVERLAPPEDWINDOW;

1 0

Eric Pouech : winhlp32: Fix typo in color init.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: a105f924f4c82c4c0eb292b01eb69e850647bc91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a105f924f4c82c4c0eb292b01… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 31 21:14:17 2009 +0200 winhlp32: Fix typo in color init. --- programs/winhlp32/winhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index a0177ee..1639c14 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -286,7 +286,7 @@ HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name) mwi.origin.x = mwi.origin.y = mwi.size.cx = mwi.size.cy = CW_USEDEFAULT; mwi.style = SW_SHOW; mwi.win_style = WS_OVERLAPPEDWINDOW; - mwi.sr_color = mwi.sr_color = 0xFFFFFF; + mwi.sr_color = mwi.nsr_color = 0xFFFFFF; } return &mwi; }

1 0

Detlef Riekenberg : mlang/tests: Add tests for LcidToRfc1766.
by Alexandre Julliard June 1, 2009

June 1, 2009

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

Eric Pouech : winhlp32: NoShow macro has NS as shortcut.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: ae20d4708b43264559bd693b4ac9c64bb909c5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae20d4708b43264559bd693b4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat May 30 14:26:27 2009 +0200 winhlp32: NoShow macro has NS as shortcut. --- programs/winhlp32/macro.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index 9e6e5f8..276d89c 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -911,7 +911,7 @@ static struct MacroDesc MACRO_Builtins[] = { {"MPrintHash", NULL, 0, "U", (FARPROC)MACRO_MPrintHash}, {"MPrintID", NULL, 0, "S", (FARPROC)MACRO_MPrintID}, {"Next", NULL, 0, "", (FARPROC)MACRO_Next}, - {"NoShow", NULL, 0, "", (FARPROC)MACRO_NoShow}, + {"NoShow", "NS", 0, "", (FARPROC)MACRO_NoShow}, {"PopupContext", "PC", 0, "SU", (FARPROC)MACRO_PopupContext}, {"PopupHash", NULL, 0, "SU", (FARPROC)MACRO_PopupHash}, {"PopupId", "PI", 0, "SS", (FARPROC)MACRO_PopupId},

1 0

Eric Pouech : winhlp32: Window name lookup is supposed to be insensitive.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: a6104304f43129cf753756a26216180cae4d3124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6104304f43129cf753756a26… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat May 30 14:26:52 2009 +0200 winhlp32: Window name lookup is supposed to be insensitive. --- programs/winhlp32/winhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 9c69d48..e361335 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -261,7 +261,7 @@ HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name) if (hlpfile) for (i = 0; i < hlpfile->numWindows; i++) - if (!strcmp(hlpfile->windows[i].name, name)) + if (!lstrcmpi(hlpfile->windows[i].name, name)) return &hlpfile->windows[i]; if (strcmp(name, "main") != 0)

1 0

Eric Pouech : winhlp32: Use current file when no file is specified in JumpHash.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: aba7b3df90a33fc032f6066338862d0082c9ef89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba7b3df90a33fc032f606633… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat May 30 14:26:46 2009 +0200 winhlp32: Use current file when no file is specified in JumpHash. --- programs/winhlp32/macro.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index c2318ce..9a7f3fd 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -535,7 +535,10 @@ void CALLBACK MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash) HLPFILE* hlpfile; WINE_TRACE("(\"%s\", \"%s\", %u)\n", lpszPath, lpszWindow, lHash); - hlpfile = WINHELP_LookupHelpFile(lpszPath); + if (!lpszPath || !lpszPath[0]) + hlpfile = MACRO_CurrentWindow()->page->file; + else + hlpfile = WINHELP_LookupHelpFile(lpszPath); WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, lHash, WINHELP_GetWindowInfo(hlpfile, lpszWindow), SW_NORMAL);

1 0

Stefan Leichter : kernel32: Fix spec of QueryFullProcessImageNameW.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: d56839f64ec7774bcc3f38c60efd0af205499b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56839f64ec7774bcc3f38c60… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun May 31 19:52:33 2009 +0200 kernel32: Fix spec of QueryFullProcessImageNameW. --- dlls/kernel32/kernel32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a73ea1b..b555621 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -866,7 +866,7 @@ @ stdcall QueryDosDeviceA(str ptr long) @ stdcall QueryDosDeviceW(wstr ptr long) @ stub QueryFullProcessImageNameA -@ stdcall QueryFullProcessImageNameW(ptr long wstr ptr) +@ stdcall QueryFullProcessImageNameW(ptr long ptr ptr) @ stdcall QueryInformationJobObject(long long ptr long ptr) # @ stub QueryMemoryResourceNotification @ stub QueryNumberOfEventLogRecords

1 0