July 2013 - Wine-Commits - list.winehq.org

Francois Gouget : po: Mark a couple of incorrect Dutch translations as fuzzy.
by Alexandre Julliard July 11, 2013

July 11, 2013

Module: wine Branch: master Commit: 70efad51e4db24ef69cc02bfa4ac5e65d2461260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70efad51e4db24ef69cc02bfa… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 11 17:46:26 2013 +0200 po: Mark a couple of incorrect Dutch translations as fuzzy. --- po/nl.po | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/po/nl.po b/po/nl.po index 266cbca..4652427 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8264,6 +8264,7 @@ msgid "Confirm overwrite" msgstr "Bevestig overschrijven" #: shell32.rc:265 +#, fuzzy msgid "" "Wine 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 " @@ -13531,6 +13532,7 @@ msgstr "" "worden. Excuses voor het ongemak." #: winedbg.rc:55 +#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"http://appdb.winehq.org\">Application "

1 0

Francois Gouget : po: Remove an extraneous trailing space in a Polish translation.
by Alexandre Julliard July 11, 2013

July 11, 2013

Module: wine Branch: master Commit: d72c6d394451d531fe4a817649253d685271bfec URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72c6d394451d531fe4a81764… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 11 17:30:31 2013 +0200 po: Remove an extraneous trailing space in a Polish translation. --- po/pl.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/pl.po b/po/pl.po index 3c7eef5..e6492b4 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3452,7 +3452,7 @@ msgstr "Joysticki" #: joy.rc:36 winecfg.rc:204 msgid "&Disable" -msgstr "Wyłą&cz " +msgstr "Wyłą&cz" #: joy.rc:37 msgid "&Enable"

1 0

Francois Gouget : po: Add a trailing full stop to an Ukrainian translation.
by Alexandre Julliard July 11, 2013

July 11, 2013

Module: wine Branch: master Commit: 2419532fc3d5b8a20c1164a24dc3905579ef2fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=2419532fc3d5b8a20c1164a24… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 11 17:29:44 2013 +0200 po: Add a trailing full stop to an Ukrainian translation. --- po/uk.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/uk.po b/po/uk.po index c95178a..97f28d3 100644 --- a/po/uk.po +++ b/po/uk.po @@ -173,7 +173,7 @@ msgstr "" "\n" "Зауважте: Рекомендується використати пакет з вашого дистрибутиву. Детальніше " "читайте <a href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</" -"a>" +"a>." #: appwiz.rc:28 msgid "Add/Remove Programs"

1 0

Francois Gouget : po: Fix the Hungarian kilobyte symbol.
by Alexandre Julliard July 11, 2013

July 11, 2013

Module: wine Branch: master Commit: b44bed30e07f79cb6c98faa1f2869ea46129a0eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b44bed30e07f79cb6c98faa1f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 11 16:34:26 2013 +0200 po: Fix the Hungarian kilobyte symbol. --- po/hu.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/hu.po b/po/hu.po index 024e72b..dbf86bc 100644 --- a/po/hu.po +++ b/po/hu.po @@ -13741,7 +13741,7 @@ msgstr "%1/%2" #: winefile.rc:115 msgctxt "unit kilobyte" msgid "kB" -msgstr "KB" +msgstr "kB" #: winefile.rc:116 msgctxt "unit megabyte"

1 0

Francois Gouget : po: Fuzzy a Croatian translation that does not match the English string.
by Alexandre Julliard July 11, 2013

July 11, 2013

Module: wine Branch: master Commit: 20cf358c8495d5b46b919bcbc8fb38eec1afdb7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=20cf358c8495d5b46b919bcbc… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 11 16:00:56 2013 +0200 po: Fuzzy a Croatian translation that does not match the English string. --- po/hr.po | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/hr.po b/po/hr.po index 04009d1..9cdf63c 100644 --- a/po/hr.po +++ b/po/hr.po @@ -12969,6 +12969,7 @@ msgstr "" "se zbog neugodnosti." #: winedbg.rc:55 +#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"http://appdb.winehq.org\">Application "

