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

Michael Stefaniuc : amstream: Avoid using the LPUNKNOWN COM iface type.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: 8185c9f0245b9615766143c8c437a29c227a1b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8185c9f0245b9615766143c8c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 18 11:20:57 2016 +0200 amstream: Avoid using the LPUNKNOWN COM iface type. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 1149584..2cadf9c 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -117,8 +117,8 @@ static HRESULT WINAPI AMCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter { IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; - LPUNKNOWN punk; - + IUnknown *punk; + TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); *ppobj = NULL;

1 0

Michael Stefaniuc : strmbase: Avoid a COM object to interface cast.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: d7f332020ca07eb2ae2a3c997f7d9f2c7d2860c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f332020ca07eb2ae2a3c997… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 18 11:20:26 2016 +0200 strmbase: Avoid a COM object to interface cast. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/qualitycontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index b756ae3..970164e 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -324,7 +324,7 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) q.Late = priv->current_jitter; q.TimeStamp = priv->current_rstart; TRACE("Late: %i from %i, rate: %g\n", (int)(q.Late/10000), (int)(q.TimeStamp/10000), 1./priv->avg_rate); - hr = IQualityControl_Notify((IQualityControl *)priv, priv->self, q); + hr = IQualityControl_Notify(&priv->IQualityControl_iface, priv->self, q); priv->qos_handled = hr == S_OK; }

1 0

Iván Matellanes : msvcirt: Implement istream:: get for strings.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: 14722ba20a0e1a711f3201ff1b6e03bf3daf4d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14722ba20a0e1a711f3201ff1… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 18 09:13:01 2016 +0100 msvcirt: Implement istream::get for strings. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 38 ++++++- dlls/msvcirt/tests/msvcirt.c | 235 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14722ba20a0e1a711f320…

1 0

Nikolay Sivov : msscript: Initial support for hosting script engines.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: b22dfdc98ce594e446b9d8e3e4dd6b7303d984da URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22dfdc98ce594e446b9d8e3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 16 22:34:18 2016 +0300 msscript: Initial support for hosting script engines. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 288 ++++++++++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 15 +- 2 files changed, 291 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b22dfdc98ce594e446b9d…

1 0

