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

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

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/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: 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

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

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

Eric Pouech : winhlp32: NoShow macro has NS as shortcut.
by Alexandre Julliard 01 Jun '09

01 Jun '09

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: Force the handling of a current help window while processing a macro.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 042bbf9a412009ec848a9ff966955a3961a49ed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=042bbf9a412009ec848a9ff96… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat May 30 14:26:33 2009 +0200 winhlp32: Force the handling of a current help window while processing a macro. --- programs/winhlp32/macro.c | 5 +++-- programs/winhlp32/macro.h | 6 ++++-- programs/winhlp32/macro.lex.l | 16 ++++++++++++++-- programs/winhlp32/winhelp.c | 8 ++++---- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index 276d89c..92a1abd 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -473,12 +473,13 @@ void CALLBACK MACRO_History(void) static void CALLBACK MACRO_IfThen(BOOL b, LPCSTR t) { - if (b) MACRO_ExecuteMacro(t); + if (b) MACRO_ExecuteMacro(MACRO_CurrentWindow(), t); } static void CALLBACK MACRO_IfThenElse(BOOL b, LPCSTR t, LPCSTR f) { - if (b) MACRO_ExecuteMacro(t); else MACRO_ExecuteMacro(f); + if (b) MACRO_ExecuteMacro(MACRO_CurrentWindow(), t); + else MACRO_ExecuteMacro(MACRO_CurrentWindow(), f); } static BOOL CALLBACK MACRO_InitMPrint(void) diff --git a/programs/winhlp32/macro.h b/programs/winhlp32/macro.h index 8b15719..910782d 100644 --- a/programs/winhlp32/macro.h +++ b/programs/winhlp32/macro.h @@ -33,9 +33,11 @@ struct lexret { }; extern struct lexret yylval; +struct tagWinHelp; -BOOL MACRO_ExecuteMacro(LPCSTR); -int MACRO_Lookup(const char* name, struct lexret* lr); +BOOL MACRO_ExecuteMacro(struct tagWinHelp*, LPCSTR); +int MACRO_Lookup(const char* name, struct lexret* lr); +struct tagWinHelp* MACRO_CurrentWindow(void); enum token_types {EMPTY, VOID_FUNCTION, BOOL_FUNCTION, INTEGER, STRING, IDENTIFIER}; void CALLBACK MACRO_About(void); diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l index 4442473..bf65fa0 100644 --- a/programs/winhlp32/macro.lex.l +++ b/programs/winhlp32/macro.lex.l @@ -25,12 +25,17 @@ %{ #include "config.h" #include <assert.h> +#include <stdarg.h> #ifndef HAVE_UNISTD_H #define YY_NO_UNISTD_H #endif -#include "macro.h" +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winhelp.h" #include "wine/debug.h" @@ -43,6 +48,7 @@ struct lex_data { unsigned quote_stk_idx; LPSTR cache_string[32]; int cache_used; + WINHELP_WINDOW* window; }; static struct lex_data* lex_data = NULL; @@ -266,7 +272,7 @@ static int MACRO_CallVoidFunc(FARPROC fn, const char* args) return 1; } -BOOL MACRO_ExecuteMacro(LPCSTR macro) +BOOL MACRO_ExecuteMacro(WINHELP_WINDOW* window, LPCSTR macro) { struct lex_data curr_lex_data, *prev_lex_data; BOOL ret = TRUE; @@ -279,6 +285,7 @@ BOOL MACRO_ExecuteMacro(LPCSTR macro) memset(lex_data, 0, sizeof(*lex_data)); lex_data->macroptr = macro; + lex_data->window = window; while ((t = yylex()) != EMPTY) { @@ -313,6 +320,11 @@ done: return ret; } +WINHELP_WINDOW* MACRO_CurrentWindow(void) +{ + return lex_data ? lex_data->window : Globals.active_win; +} + #ifndef yywrap int yywrap(void) { return 1; } #endif diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 7f74d8b..9c69d48 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -772,10 +772,10 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe { HLPFILE_MACRO *macro; for (macro = wpage->page->file->first_macro; macro; macro = macro->next) - MACRO_ExecuteMacro(macro->lpszMacro); + MACRO_ExecuteMacro(win, macro->lpszMacro); for (macro = wpage->page->first_macro; macro; macro = macro->next) - MACRO_ExecuteMacro(macro->lpszMacro); + MACRO_ExecuteMacro(win, macro->lpszMacro); } if (bPopup) @@ -870,7 +870,7 @@ static BOOL WINHELP_HandleTextMouse(WINHELP_WINDOW* win, UINT msg, LPARAM lParam SW_NORMAL); break; case hlp_link_macro: - MACRO_ExecuteMacro(link->string); + MACRO_ExecuteMacro(win, link->string); break; default: WINE_FIXME("Unknown link cookie %d\n", link->cookie); @@ -1368,7 +1368,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, for (button = win->first_button; button; button = button->next) if (wParam == button->wParam) break; if (button) - MACRO_ExecuteMacro(button->lpszMacro); + MACRO_ExecuteMacro(win, button->lpszMacro); else if (!HIWORD(wParam)) MessageBox(0, MAKEINTRESOURCE(STID_NOT_IMPLEMENTED), MAKEINTRESOURCE(STID_WHERROR), MB_OK);

1 0

Eric Pouech : winhlp32: Make use of the hlpfile for the running macro to handle correctly some macro implementations .
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 29f865c5c1dcb1d3061c275a6eb078829a9b9b31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29f865c5c1dcb1d3061c275a6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat May 30 14:26:39 2009 +0200 winhlp32: Make use of the hlpfile for the running macro to handle correctly some macro implementations. --- programs/winhlp32/macro.c | 48 +++++++++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 21 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index 92a1abd..c2318ce 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -68,7 +68,7 @@ static WINHELP_BUTTON** MACRO_LookupButton(WINHELP_WINDOW* win, LPCSTR na void CALLBACK MACRO_CreateButton(LPCSTR id, LPCSTR name, LPCSTR macro) { - WINHELP_WINDOW *win = Globals.active_win; + WINHELP_WINDOW *win = MACRO_CurrentWindow(); WINHELP_BUTTON *button, **b; LONG size; LPSTR ptr; @@ -115,7 +115,7 @@ void CALLBACK MACRO_DisableButton(LPCSTR id) WINE_TRACE("(\"%s\")\n", id); - b = MACRO_LookupButton(Globals.active_win, id); + b = MACRO_LookupButton(MACRO_CurrentWindow(), id); if (!*b) {WINE_FIXME("Couldn't find button '%s'\n", id); return;} EnableWindow((*b)->hWnd, FALSE); @@ -127,7 +127,7 @@ static void CALLBACK MACRO_EnableButton(LPCSTR id) WINE_TRACE("(\"%s\")\n", id); - b = MACRO_LookupButton(Globals.active_win, id); + b = MACRO_LookupButton(MACRO_CurrentWindow(), id); if (!*b) {WINE_FIXME("Couldn't find button '%s'\n", id); return;} EnableWindow((*b)->hWnd, TRUE); @@ -172,7 +172,7 @@ static void CALLBACK MACRO_AppendItem(LPCSTR str1, LPCSTR str2, LPCSTR str3, LPC static void CALLBACK MACRO_Back(void) { - WINHELP_WINDOW* win = Globals.active_win; + WINHELP_WINDOW* win = MACRO_CurrentWindow(); WINE_TRACE("()\n"); @@ -182,7 +182,7 @@ static void CALLBACK MACRO_Back(void) static void CALLBACK MACRO_BackFlush(void) { - WINHELP_WINDOW* win = Globals.active_win; + WINHELP_WINDOW* win = MACRO_CurrentWindow(); WINE_TRACE("()\n"); @@ -201,7 +201,7 @@ static void CALLBACK MACRO_BookmarkMore(void) static void CALLBACK MACRO_BrowseButtons(void) { - HLPFILE_PAGE* page = Globals.active_win->page; + HLPFILE_PAGE* page = MACRO_CurrentWindow()->page; ULONG relative; WINE_TRACE("()\n"); @@ -217,7 +217,7 @@ static void CALLBACK MACRO_BrowseButtons(void) static void CALLBACK MACRO_ChangeButtonBinding(LPCSTR id, LPCSTR macro) { - WINHELP_WINDOW* win = Globals.active_win; + WINHELP_WINDOW* win = MACRO_CurrentWindow(); WINHELP_BUTTON* button; WINHELP_BUTTON** b; LONG size; @@ -304,10 +304,12 @@ static void CALLBACK MACRO_Compare(LPCSTR str) static void CALLBACK MACRO_Contents(void) { + HLPFILE_PAGE* page = MACRO_CurrentWindow()->page; + WINE_TRACE("()\n"); - if (Globals.active_win->page) - MACRO_JumpContents(Globals.active_win->page->file->lpszPath, NULL); + if (page) + MACRO_JumpContents(page->file->lpszPath, NULL); } static void CALLBACK MACRO_ControlPanel(LPCSTR str1, LPCSTR str2, LONG u) @@ -447,7 +449,7 @@ void CALLBACK MACRO_HelpOn(void) LPCSTR file; WINE_TRACE("()\n"); - file = Globals.active_win->page->file->help_on_file; + file = MACRO_CurrentWindow()->page->file->help_on_file; if (!file) file = (Globals.wVersion > 4) ? "winhlp32.hlp" : "winhelp.hlp"; @@ -600,12 +602,12 @@ static void CALLBACK MACRO_Next(void) WINHELP_WNDPAGE wp; WINE_TRACE("()\n"); - wp.page = Globals.active_win->page; + wp.page = MACRO_CurrentWindow()->page; wp.page = HLPFILE_PageByOffset(wp.page->file, wp.page->browse_fwd, &wp.relative); if (wp.page) { wp.page->file->wRefCount++; - wp.wininfo = Globals.active_win->info; + wp.wininfo = MACRO_CurrentWindow()->info; WINHELP_CreateHelpWindow(&wp, SW_NORMAL, TRUE); } } @@ -640,12 +642,12 @@ static void CALLBACK MACRO_Prev(void) WINHELP_WNDPAGE wp; WINE_TRACE("()\n"); - wp.page = Globals.active_win->page; + wp.page = MACRO_CurrentWindow()->page; wp.page = HLPFILE_PageByOffset(wp.page->file, wp.page->browse_bwd, &wp.relative); if (wp.page) { wp.page->file->wRefCount++; - wp.wininfo = Globals.active_win->info; + wp.wininfo = MACRO_CurrentWindow()->info; WINHELP_CreateHelpWindow(&wp, SW_NORMAL, TRUE); } } @@ -657,7 +659,7 @@ void CALLBACK MACRO_Print(void) WINE_TRACE("()\n"); printer.lStructSize = sizeof(printer); - printer.hwndOwner = Globals.active_win->hMainWnd; + printer.hwndOwner = MACRO_CurrentWindow()->hMainWnd; printer.hInstance = Globals.hInstance; printer.hDevMode = 0; printer.hDevNames = 0; @@ -775,19 +777,23 @@ void CALLBACK MACRO_SetContents(LPCSTR str, LONG u) static void CALLBACK MACRO_SetHelpOnFile(LPCSTR str) { + HLPFILE_PAGE* page = MACRO_CurrentWindow()->page; + WINE_TRACE("(\"%s\")\n", str); - HeapFree(GetProcessHeap(), 0, Globals.active_win->page->file->help_on_file); - Globals.active_win->page->file->help_on_file = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); - if (Globals.active_win->page->file->help_on_file) - strcpy(Globals.active_win->page->file->help_on_file, str); + HeapFree(GetProcessHeap(), 0, page->file->help_on_file); + page->file->help_on_file = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); + if (page->file->help_on_file) + strcpy(page->file->help_on_file, str); } static void CALLBACK MACRO_SetPopupColor(LONG r, LONG g, LONG b) { + HLPFILE_PAGE* page = MACRO_CurrentWindow()->page; + WINE_TRACE("(%x, %x, %x)\n", r, g, b); - Globals.active_win->page->file->has_popup_color = TRUE; - Globals.active_win->page->file->popup_color = RGB(r, g, b); + page->file->has_popup_color = TRUE; + page->file->popup_color = RGB(r, g, b); } static void CALLBACK MACRO_ShellExecute(LPCSTR str1, LPCSTR str2, LONG u1, LONG u2, LPCSTR str3, LPCSTR str4)

1 0

Eric Pouech : winhlp32: Use current file when no file is specified in JumpHash.
by Alexandre Julliard 01 Jun '09

01 Jun '09

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