March 2012 - Wine-commits - list.winehq.org

Zoltan Nagy : po: Update Hungarian translation.
by Alexandre Julliard 02 Mar '12

02 Mar '12

Module: wine Branch: master Commit: 36c195e60a902da22b885b70967c63dd03317c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c195e60a902da22b885b709… Author: Zoltan Nagy <e-sw(a)freemail.hu> Date: Thu Mar 1 18:36:05 2012 +0100 po: Update Hungarian translation. --- po/hu.po | 411 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 353 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36c195e60a902da22b885…

1 0

Alexandre Julliard : gdi32: Fix missing increment of integer data in GetCharABCWidthsFloat.
by Alexandre Julliard 02 Mar '12

02 Mar '12

Module: wine Branch: master Commit: 78c3af9f18908204227e08067775ee5bc067edbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=78c3af9f18908204227e08067… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 2 16:51:22 2012 +0100 gdi32: Fix missing increment of integer data in GetCharABCWidthsFloat. --- dlls/gdi32/font.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6035b57..4191904 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3367,9 +3367,9 @@ BOOL WINAPI GetCharABCWidthsFloatW( HDC hdc, UINT first, UINT last, LPABCFLOAT a /* convert device units to logical */ for (i = first; i <= last; i++, abcf++) { - abcf->abcfA = abc->abcA * dc->xformVport2World.eM11; - abcf->abcfB = abc->abcB * dc->xformVport2World.eM11; - abcf->abcfC = abc->abcC * dc->xformVport2World.eM11; + abcf->abcfA = abc[i - first].abcA * dc->xformVport2World.eM11; + abcf->abcfB = abc[i - first].abcB * dc->xformVport2World.eM11; + abcf->abcfC = abc[i - first].abcC * dc->xformVport2World.eM11; } } HeapFree( GetProcessHeap(), 0, abc );

1 0

Alexandre Julliard : Updated the authors list.
by Alexandre Julliard 02 Mar '12

02 Mar '12

Module: wine Branch: master Commit: e69040d889c1748d538f1198f6c85b97f55418b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e69040d889c1748d538f1198f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 2 17:54:50 2012 +0100 Updated the authors list. --- AUTHORS | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 111 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e69040d889c1748d538f1…

1 0

Nikolay Sivov : msxml3: Return default namespace uri for 'xml' -prefixed attributes.
by Alexandre Julliard 01 Mar '12

01 Mar '12