Piotr Chruściel : server: Move the \BaseNamedObjects symlink in \Sessions\0 to \Sessions\1\BaseNamedObjects.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: 84c3b8ae28fc799146f72a9dbc5f38bb188df672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84c3b8ae28fc799146f72a9db… Author: Piotr Chruściel <flan(a)flande.re> Date: Fri Jul 8 17:53:03 2016 +0200 server: Move the \BaseNamedObjects symlink in \Sessions\0 to \Sessions\1\BaseNamedObjects. Signed-off-by: Piotr Chruściel <flan(a)flande.re> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/server/directory.c b/server/directory.c index 96555bb..9368421 100644 --- a/server/directory.c +++ b/server/directory.c @@ -258,6 +258,7 @@ void init_directories(void) static const WCHAR dir_mailslotW[] = {'\\','D','e','v','i','c','e','\\','M','a','i','l','S','l','o','t'}; static const WCHAR dir_objtypeW[] = {'O','b','j','e','c','t','T','y','p','e','s'}; static const WCHAR dir_sessionsW[] = {'S','e','s','s','i','o','n','s'}; + static const WCHAR dir_1W[] = {'1'}; static const WCHAR dir_kernelW[] = {'K','e','r','n','e','l','O','b','j','e','c','t','s'}; static const WCHAR dir_windowsW[] = {'W','i','n','d','o','w','s'}; static const WCHAR dir_winstationsW[] = {'W','i','n','d','o','w','S','t','a','t','i','o','n','s'}; @@ -270,6 +271,7 @@ void init_directories(void) static const struct unicode_str dir_mailslot_str = {dir_mailslotW, sizeof(dir_mailslotW)}; static const struct unicode_str dir_objtype_str = {dir_objtypeW, sizeof(dir_objtypeW)}; static const struct unicode_str dir_sessions_str = {dir_sessionsW, sizeof(dir_sessionsW)}; + static const struct unicode_str dir_1_str = {dir_1W, sizeof(dir_1W)}; static const struct unicode_str dir_kernel_str = {dir_kernelW, sizeof(dir_kernelW)}; static const struct unicode_str dir_windows_str = {dir_windowsW, sizeof(dir_windowsW)}; static const struct unicode_str dir_winstations_str = {dir_winstationsW, sizeof(dir_winstationsW)}; @@ -281,7 +283,7 @@ void init_directories(void) static const WCHAR link_nulW[] = {'N','U','L'}; static const WCHAR link_pipeW[] = {'P','I','P','E'}; static const WCHAR link_mailslotW[] = {'M','A','I','L','S','L','O','T'}; - static const WCHAR link_0W[] = {'0'}; + static const WCHAR link_basenamedW[] = {'B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s'}; static const WCHAR link_sessionW[] = {'S','e','s','s','i','o','n'}; static const WCHAR link_sessionsW[] = {'\\','S','e','s','s','i','o','n','s'}; static const struct unicode_str link_dosdev_str = {link_dosdevW, sizeof(link_dosdevW)}; @@ -290,7 +292,7 @@ void init_directories(void) static const struct unicode_str link_nul_str = {link_nulW, sizeof(link_nulW)}; static const struct unicode_str link_pipe_str = {link_pipeW, sizeof(link_pipeW)}; static const struct unicode_str link_mailslot_str = {link_mailslotW, sizeof(link_mailslotW)}; - static const struct unicode_str link_0_str = {link_0W, sizeof(link_0W)}; + static const struct unicode_str link_basenamed_str = {link_basenamedW, sizeof(link_basenamedW)}; static const struct unicode_str link_session_str = {link_sessionW, sizeof(link_sessionW)}; static const struct unicode_str link_sessions_str = {link_sessionsW, sizeof(link_sessionsW)}; @@ -321,8 +323,8 @@ void init_directories(void) }; static const struct unicode_str keyed_event_crit_sect_str = {keyed_event_crit_sectW, sizeof(keyed_event_crit_sectW)}; - struct directory *dir_driver, *dir_device, *dir_global, *dir_basenamed, *dir_sessions, *dir_kernel, *dir_windows, *dir_winstation; - struct symlink *link_dosdev, *link_global1, *link_global2, *link_local, *link_nul, *link_pipe, *link_mailslot, *link_0, *link_session; + struct directory *dir_driver, *dir_device, *dir_global, *dir_basenamed, *dir_sessions, *dir_1, *dir_kernel, *dir_windows, *dir_winstation; + struct symlink *link_dosdev, *link_global1, *link_global2, *link_local, *link_nul, *link_pipe, *link_mailslot, *link_basenamed, *link_session; struct keyed_event *keyed_event; unsigned int i; @@ -331,6 +333,7 @@ void init_directories(void) dir_device = create_directory( &root_directory->obj, &dir_device_str, 0, HASH_SIZE, NULL ); dir_objtype = create_directory( &root_directory->obj, &dir_objtype_str, 0, HASH_SIZE, NULL ); dir_sessions = create_directory( &root_directory->obj, &dir_sessions_str, 0, HASH_SIZE, NULL ); + dir_1 = create_directory( &dir_sessions->obj, &dir_1_str, 0, HASH_SIZE, NULL ); dir_kernel = create_directory( &root_directory->obj, &dir_kernel_str, 0, HASH_SIZE, NULL ); dir_windows = create_directory( &root_directory->obj, &dir_windows_str, 0, HASH_SIZE, NULL ); dir_winstation = create_directory( &dir_windows->obj, &dir_winstations_str, 0, HASH_SIZE, NULL ); @@ -356,7 +359,7 @@ void init_directories(void) link_nul = create_symlink( &dir_global->obj, &link_nul_str, 0, &dir_null_str, NULL ); link_pipe = create_symlink( &dir_global->obj, &link_pipe_str, 0, &dir_named_pipe_str, NULL ); link_mailslot = create_symlink( &dir_global->obj, &link_mailslot_str, 0, &dir_mailslot_str, NULL ); - link_0 = create_symlink( &dir_sessions->obj, &link_0_str, 0, &dir_basenamed_str, NULL ); + link_basenamed = create_symlink( &dir_1->obj, &link_basenamed_str, 0, &dir_basenamed_str, NULL ); link_session = create_symlink( &dir_basenamed->obj, &link_session_str, 0, &link_sessions_str, NULL ); make_object_static( (struct object *)link_dosdev ); make_object_static( (struct object *)link_global1 ); @@ -365,7 +368,7 @@ void init_directories(void) make_object_static( (struct object *)link_nul ); make_object_static( (struct object *)link_pipe ); make_object_static( (struct object *)link_mailslot ); - make_object_static( (struct object *)link_0 ); + make_object_static( (struct object *)link_basenamed ); make_object_static( (struct object *)link_session ); /* events */ @@ -382,6 +385,7 @@ void init_directories(void) release_object( dir_device ); release_object( dir_basenamed ); release_object( dir_sessions ); + release_object( dir_1 ); release_object( dir_kernel ); release_object( dir_windows ); }

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: 456dab89194e288183e5a23240e32b320ea951e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=456dab89194e288183e5a2324… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Jul 16 20:54:37 2016 +0300 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 53 +++++++++++++++++------------------------------------ 1 file changed, 17 insertions(+), 36 deletions(-) diff --git a/po/uk.po b/po/uk.po index 503955c..c350b51 100644 --- a/po/uk.po +++ b/po/uk.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: 2016-05-05 21:44+0200\n" +"PO-Revision-Date: 2016-07-16 20:50+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -12064,85 +12064,66 @@ msgstr "regedit: Непідтримувана операція.\n" #: regedit.rc:367 msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" -msgstr "" +msgstr "regedit: Недостатньо пам'яті! (%1!S!, рядок %2!u!)\n" #: regedit.rc:368 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid hexadecimal value.\n" -msgstr "reg: невірне ім'я ключа\n" +msgstr "regedit: Невірне шістнадцяткове значення.\n" #: regedit.rc:369 msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" +"regedit: Неможливо конвертувати дані у шістнадцятковому форматі. Невірне " +"значення '%1'.\n" #: regedit.rc:370 -#, fuzzy -#| msgid "regedit: Invalid or unrecognized switch [%1]\n" msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Невірний або нерозпізнаний параметр [%1]\n" +msgstr "regedit: Нерозпізнана послідовність [\\%1!c!]\n" #: regedit.rc:371 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1!u!]\n" -msgstr "reg: непідтримуваний тип даних [%1]\n" +msgstr "regedit: Непідтримуваний тип даних [%1!u!]\n" #: regedit.rc:372 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unexpected end of line in '%1'.\n" -msgstr "regedit: Неможливо відкрити файл '%1'.\n" +msgstr "regedit: Неочікуваний кінець рядка у '%1'.\n" #: regedit.rc:373 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "regedit: The line '%1' was not recognized.\n" -msgstr "regedit: Файл '%1' не знайдено.\n" +msgstr "regedit: Рядок '%1' не був розпізнаний.\n" #: regedit.rc:374 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" -msgstr "regedit: Неможливо відкрити файл '%1'.\n" +msgstr "regedit: Неможливо додати значення '%1' у '%2'.\n" #: regedit.rc:375 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "regedit: Неможливо відкрити файл '%1'.\n" +msgstr "regedit: Неможливо відкрити ключ '%1'.\n" #: regedit.rc:376 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" -msgstr "reg: непідтримуваний тип даних [%1]\n" +msgstr "regedit: '%2' містить непідтримуваний тип даних [%1!u!].\n" #: regedit.rc:377 msgid "regedit: The registry value '%1' will be exported as binary data.\n" msgstr "" +"regedit: Значення реєстру '%1' буде експортоване у двійковому вигляді.\n" #: regedit.rc:378 -#, fuzzy -#| msgid "regedit: No registry key was specified for removal.\n" msgid "regedit: Incorrect registry class specification in '%1'.\n" -msgstr "regedit: Не вказано ключ реєстру для видалення.\n" +msgstr "regedit: Невірний формат ключа реєстру у '%1'.\n" #: regedit.rc:379 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "" "regedit: Unable to export '%1'. The specified registry key was not found.\n" -msgstr "reg: не вдалось знайти вказаний ключ реєстру чи значення\n" +msgstr "" +"regedit: Неможливо експортувати '%1'. Вказаний ключ не був знайдений.\n" #: regedit.rc:380 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to delete the registry class '%1'.\n" -msgstr "regedit: Неможливо відкрити файл '%1'.\n" +msgstr "regedit: Неможливо видалити клас реєстру '%1'.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: 11e6898e34fcaed8cfca7276bc354b2020771f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=11e6898e34fcaed8cfca7276b… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Jul 16 12:23:21 2016 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 53 +++++++++++++++++------------------------------------ 1 file changed, 17 insertions(+), 36 deletions(-) diff --git a/po/lt.po b/po/lt.po index 8c7820f..d695575 100644 --- a/po/lt.po +++ b/po/lt.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: 2016-07-06 11:31+0300\n" +"PO-Revision-Date: 2016-07-16 12:20+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11982,85 +11982,66 @@ msgstr "regedit: Neapdorojamas veiksmas.\n" #: regedit.rc:367 msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" -msgstr "" +msgstr "regedit: Trūksta atminties! (%1!S!, eilutė %2!u!)\n" #: regedit.rc:368 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid hexadecimal value.\n" -msgstr "reg: Netinkamas rakto vardas\n" +msgstr "regedit: Netinkama šešioliktainė reikšmė.\n" #: regedit.rc:369 msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" +"regedit: Nepavyko konvertuoti šešioliktainių duomenų. Neteisinga reikšmė " +"sutikta „%1“.\n" #: regedit.rc:370 -#, fuzzy -#| msgid "regedit: Invalid or unrecognized switch [%1]\n" msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Netinkamas arba neatpažintas parametras [%1]\n" +msgstr "regedit: Neatpažinta kaitos seka [\\%1!c!]\n" #: regedit.rc:371 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1!u!]\n" -msgstr "reg: Nepalaikomas registro duomenų tipas [%1]\n" +msgstr "regedit: Nepalaikomas registro duomenų tipas [%1!u!]\n" #: regedit.rc:372 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unexpected end of line in '%1'.\n" -msgstr "regedit: Nepavyko atverti failo „%1“.\n" +msgstr "regedit: Netikėta eilutės pabaiga „%1“.\n" #: regedit.rc:373 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "regedit: The line '%1' was not recognized.\n" -msgstr "regedit: Failas „%1“ nerastas.\n" +msgstr "regedit: Eilutė „%1“ neatpažinta.\n" #: regedit.rc:374 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" -msgstr "regedit: Nepavyko atverti failo „%1“.\n" +msgstr "regedit: Nepavyko pridėti registro reikšmės „%1“ į „%2“.\n" #: regedit.rc:375 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "regedit: Nepavyko atverti failo „%1“.\n" +msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" #: regedit.rc:376 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" -msgstr "reg: Nepalaikomas registro duomenų tipas [%1]\n" +msgstr "regedit: Nepalaikomas registro duomenų tipas [%1!u!] sutiktas „%2“.\n" #: regedit.rc:377 msgid "regedit: The registry value '%1' will be exported as binary data.\n" msgstr "" +"regedit: Registro reikšmė „%1“ bus eksportuota kaip dvejetainiai duomenys.\n" #: regedit.rc:378 -#, fuzzy -#| msgid "regedit: No registry key was specified for removal.\n" msgid "regedit: Incorrect registry class specification in '%1'.\n" -msgstr "regedit: Nenurodytas registro raktas šalinimui.\n" +msgstr "regedit: Neteisinga registro klasės specifikacija „%1“.\n" #: regedit.rc:379 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "" "regedit: Unable to export '%1'. The specified registry key was not found.\n" -msgstr "reg: Sistemai nepavyko rasti nurodyto registro rakto ar reikšmės\n" +msgstr "" +"regedit: Nepavyko eksportuoti „%1“. Nurodytas registro raktas nerastas.\n" #: regedit.rc:380 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to delete the registry class '%1'.\n" -msgstr "regedit: Nepavyko atverti failo „%1“.\n" +msgstr "regedit: Nepavyko pašalinti registro klasės „%1“.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Michael Stefaniuc : usp10/tests: Use SetRect() instead of open coding it.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: ac740f17dcf3037cf485df4e261a12ae02aa223e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac740f17dcf3037cf485df4e2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 11 09:57:03 2016 +0200 usp10/tests: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index bb044ce..6b2152f 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2450,10 +2450,7 @@ static void test_ScriptTextOut(HDC hdc) ok (hr == S_OK, "ScriptTextOut should return S_OK not (%08x)\n", hr); /* Test Rect Rgn is acceptable */ - rect.top = 10; - rect.bottom = 20; - rect.left = 10; - rect.right = 40; + SetRect(&rect, 10, 10, 40, 20); hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); ok (hr == S_OK, "ScriptTextOut should return S_OK not (%08x)\n", hr); @@ -2616,10 +2613,7 @@ static void test_ScriptTextOut3(HDC hdc) ok (hr == S_OK, "Should return S_OK not (%08x)\n", hr); /* Test Rect Rgn is acceptable */ - rect.top = 10; - rect.bottom = 20; - rect.left = 10; - rect.right = 40; + SetRect(&rect, 10, 10, 40, 20); hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); ok (hr == S_OK, "ScriptTextOut should return S_OK not (%08x)\n", hr);

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: 4a081b8898375bb6ee9de833b3f7b60415d797bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a081b8898375bb6ee9de833b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 15 23:56:24 2016 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 53 ++++++++++++++++------------------------------------- 1 file changed, 16 insertions(+), 37 deletions(-) diff --git a/po/ru.po b/po/ru.po index ad723f7..e67ae36 100644 --- a/po/ru.po +++ b/po/ru.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: 2016-07-07 13:26+0300\n" +"PO-Revision-Date: 2016-07-15 23:49+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -11979,85 +11979,64 @@ msgstr "regedit: операция не поддерживается.\n" #: regedit.rc:367 msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" -msgstr "" +msgstr "regedit: недостаточно памяти! (%1!S!, строка %2!u!)\n" #: regedit.rc:368 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid hexadecimal value.\n" -msgstr "reg: неверное имя раздела\n" +msgstr "regedit: неверное шестнадцатеричное значение.\n" #: regedit.rc:369 msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" +"regedit: не удалось преобразовать данные в шестнадцатеричном формате. " +"Неверное значение «%1».\n" #: regedit.rc:370 -#, fuzzy -#| msgid "regedit: Invalid or unrecognized switch [%1]\n" msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: неверный или неизвестный параметр [%1]\n" +msgstr "regedit: неизвестная управляющая последовательность [\\%1!c!]\n" #: regedit.rc:371 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1!u!]\n" -msgstr "reg: тип данных [%1] не поддерживается\n" +msgstr "regedit: тип данных [%1!u!] не поддерживается\n" #: regedit.rc:372 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unexpected end of line in '%1'.\n" -msgstr "regedit: не удалось открыть файл «%1».\n" +msgstr "regedit: неожиданный конец строки в «%1».\n" #: regedit.rc:373 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "regedit: The line '%1' was not recognized.\n" -msgstr "regedit: файл «%1» не найден.\n" +msgstr "regedit: строка «%1» не распознана.\n" #: regedit.rc:374 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" -msgstr "regedit: не удалось открыть файл «%1».\n" +msgstr "regedit: не удалось добавить значение «%1» в «%2».\n" #: regedit.rc:375 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "regedit: не удалось открыть файл «%1».\n" +msgstr "regedit: не удалось открыть ключ «%1».\n" #: regedit.rc:376 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" -msgstr "reg: тип данных [%1] не поддерживается\n" +msgstr "regedit: «%2» содержит неподдерживаемый тип данных [%1!u!].\n" #: regedit.rc:377 msgid "regedit: The registry value '%1' will be exported as binary data.\n" -msgstr "" +msgstr "regedit: значение «%1» будет экспортировано в бинарном виде.\n" #: regedit.rc:378 -#, fuzzy -#| msgid "regedit: No registry key was specified for removal.\n" msgid "regedit: Incorrect registry class specification in '%1'.\n" -msgstr "regedit: не указан удаляемый ключ.\n" +msgstr "regedit: неверный формат имени ключа «%1».\n" #: regedit.rc:379 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "" "regedit: Unable to export '%1'. The specified registry key was not found.\n" -msgstr "reg: не удалось найти указанный раздел реестра или значение\n" +msgstr "regedit: не удалось экспортировать «%1». Указанный ключ не найден.\n" #: regedit.rc:380 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to delete the registry class '%1'.\n" -msgstr "regedit: не удалось открыть файл «%1».\n" +msgstr "regedit: не удалось удалить класс «%1».\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Alistair Leslie-Hughes : inetcomm: Improve IMimeBody GetHandle return value.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: b8b7db8be81640c9045200ef042e7ace134dd42a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8b7db8be81640c9045200ef0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 12 08:02:34 2016 +0000 inetcomm: Improve IMimeBody GetHandle return value. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 5 +++++ dlls/inetcomm/tests/mimeole.c | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index f4537f3..23bd930 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1314,6 +1314,9 @@ static HRESULT WINAPI MimeBody_GetHandle( MimeBody *This = impl_from_IMimeBody(iface); TRACE("(%p)->(%p)\n", iface, phBody); + if(!phBody) + return E_INVALIDARG; + *phBody = This->handle; return This->handle ? S_OK : MIME_E_NO_DATA; } @@ -1819,6 +1822,8 @@ static body_t *new_body_entry(MimeBody *mime_body, DWORD index, body_t *parent) body->index = index; list_init(&body->children); body->parent = parent; + + mime_body->handle = UlongToHandle(body->index); } return body; } diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 84b2c8d..58d0520 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -220,6 +220,7 @@ static void test_CreateMessage(void) ULONG count; FINDBODY find_struct; HCHARSET hcs; + HBODY handle = NULL; char text[] = "text"; HBODY *body_list; @@ -258,6 +259,13 @@ static void test_CreateMessage(void) hr = IMimeMessage_GetBody(msg, IBL_ROOT, NULL, &hbody); ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeBody_GetHandle(body, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + hr = IMimeBody_GetHandle(body, &handle); + ok(hr == S_OK, "ret %08x\n", hr); + ok(handle != NULL, "handle %p\n", handle); + PropVariantInit(&prop); hr = IMimeMessage_GetBodyProp(msg, hbody, att_pritype, 0, &prop); ok(hr == S_OK, "ret %08x\n", hr); @@ -269,6 +277,11 @@ static void test_CreateMessage(void) ok(hr == S_OK, "ret %08x\n", hr); hr = IMimeMessage_BindToObject(msg, hbody, &IID_IMimeBody, (void**)&body); ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeBody_GetHandle(body, &handle); + ok(hr == S_OK, "ret %08x\n", hr); + ok(handle == hbody, "handle %p\n", handle); + hr = IMimeBody_GetOffsets(body, &offsets); ok(hr == S_OK, "ret %08x\n", hr); ok(offsets.cbBoundaryStart == 405, "got %d\n", offsets.cbBoundaryStart); @@ -289,6 +302,11 @@ static void test_CreateMessage(void) ok(hr == S_OK, "ret %08x\n", hr); hr = IMimeMessage_BindToObject(msg, hbody, &IID_IMimeBody, (void**)&body); ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeBody_GetHandle(body, &handle); + ok(hr == S_OK, "ret %08x\n", hr); + ok(handle == hbody, "handle %p\n", handle); + hr = IMimeBody_GetOffsets(body, &offsets); ok(hr == S_OK, "ret %08x\n", hr); ok(offsets.cbBoundaryStart == 525, "got %d\n", offsets.cbBoundaryStart);

1 0