wine-commits April 2014

wine-commits@winehq.org

2 participants
500 discussions

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 02 Apr '14

02 Apr '14

Module: wine Branch: master Commit: e8519994606918b6a6f3774b42dbc0b4c7ba194b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8519994606918b6a6f3774b4… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Apr 2 18:03:45 2014 +0300 po: Update Ukrainian translation. --- po/uk.po | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/po/uk.po b/po/uk.po index 12c41bc..458d352 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: 2014-03-11 16:05+0300\n" +"PO-Revision-Date: 2014-04-02 17:53+0300\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: none\n" "Language: Ukrainian\n" @@ -11708,6 +11708,10 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" +"Утиліта реєстрації DLL у Wine\n" +"\n" +"Слугує сервісом для реєстрації DLL\n" +"\n" #: regsvr32.rc:40 msgid "" @@ -11722,54 +11726,64 @@ msgid "" " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" "\n" msgstr "" +"Використання:\n" +" regsvr32 [/u] [/s] [/n] [/i[:cmdline]] DllName\n" +"\n" +"Опції:\n" +" [/u] Скасувати реєстрацію сервера.\n" +" [/s] Тихий режим (повідомлення не відображатимуться).\n" +" [/i] Виклик DllInstall з додатковими параметрами [cmdline].\n" +"\tПри використанні з [/u] DllInstall буде викликана в режимі видалення.\n" +" [/n] Не викликати DllRegisterServer. Має використовуватися з [/i].\n" +"\n" #: regsvr32.rc:41 msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" +"regsvr32: Невірний або нерозпізнаний параметр [%1]\n" +"\n" #: regsvr32.rc:42 -#, fuzzy -#| msgid "Failed to open '%1'\n" msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "Не вдалось відкрити '%1'\n" +msgstr "regsvr32: Не вдалося завантажити DLL '%1'\n" #: regsvr32.rc:43 msgid "regsvr32: %1 not implemented in DLL '%2'\n" -msgstr "" +msgstr "regsvr32: %1 не реалізовано у DLL '%2'\n" #: regsvr32.rc:44 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Не вдалося зареєструвати DLL '%1'\n" #: regsvr32.rc:45 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' успішно зареєстрована\n" #: regsvr32.rc:46 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Не вдалося скасувати реєстрацію DLL '%1'\n" #: regsvr32.rc:47 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Реєстрація для DLL '%1' успішно скасована\n" #: regsvr32.rc:48 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Не вдалося встановити DLL '%1'\n" #: regsvr32.rc:49 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' успішно встановлена\n" #: regsvr32.rc:50 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Не вдалося видалити DLL '%1'\n" #: regsvr32.rc:51 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' успішно видалена\n" #: start.rc:55 msgid ""

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 02 Apr '14

02 Apr '14