Module: wine Branch: master Commit: 973f62f0e3d5afe2443a9631f0a0515ac5dddcf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=973f62f0e3d5afe2443a9631f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 1 21:06:39 2012 +0300 msxml3: Return default namespace uri for 'xml'-prefixed attributes. --- dlls/msxml3/saxreader.c | 8 +++++- dlls/msxml3/tests/saxreader.c | 53 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index d80c256..b1508ca 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1135,8 +1135,14 @@ static HRESULT SAXAttributes_populate(saxlocator *locator, for(index=0; index<nb_attributes; index++) { + static const xmlChar xmlA[] = "xml"; + + if (xmlStrEqual(xmlAttributes[index*5+1], xmlA)) + attrs[index].szURI = bstr_from_xmlChar(xmlAttributes[index*5+2]); + else + attrs[index].szURI = find_element_uri(locator, xmlAttributes[index*5+2]); + attrs[index].szLocalname = bstr_from_xmlChar(xmlAttributes[index*5]); - attrs[index].szURI = find_element_uri(locator, xmlAttributes[index*5+2]); attrs[index].szValue = bstr_from_xmlCharN(xmlAttributes[index*5+3], xmlAttributes[index*5+4]-xmlAttributes[index*5+3]); attrs[index].szQName = QName_from_xmlChar(xmlAttributes[index*5+1], diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 74afc67..56f6aa0 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -249,6 +249,20 @@ static content_handler_test contentHandlerTestAttributes6[] = { { CH_ENDTEST } }; +static content_handler_test xmlspaceattr_test[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0, 1, 0 }, + { CH_STARTDOCUMENT, 0, 0, 1, 39 }, + { CH_STARTELEMENT, 1, 64, 1, 63, "", "a", "a" }, + { CH_CHARACTERS, 1, 64, 1, 80, " Some text data " }, + { CH_ENDELEMENT, 1, 82, 1, 83, "", "a", "a" }, + { CH_ENDDOCUMENT, 0, 0, 1, 83 }, + { CH_ENDTEST } +}; + +static const char xmlspace_attr[] = + "<?xml version=\"1.0\" encoding=\"UTF-16\"?>" + "<a xml:space=\"preserve\"> Some text data </a>"; + static content_handler_test *expectCall; static ISAXLocator *locator; int msxml_version; @@ -266,8 +280,10 @@ static void test_saxstr(unsigned line, const WCHAR *szStr, int nStr, const char len = strlen(szTest); ok_(__FILE__,line) (len == nStr, "nStr = %d, expected %d (%s)\n", nStr, len, szTest); - if(len != nStr) + if(len != nStr) { + ok_(__FILE__,line)(0, "got string %s, expected %s\n", wine_dbgstr_wn(szStr, nStr), szTest); return; + } MultiByteToWideChar(CP_ACP, 0, szTest, -1, buf, sizeof(buf)/sizeof(WCHAR)); ok_(__FILE__,line) (!memcmp(szStr, buf, len*sizeof(WCHAR)), "unexpected szStr %s, expected %s\n", @@ -379,8 +395,13 @@ static HRESULT WINAPI contentHandler_endDocument( if(!test_expect_call(CH_ENDDOCUMENT)) return E_FAIL; - test_locator(__LINE__, msxml_version>=6 ? expectCall->line_v6 : expectCall->line, - msxml_version>=6 ? expectCall->column_v6 : expectCall->column); + if(expectCall == xmlspaceattr_test+5 && msxml_version>=6) { + todo_wine + test_locator(__LINE__, expectCall->line_v6, expectCall->column_v6); + } + else + test_locator(__LINE__, msxml_version>=6 ? expectCall->line_v6 : expectCall->line, + msxml_version>=6 ? expectCall->column_v6 : expectCall->column); return (expectCall++)->ret; } @@ -534,6 +555,24 @@ static HRESULT WINAPI contentHandler_startElement( test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, "http://www.w3.org/2000/xmlns/"); test_saxstr(__LINE__, pLocalName, nLocalName, ""); test_saxstr(__LINE__, pQName, nQName, "xmlns"); + } else if(expectCall == xmlspaceattr_test+2) { + const WCHAR *value; + int valuelen; + + hres = ISAXAttributes_getLength(pAttr, &len); + EXPECT_HR(hres, S_OK); + ok(len == 1, "Incorrect number of attributes: %d\n", len); + + hres = ISAXAttributes_getName(pAttr, 0, &pNamespaceUri, &nNamespaceUri, + &pLocalName, &nLocalName, &pQName, &nQName); + EXPECT_HR(hres, S_OK); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, "http://www.w3.org/XML/1998/namespace"); + test_saxstr(__LINE__, pLocalName, nLocalName, "space"); + test_saxstr(__LINE__, pQName, nQName, "xml:space"); + + hres = ISAXAttributes_getValue(pAttr, 0, &value, &valuelen); + EXPECT_HR(hres, S_OK); + test_saxstr(__LINE__, value, valuelen, "preserve"); } return (expectCall++)->ret; @@ -1426,8 +1465,16 @@ static void test_saxreader(int version) test_expect_call(CH_ENDTEST); IXMLDOMDocument_Release(domDocument); + expectCall = xmlspaceattr_test; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_(xmlspace_attr); + hr = ISAXXMLReader_parse(reader, var); + EXPECT_HR(hr, S_OK); + test_expect_call(CH_ENDTEST); + ISAXXMLReader_Release(reader); SysFreeString(bstrData); + free_bstrs(); } struct saxreader_props_test_t

1 0

Francois Gouget : start: Remove the license and the /L option.
by Alexandre Julliard 01 Mar '12

01 Mar '12

Module: wine Branch: master Commit: da7e97bbe56487c6d65594347c7fa12c01616406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7e97bbe56487c6d65594347… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 1 03:12:56 2012 +0100 start: Remove the license and the /L option. --- po/ar.po | 166 ++++++++++++---------------------- po/bg.po | 166 ++++++++++++---------------------- po/ca.po | 207 ++++++++++++------------------------------ po/cs.po | 209 ++++++++++++------------------------------- po/da.po | 210 ++++++++++++------------------------------- po/de.po | 209 ++++++++++++------------------------------- po/el.po | 166 ++++++++++++---------------------- po/en.po | 204 ++++++++++++------------------------------ po/en_US.po | 204 ++++++++++++------------------------------ po/eo.po | 166 ++++++++++++---------------------- po/es.po | 213 ++++++++++++------------------------------- po/fa.po | 166 ++++++++++++---------------------- po/fi.po | 207 ++++++++++++------------------------------ po/fr.po | 212 ++++++++++++------------------------------- po/he.po | 204 ++++++++++++------------------------------ po/hi.po | 166 ++++++++++++---------------------- po/hu.po | 186 ++++++++++++-------------------------- po/it.po | 206 ++++++++++++------------------------------ po/ja.po | 206 ++++++++++++------------------------------ po/ko.po | 202 ++++++++++++----------------------------- po/lt.po | 208 +++++++++++++------------------------------ po/ml.po | 166 ++++++++++++---------------------- po/nb_NO.po | 213 ++++++++++++------------------------------- po/nl.po | 208 ++++++++++++------------------------------ po/or.po | 166 ++++++++++++---------------------- po/pa.po | 166 ++++++++++++---------------------- po/pl.po | 209 ++++++++++++------------------------------- po/pt_BR.po | 206 ++++++++++++------------------------------ po/pt_PT.po | 212 ++++++++++++------------------------------- po/rm.po | 166 ++++++++++++---------------------- po/ro.po | 213 ++++++++++++------------------------------- po/ru.po | 210 ++++++++++++------------------------------- po/sk.po | 166 ++++++++++++---------------------- po/sl.po | 208 +++++++++++++------------------------------ po/sr_RS(a)cyrillic.po | 166 ++++++++++++---------------------- po/sr_RS(a)latin.po | 166 ++++++++++++---------------------- po/sv.po | 206 ++++++++++++------------------------------ po/te.po | 166 ++++++++++++---------------------- po/th.po | 166 ++++++++++++---------------------- po/tr.po | 193 ++++++++++++--------------------------- po/uk.po | 212 ++++++++++++------------------------------- po/wa.po | 166 ++++++++++++---------------------- po/wine.pot | 166 ++++++++++++---------------------- po/zh_CN.po | 166 ++++++++++++---------------------- po/zh_TW.po | 166 ++++++++++++---------------------- programs/cmd/cmd.rc | 1 - programs/start/resources.h | 1 - programs/start/start.c | 9 -- programs/start/start.rc | 27 +------ 49 files changed, 2703 insertions(+), 5866 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da7e97bbe56487c6d6559…

1 0

Eduardo García : po: Update Spanish translation.
by Alexandre Julliard 01 Mar '12

01 Mar '12

Module: wine Branch: master Commit: 1ad11b3616cfecaa9f256ed5ed8b471595e24c35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ad11b3616cfecaa9f256ed5e… Author: Eduardo García <eduardo.garcia(a)gmx.com> Date: Wed Feb 29 21:00:50 2012 +0100 po: Update Spanish translation. --- po/es.po | 340 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 171 insertions(+), 169 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ad11b3616cfecaa9f256…

1 0

Gustavo Henrique Milaré : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 01 Mar '12

01 Mar '12

Module: wine Branch: master Commit: 0239d2124418772c9ac058d6bda707e64fcf5ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0239d2124418772c9ac058d6b… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Wed Feb 29 21:48:31 2012 -0300 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 20b338d..57b4c51 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-02-17 16:03-0200\n" +"PO-Revision-Date: 2012-02-29 21:39-0300\n" "Last-Translator: Gustavo Henrique Milaré <gugamilare(a)gmail.com>\n" "Language-Team: none\n" "Language: Portuguese (Brazil)\n" @@ -9550,7 +9550,7 @@ msgid "" "action, and can therefore be used as a comment in a batch file.\n" msgstr "" "Uma linha de comando iniciando com REM (seguindo de um espaço) não faz\n" -"nada e, portanto, pode ser usado como um comentário em umarquivo de lote.\n" +"nada e, portanto, pode ser usado como um comentário em um arquivo de lote.\n" #: cmd.rc:156 msgid "REN <filename> is the short version of RENAME. It renames a file.\n" @@ -14019,9 +14019,8 @@ msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Parâmetro inválido '%1' - Use xcopy /? para ajuda\n" #: xcopy.rc:29 -#, fuzzy msgid "Press <Enter> to begin copying\n" -msgstr "Pressione <Enter> para \n" +msgstr "Pressione <Enter> para começar a copiar\n" #: xcopy.rc:30 msgid "%1!d! file(s) would be copied\n"

1 0

Austin English : ntdll: Use proper CPU speed detection on FreeBSD.
by Alexandre Julliard 01 Mar '12

01 Mar '12

Module: wine Branch: master Commit: 78f82fa063bdbbe319eadb457725e28af6b1ca19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78f82fa063bdbbe319eadb457… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 29 16:09:59 2012 -0800 ntdll: Use proper CPU speed detection on FreeBSD. Reported by Hardy Schumacher. --- dlls/ntdll/nt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 30d3e34..3ed8038 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1178,7 +1178,7 @@ void fill_cpu_info(void) NtCurrentTeb()->Peb->NumberOfProcessors = num; len = sizeof(num); - if (!sysctlbyname("dev.cpu.0.freq", &num, &len, NULL, 0)) + if (!sysctlbyname("hw.clockrate", &num, &len, NULL, 0)) cpuHz = num * 1000 * 1000; } #elif defined(__sun)