1 0

Francois Gouget : po: Translate the task manager' s CPU affinity labels to Hungarian.
by Alexandre Julliard July 11, 2013

July 11, 2013

Module: wine Branch: master Commit: d4b403477b6f896847914f504061e2ba032fdc04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b403477b6f896847914f504… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 11 16:32:34 2013 +0200 po: Translate the task manager's CPU affinity labels to Hungarian. --- po/hu.po | 64 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/po/hu.po b/po/hu.po index c81bec4..024e72b 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12053,131 +12053,131 @@ msgstr "" #: taskmgr.rc:446 msgid "CPU 0" -msgstr "" +msgstr "CPU 0" #: taskmgr.rc:448 msgid "CPU 1" -msgstr "" +msgstr "CPU 1" #: taskmgr.rc:450 msgid "CPU 2" -msgstr "" +msgstr "CPU 2" #: taskmgr.rc:452 msgid "CPU 3" -msgstr "" +msgstr "CPU 3" #: taskmgr.rc:454 msgid "CPU 4" -msgstr "" +msgstr "CPU 4" #: taskmgr.rc:456 msgid "CPU 5" -msgstr "" +msgstr "CPU 5" #: taskmgr.rc:458 msgid "CPU 6" -msgstr "" +msgstr "CPU 6" #: taskmgr.rc:460 msgid "CPU 7" -msgstr "" +msgstr "CPU 7" #: taskmgr.rc:462 msgid "CPU 8" -msgstr "" +msgstr "CPU 8" #: taskmgr.rc:464 msgid "CPU 9" -msgstr "" +msgstr "CPU 9" #: taskmgr.rc:466 msgid "CPU 10" -msgstr "" +msgstr "CPU 10" #: taskmgr.rc:468 msgid "CPU 11" -msgstr "" +msgstr "CPU 11" #: taskmgr.rc:470 msgid "CPU 12" -msgstr "" +msgstr "CPU 12" #: taskmgr.rc:472 msgid "CPU 13" -msgstr "" +msgstr "CPU 13" #: taskmgr.rc:474 msgid "CPU 14" -msgstr "" +msgstr "CPU 14" #: taskmgr.rc:476 msgid "CPU 15" -msgstr "" +msgstr "CPU 15" #: taskmgr.rc:478 msgid "CPU 16" -msgstr "" +msgstr "CPU 16" #: taskmgr.rc:480 msgid "CPU 17" -msgstr "" +msgstr "CPU 17" #: taskmgr.rc:482 msgid "CPU 18" -msgstr "" +msgstr "CPU 18" #: taskmgr.rc:484 msgid "CPU 19" -msgstr "" +msgstr "CPU 19" #: taskmgr.rc:486 msgid "CPU 20" -msgstr "" +msgstr "CPU 20" #: taskmgr.rc:488 msgid "CPU 21" -msgstr "" +msgstr "CPU 21" #: taskmgr.rc:490 msgid "CPU 22" -msgstr "" +msgstr "CPU 22" #: taskmgr.rc:492 msgid "CPU 23" -msgstr "" +msgstr "CPU 23" #: taskmgr.rc:494 msgid "CPU 24" -msgstr "" +msgstr "CPU 24" #: taskmgr.rc:496 msgid "CPU 25" -msgstr "" +msgstr "CPU 25" #: taskmgr.rc:498 msgid "CPU 26" -msgstr "" +msgstr "CPU 26" #: taskmgr.rc:500 msgid "CPU 27" -msgstr "" +msgstr "CPU 27" #: taskmgr.rc:502 msgid "CPU 28" -msgstr "" +msgstr "CPU 28" #: taskmgr.rc:504 msgid "CPU 29" -msgstr "" +msgstr "CPU 29" #: taskmgr.rc:506 msgid "CPU 30" -msgstr "" +msgstr "CPU 30" #: taskmgr.rc:508 msgid "CPU 31" -msgstr "" +msgstr "CPU 31" #: taskmgr.rc:514 msgid "Select Columns"