Module: wine Branch: master Commit: b428c5e117bbdb369b276d629f5f0b5359c98936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b428c5e117bbdb369b276d629… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Apr 2 17:50:34 2014 +0300 po: Update Finnish translation. --- po/fi.po | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/po/fi.po b/po/fi.po index a0f15b0..f0df981 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11654,6 +11654,10 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" +"Winen DLL-rekisteröintityökalu\n" +"\n" +"Tuottaa DLL-rekisteröintipalvelut.\n" +"\n" #: regsvr32.rc:40 msgid "" @@ -11668,54 +11672,64 @@ msgid "" " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" "\n" msgstr "" +"Käyttö:\n" +" regsvr32 [/u] [/s] [/n] [/i[:komentorivi]] Dll-tiedostonNimi\n" +"\n" +"Valitsimet:\n" +" [/u] Pura palvelimen rekisteröinti.\n" +" [/s] Hiljainen tila (mitään viestejä ei näytetä).\n" +" [/i] Kutsu funktiota DllInstall, välitä valinnainen [komentorivi].\n" +"\tValitsimen [/u] kanssa kutsuu funktiota DllInstall poistotilassa.\n" +" [/n] Älä kutsu funktiota DllRegisterServer. Vaatii valitsimen [/i].\n" +"\n" #: regsvr32.rc:41 msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" +"regsvr32: Virheellinen tai tuntematon valitsin [%1]\n" +"\n" #: regsvr32.rc:42 -#, fuzzy -#| msgid "Failed to open '%1'\n" msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "'%1' ei auennut\n" +msgstr "regsvr32: DLL:n '%1' lataaminen epäonnistui\n" #: regsvr32.rc:43 msgid "regsvr32: %1 not implemented in DLL '%2'\n" -msgstr "" +msgstr "regsvr32: %1-toteutusta ei ole DLL:ssä '%2'\n" #: regsvr32.rc:44 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL:n '%1' rekisteröinti epäonnistui\n" #: regsvr32.rc:45 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' rekisteröity\n" #: regsvr32.rc:46 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL:n '%1' rekisteröinnin purkaminen epäonnistui\n" #: regsvr32.rc:47 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL:n '%1' rekisteröinti purettu\n" #: regsvr32.rc:48 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL:n '%1' asennus epäonnistui\n" #: regsvr32.rc:49 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' asennettu\n" #: regsvr32.rc:50 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL:n '%1' asennuksen purku epäonnistui\n" #: regsvr32.rc:51 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL:n '%1' asennus purettu\n" #: start.rc:55 msgid ""

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 02 Apr '14

02 Apr '14

Module: wine Branch: master Commit: 50add3afa7278eed574152d3a0ea206352c4d621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50add3afa7278eed574152d3a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 2 09:00:26 2014 +0400 po: Update Russian translation. --- po/ru.po | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/po/ru.po b/po/ru.po index 124a203..05c7999 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11680,6 +11680,10 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" +"Утилита регистрации DLL в Wine\n" +"\n" +"Используется для регистрации DLL.\n" +"\n" #: regsvr32.rc:40 msgid "" @@ -11694,54 +11698,64 @@ msgid "" " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" "\n" msgstr "" +"Использование:\n" +" regsvr32 [/u] [/s] [/n] [/i[:cmdline]] имя_dll\n" +"\n" +"Параметры:\n" +" [/u] Разрегистрировать сервер.\n" +" [/s] Тихий режим (сообщения не выводятся).\n" +" [/i] Вызвать DllInstall с дополнительными параметрами [cmdline].\n" +"\tПри использовании с [/u] DllInstall будет вызвана в режиме удаления.\n" +" [/n] Не вызывать DllRegisterServer. Используется с [/i].\n" +"\n" #: regsvr32.rc:41 msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" +"regsvr32: неверный или неизвестный параметр [%1]\n" +"\n" #: regsvr32.rc:42 -#, fuzzy -#| msgid "Failed to open '%1'\n" msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "Не удалось открыть «%1»\n" +msgstr "regsvr32: не удалось загрузить DLL «%1»\n" #: regsvr32.rc:43 msgid "regsvr32: %1 not implemented in DLL '%2'\n" -msgstr "" +msgstr "regsvr32: %1 не реализован в DLL «%2»\n" #: regsvr32.rc:44 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "" +msgstr "regsvr32: не удалось зарегистрировать «%1»\n" #: regsvr32.rc:45 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL «%1» успешно зарегистрирована\n" #: regsvr32.rc:46 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "" +msgstr "regsvr32: не удалось разрегистрировать DLL «%1»\n" #: regsvr32.rc:47 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL «%1» успешно разрегистрирована\n" #: regsvr32.rc:48 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "" +msgstr "regsvr32: не удалось установить DLL «%1»\n" #: regsvr32.rc:49 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL «%1» успешно установлена\n" #: regsvr32.rc:50 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "" +msgstr "regsvr32: не удалось удалить DLL «%1»\n" #: regsvr32.rc:51 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL «%1» успешно удалена\n" #: start.rc:55 msgid ""

1 0

Piotr Caban : user32: Make it possible to activate a window with parent and no WS_CHILD flag in WS_NCLBUTTONDOWN function.
by Alexandre Julliard 02 Apr '14

