wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

Alexandre Julliard : user32: Store window station objects under the session directory.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 911e59c1333be238cc504bd9c3e06131e1204882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=911e59c1333be238cc504bd9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 15:38:42 2016 +0900 user32: Store window station objects under the session directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winstation.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 61add76..673917c 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -59,8 +59,10 @@ static BOOL CALLBACK enum_names_WtoA( LPWSTR name, LPARAM lparam ) static HANDLE get_winstations_dir_handle(void) { static HANDLE handle = NULL; - static const WCHAR basenameW[] = {'\\','W','i','n','d','o','w','s','\\', + static const WCHAR basenameW[] = {'\\','S','e','s','s','i','o','n','s','\\','%','u', + '\\','W','i','n','d','o','w','s','\\', 'W','i','n','d','o','w','S','t','a','t','i','o','n','s',0}; + WCHAR buffer[64]; UNICODE_STRING str; OBJECT_ATTRIBUTES attr; @@ -68,7 +70,8 @@ static HANDLE get_winstations_dir_handle(void) { HANDLE dir; - RtlInitUnicodeString( &str, basenameW ); + sprintfW( buffer, basenameW, NtCurrentTeb()->Peb->SessionId ); + RtlInitUnicodeString( &str, buffer ); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); NtOpenDirectoryObject( &dir, DIRECTORY_CREATE_OBJECT | DIRECTORY_TRAVERSE, &attr ); if (InterlockedCompareExchangePointer( &handle, dir, 0 ) != 0) /* someone beat us here */

1 0

Alexandre Julliard : kernel32: Store synchronization objects under the session directory.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 2f514becdb374f793511f8c3b229412fcd2e6c81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f514becdb374f793511f8c3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 15:38:30 2016 +0900 kernel32: Store synchronization objects under the session directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 8 +++++--- dlls/ntdll/tests/om.c | 27 ++++++++++++--------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 13fb0f0..c10fd01 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -57,8 +57,9 @@ static inline BOOL is_version_nt(void) HANDLE get_BaseNamedObjects_handle(void) { static HANDLE handle = NULL; - static const WCHAR basenameW[] = - {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s',0}; + static const WCHAR basenameW[] = {'\\','S','e','s','s','i','o','n','s','\\','%','u', + '\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s',0}; + WCHAR buffer[64]; UNICODE_STRING str; OBJECT_ATTRIBUTES attr; @@ -66,7 +67,8 @@ HANDLE get_BaseNamedObjects_handle(void) { HANDLE dir; - RtlInitUnicodeString(&str, basenameW); + sprintfW( buffer, basenameW, NtCurrentTeb()->Peb->SessionId ); + RtlInitUnicodeString( &str, buffer ); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); NtOpenDirectoryObject(&dir, DIRECTORY_CREATE_OBJECT|DIRECTORY_TRAVERSE, &attr); diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 64a16ab..43c5ee4 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -231,13 +231,14 @@ static HANDLE get_base_dir(void) UNICODE_STRING str; OBJECT_ATTRIBUTES attr; HANDLE dir, h; - unsigned int i; + char name[40]; h = CreateMutexA(NULL, FALSE, objname); ok(h != 0, "CreateMutexA failed got ret=%p (%d)\n", h, GetLastError()); InitializeObjectAttributes(&attr, &str, OBJ_OPENIF, 0, NULL); - pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local"); + sprintf( name, "\\BaseNamedObjects\\Session\\%u", NtCurrentTeb()->Peb->SessionId ); + pRtlCreateUnicodeStringFromAsciiz(&str, name ); status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr); pRtlFreeUnicodeString(&str); if (!status && is_correct_dir( dir, objname )) goto done; @@ -249,16 +250,6 @@ static HANDLE get_base_dir(void) if (!status && is_correct_dir( dir, objname )) goto done; if (!status) pNtClose( dir ); - for (i = 0; i < 20; i++) - { - char name[40]; - sprintf( name, "\\BaseNamedObjects\\Session\\%u", i ); - pRtlCreateUnicodeStringFromAsciiz(&str, name ); - status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr); - pRtlFreeUnicodeString(&str); - if (!status && is_correct_dir( dir, objname )) goto done; - if (!status) pNtClose( dir ); - } dir = 0; done: @@ -1293,10 +1284,12 @@ static void test_query_object(void) NTSTATUS status; ULONG len, expected_len; OBJECT_ATTRIBUTES attr; - UNICODE_STRING path, *str; + UNICODE_STRING path, session, *str; char dir[MAX_PATH], tmp_path[MAX_PATH], file1[MAX_PATH + 16]; LARGE_INTEGER size; + sprintf( tmp_path, "\\Sessions\\%u", NtCurrentTeb()->Peb->SessionId ); + pRtlCreateUnicodeStringFromAsciiz( &session, tmp_path ); InitializeObjectAttributes( &attr, &path, 0, 0, 0 ); handle = CreateEventA( NULL, FALSE, FALSE, "test_event" ); @@ -1330,8 +1323,11 @@ static void test_query_object(void) ok( str->Length >= sizeof(name), "unexpected len %u\n", str->Length ); ok( len > sizeof(UNICODE_STRING) + sizeof("\\test_event") * sizeof(WCHAR), "name too short %s\n", wine_dbgstr_w(str->Buffer) ); - /* there can be a \\Sessions prefix in the name */ - ok( !memcmp( str->Buffer + (str->Length - sizeof(name)) / sizeof(WCHAR), name, sizeof(name) ), + /* check for \\Sessions prefix in the name */ + ok( (str->Length > session.Length && + !memcmp( str->Buffer, session.Buffer, session.Length ) && + !memcmp( str->Buffer + session.Length / sizeof(WCHAR), name, sizeof(name) )) || + broken( !memcmp( str->Buffer, name, sizeof(name) )), /* winxp */ "wrong name %s\n", wine_dbgstr_w(str->Buffer) ); trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); @@ -1528,6 +1524,7 @@ static void test_query_object(void) trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); pNtClose( handle ); } + pRtlFreeUnicodeString( &session ); } static void test_type_mismatch(void)

1 0

Alexandre Julliard : server: Add a helper function to create session directories and symlinks.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 87bbc84ad538758c777ff1ad9829495c2d1d448e URL: http://source.winehq.org/git/wine.git/?a=commit;h=87bbc84ad538758c777ff1ad9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 15:36:32 2016 +0900 server: Add a helper function to create session directories and symlinks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 133 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 91 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87bbc84ad538758c777ff…

1 0

Alexandre Julliard : server: Add a helper function to create a symlink to an existing object.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: c7f16d62204c86ed66c216125448d6678b5ad42e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f16d62204c86ed66c216125… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 15:34:08 2016 +0900 server: Add a helper function to create a symlink to an existing object. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 5 ++--- server/directory.c | 56 +++++++++++++++++++++++++---------------------------- server/file.h | 6 +++--- server/mailslot.c | 4 ++-- server/named_pipe.c | 4 ++-- server/object.h | 6 +++--- server/symlink.c | 31 ++++++++++++++++++++++++++--- 7 files changed, 66 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7f16d62204c86ed66c21…

1 0

Piotr Chruściel : server: Move the \BaseNamedObjects symlink in \Sessions\0 to \Sessions\1\BaseNamedObjects.
by Alexandre Julliard 18 Jul '16

18 Jul '16

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 18 Jul '16

18 Jul '16

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 18 Jul '16

18 Jul '16

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

Alistair Leslie-Hughes : inetcomm: GetBody returns MIME_E_NOT_FOUND when no parent found.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: ed880969b37c873ce6d46bcc1e03177228e4061e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed880969b37c873ce6d46bcc1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 12 08:02:46 2016 +0000 inetcomm: GetBody returns MIME_E_NOT_FOUND when no parent found. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 10 +++++++++- dlls/inetcomm/tests/mimeole.c | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 23bd930..6046c74 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2175,7 +2175,10 @@ static HRESULT get_body(MimeMessage *msg, BODYLOCATION location, HBODY pivot, bo switch(location) { case IBL_PARENT: - *out = body->parent; + if(body->parent) + *out = body->parent; + else + hr = MIME_E_NOT_FOUND; break; case IBL_FIRST: @@ -2239,6 +2242,11 @@ static HRESULT WINAPI MimeMessage_GetBody(IMimeMessage *iface, BODYLOCATION loca TRACE("(%p)->(%d, %p, %p)\n", iface, location, hPivot, phBody); + if(!phBody) + return E_INVALIDARG; + + *phBody = NULL; + hr = get_body(This, location, hPivot, &body); if(hr == S_OK) *phBody = UlongToHandle(body->index); diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 58d0520..011c19f 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -214,7 +214,7 @@ static void test_CreateMessage(void) IStream *stream; LARGE_INTEGER pos; LONG ref; - HBODY hbody; + HBODY hbody, hbody2; IMimeBody *body; BODYOFFSETS offsets; ULONG count; @@ -266,6 +266,14 @@ static void test_CreateMessage(void) ok(hr == S_OK, "ret %08x\n", hr); ok(handle != NULL, "handle %p\n", handle); + hr = IMimeMessage_GetBody(msg, IBL_PARENT, hbody, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + hbody2 = (HBODY)0xdeadbeef; + hr = IMimeMessage_GetBody(msg, IBL_PARENT, hbody, &hbody2); + ok(hr == MIME_E_NOT_FOUND, "ret %08x\n", hr); + ok(hbody2 == NULL, "hbody2 %p\n", hbody2); + PropVariantInit(&prop); hr = IMimeMessage_GetBodyProp(msg, hbody, att_pritype, 0, &prop); ok(hr == S_OK, "ret %08x\n", hr);

1 0

Alistair Leslie-Hughes : inetcomm: Improve IMimeBody GetHandle return value.
by Alexandre Julliard 18 Jul '16

18 Jul '16

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

Michael Stefaniuc : usp10/tests: Use SetRect() instead of open coding it.
by Alexandre Julliard 18 Jul '16

18 Jul '16

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

← Newer
1
...
25
26
27
28
29
30
31
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2016