1 0

Francois Gouget : po: Fix some typography issues in the Croatian translation.
by Alexandre Julliard July 11, 2013

July 11, 2013

Module: wine Branch: master Commit: edd7c82cb0aee4f06618c9f7f7e84e750348dced URL: http://source.winehq.org/git/wine.git/?a=commit;h=edd7c82cb0aee4f06618c9f7f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 11 15:51:30 2013 +0200 po: Fix some typography issues in the Croatian translation. --- po/hr.po | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/po/hr.po b/po/hr.po index 86cdb3b..04009d1 100644 --- a/po/hr.po +++ b/po/hr.po @@ -716,11 +716,11 @@ msgstr "Sele&kcija" #: comdlg32.rc:383 msgid "&from:" -msgstr "&od" +msgstr "&od:" #: comdlg32.rc:384 msgid "&to:" -msgstr "&do" +msgstr "&do:" #: comdlg32.rc:410 winecfg.rc:286 msgid "Si&ze:" @@ -1358,7 +1358,7 @@ msgstr "Netscape CA URL za opoziv" #: crypt32.rc:64 msgid "Netscape Cert Renewal URL" -msgstr "Netscape URL za obnavljanje cert." +msgstr "Netscape URL za obnavljanje cert" #: crypt32.rc:65 msgid "Netscape CA Policy URL" @@ -4366,7 +4366,7 @@ msgstr "Primljena neispravna poruka za oportunističko zaključavanje.\n" #: winerror.mc:966 msgid "Message 0x%1 not found in file %2.\n" -msgstr "Poruka 0x%1 nije pronađena u datoteci %2\n" +msgstr "Poruka 0x%1 nije pronađena u datoteci %2.\n" #: winerror.mc:971 msgid "Invalid address.\n" @@ -4898,7 +4898,7 @@ msgstr "Unos u dnevniku je izbrisan.\n" #: winerror.mc:1631 msgid "Invalid device name.\n" -msgstr "Neispravno ime uređaja\n" +msgstr "Neispravno ime uređaja.\n" #: winerror.mc:1636 msgid "Connection unavailable.\n" @@ -6697,7 +6697,7 @@ msgid "" "The specified installation package could not be opened. Please check the " "file path and try again." msgstr "" -"Instalacijski paket se nije mogao otvoriti. Provjerite putanju datoteke i " +"Instalacijski paket se nije mogao otvoriti. Provjerite putanju datoteke i " "pokušajte ponovo." #: msi.rc:28 @@ -8899,7 +8899,7 @@ msgstr "&Naziv odredišne datoteke:" #: winspool.rc:28 msgid "The output file already exists. Click OK to overwrite." msgstr "" -"Odredišna datoteka već postoji. Kliknite na gumb 'U redu' kako bi je " +"Odredišna datoteka već postoji. Kliknite na gumb 'U redu' kako bi je " "zamjenili." #: winspool.rc:29 @@ -10777,7 +10777,7 @@ msgstr "Atributi grupe programa" #: progman.rc:153 msgid "&Group file:" -msgstr "Datoteka g&rupe" +msgstr "Datoteka g&rupe:" #: progman.rc:165 msgid "Program Attributes" @@ -10789,7 +10789,7 @@ msgstr "&Naredbena linija:" #: progman.rc:171 msgid "&Working directory:" -msgstr "Trenutni direktori&j" +msgstr "Trenutni direktori&j:" #: progman.rc:173 msgid "&Key combination:" @@ -12218,8 +12218,8 @@ msgid "" "linked to the Libraries and Graphics tabs to allow you to change system-wide " "or per-application settings in those tabs as well." msgstr "" -"Wine može imitirati različite verzije Windowsa za pojedini program. Ovaj " -"tab je povezan sa tabovima Biblioteke i Grafika kako bi dozvolio sistemske " +"Wine može imitirati različite verzije Windowsa za pojedini program. Ovaj tab " +"je povezan sa tabovima Biblioteke i Grafika kako bi dozvolio sistemske " "promjene ili za podešavanje aplikacija u tim istim tabovima." #: winecfg.rc:150 @@ -12381,19 +12381,19 @@ msgstr "Podrazumijevano" #: winecfg.rc:259 msgid "Output device:" -msgstr "Izlazni uređaj" +msgstr "Izlazni uređaj:" #: winecfg.rc:260 msgid "Voice output device:" -msgstr "Izlazni uređaj za glas" +msgstr "Izlazni uređaj za glas:" #: winecfg.rc:261 msgid "Input device:" -msgstr "Ulazni uređaj" +msgstr "Ulazni uređaj:" #: winecfg.rc:262 msgid "Voice input device:" -msgstr "Ulazni uređdaj za glas" +msgstr "Ulazni uređdaj za glas:" #: winecfg.rc:267 msgid "&Test Sound" @@ -12413,7 +12413,7 @@ msgstr "&Instaliraj temu..." #: winecfg.rc:282 msgid "It&em:" -msgstr "Stavka" +msgstr "Stavka:" #: winecfg.rc:284 msgid "C&olor:" @@ -12787,7 +12787,7 @@ msgstr "Povijest naredbi" #: wineconsole.rc:73 msgid "&Number of recalled commands:" -msgstr "Broj povučen&ih naredbi" +msgstr "Broj povučen&ih naredbi:" #: wineconsole.rc:76 msgid "&Remove doubles" @@ -12811,7 +12811,7 @@ msgstr "Tampon zona" #: wineconsole.rc:101 msgid "&Width:" -msgstr "&Širina" +msgstr "&Širina:" #: wineconsole.rc:104 msgid "&Height:" @@ -12823,7 +12823,7 @@ msgstr "Veličina rozora" #: wineconsole.rc:109 msgid "W&idth:" -msgstr "Š&irina" +msgstr "Š&irina:" #: wineconsole.rc:112 msgid "H&eight:" @@ -13022,7 +13022,7 @@ msgstr "&Otvori\tUnesi" #: winefile.rc:30 msgid "Re&name..." -msgstr "&Preimenuj" +msgstr "&Preimenuj..." #: winefile.rc:31 msgid "Propert&ies\tAlt+Enter" @@ -13183,7 +13183,7 @@ msgstr "Primjenjujem postavke fonta" #: winefile.rc:88 msgid "Error while selecting new font." -msgstr "Pogreška prilikom odabira novog fonta" +msgstr "Pogreška prilikom odabira novog fonta." #: winefile.rc:93 msgid "Wine File Manager" @@ -13437,11 +13437,11 @@ msgstr "" #: wmic.rc:26 msgid "Error: Alias not found\n" -msgstr "Greška: zamjensko ime nije pronađen.\n" +msgstr "Greška: Zamjensko ime nije pronađen\n" #: wmic.rc:27 msgid "Error: Invalid query\n" -msgstr "Error: Neispravan upit.\n" +msgstr "Error: Neispravan upit\n" #: wordpad.rc:28 msgid "&New...\tCtrl+N" @@ -13924,5 +13924,5 @@ msgstr "" "[/D | /D:m-d-y] Kopiraj nove ili izmjenjene datoteke nakon određenog " "datuma.\n" "\t\tAko datum nije unesen, kopiraj samo ako je odredište starije\n" -"\t\tod izvora\n" +"\t\tod izvora.\n" "\n"