02 Apr '14

Module: wine Branch: master Commit: 27374064b68136cbb628f85111c95d20e31699c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27374064b68136cbb628f8511… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 2 15:39:45 2014 +0200 user32: Make it possible to activate a window with parent and no WS_CHILD flag in WS_NCLBUTTONDOWN function. --- dlls/user32/nonclient.c | 10 +++++++++- dlls/user32/tests/win.c | 21 +++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 5ea26dc..11b8d08 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1396,7 +1396,15 @@ LRESULT NC_HandleNCLButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) { case HTCAPTION: { - HWND top = GetAncestor( hwnd, GA_ROOT ); + HWND top = hwnd, parent; + while(1) + { + if ((GetWindowLongW( top, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) != WS_CHILD) + break; + parent = GetAncestor( top, GA_PARENT ); + if (!parent || parent == GetDesktopWindow()) break; + top = parent; + } if (FOCUS_MouseActivate( top ) || (GetActiveWindow() == top)) SendMessageW( hwnd, WM_SYSCOMMAND, SC_MOVE + HTCAPTION, lParam ); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 0966bad..2d6e534 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7510,6 +7510,26 @@ todo_wine DestroyWindow(parent); } +static void test_window_without_child_style(void) +{ + HWND hwnd; + + hwnd = CreateWindowExA(0, "edit", NULL, WS_VISIBLE|WS_CHILD, + 0, 0, 50, 50, hwndMain, NULL, 0, NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + + ok(SetWindowLongA(hwnd, GWL_STYLE, GetWindowLongA(hwnd, GWL_STYLE) & (~WS_CHILD)), + "can't remove WS_CHILD style\n"); + + SetActiveWindow(hwndMain); + PostMessageW(hwnd, WM_LBUTTONUP, 0, 0); + SendMessageW(hwnd, WM_NCLBUTTONDOWN, HTCAPTION, 0); + check_active_state(hwnd, hwnd, hwnd); + flush_events(TRUE); + + DestroyWindow(hwnd); +} + START_TEST(win) { HMODULE user32 = GetModuleHandleA( "user32.dll" ); @@ -7640,6 +7660,7 @@ START_TEST(win) test_winregion(); test_map_points(); test_update_region(); + test_window_without_child_style(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook);

1 0

Nikolay Sivov : kernel32: Added QueryUnbiasedInterruptTime().
by Alexandre Julliard 02 Apr '14

02 Apr '14

Module: wine Branch: master Commit: b82b1306a442ec7270aa497a8b8da07d45d04dcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b82b1306a442ec7270aa497a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 2 16:43:50 2014 +0400 kernel32: Added QueryUnbiasedInterruptTime(). --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/time.c | 11 +++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/time.c | 9 +++++++++ include/winternl.h | 1 + 5 files changed, 23 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b24a9ee..f3e5c67 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -940,6 +940,7 @@ @ stub QueryOldestEventLogRecord @ stdcall QueryPerformanceCounter(ptr) @ stdcall QueryPerformanceFrequency(ptr) +@ stdcall QueryUnbiasedInterruptTime(ptr) @ stub QueryWin31IniFilesMappedToRegistry @ stdcall QueueUserAPC(ptr long long) @ stdcall QueueUserWorkItem(ptr ptr long) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 4dc5d0e..01d38fc 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1103,3 +1103,14 @@ DWORD WINAPI GetDynamicTimeZoneInformation(PDYNAMIC_TIME_ZONE_INFORMATION info) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return TIME_ZONE_ID_INVALID; } + +/*********************************************************************** + * QueryUnbiasedInterruptTime (KERNEL32.@) + */ +BOOL WINAPI QueryUnbiasedInterruptTime(ULONGLONG *time) +{ + TRACE("(%p)\n", time); + if (!time) return FALSE; + RtlQueryUnbiasedInterruptTime(time); + return TRUE; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 3c751ea..0dd75a2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -797,6 +797,7 @@ @ stub RtlQuerySecurityObject @ stub RtlQueryTagHeap @ stdcall RtlQueryTimeZoneInformation(ptr) +@ stdcall RtlQueryUnbiasedInterruptTime(ptr) @ stub RtlQueueApcWow64Thread @ stdcall RtlQueueWorkItem(ptr ptr long) @ stdcall -register RtlRaiseException(ptr) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index c398878..5ec5a1c 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -931,3 +931,12 @@ NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER *NewTime, LARGE_INTEGER *Old return STATUS_NOT_IMPLEMENTED; #endif } + +/*********************************************************************** + * RtlQueryUnbiasedInterruptTime [NTDLL.@] + */ +NTSTATUS WINAPI RtlQueryUnbiasedInterruptTime(ULONGLONG *time) +{ + *time = monotonic_counter(); + return STATUS_SUCCESS; +} diff --git a/include/winternl.h b/include/winternl.h index 22ee8e8..886c2ea 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2469,6 +2469,7 @@ NTSYSAPI NTSTATUS WINAPI RtlQueryInformationActivationContext(ULONG,HANDLE,PVOI NTSYSAPI NTSTATUS WINAPI RtlQueryProcessDebugInformation(ULONG,ULONG,PDEBUG_BUFFER); NTSYSAPI NTSTATUS WINAPI RtlQueryRegistryValues(ULONG, PCWSTR, PRTL_QUERY_REGISTRY_TABLE, PVOID, PVOID); NTSYSAPI NTSTATUS WINAPI RtlQueryTimeZoneInformation(RTL_TIME_ZONE_INFORMATION*); +NTSYSAPI NTSTATUS WINAPI RtlQueryUnbiasedInterruptTime(ULONGLONG*); NTSYSAPI NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE,PVOID,ULONG); NTSYSAPI void WINAPI RtlRaiseException(PEXCEPTION_RECORD); NTSYSAPI void WINAPI RtlRaiseStatus(NTSTATUS);

1 0

Dmitry Timoshkov : rpcrt4/tests: Add a couple of tests for marshalling an array of strings.
by Alexandre Julliard 02 Apr '14

02 Apr '14

Module: wine Branch: master Commit: 05aab53f38da20ae9ac299bd3223df2e7f86cc0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=05aab53f38da20ae9ac299bd3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 2 18:37:51 2014 +0900 rpcrt4/tests: Add a couple of tests for marshalling an array of strings. --- dlls/rpcrt4/tests/server.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 5 ++++ 2 files changed, 60 insertions(+) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index f32d3f7..bd9f001 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -54,6 +54,9 @@ static char *domain_and_user; /* type check statements generated in header file */ fnprintf *p_printf = printf; +static const WCHAR helloW[] = { 'H','e','l','l','o',0 }; +static const WCHAR worldW[] = { 'W','o','r','l','d','!',0 }; + static void InitFunctionPointers(void) { HMODULE hrpcrt4 = GetModuleHandleA("rpcrt4.dll"); @@ -572,6 +575,34 @@ void __cdecl s_get_name(name_t *name) name->name[name->size - 1] = 0; } +void __cdecl s_get_names(int *n, str_array_t *names) +{ + str_array_t list; + + list = MIDL_user_allocate(2 * sizeof(list[0])); + list[0] = MIDL_user_allocate(6); + strcpy(list[0], "Hello"); + list[1] = MIDL_user_allocate(7); + strcpy(list[1], "World!"); + + *names = list; + *n = 2; +} + +void __cdecl s_get_namesw(int *n, wstr_array_t *names) +{ + wstr_array_t list; + + list = MIDL_user_allocate(2 * sizeof(list[0])); + list[0] = MIDL_user_allocate(sizeof(helloW)); + lstrcpyW(list[0], helloW); + list[1] = MIDL_user_allocate(sizeof(worldW)); + lstrcpyW(list[1], worldW); + + *names = list; + *n = 2; +} + int __cdecl s_sum_pcarr2(int n, int **pa) { return s_sum_conf_array(*pa, n); @@ -1191,12 +1222,36 @@ pointer_tests(void) if (!old_windows_version) { + int n; + str_array_t names; + wstr_array_t namesw; + name.size = 10; name.name = buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, name.size); get_name(&name); ok(name.name == buffer, "[in,out] pointer should have stayed as %p but instead changed to %p\n", name.name, buffer); ok(!strcmp(name.name, "Jeremy Wh"), "name didn't unmarshall properly, expected \"Jeremy Wh\", but got \"%s\"\n", name.name); HeapFree(GetProcessHeap(), 0, name.name); + + n = -1; + names = NULL; + get_names(&n, &names); + ok(n == 2, "expected 2, got %d\n", n); + ok(!strcmp(names[0], "Hello"), "expected Hello, got %s\n", names[0]); + ok(!strcmp(names[1], "World!"), "expected World!, got %s\n", names[1]); + MIDL_user_free(names[0]); + MIDL_user_free(names[1]); + MIDL_user_free(names); + + n = -1; + namesw = NULL; + get_namesw(&n, &namesw); + ok(n == 2, "expected 2, got %d\n", n); + ok(!lstrcmpW(namesw[0], helloW), "expected Hello, got %s\n", wine_dbgstr_w(namesw[0])); + ok(!lstrcmpW(namesw[1], worldW), "expected World!, got %s\n", wine_dbgstr_w(namesw[1])); + MIDL_user_free(namesw[0]); + MIDL_user_free(namesw[1]); + MIDL_user_free(namesw); } pa2 = a; diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index c193bae..8a02c29 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -328,6 +328,11 @@ cpp_quote("#endif") } name_t; void get_name([in,out] name_t *name); + typedef char **str_array_t; + void get_names([out] int *n, [out, string, size_is(,*n)] str_array_t *names); + typedef WCHAR **wstr_array_t; + void get_namesw([out] int *n, [out, string, size_is(,*n)] wstr_array_t *names); + int sum_pcarr2(int n, [size_is(, n)] int **pa); int sum_L1_norms(int n, [size_is(n)] vector_t *vs);

1 0

Dmitry Timoshkov : widl: Add support for an array of strings to write_string_tfs.
by Alexandre Julliard 02 Apr '14

02 Apr '14

Module: wine Branch: master Commit: a333c6584d73f76f227dff905f807491188e91cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a333c6584d73f76f227dff905… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 2 18:37:47 2014 +0900 widl: Add support for an array of strings to write_string_tfs. --- tools/widl/typegen.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9d9aeb7..d85b5e0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -85,6 +85,8 @@ static const unsigned short IsSimpleRef = 0x0100; static unsigned int field_memsize(const type_t *type, unsigned int *offset); static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align); static unsigned int type_memsize_and_alignment(const type_t *t, unsigned int *align); +static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type, + const char *name, unsigned int *typestring_offset); static unsigned int write_struct_tfs(FILE *file, type_t *type, const char *name, unsigned int *tfsoff); static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *type, const char *name, int write_ptr, unsigned int *tfsoff); @@ -2809,6 +2811,9 @@ static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, else elem_type = type_pointer_get_ref(type); + if (type_get_type(elem_type) == TYPE_POINTER && is_array(type)) + return write_array_tfs(file, attrs, type, name, typestring_offset); + if (type_get_type(elem_type) != TYPE_BASIC) { error("write_string_tfs: Unimplemented for non-basic type %s\n", name);

1 0

Dmitry Timoshkov : widl: Don' t call write_embedded_types if an array element is a string.
by Alexandre Julliard 02 Apr '14

02 Apr '14

Module: wine Branch: master Commit: 1dbcdee3268ccddca5a70a350b2f7ce9dcf70ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dbcdee3268ccddca5a70a350… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 2 18:37:41 2014 +0900 widl: Don't call write_embedded_types if an array element is a string. --- tools/widl/typegen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 37222d1..9d9aeb7 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2899,7 +2899,8 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t if (!pointer_type) pointer_type = RPC_FC_RP; - write_embedded_types(file, attrs, type_array_get_element(type), name, FALSE, typestring_offset); + if (!is_string_type(attrs, type_array_get_element(type))) + write_embedded_types(file, attrs, type_array_get_element(type), name, FALSE, typestring_offset); size = type_memsize(is_conformant_array(type) ? type_array_get_element(type) : type); align = type_buffer_alignment(is_conformant_array(type) ? type_array_get_element(type) : type);

1 0

Dmitry Timoshkov : widl: Avoid generating negative offsets for conformant arrays of strings.
by Alexandre Julliard 02 Apr '14

02 Apr '14

Module: wine Branch: master Commit: bde38bebe9d396ba83a5b3e477fa616b6500c4d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde38bebe9d396ba83a5b3e47… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 2 18:37:37 2014 +0900 widl: Avoid generating negative offsets for conformant arrays of strings. --- tools/widl/typegen.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 881f161..37222d1 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3581,12 +3581,26 @@ static unsigned int write_type_tfs(FILE *file, int indent, case TGT_POINTER: { enum type_context ref_context; + type_t *ref = type_pointer_get_ref(type); + if (context == TYPE_CONTEXT_TOPLEVELPARAM) ref_context = TYPE_CONTEXT_PARAM; else if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS) ref_context = TYPE_CONTEXT_CONTAINER; else ref_context = context; + + if (is_string_type(attrs, type) && is_conformant_array(ref)) + { + if (context != TYPE_CONTEXT_CONTAINER_NO_POINTERS) + write_pointer_tfs(file, attrs, type, *typeformat_offset + 4, context, typeformat_offset); + + offset = write_type_tfs(file, indent, attrs, ref, name, ref_context, typeformat_offset); + if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS) + return 0; + return offset; + } + offset = write_type_tfs( file, indent, attrs, type_pointer_get_ref(type), name, ref_context, typeformat_offset); if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS)