1 0

Maarten Lankhorst : mmdevapi: Add tests for checking events to capture.
by Alexandre Julliard 01 Mar '12

01 Mar '12

Module: wine Branch: master Commit: 27adecec49c7a02f2e8cbdbed9d2012e97bb6532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27adecec49c7a02f2e8cbdbed… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Feb 29 23:43:56 2012 +0100 mmdevapi: Add tests for checking events to capture. --- dlls/mmdevapi/tests/capture.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index e13e813..96ddf77 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -82,7 +82,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) HRESULT hr; UINT32 frames, next, pad, sum = 0; BYTE *data; - DWORD flags; + DWORD flags, r; UINT64 pos, qpc; REFERENCE_TIME period; @@ -413,8 +413,35 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) /* Some w7 machines signal DATA_DISCONTINUITY here following the * previous AUDCLNT_S_BUFFER_EMPTY, others not. What logic? */ ok(pos >= sum, "Position %u gap %d\n", (UINT)pos, (UINT)pos - sum); + IAudioCaptureClient_ReleaseBuffer(acc, frames); } + hr = IAudioClient_Stop(ac); + ok(hr == S_OK, "Stop failed: %08x\n", hr); + + ok(ResetEvent(handle), "ResetEvent\n"); + + /* Still receiving events! */ + r = WaitForSingleObject(handle, 20); + todo_wine ok(r == WAIT_OBJECT_0, "Wait(event) after Stop gave %x\n", r); + + hr = IAudioClient_Reset(ac); + ok(hr == S_OK, "Reset failed: %08x\n", hr); + + ok(ResetEvent(handle), "ResetEvent\n"); + + r = WaitForSingleObject(handle, 120); + todo_wine ok(r == WAIT_OBJECT_0, "Wait(event) after Reset gave %x\n", r); + + hr = IAudioClient_SetEventHandle(ac, NULL); + ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); + + r = WaitForSingleObject(handle, 70); + todo_wine ok(r == WAIT_OBJECT_0, "Wait(NULL event) gave %x\n", r); + + hr = IAudioClient_Start(ac); + ok(hr == S_OK, "Start failed: %08x\n", hr); + IUnknown_Release(acc); }