1 0

Francois Gouget : po: Fix the Esperanto hour abbreviation.
by Alexandre Julliard July 11, 2013

July 11, 2013

Module: wine Branch: master Commit: 62dbee38764af61fffb3ab698b81a189d8288219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62dbee38764af61fffb3ab698… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 11 15:48:06 2013 +0200 po: Fix the Esperanto hour abbreviation. --- po/eo.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/eo.po b/po/eo.po index 4c95b5b..2693796 100644 --- a/po/eo.po +++ b/po/eo.po @@ -8093,7 +8093,7 @@ msgstr "%d bajtoj" #: shlwapi.rc:28 msgctxt "time unit: hours" msgid " hr" -msgstr " hr" +msgstr " h" #: shlwapi.rc:29 msgctxt "time unit: minutes"

1 0

Nikolay Sivov : kernel32/tests: Some tests for activation context data structures.
by Alexandre Julliard July 11, 2013

July 11, 2013

Module: wine Branch: master Commit: eaf2cce99fc7c4f27de6f1d5edd315b26196be53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf2cce99fc7c4f27de6f1d5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 10 23:32:03 2013 +0400 kernel32/tests: Some tests for activation context data structures. --- dlls/kernel32/tests/actctx.c | 82 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 74 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 3af6e63..b021a4d 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -693,10 +693,16 @@ static void test_create_fail(void) test_create_and_fail(manifest2, wrong_depmanifest1, 0 ); } +struct dllredirect_keyed_data +{ + ULONG size; + ULONG unk; + DWORD res[3]; +}; + static void test_find_dll_redirection(HANDLE handle, LPCWSTR libname, ULONG exid, int line) { ACTCTX_SECTION_KEYED_DATA data; - DWORD *p; BOOL ret; memset(&data, 0xfe, sizeof(data)); @@ -717,10 +723,19 @@ static void test_find_dll_redirection(HANDLE handle, LPCWSTR libname, ULONG exid ok_(__FILE__, line)(data.lpData != NULL, "data.lpData == NULL\n"); ok_(__FILE__, line)(data.ulLength == 20, "data.ulLength=%u\n", data.ulLength); - p = data.lpData; - if(ret && p) todo_wine { - ok_(__FILE__, line)(p[0] == 20 && p[1] == 2 && p[2] == 0 && p[3] == 0 && p[4] == 0, - "wrong data %u,%u,%u,%u,%u\n",p[0], p[1], p[2], p[3], p[4]); + if (data.lpData) + { + struct dllredirect_keyed_data *dlldata = (struct dllredirect_keyed_data*)data.lpData; +todo_wine + ok_(__FILE__, line)(dlldata->size == data.ulLength, "got wrong size %d\n", dlldata->size); + +if (dlldata->size == data.ulLength) +{ + ok_(__FILE__, line)(dlldata->unk == 2, "got wrong field value %d\n", dlldata->unk); + ok_(__FILE__, line)(dlldata->res[0] == 0, "got wrong res[0] value %d\n", dlldata->res[0]); + ok_(__FILE__, line)(dlldata->res[1] == 0, "got wrong res[1] value %d\n", dlldata->res[1]); + ok_(__FILE__, line)(dlldata->res[2] == 0, "got wrong res[2] value %d\n", dlldata->res[2]); +} } ok_(__FILE__, line)(data.lpSectionGlobalData == NULL, "data.lpSectionGlobalData != NULL\n"); @@ -763,8 +778,20 @@ static void test_find_dll_redirection(HANDLE handle, LPCWSTR libname, ULONG exid pReleaseActCtx(handle); } +struct wndclass_keyed_data +{ + DWORD size; + DWORD reserved; + DWORD classname_len; + DWORD classname_offset; + DWORD modulename_len; + DWORD modulename_offset; /* offset relative to section base */ + WCHAR strdata[1]; +}; + static void test_find_window_class(HANDLE handle, LPCWSTR clsname, ULONG exid, int line) { + struct wndclass_keyed_data *wnddata; ACTCTX_SECTION_KEYED_DATA data; BOOL ret; @@ -781,16 +808,55 @@ static void test_find_window_class(HANDLE handle, LPCWSTR clsname, ULONG exid, i return; } + wnddata = (struct wndclass_keyed_data*)data.lpData; + ok_(__FILE__, line)(data.cbSize == sizeof(data), "data.cbSize=%u\n", data.cbSize); ok_(__FILE__, line)(data.ulDataFormatVersion == 1, "data.ulDataFormatVersion=%u\n", data.ulDataFormatVersion); ok_(__FILE__, line)(data.lpData != NULL, "data.lpData == NULL\n"); - /* ok_(__FILE__, line)(data.ulLength == ??, "data.ulLength=%u\n", data.ulLength); */ +todo_wine + ok_(__FILE__, line)(wnddata->size == FIELD_OFFSET(struct wndclass_keyed_data, strdata), "got %d for header size\n", wnddata->size); + if (data.lpData && wnddata->size == FIELD_OFFSET(struct wndclass_keyed_data, strdata)) + { + static const WCHAR verW[] = {'6','.','5','.','4','.','3','!',0}; + WCHAR buff[50]; + WCHAR *ptr; + ULONG len; + + ok_(__FILE__, line)(wnddata->reserved == 0, "got reserved as %d\n", wnddata->reserved); + /* redirect class name (versioned or not) is stored just after header data */ + ok_(__FILE__, line)(wnddata->classname_offset == wnddata->size, "got name offset as %d\n", wnddata->classname_offset); + ok_(__FILE__, line)(wnddata->modulename_len > 0, "got module name length as %d\n", wnddata->modulename_len); + + /* expected versioned name */ + lstrcpyW(buff, verW); + lstrcatW(buff, clsname); + ptr = (WCHAR*)((BYTE*)wnddata + wnddata->size); + ok_(__FILE__, line)(!lstrcmpW(ptr, buff), "got wrong class name %s, expected %s\n", wine_dbgstr_w(ptr), wine_dbgstr_w(buff)); + ok_(__FILE__, line)(lstrlenW(ptr)*sizeof(WCHAR) == wnddata->classname_len, + "got wrong class name length %d, expected %d\n", wnddata->classname_len, lstrlenW(ptr)); + + /* data length is simply header length + string data length including nulls */ + len = wnddata->size + wnddata->classname_len + wnddata->modulename_len + 2*sizeof(WCHAR); + ok_(__FILE__, line)(data.ulLength == len, "got wrong data length %d, expected %d\n", data.ulLength, len); + + if (data.ulSectionTotalLength > wnddata->modulename_offset) + { + WCHAR *modulename, *sectionptr; + + /* just compare pointers */ + modulename = (WCHAR*)((BYTE*)wnddata + wnddata->size + wnddata->classname_len + sizeof(WCHAR)); + sectionptr = (WCHAR*)((BYTE*)data.lpSectionBase + wnddata->modulename_offset); + ok_(__FILE__, line)(modulename == sectionptr, "got wrong name offset %p, expected %p\n", sectionptr, modulename); + } + } + ok_(__FILE__, line)(data.lpSectionGlobalData == NULL, "data.lpSectionGlobalData != NULL\n"); ok_(__FILE__, line)(data.ulSectionGlobalDataLength == 0, "data.ulSectionGlobalDataLength=%u\n", data.ulSectionGlobalDataLength); ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); - /* ok_(__FILE__, line)(data.ulSectionTotalLength == 0, "data.ulSectionTotalLength=%u\n", - data.ulSectionTotalLength); FIXME */ +todo_wine + ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "data.ulSectionTotalLength=%u\n", + data.ulSectionTotalLength); ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%u, expected %u\n", data.ulAssemblyRosterIndex, exid);

1 0

Stefan Leichter : mmdevapi/tests: Fix a crash when function IMMDevice_Activate fails.
by Alexandre Julliard July 11, 2013

July 11, 2013

Module: wine Branch: master Commit: 55972526067ea6d9452aa2d46b7bfffe64d89752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55972526067ea6d9452aa2d46… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Jul 10 22:34:25 2013 +0200 mmdevapi/tests: Fix a crash when function IMMDevice_Activate fails. --- dlls/mmdevapi/tests/capture.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index feedfde..1873735 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -915,6 +915,8 @@ static void test_volume_dependence(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; hr = IAudioClient_GetMixFormat(ac, &fmt); ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr);

1 0