1 0

Dmitry Timoshkov : widl: Pass type attributes from write_array_tfs to write_array_element_type.
by Alexandre Julliard 02 Apr '14

02 Apr '14

Module: wine Branch: master Commit: 1845d10c3eee8bca3bfbfc6cdeab831dcd907ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1845d10c3eee8bca3bfbfc6cd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 2 18:37:32 2014 +0900 widl: Pass type attributes from write_array_tfs to write_array_element_type. This allows to differentiate strings and write appropriate rpc type (FC_C_C[W]STRING instead of FC_[W]CHAR). --- tools/widl/typegen.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 889d8c5..881f161 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2316,7 +2316,7 @@ static void write_member_type(FILE *file, const type_t *cont, error("Unsupported member type %d\n", type_get_type(type)); } -static void write_array_element_type(FILE *file, const type_t *type, +static void write_array_element_type(FILE *file, const attr_list_t *attrs, const type_t *type, int cont_is_complex, unsigned int *tfsoff) { type_t *elem = type_array_get_element(type); @@ -2331,7 +2331,7 @@ static void write_array_element_type(FILE *file, const type_t *type, ref->typestring_offset, tfsoff); return; } - if (cont_is_complex && is_string_type(NULL, elem)) + if (cont_is_complex && is_string_type(attrs, elem)) { write_string_tfs(file, NULL, elem, TYPE_CONTEXT_CONTAINER, NULL, tfsoff); return; @@ -2967,7 +2967,7 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *typestring_offset += 1; } - write_array_element_type(file, type, FALSE, typestring_offset); + write_array_element_type(file, is_string_type(attrs, type) ? attrs : NULL, type, FALSE, typestring_offset); write_end(file, typestring_offset); } else @@ -2982,7 +2982,7 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t += write_conf_or_var_desc(file, current_structure, baseoff, type, length_is); - write_array_element_type(file, type, TRUE, typestring_offset); + write_array_element_type(file, is_string_type(attrs, type) ? attrs : NULL, type, TRUE, typestring_offset); write_end(file, typestring_offset); }

1 0

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 April 2014