1 0

Bruno Jesus : imm32/tests: Add ImmGetDescription tests.
by Alexandre Julliard 01 Mar '12

01 Mar '12

Module: wine Branch: master Commit: 0fd047559cbfa8ff8f68c4502033629a47eb9ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fd047559cbfa8ff8f68c4502… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Mar 1 01:28:38 2012 -0300 imm32/tests: Add ImmGetDescription tests. --- dlls/imm32/tests/imm32.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index eca4d5e..7fa8551 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -573,6 +573,51 @@ static void test_ImmGetContext(void) ok(ImmReleaseContext(hwnd, himc), "ImmReleaseContext failed\n"); } +static void test_ImmGetDescription(void) +{ + HKL hkl; + WCHAR japime[] = { 'E', '0', '0', '1', '0', '4', '1', '1', 0 }; + WCHAR descW[100]; + CHAR descA[100]; + UINT ret, lret; + + /* FIXME: invalid keyboard layouts should not pass */ + ret = ImmGetDescriptionW(NULL, NULL, 0); + todo_wine ok(!ret, "ImmGetDescriptionW failed, expected 0 received %d.\n", ret); + + /* load a language with valid IMM descriptions */ + hkl = LoadKeyboardLayoutW(japime, KLF_ACTIVATE); + todo_wine ok(hkl != 0, "LoadKeyboardLayoutW failed, expected != 0.\n"); + + ret = ImmGetDescriptionW(hkl, NULL, 0); + if(!ret) + { + win_skip("ImmGetDescriptionW is not working for current loaded keyboard.\n"); + return; + } + + ret = ImmGetDescriptionW(hkl, descW, 0); + ok(ret, "ImmGetDescriptionW failed, expected != 0 received 0.\n"); + + lret = ImmGetDescriptionW(hkl, descW, ret + 1); + ok(lret, "ImmGetDescriptionW failed, expected != 0 received 0.\n"); + ok(lret == ret, "ImmGetDescriptionW failed to return the correct amount of data. Expected %d, got %d.\n", ret, lret); + + lret = ImmGetDescriptionA(hkl, descA, ret + 1); + ok(lret, "ImmGetDescriptionA failed, expected != 0 received 0.\n"); + todo_wine ok(lret == ret, "ImmGetDescriptionA failed to return the correct amount of data. Expected %d, got %d.\n", ret, lret); + + ret /= 2; /* try to copy partially */ + lret = ImmGetDescriptionW(hkl, descW, ret + 1); + ok(lret, "ImmGetDescriptionW failed, expected != 0 received 0.\n"); + ok(lret == ret, "ImmGetDescriptionW failed to return the correct amount of data. Expected %d, got %d.\n", ret, lret); + + ret = ImmGetDescriptionW(hkl, descW, 1); + ok(!ret, "ImmGetDescriptionW failed, expected 0 received %d.\n", ret); + + UnloadKeyboardLayout(hkl); +} + START_TEST(imm32) { if (init()) { @@ -584,6 +629,7 @@ START_TEST(imm32) { test_ImmThreads(); test_ImmIsUIMessage(); test_ImmGetContext(); + test_ImmGetDescription(); } cleanup(); }

1 0