January 2022 - Wine-devel - list.winehq.org

[PATCH] d2d: Suppress last empty segment also for D2D1_FIGURE_END_OPEN
by Stefan Brüns 03 Jan '22

03 Jan '22

When the last vertex is coincident with the first vertex, the last segment should be suppressed for both END_OPEN and END_CLOSED. When the last, zero length segment is not omitted d2d_geometry_intersect_self will add invalid segments. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51139 Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- dlls/d2d1/geometry.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a7074899fda..95aaf199ad2 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2917,8 +2917,9 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_EndFigure(ID2D1GeometrySink *ifa { ++geometry->u.path.segment_count; figure->flags |= D2D_FIGURE_FLAG_CLOSED; - if (!memcmp(&figure->vertices[0], &figure->vertices[figure->vertex_count - 1], sizeof(*figure->vertices))) - --figure->vertex_count; + } + if (!memcmp(&figure->vertices[0], &figure->vertices[figure->vertex_count - 1], sizeof(*figure->vertices))) { + --figure->vertex_count; } if (!d2d_geometry_add_figure_outline(geometry, figure, figure_end)) -- 2.34.1

3 6

[PATCH 1/2] ws2_32/tests: Add a test for simultaneous WSARecv().
by Jinoh Kang 03 Jan '22

03 Jan '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 55 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d4585c2b1dc..57ff496cfb8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -11451,6 +11451,60 @@ static void test_nonblocking_async_recv(void) CloseHandle(overlapped.hEvent); } +static void test_simultaneous_async_recv(void) +{ + SOCKET client, server; + OVERLAPPED overlappeds[2] = {{0}}; + HANDLE events[2]; + WSABUF wsabufs[2]; + DWORD flags[2] = {0}; + size_t num_io = 2, stride = 16, i; + char resbuf[32] = ""; + static const char msgstr[32] = "-- Lorem ipsum dolor sit amet -"; + int ret; + + for (i = 0; i < num_io; i++) events[i] = CreateEventW(NULL, TRUE, FALSE, NULL); + + tcp_socketpair(&client, &server); + + for (i = 0; i < num_io; i++) + { + wsabufs[i].buf = resbuf + i * stride; + wsabufs[i].len = stride; + overlappeds[i].hEvent = events[i]; + ret = WSARecv(client, &wsabufs[i], 1, NULL, &flags[i], &overlappeds[i], NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + } + + ret = send(server, msgstr, sizeof(msgstr), 0); + ok(ret == sizeof(msgstr), "got %d\n", ret); + + for (i = 0; i < num_io; i++) + { + const void *expect = msgstr + i * stride; + const void *actual = resbuf + i * stride; + DWORD size; + + ret = WaitForSingleObject(events[i], 1000); + todo_wine_if(i > 0) + ok(!ret, "wait timed out\n"); + + ret = GetOverlappedResult((HANDLE)client, &overlappeds[i], &size, FALSE); + todo_wine_if(i > 0) + ok(ret, "got error %u\n", GetLastError()); + todo_wine_if(i > 0) + ok(size == stride, "got size %u\n", size); + todo_wine_if(i > 0) + ok(!memcmp(expect, actual, stride), "expected %s, got %s\n", debugstr_an(expect, stride), debugstr_an(actual, stride)); + } + + closesocket(client); + closesocket(server); + + for (i = 0; i < num_io; i++) CloseHandle(events[i]); +} + static void test_empty_recv(void) { OVERLAPPED overlapped = {0}; @@ -12009,6 +12063,7 @@ START_TEST( sock ) test_connecting_socket(); test_WSAGetOverlappedResult(); test_nonblocking_async_recv(); + test_simultaneous_async_recv(); test_empty_recv(); test_timeout(); -- 2.31.1

2 2

[PATCH] po: Update Russian translation.
by Nikolay Sivov 03 Jan '22

03 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 392 +++++++++++++++++++++++++++---------------------------- 1 file changed, 196 insertions(+), 196 deletions(-) diff --git a/po/ru.po b/po/ru.po index 1076281f7f8..982f907359d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-12-30 18:27+0300\n" +"PO-Revision-Date: 2022-01-03 11:22+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -10375,15 +10375,15 @@ msgstr "Выберите источник" #: dlls/tzres/tzres.rc:126 msgid "China Standard Time" -msgstr "" +msgstr "Китайское стандартное время" #: dlls/tzres/tzres.rc:127 msgid "China Daylight Time" -msgstr "" +msgstr "Китайское летнее время" #: dlls/tzres/tzres.rc:128 msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" -msgstr "" +msgstr "(UTC+08:00) Пекин, Чунцин, Гонконг, Урумчи" #: dlls/tzres/tzres.rc:267 msgid "North Asia Standard Time" @@ -10399,11 +10399,11 @@ msgstr "(UTC+07:00) Красноярск" #: dlls/tzres/tzres.rc:168 msgid "Georgian Standard Time" -msgstr "" +msgstr "Грузинское стандартное время" #: dlls/tzres/tzres.rc:169 msgid "Georgian Daylight Time" -msgstr "" +msgstr "Грузинское летнее время" #: dlls/tzres/tzres.rc:170 msgid "(UTC+04:00) Tbilisi" @@ -10419,11 +10419,11 @@ msgstr "" #: dlls/tzres/tzres.rc:252 msgid "Nepal Standard Time" -msgstr "" +msgstr "Непальское стандартное время" #: dlls/tzres/tzres.rc:253 msgid "Nepal Daylight Time" -msgstr "" +msgstr "Непальское летнее время" #: dlls/tzres/tzres.rc:254 msgid "(UTC+05:45) Kathmandu" @@ -10443,11 +10443,11 @@ msgstr "" #: dlls/tzres/tzres.rc:183 msgid "Haiti Standard Time" -msgstr "" +msgstr "Гаитянское стандартное время" #: dlls/tzres/tzres.rc:184 msgid "Haiti Daylight Time" -msgstr "" +msgstr "Гаитянское летнее время" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" @@ -10467,11 +10467,11 @@ msgstr "(UTC+01:00) Сараево, Скопье, Варшава, Загреб" #: dlls/tzres/tzres.rc:234 msgid "Morocco Standard Time" -msgstr "" +msgstr "Марокканское стандартное время" #: dlls/tzres/tzres.rc:235 msgid "Morocco Daylight Time" -msgstr "" +msgstr "Марокканское летнее время" #: dlls/tzres/tzres.rc:236 msgid "(UTC+01:00) Casablanca" @@ -10487,23 +10487,23 @@ msgstr "" #: dlls/tzres/tzres.rc:39 msgid "Altai Standard Time" -msgstr "" +msgstr "Алтайское стандартное время" #: dlls/tzres/tzres.rc:40 msgid "Altai Daylight Time" -msgstr "" +msgstr "Алтайское летнее время" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" -msgstr "" +msgstr "(UTC+07:00) Барнаул, Горно-Алтайск" #: dlls/tzres/tzres.rc:108 msgid "Central Europe Standard Time" -msgstr "" +msgstr "Центральноевропейское стандартное время" #: dlls/tzres/tzres.rc:109 msgid "Central Europe Daylight Time" -msgstr "" +msgstr "Центральноевропейское летнее время" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" @@ -10511,11 +10511,11 @@ msgstr "(UTC+01:00) Белград, Братислава, Будапешт, Лю #: dlls/tzres/tzres.rc:192 msgid "Iran Standard Time" -msgstr "" +msgstr "Иранское стандартное время" #: dlls/tzres/tzres.rc:193 msgid "Iran Daylight Time" -msgstr "" +msgstr "Иранское летнее время" #: dlls/tzres/tzres.rc:194 msgid "(UTC+03:30) Tehran" @@ -10523,51 +10523,51 @@ msgstr "(UTC+03:30) Тегеран" #: dlls/tzres/tzres.rc:318 msgid "Saint Pierre Standard Time" -msgstr "" +msgstr "Сен-Пьер стандартное время" #: dlls/tzres/tzres.rc:319 msgid "Saint Pierre Daylight Time" -msgstr "" +msgstr "Сен-Пьер летнее время" #: dlls/tzres/tzres.rc:320 msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "" +msgstr "(UTC-03:00) Сен-Пьер и Микелон" #: dlls/tzres/tzres.rc:327 msgid "Sao Tome Standard Time" -msgstr "" +msgstr "Сан-Томе стандартное время" #: dlls/tzres/tzres.rc:328 msgid "Sao Tome Daylight Time" -msgstr "" +msgstr "Сан-Томе летнее время" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" -msgstr "" +msgstr "(UTC+00:00) Сан-Томе" #: dlls/tzres/tzres.rc:249 msgid "Namibia Standard Time" -msgstr "" +msgstr "Намибийское стандартное время" #: dlls/tzres/tzres.rc:250 msgid "Namibia Daylight Time" -msgstr "" +msgstr "Намибийское летнее время" #: dlls/tzres/tzres.rc:251 msgid "(UTC+02:00) Windhoek" -msgstr "" +msgstr "(UTC+02:00) Виндхук" #: dlls/tzres/tzres.rc:369 msgid "Tonga Standard Time" -msgstr "" +msgstr "Тонга стандартное время" #: dlls/tzres/tzres.rc:370 msgid "Tonga Daylight Time" -msgstr "" +msgstr "Тонга летнее время" #: dlls/tzres/tzres.rc:371 msgid "(UTC+13:00) Nuku'alofa" -msgstr "" +msgstr "(UTC+13:00) Нукуалофа" #: dlls/tzres/tzres.rc:240 msgid "Mountain Standard Time (Mexico)" @@ -10583,11 +10583,11 @@ msgstr "" #: dlls/tzres/tzres.rc:171 msgid "GMT Standard Time" -msgstr "" +msgstr "Стандартное время GMT" #: dlls/tzres/tzres.rc:172 msgid "GMT Daylight Time" -msgstr "" +msgstr "Стандартное время GMT" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" @@ -10595,23 +10595,23 @@ msgstr "(UTC+00:00) Дублин, Эдинбург, Лиссабон, Лондо #: dlls/tzres/tzres.rc:342 msgid "South Sudan Standard Time" -msgstr "" +msgstr "Южный Судан стандартное время" #: dlls/tzres/tzres.rc:343 msgid "South Sudan Daylight Time" -msgstr "" +msgstr "Южный Судан летнее время" #: dlls/tzres/tzres.rc:344 msgid "(UTC+02:00) Juba" -msgstr "" +msgstr "(UTC+02:00) Джуба" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" -msgstr "" +msgstr "Центральноазиатское стандартное время" #: dlls/tzres/tzres.rc:103 msgid "Central Asia Daylight Time" -msgstr "" +msgstr "Центральноазиатское летнее время" #: dlls/tzres/tzres.rc:104 msgid "(UTC+06:00) Astana" @@ -10631,11 +10631,11 @@ msgstr "" #: dlls/tzres/tzres.rc:48 msgid "Arabic Standard Time" -msgstr "" +msgstr "Арабское стандартное время" #: dlls/tzres/tzres.rc:49 msgid "Arabic Daylight Time" -msgstr "" +msgstr "Арабское летнее время" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" @@ -10651,11 +10651,11 @@ msgstr "" #: dlls/tzres/tzres.rc:216 msgid "Magadan Standard Time" -msgstr "" +msgstr "Магаданское стандартное время" #: dlls/tzres/tzres.rc:217 msgid "Magadan Daylight Time" -msgstr "" +msgstr "Магаданское летнее время" #: dlls/tzres/tzres.rc:218 msgid "(UTC+11:00) Magadan" @@ -10675,15 +10675,15 @@ msgstr "" #: dlls/tzres/tzres.rc:348 msgid "Sudan Standard Time" -msgstr "" +msgstr "Суданское стандартное время" #: dlls/tzres/tzres.rc:349 msgid "Sudan Daylight Time" -msgstr "" +msgstr "Суданское летнее время" #: dlls/tzres/tzres.rc:350 msgid "(UTC+02:00) Khartoum" -msgstr "" +msgstr "(UTC+02:00) Хартум" #: dlls/tzres/tzres.rc:438 msgid "West Pacific Standard Time" @@ -10695,7 +10695,7 @@ msgstr "" #: dlls/tzres/tzres.rc:440 msgid "(UTC+10:00) Guam, Port Moresby" -msgstr "" +msgstr "(UTC+10:00) Гуам, Порт-Морсби" #: dlls/tzres/tzres.rc:279 msgid "Pacific Standard Time" @@ -10711,11 +10711,11 @@ msgstr "" #: dlls/tzres/tzres.rc:69 msgid "Azerbaijan Standard Time" -msgstr "" +msgstr "Азербайджанское стандартное время" #: dlls/tzres/tzres.rc:70 msgid "Azerbaijan Daylight Time" -msgstr "" +msgstr "Азербайджанское летнее время" #: dlls/tzres/tzres.rc:71 msgid "(UTC+04:00) Baku" @@ -10731,15 +10731,15 @@ msgstr "" #: dlls/tzres/tzres.rc:221 msgid "(UTC-03:00) Punta Arenas" -msgstr "" +msgstr "(UTC-03:00) Пунта-Аренас" #: dlls/tzres/tzres.rc:324 msgid "Samoa Standard Time" -msgstr "" +msgstr "Стандартное время Самоа" #: dlls/tzres/tzres.rc:325 msgid "Samoa Daylight Time" -msgstr "" +msgstr "Летнее время Самоа" #: dlls/tzres/tzres.rc:326 msgid "(UTC+13:00) Samoa" @@ -10747,11 +10747,11 @@ msgstr "(UTC+13:00) Самоа" #: dlls/tzres/tzres.rc:201 msgid "Kaliningrad Standard Time" -msgstr "" +msgstr "Калининградское стандартное время" #: dlls/tzres/tzres.rc:202 msgid "Kaliningrad Daylight Time" -msgstr "" +msgstr "Калининградское летнее время" #: dlls/tzres/tzres.rc:203 msgid "(UTC+02:00) Kaliningrad" @@ -10767,15 +10767,15 @@ msgstr "" #: dlls/tzres/tzres.rc:284 msgid "(UTC-08:00) Baja California" -msgstr "" +msgstr "(UTC-08:00) Нижняя Калифорния" #: dlls/tzres/tzres.rc:228 msgid "Middle East Standard Time" -msgstr "" +msgstr "Ближневосточное стандартное время" #: dlls/tzres/tzres.rc:229 msgid "Middle East Daylight Time" -msgstr "" +msgstr "Ближневосточное летнее время" #: dlls/tzres/tzres.rc:230 msgid "(UTC+02:00) Beirut" @@ -10783,15 +10783,15 @@ msgstr "(UTC+02:00) Бейрут" #: dlls/tzres/tzres.rc:363 msgid "Tokyo Standard Time" -msgstr "" +msgstr "Стандартное время Токио" #: dlls/tzres/tzres.rc:364 msgid "Tokyo Daylight Time" -msgstr "" +msgstr "Летнее время Токио" #: dlls/tzres/tzres.rc:365 msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" -msgstr "" +msgstr "(UTC+09:00) Осака, Саппоро, Токио" #: dlls/tzres/tzres.rc:210 msgid "Line Islands Standard Time" @@ -10803,15 +10803,15 @@ msgstr "" #: dlls/tzres/tzres.rc:212 msgid "(UTC+14:00) Kiritimati Island" -msgstr "" +msgstr "(UTC+14:00) Кирибати" #: dlls/tzres/tzres.rc:129 msgid "Cuba Standard Time" -msgstr "" +msgstr "Кубинское стандартное время" #: dlls/tzres/tzres.rc:130 msgid "Cuba Daylight Time" -msgstr "" +msgstr "Кубинское летнее время" #: dlls/tzres/tzres.rc:131 msgid "(UTC-05:00) Havana" @@ -10819,11 +10819,11 @@ msgstr "(UTC-05:00) Гавана" #: dlls/tzres/tzres.rc:198 msgid "Jordan Standard Time" -msgstr "" +msgstr "Иорданское стандартное время" #: dlls/tzres/tzres.rc:199 msgid "Jordan Daylight Time" -msgstr "" +msgstr "Иорданское летнее время" #: dlls/tzres/tzres.rc:200 msgid "(UTC+02:00) Amman" @@ -10831,15 +10831,15 @@ msgstr "(UTC+02:00) Амман" #: dlls/tzres/tzres.rc:117 msgid "Central Standard Time" -msgstr "" +msgstr "Центральное время" #: dlls/tzres/tzres.rc:118 msgid "Central Daylight Time" -msgstr "" +msgstr "Центральное летнее время" #: dlls/tzres/tzres.rc:119 msgid "(UTC-06:00) Central Time (US & Canada)" -msgstr "" +msgstr "(UTC-06:00) Центральное время (США и Канада)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 msgid "Russia Time Zone 3" @@ -10851,11 +10851,11 @@ msgstr "(UTC+04:00) Ижевск, Самара" #: dlls/tzres/tzres.rc:417 msgid "Volgograd Standard Time" -msgstr "" +msgstr "Волгоградское стандартное время" #: dlls/tzres/tzres.rc:418 msgid "Volgograd Daylight Time" -msgstr "" +msgstr "Волгоградское летнее время" #: dlls/tzres/tzres.rc:419 msgid "(UTC+04:00) Volgograd" @@ -10863,15 +10863,15 @@ msgstr "(UTC+04:00) Волгоград" #: dlls/tzres/tzres.rc:72 msgid "Azores Standard Time" -msgstr "" +msgstr "Азорское стандартное время" #: dlls/tzres/tzres.rc:73 msgid "Azores Daylight Time" -msgstr "" +msgstr "Азорское летнее время" #: dlls/tzres/tzres.rc:74 msgid "(UTC-01:00) Azores" -msgstr "" +msgstr "(UTC-01:00) Азорские острова" #: dlls/tzres/tzres.rc:264 msgid "North Asia East Standard Time" @@ -10895,39 +10895,39 @@ msgstr "" #: dlls/tzres/tzres.rc:51 msgid "Argentina Standard Time" -msgstr "" +msgstr "Аргентинское стандартное время" #: dlls/tzres/tzres.rc:52 msgid "Argentina Daylight Time" -msgstr "" +msgstr "Аргентинское летнее время" #: dlls/tzres/tzres.rc:53 msgid "(UTC-03:00) City of Buenos Aires" -msgstr "" +msgstr "(UTC-03:00) Буэнос-Айрес" #: dlls/tzres/tzres.rc:378 msgid "Turks And Caicos Standard Time" -msgstr "" +msgstr "Теркс и Кайкос стандартное время" #: dlls/tzres/tzres.rc:379 msgid "Turks And Caicos Daylight Time" -msgstr "" +msgstr "Теркс и Кайкос летнее время" #: dlls/tzres/tzres.rc:380 msgid "(UTC-05:00) Turks and Caicos" -msgstr "" +msgstr "(UTC-05:00) Теркс и Кайкос" #: dlls/tzres/tzres.rc:222 msgid "Marquesas Standard Time" -msgstr "" +msgstr "Маркизские острова стандартное время" #: dlls/tzres/tzres.rc:223 msgid "Marquesas Daylight Time" -msgstr "" +msgstr "Маркизские острова летнее время" #: dlls/tzres/tzres.rc:224 msgid "(UTC-09:30) Marquesas Islands" -msgstr "" +msgstr "(UTC-09:30) Маркизские острова" #: dlls/tzres/tzres.rc:243 msgid "Myanmar Standard Time" @@ -10951,11 +10951,11 @@ msgstr "" #: dlls/tzres/tzres.rc:189 msgid "India Standard Time" -msgstr "" +msgstr "Индийское стандартное время" #: dlls/tzres/tzres.rc:190 msgid "India Daylight Time" -msgstr "" +msgstr "Индийское летнее время" #: dlls/tzres/tzres.rc:191 msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" @@ -10975,11 +10975,11 @@ msgstr "(UTC+02:00) Афины, Бухарест" #: dlls/tzres/tzres.rc:375 msgid "Turkey Standard Time" -msgstr "" +msgstr "Турецкое стандартное время" #: dlls/tzres/tzres.rc:376 msgid "Turkey Daylight Time" -msgstr "" +msgstr "Турецкое летнее время" #: dlls/tzres/tzres.rc:377 msgid "(UTC+03:00) Istanbul" @@ -10987,11 +10987,11 @@ msgstr "(UTC+03:00) Стамбул" #: dlls/tzres/tzres.rc:54 msgid "Astrakhan Standard Time" -msgstr "" +msgstr "Астраханское стандартное время" #: dlls/tzres/tzres.rc:55 msgid "Astrakhan Daylight Time" -msgstr "" +msgstr "Астраханское летнее время" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" @@ -10999,11 +10999,11 @@ msgstr "(UTC+04:00) Астрахань, Ульяновск" #: dlls/tzres/tzres.rc:162 msgid "Fiji Standard Time" -msgstr "" +msgstr "Стандартное время Фиджи" #: dlls/tzres/tzres.rc:163 msgid "Fiji Daylight Time" -msgstr "" +msgstr "Летнее время Фиджи" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" @@ -11011,23 +11011,23 @@ msgstr "(UTC+12:00) Фиджи" #: dlls/tzres/tzres.rc:87 msgid "Canada Central Standard Time" -msgstr "" +msgstr "Центральное канадское время" #: dlls/tzres/tzres.rc:88 msgid "Canada Central Daylight Time" -msgstr "" +msgstr "Центральное канадское летнее время" #: dlls/tzres/tzres.rc:89 msgid "(UTC-06:00) Saskatchewan" -msgstr "" +msgstr "(UTC-06:00) Саскачеван" #: dlls/tzres/tzres.rc:444 msgid "Yukon Standard Time" -msgstr "" +msgstr "Стандартное время Юкон" #: dlls/tzres/tzres.rc:445 msgid "Yukon Daylight Time" -msgstr "" +msgstr "Летнее время Юкон" #: dlls/tzres/tzres.rc:446 msgid "(UTC-07:00) Yukon" @@ -11035,23 +11035,23 @@ msgstr "(UTC-07:00) Юкон" #: dlls/tzres/tzres.rc:354 msgid "Taipei Standard Time" -msgstr "" +msgstr "Тайбэйское стандартное время" #: dlls/tzres/tzres.rc:355 msgid "Taipei Daylight Time" -msgstr "" +msgstr "Тайбэйское летнее время" #: dlls/tzres/tzres.rc:356 msgid "(UTC+08:00) Taipei" -msgstr "" +msgstr "(UTC+08:00) Тайбэй" #: dlls/tzres/tzres.rc:426 msgid "W. Europe Standard Time" -msgstr "" +msgstr "Западноевропейское стандартное время" #: dlls/tzres/tzres.rc:427 msgid "W. Europe Daylight Time" -msgstr "" +msgstr "Западноевропейское летнее время" #: dlls/tzres/tzres.rc:428 msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" @@ -11059,11 +11059,11 @@ msgstr "(UTC+01:00) Амстердам, Берлин, Берн, Стокголь #: dlls/tzres/tzres.rc:231 msgid "Montevideo Standard Time" -msgstr "" +msgstr "Монтевидео стандартное время" #: dlls/tzres/tzres.rc:232 msgid "Montevideo Daylight Time" -msgstr "" +msgstr "Монтевидео летнее время" #: dlls/tzres/tzres.rc:233 msgid "(UTC-03:00) Montevideo" @@ -11071,11 +11071,11 @@ msgstr "(UTC-03:00) Монтевидео" #: dlls/tzres/tzres.rc:285 msgid "Pakistan Standard Time" -msgstr "" +msgstr "Пакистанское стандартное время" #: dlls/tzres/tzres.rc:286 msgid "Pakistan Daylight Time" -msgstr "" +msgstr "Пакистанское летнее время" #: dlls/tzres/tzres.rc:287 msgid "(UTC+05:00) Islamabad, Karachi" @@ -11083,11 +11083,11 @@ msgstr "(UTC+05:00) Исламабад, Карачи" #: dlls/tzres/tzres.rc:366 msgid "Tomsk Standard Time" -msgstr "" +msgstr "Томское стандартное время" #: dlls/tzres/tzres.rc:367 msgid "Tomsk Daylight Time" -msgstr "" +msgstr "Томское летнее время" #: dlls/tzres/tzres.rc:368 msgid "(UTC+07:00) Tomsk" @@ -11095,11 +11095,11 @@ msgstr "(UTC+07:00) Томск" #: dlls/tzres/tzres.rc:93 msgid "Caucasus Standard Time" -msgstr "" +msgstr "Кавказское стандартное время" #: dlls/tzres/tzres.rc:94 msgid "Caucasus Daylight Time" -msgstr "" +msgstr "Кавказское летнее время" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" @@ -11107,11 +11107,11 @@ msgstr "(UTC+04:00) Ереван" #: dlls/tzres/tzres.rc:66 msgid "AUS Eastern Standard Time" -msgstr "" +msgstr "Восточноавстралийское стандартное время" #: dlls/tzres/tzres.rc:67 msgid "AUS Eastern Daylight Time" -msgstr "" +msgstr "Восточноавстралийское летнее время" #: dlls/tzres/tzres.rc:68 msgid "(UTC+10:00) Canberra, Melbourne, Sydney" @@ -11131,15 +11131,15 @@ msgstr "(UTC+07:00) Новосибирск" #: dlls/tzres/tzres.rc:150 msgid "Eastern Standard Time" -msgstr "" +msgstr "Восточное стандартное время" #: dlls/tzres/tzres.rc:151 msgid "Eastern Daylight Time" -msgstr "" +msgstr "Восточное летнее время" #: dlls/tzres/tzres.rc:152 msgid "(UTC-05:00) Eastern Time (US & Canada)" -msgstr "" +msgstr "(UTC-05:00) Восточное время (США и Канада)" #: dlls/tzres/tzres.rc:372 msgid "Transbaikal Standard Time" @@ -11155,11 +11155,11 @@ msgstr "(UTC+09:00) Чита" #: dlls/tzres/tzres.rc:141 msgid "E. Europe Standard Time" -msgstr "" +msgstr "Восточноевропейское стандартное время" #: dlls/tzres/tzres.rc:142 msgid "E. Europe Daylight Time" -msgstr "" +msgstr "Восточноевропейское летнее время" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" @@ -11179,11 +11179,11 @@ msgstr "(UTC-06:00) Гвадалахара, Мехико, Монтеррей" #: dlls/tzres/tzres.rc:330 msgid "Saratov Standard Time" -msgstr "" +msgstr "Саратовское стандартное время" #: dlls/tzres/tzres.rc:331 msgid "Saratov Daylight Time" -msgstr "" +msgstr "Саратовское летнее время" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" @@ -11191,15 +11191,15 @@ msgstr "(UTC+04:00) Саратов" #: dlls/tzres/tzres.rc:57 msgid "Atlantic Standard Time" -msgstr "" +msgstr "Атлантическое стандартное время" #: dlls/tzres/tzres.rc:58 msgid "Atlantic Daylight Time" -msgstr "" +msgstr "Атлантическое летнее время" #: dlls/tzres/tzres.rc:59 msgid "(UTC-04:00) Atlantic Time (Canada)" -msgstr "" +msgstr "(UTC-04:00) Атлантическое время (Канада)" #: dlls/tzres/tzres.rc:237 msgid "Mountain Standard Time" @@ -11223,15 +11223,15 @@ msgstr "" #: dlls/tzres/tzres.rc:386 msgid "(UTC-05:00) Indiana (East)" -msgstr "" +msgstr "(UTC-05:00) Индиана (запад)" #: dlls/tzres/tzres.rc:321 msgid "Sakhalin Standard Time" -msgstr "" +msgstr "Сахалинское стандартное время" #: dlls/tzres/tzres.rc:322 msgid "Sakhalin Daylight Time" -msgstr "" +msgstr "Сахалинское летнее время" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" @@ -11239,39 +11239,39 @@ msgstr "(UTC+11:00) Сахалин" #: dlls/tzres/tzres.rc:270 msgid "North Korea Standard Time" -msgstr "" +msgstr "Северокорейское стандартное время" #: dlls/tzres/tzres.rc:271 msgid "North Korea Daylight Time" -msgstr "" +msgstr "Северокорейское летнее время" #: dlls/tzres/tzres.rc:272 msgid "(UTC+09:00) Pyongyang" -msgstr "" +msgstr "(UTC+09:00) Пхеньян" #: dlls/tzres/tzres.rc:357 msgid "Tasmania Standard Time" -msgstr "" +msgstr "Тасманийское стандартное время" #: dlls/tzres/tzres.rc:358 msgid "Tasmania Daylight Time" -msgstr "" +msgstr "Тасманийское летнее время" #: dlls/tzres/tzres.rc:359 msgid "(UTC+10:00) Hobart" -msgstr "" +msgstr "(UTC+10:00) Хобарт" #: dlls/tzres/tzres.rc:99 msgid "Central America Standard Time" -msgstr "" +msgstr "Центральноамериканское стандартное время" #: dlls/tzres/tzres.rc:100 msgid "Central America Daylight Time" -msgstr "" +msgstr "Центральноамериканское летнее время" #: dlls/tzres/tzres.rc:101 msgid "(UTC-06:00) Central America" -msgstr "" +msgstr "(UTC-06:00) Центральная Америка" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-02" @@ -11295,15 +11295,15 @@ msgstr "(UTC-07:00) Аризона" #: dlls/tzres/tzres.rc:339 msgid "South Africa Standard Time" -msgstr "" +msgstr "Южноафриканское стандартное время" #: dlls/tzres/tzres.rc:340 msgid "South Africa Daylight Time" -msgstr "" +msgstr "Южноафриканское летнее время" #: dlls/tzres/tzres.rc:341 msgid "(UTC+02:00) Harare, Pretoria" -msgstr "" +msgstr "(UTC+02:00) Хараре, Претория" #: dlls/tzres/tzres.rc:96 msgid "Cen. Australia Standard Time" @@ -11339,11 +11339,11 @@ msgstr "" #: dlls/tzres/tzres.rc:30 msgid "Afghanistan Standard Time" -msgstr "" +msgstr "Афганское стандартное время" #: dlls/tzres/tzres.rc:31 msgid "Afghanistan Daylight Time" -msgstr "" +msgstr "Афганское летнее время" #: dlls/tzres/tzres.rc:32 msgid "(UTC+04:30) Kabul" @@ -11351,11 +11351,11 @@ msgstr "(UTC+04:30) Кабул" #: dlls/tzres/tzres.rc:441 msgid "Yakutsk Standard Time" -msgstr "" +msgstr "Якутское стандартное время" #: dlls/tzres/tzres.rc:442 msgid "Yakutsk Daylight Time" -msgstr "" +msgstr "Якутское летнее время" #: dlls/tzres/tzres.rc:443 msgid "(UTC+09:00) Yakutsk" @@ -11375,11 +11375,11 @@ msgstr "" #: dlls/tzres/tzres.rc:42 msgid "Arab Standard Time" -msgstr "" +msgstr "Арабское стандартное время" #: dlls/tzres/tzres.rc:43 msgid "Arab Daylight Time" -msgstr "" +msgstr "Арабское летнее время" #: dlls/tzres/tzres.rc:44 msgid "(UTC+03:00) Kuwait, Riyadh" @@ -11387,15 +11387,15 @@ msgstr "(UTC+03:00) Кувейт, Риад" #: dlls/tzres/tzres.rc:45 msgid "Arabian Standard Time" -msgstr "" +msgstr "Аравийское стандартное время" #: dlls/tzres/tzres.rc:46 msgid "Arabian Daylight Time" -msgstr "" +msgstr "Аравийское летнее время" #: dlls/tzres/tzres.rc:47 msgid "(UTC+04:00) Abu Dhabi, Muscat" -msgstr "" +msgstr "(UTC+04:00) Абу-Даби, Мускат" #: dlls/tzres/tzres.rc:360 msgid "Tocantins Standard Time" @@ -11407,15 +11407,15 @@ msgstr "" #: dlls/tzres/tzres.rc:362 msgid "(UTC-03:00) Araguaina" -msgstr "" +msgstr "(UTC-03:00) Арагуаина" #: dlls/tzres/tzres.rc:306 msgid "Russian Standard Time" -msgstr "" +msgstr "Российское стандартное время" #: dlls/tzres/tzres.rc:307 msgid "Russian Daylight Time" -msgstr "" +msgstr "Российское летнее время" #: dlls/tzres/tzres.rc:308 msgid "(UTC+03:00) Moscow, St. Petersburg" @@ -11447,11 +11447,11 @@ msgstr "(UTC+01:00) Брюссель, Копенгаген, Мадрид, Пар #: dlls/tzres/tzres.rc:159 msgid "Ekaterinburg Standard Time" -msgstr "" +msgstr "Екатеринбургское стандартное время" #: dlls/tzres/tzres.rc:160 msgid "Ekaterinburg Daylight Time" -msgstr "" +msgstr "Екатеринбургское летнее время" #: dlls/tzres/tzres.rc:161 msgid "(UTC+05:00) Ekaterinburg" @@ -11475,15 +11475,15 @@ msgstr "" #: dlls/tzres/tzres.rc:437 msgid "(UTC+02:00) Gaza, Hebron" -msgstr "" +msgstr "(UTC+02:00) Газа, Хеврон" #: dlls/tzres/tzres.rc:351 msgid "Syria Standard Time" -msgstr "" +msgstr "Сирийское стандартное время" #: dlls/tzres/tzres.rc:352 msgid "Syria Daylight Time" -msgstr "" +msgstr "Сирийское летнее время" #: dlls/tzres/tzres.rc:353 msgid "(UTC+02:00) Damascus" @@ -11511,7 +11511,7 @@ msgstr "" #: dlls/tzres/tzres.rc:179 msgid "(UTC+00:00) Monrovia, Reykjavik" -msgstr "" +msgstr "(UTC+00:00) Монровия, Рейкьявик" #: dlls/tzres/tzres.rc:381 msgid "Ulaanbaatar Standard Time" @@ -11523,27 +11523,27 @@ msgstr "" #: dlls/tzres/tzres.rc:383 msgid "(UTC+08:00) Ulaanbaatar" -msgstr "" +msgstr "(UTC+08:00) Улан-Батор" #: dlls/tzres/tzres.rc:261 msgid "Norfolk Standard Time" -msgstr "" +msgstr "Норфолк стандартное время" #: dlls/tzres/tzres.rc:262 msgid "Norfolk Daylight Time" -msgstr "" +msgstr "Норфолк летнее время" #: dlls/tzres/tzres.rc:263 msgid "(UTC+11:00) Norfolk Island" -msgstr "" +msgstr "(UTC+11:00) Остров Норфолк" #: dlls/tzres/tzres.rc:195 msgid "Israel Standard Time" -msgstr "" +msgstr "Израильское стандартное время" #: dlls/tzres/tzres.rc:196 msgid "Israel Daylight Time" -msgstr "" +msgstr "Израильское летнее время" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" @@ -11559,7 +11559,7 @@ msgstr "" #: dlls/tzres/tzres.rc:80 msgid "(UTC+06:00) Dhaka" -msgstr "" +msgstr "(UTC+06:00) Дакка" #: dlls/tzres/tzres.rc:312 msgid "SA Pacific Standard Time" @@ -11571,7 +11571,7 @@ msgstr "" #: dlls/tzres/tzres.rc:314 msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" -msgstr "" +msgstr "(UTC-05:00) Богота, Лима, Кито, Риу-Бранку" #: dlls/tzres/tzres.rc:432 msgid "West Asia Standard Time" @@ -11623,11 +11623,11 @@ msgstr "" #: dlls/tzres/tzres.rc:207 msgid "Libya Standard Time" -msgstr "" +msgstr "Ливийское стандартное время" #: dlls/tzres/tzres.rc:208 msgid "Libya Daylight Time" -msgstr "" +msgstr "Ливийское летнее время" #: dlls/tzres/tzres.rc:209 msgid "(UTC+02:00) Tripoli" @@ -11647,35 +11647,35 @@ msgstr "(UTC-03:00) Сальвадор" #: dlls/tzres/tzres.rc:411 msgid "Venezuela Standard Time" -msgstr "" +msgstr "Венесуэльское стандартное время" #: dlls/tzres/tzres.rc:412 msgid "Venezuela Daylight Time" -msgstr "" +msgstr "Венесуэльское летнее время" #: dlls/tzres/tzres.rc:413 msgid "(UTC-04:00) Caracas" -msgstr "" +msgstr "(UTC-04:00) Каракас" #: dlls/tzres/tzres.rc:84 msgid "Bougainville Standard Time" -msgstr "" +msgstr "Бугенвиль стандартное время" #: dlls/tzres/tzres.rc:85 msgid "Bougainville Daylight Time" -msgstr "" +msgstr "Бугенвиль летнее время" #: dlls/tzres/tzres.rc:86 msgid "(UTC+11:00) Bougainville Island" -msgstr "" +msgstr "(UTC+11:00) Остров Бугенвиль" #: dlls/tzres/tzres.rc:186 msgid "Hawaiian Standard Time" -msgstr "" +msgstr "Гавайское стандартное время" #: dlls/tzres/tzres.rc:187 msgid "Hawaiian Daylight Time" -msgstr "" +msgstr "Гавайское летнее время" #: dlls/tzres/tzres.rc:188 msgid "(UTC-10:00) Hawaii" @@ -11703,7 +11703,7 @@ msgstr "" #: dlls/tzres/tzres.rc:293 msgid "(UTC+05:00) Qyzylorda" -msgstr "" +msgstr "(UTC+05:00) Кызылорда" #: dlls/tzres/tzres.rc:429 msgid "W. Mongolia Standard Time" @@ -11715,7 +11715,7 @@ msgstr "" #: dlls/tzres/tzres.rc:431 msgid "(UTC+07:00) Hovd" -msgstr "" +msgstr "(UTC+07:00) Ховд" #: dlls/tzres/tzres.rc:255 msgid "New Zealand Standard Time" @@ -11731,23 +11731,23 @@ msgstr "(UTC+12:00) Окленд, Веллингтон" #: dlls/tzres/tzres.rc:36 msgid "Aleutian Standard Time" -msgstr "" +msgstr "Алеутское стандартное время" #: dlls/tzres/tzres.rc:37 msgid "Aleutian Daylight Time" -msgstr "" +msgstr "Алеутское летнее время" #: dlls/tzres/tzres.rc:38 msgid "(UTC-10:00) Aleutian Islands" -msgstr "" +msgstr "(UTC-10:00) Алеутские острова" #: dlls/tzres/tzres.rc:273 msgid "Omsk Standard Time" -msgstr "" +msgstr "Омское стандартное время" #: dlls/tzres/tzres.rc:274 msgid "Omsk Daylight Time" -msgstr "" +msgstr "Омское летнее время" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" @@ -11763,15 +11763,15 @@ msgstr "" #: dlls/tzres/tzres.rc:107 msgid "(UTC-04:00) Cuiaba" -msgstr "" +msgstr "(UTC-04:00) Куяба" #: dlls/tzres/tzres.rc:81 msgid "Belarus Standard Time" -msgstr "" +msgstr "Белорусское стандартное время" #: dlls/tzres/tzres.rc:82 msgid "Belarus Daylight Time" -msgstr "" +msgstr "Белорусское летнее время" #: dlls/tzres/tzres.rc:83 msgid "(UTC+03:00) Minsk" @@ -11791,11 +11791,11 @@ msgstr "" #: dlls/tzres/tzres.rc:174 msgid "Greenland Standard Time" -msgstr "" +msgstr "Гренландское стандартное время" #: dlls/tzres/tzres.rc:175 msgid "Greenland Daylight Time" -msgstr "" +msgstr "Гренландское летнее время" #: dlls/tzres/tzres.rc:176 msgid "(UTC-03:00) Greenland" @@ -11811,7 +11811,7 @@ msgstr "" #: dlls/tzres/tzres.rc:149 msgid "(UTC-06:00) Easter Island" -msgstr "" +msgstr "(UTC-06:00) Остров Пасхи" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 msgid "Russia Time Zone 10" @@ -11819,15 +11819,15 @@ msgstr "" #: dlls/tzres/tzres.rc:299 msgid "(UTC+11:00) Chokurdakh" -msgstr "" +msgstr "(UTC+11:00) Чокурдах" #: dlls/tzres/tzres.rc:156 msgid "Egypt Standard Time" -msgstr "" +msgstr "Египетское стандартное время" #: dlls/tzres/tzres.rc:157 msgid "Egypt Daylight Time" -msgstr "" +msgstr "Египетское летнее время" #: dlls/tzres/tzres.rc:158 msgid "(UTC+02:00) Cairo" @@ -11843,7 +11843,7 @@ msgstr "" #: dlls/tzres/tzres.rc:155 msgid "(UTC-05:00) Chetumal" -msgstr "" +msgstr "(UTC-05:00) Четумаль" #: dlls/tzres/tzres.rc:225 msgid "Mauritius Standard Time" @@ -11855,15 +11855,15 @@ msgstr "" #: dlls/tzres/tzres.rc:227 msgid "(UTC+04:00) Port Louis" -msgstr "" +msgstr "(UTC+04:00) Порт-Луи" #: dlls/tzres/tzres.rc:414 msgid "Vladivostok Standard Time" -msgstr "" +msgstr "Владивостокское стандартное время" #: dlls/tzres/tzres.rc:415 msgid "Vladivostok Daylight Time" -msgstr "" +msgstr "Владивостокское летнее время" #: dlls/tzres/tzres.rc:416 msgid "(UTC+10:00) Vladivostok" @@ -11871,23 +11871,23 @@ msgstr "(UTC+10:00) Владивосток" #: dlls/tzres/tzres.rc:336 msgid "Singapore Standard Time" -msgstr "" +msgstr "Сингапурское стандартное время" #: dlls/tzres/tzres.rc:337 msgid "Singapore Daylight Time" -msgstr "" +msgstr "Сингапурское летнее время" #: dlls/tzres/tzres.rc:338 msgid "(UTC+08:00) Kuala Lumpur, Singapore" -msgstr "" +msgstr "(UTC+08:00) Куала-Лумпур, Сингапур" #: dlls/tzres/tzres.rc:204 msgid "Korea Standard Time" -msgstr "" +msgstr "Корейское стандартное время" #: dlls/tzres/tzres.rc:205 msgid "Korea Daylight Time" -msgstr "" +msgstr "Корейское летнее время" #: dlls/tzres/tzres.rc:206 msgid "(UTC+09:00) Seoul" @@ -11903,7 +11903,7 @@ msgstr "" #: dlls/tzres/tzres.rc:125 msgid "(UTC+12:45) Chatham Islands" -msgstr "" +msgstr "(UTC+12:45) Острова Чатем" #: dlls/tzres/tzres.rc:135 msgid "E. Africa Standard Time" -- 2.34.1

1 0

[PATCH] taskmgr: Select process on switch from application to process
by David Kahurani 03 Jan '22

03 Jan '22

Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- programs/taskmgr/applpage.c | 22 ++++++++++++++-------- programs/taskmgr/perfdata.c | 21 +++++++++++++++++++++ programs/taskmgr/perfdata.h | 1 + 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index b35881c2..0cf9f48d 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -28,6 +28,7 @@ #include <commctrl.h> #include "taskmgr.h" +#include "perfdata.h" typedef struct { @@ -790,15 +791,20 @@ void ApplicationPage_OnGotoProcess(void) } if (pAPLI) { DWORD dwProcessId; + int index; + memset(&item, 0, sizeof(LV_ITEMW)); + item.state = LVIS_SELECTED | LVIS_FOCUSED; + item.stateMask = LVIS_SELECTED | LVIS_FOCUSED; - GetWindowThreadProcessId(pAPLI->hWnd, &dwProcessId); - /* - * Switch to the process tab - */ - SendMessageW(hTabWnd, TCM_SETCURFOCUS, 1, 0); - /* - * FIXME: Select the process item in the list - */ + GetWindowThreadProcessId(pAPLI->hWnd, &dwProcessId); + /* + * Switch to the process tab + */ + SendMessageW(hTabWnd, TCM_SETCURFOCUS, 1, 0); + + index = PerfDataGetProcessIndex(dwProcessId); + + SendMessageW(hProcessPageListCtrl, LVM_SETITEMSTATE, index, (LPARAM) &item); } } diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 4498a2fe..e8dc8900 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -356,6 +356,27 @@ ULONG PerfDataGetProcessId(ULONG Index) return ProcessId; } +ULONG PerfDataGetProcessIndex(ULONG ProcessId) +{ + ULONG index; + + EnterCriticalSection(&PerfDataCriticalSection); + + for(index=0; index<ProcessCount; index++) + { + if(pPerfData[index].ProcessId == ProcessId) + break; + } + + LeaveCriticalSection(&PerfDataCriticalSection); + + if (index == ProcessCount) + return 0; + else + return index; +} + + BOOL PerfDataGetUserName(ULONG Index, LPWSTR lpUserName, int nMaxCount) { BOOL bSuccessful; diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h index 615e7db2..ffc1d2d6 100644 --- a/programs/taskmgr/perfdata.h +++ b/programs/taskmgr/perfdata.h @@ -75,6 +75,7 @@ ULONG PerfDataGetProcessorSystemUsage(void); BOOL PerfDataGetImageName(ULONG Index, LPWSTR lpImageName, int nMaxCount); ULONG PerfDataGetProcessId(ULONG Index); +ULONG PerfDataGetProcessIndex(ULONG ProcessId); BOOL PerfDataGetUserName(ULONG Index, LPWSTR lpUserName, int nMaxCount); ULONG PerfDataGetSessionId(ULONG Index); ULONG PerfDataGetCPUUsage(ULONG Index); -- 2.25.1

1 0

[PATCH] msvcrt: Use __WINE_PE_BUILD in crt_gccmain.c.
by Jacek Caban 03 Jan '22

03 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52292 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/crt_gccmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] wmphoto: Fix memory leak on error path in wmp_decoder_create (Coverity)
by Alex Henrie 03 Jan '22

03 Jan '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wmphoto/jxrlib.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wmphoto/jxrlib.c b/dlls/wmphoto/jxrlib.c index 757312b5f0f..3d7dedb869d 100644 --- a/dlls/wmphoto/jxrlib.c +++ b/dlls/wmphoto/jxrlib.c @@ -358,7 +358,10 @@ HRESULT CDECL wmp_decoder_create(struct decoder_info *info, struct decoder **res if (PKImageDecode_Create_WMP(&decoder)) return E_FAIL; This = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*This)); if (!This) + { + decoder->Release(&decoder); return E_OUTOFMEMORY; + } This->decoder_iface.vtable = &wmp_decoder_vtable; This->WMPStream_iface.Close = &wmp_stream_Close; -- 2.34.1

2 1

[PATCH v2 1/7] dinput/tests: Move tests from dinput8/tests.
by Rémi Bernon 03 Jan '22

03 Jan '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: More changes to the tests but this should avoid spurious failures caused by test output overflow. It's also probably something I think we should ultimately do, as there's little reason to keep these tests separated. configure.ac | 1 - dlls/dinput/tests/Makefile.in | 12 ++++++++++-- .../tests/device.c => dinput/tests/device8.c} | 2 +- dlls/dinput/tests/dinput.c | 4 +++- .../tests/dinput.c => dinput/tests/dinput8.c} | 5 ++--- dlls/{dinput8 => dinput}/tests/driver_hid.c | 0 dlls/{dinput8 => dinput}/tests/driver_hid.h | 0 dlls/{dinput8 => dinput}/tests/driver_hid.spec | 0 dlls/{dinput8 => dinput}/tests/hid.c | 0 dlls/{dinput8 => dinput}/tests/pop_hid_macros.h | 0 dlls/{dinput8 => dinput}/tests/psh_hid_macros.h | 0 dlls/dinput8/tests/Makefile.in | 12 ------------ 12 files changed, 16 insertions(+), 20 deletions(-) rename dlls/{dinput8/tests/device.c => dinput/tests/device8.c} (99%) rename dlls/{dinput8/tests/dinput.c => dinput/tests/dinput8.c} (99%) rename dlls/{dinput8 => dinput}/tests/driver_hid.c (100%) rename dlls/{dinput8 => dinput}/tests/driver_hid.h (100%) rename dlls/{dinput8 => dinput}/tests/driver_hid.spec (100%) rename dlls/{dinput8 => dinput}/tests/hid.c (100%) rename dlls/{dinput8 => dinput}/tests/pop_hid_macros.h (100%) rename dlls/{dinput8 => dinput}/tests/psh_hid_macros.h (100%) delete mode 100644 dlls/dinput8/tests/Makefile.in diff --git a/configure.ac b/configure.ac index 9b2c111119f..ddd45b8c241 100644 --- a/configure.ac +++ b/configure.ac @@ -2743,7 +2743,6 @@ WINE_CONFIG_MAKEFILE(dlls/difxapi) WINE_CONFIG_MAKEFILE(dlls/dinput) WINE_CONFIG_MAKEFILE(dlls/dinput/tests) WINE_CONFIG_MAKEFILE(dlls/dinput8) -WINE_CONFIG_MAKEFILE(dlls/dinput8/tests) WINE_CONFIG_MAKEFILE(dlls/directmanipulation) WINE_CONFIG_MAKEFILE(dlls/directmanipulation/tests) WINE_CONFIG_MAKEFILE(dlls/dispdib.dll16,enable_win16) diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index 858c2cdae7a..87a4dad2708 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -1,9 +1,17 @@ TESTDLL = dinput.dll -IMPORTS = dinput ole32 version user32 +IMPORTS = dinput dinput8 ole32 version user32 advapi32 hid uuid crypt32 newdev setupapi wintrust winmm -C_SRCS = \ +driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass +driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native + +SOURCES = \ device.c \ + device8.c \ dinput.c \ + dinput8.c \ + driver_hid.c \ + driver_hid.spec \ + hid.c \ joystick.c \ keyboard.c \ mouse.c diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput/tests/device8.c similarity index 99% rename from dlls/dinput8/tests/device.c rename to dlls/dinput/tests/device8.c index 8b34de276db..817e843e33c 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput/tests/device8.c @@ -1836,7 +1836,7 @@ static void test_keyboard_info(void) ok( ref == 0, "Release returned %d\n", ref ); } -START_TEST(device) +START_TEST(device8) { instance = GetModuleHandleW( NULL ); diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index c7fa0b76397..10da888fdd4 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -19,8 +19,10 @@ #define DIRECTINPUT_VERSION 0x0700 #define COBJMACROS -#include <initguid.h> #include <windows.h> +#include "objbase.h" + +#include <initguid.h> #include <dinput.h> #include <dinputd.h> diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput/tests/dinput8.c similarity index 99% rename from dlls/dinput8/tests/dinput.c rename to dlls/dinput/tests/dinput8.c index 3e2e4fbb371..81aeb8191f6 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput/tests/dinput8.c @@ -22,13 +22,12 @@ #include <windows.h> #include <objidl.h> -#include <initguid.h> #include <dinput.h> #include <dinputd.h> #include "wine/test.h" -HINSTANCE hInstance; +static HINSTANCE hInstance; static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *context) { @@ -711,7 +710,7 @@ static void test_Initialize(void) IDirectInput8_Release(pDI); } -START_TEST(dinput) +START_TEST(dinput8) { hInstance = GetModuleHandleA(NULL); diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput/tests/driver_hid.c similarity index 100% rename from dlls/dinput8/tests/driver_hid.c rename to dlls/dinput/tests/driver_hid.c diff --git a/dlls/dinput8/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h similarity index 100% rename from dlls/dinput8/tests/driver_hid.h rename to dlls/dinput/tests/driver_hid.h diff --git a/dlls/dinput8/tests/driver_hid.spec b/dlls/dinput/tests/driver_hid.spec similarity index 100% rename from dlls/dinput8/tests/driver_hid.spec rename to dlls/dinput/tests/driver_hid.spec diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput/tests/hid.c similarity index 100% rename from dlls/dinput8/tests/hid.c rename to dlls/dinput/tests/hid.c diff --git a/dlls/dinput8/tests/pop_hid_macros.h b/dlls/dinput/tests/pop_hid_macros.h similarity index 100% rename from dlls/dinput8/tests/pop_hid_macros.h rename to dlls/dinput/tests/pop_hid_macros.h diff --git a/dlls/dinput8/tests/psh_hid_macros.h b/dlls/dinput/tests/psh_hid_macros.h similarity index 100% rename from dlls/dinput8/tests/psh_hid_macros.h rename to dlls/dinput/tests/psh_hid_macros.h diff --git a/dlls/dinput8/tests/Makefile.in b/dlls/dinput8/tests/Makefile.in deleted file mode 100644 index 336dbd500ba..00000000000 --- a/dlls/dinput8/tests/Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ -TESTDLL = dinput8.dll -IMPORTS = dinput8 dinput ole32 user32 hid advapi32 uuid crypt32 newdev setupapi wintrust winmm - -driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass -driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native - -SOURCES = \ - device.c \ - dinput.c \ - driver_hid.c \ - driver_hid.spec \ - hid.c -- 2.34.1

2 12

[PATCH] include: Fix the definition of D3D_PRIMITIVE enum members.
by Zebediah Figura 03 Jan '22

03 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/d3dcommon.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 05577d34daf..7a53a84079d 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -319,7 +319,7 @@ typedef enum D3D_PRIMITIVE D3D_PRIMITIVE_17_CONTROL_POINT_PATCH, D3D_PRIMITIVE_18_CONTROL_POINT_PATCH, D3D_PRIMITIVE_19_CONTROL_POINT_PATCH, - D3D_PRIMITIVE_20_CONTROL_POINT_PATCH = 28, + D3D_PRIMITIVE_20_CONTROL_POINT_PATCH, D3D_PRIMITIVE_21_CONTROL_POINT_PATCH, D3D_PRIMITIVE_22_CONTROL_POINT_PATCH, D3D_PRIMITIVE_23_CONTROL_POINT_PATCH, @@ -363,7 +363,7 @@ typedef enum D3D_PRIMITIVE D3D11_PRIMITIVE_17_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_18_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_19_CONTROL_POINT_PATCH, - D3D11_PRIMITIVE_20_CONTROL_POINT_PATCH = 28, + D3D11_PRIMITIVE_20_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_21_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_22_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_23_CONTROL_POINT_PATCH, -- 2.34.1

2 1

[tools] testbot/SetwinLocale: Tweak the --country checks and conversion.
by Francois Gouget 03 Jan '22

03 Jan '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index e7ae3c0ced..8360c76840 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -397,19 +397,19 @@ if (!defined $Usage) $OptLocale ||= $OptDefault; $OptSystem ||= $OptDefault; $OptMUI ||= $OptDefault; - if (!defined $OptCountry and defined $OptDefault and - $OptDefault =~ /-([A-Z]{2})$/) + + if (!$OptCountry and ($OptDefault || "") =~ /-([A-Z]{2})$/) { $OptCountry = $1; } - if (defined $OptCountry) + if ($OptCountry) { - if (!exists $Countries{$OptCountry}) + $CountryId = $Countries{$OptCountry}; + if (!defined $CountryId) { Error("unknown country '$OptCountry'\n"); $Usage = 2; } - $CountryId = $Countries{$OptCountry}; } if (!$OptLocale and !$OptSystem and !$OptMUI and !$OptKeyboard and -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Fix the usage message and add Powershell information.
by Francois Gouget 03 Jan '22

03 Jan '22

--- testbot/bin/SetWinLocale | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index e8aff6c9d1..3a74406a49 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -432,41 +432,46 @@ if (defined $Usage) Error("try '$name0 --help' for more information\n"); exit $Usage; } - print "or $name0 [options] --show HOSTNAME\n"; - print "or $name0 [options] [--default LOC] [--locale USR] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; + print "Usage: $name0 [options] --show HOSTNAME\n"; + print "or $name0 [options] [--default DEF] [--locale LOC] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; print "\n"; print "Sets the locale of the specified Windows machine.\n"; print "\n"; print "Where:\n"; print " HOSTNAME Work on the specified Windows host (must be running TestAgentd).\n"; print " --show Show the locale settings of the specified host and exit.\n"; - print " --default LOC Use this Windows locale as the default for the other options.\n"; + print " --default DEF Use this Windows locale as the default for the other options.\n"; print " The locale must be in a form suitable for Windows' intl.cpl\n"; print " control panel module, that is roughly ll-CC where ll is an\n"; print " ISO 639-1 language code and CC an ISO 3166-1 alpha-2 country\n"; print " code.\n"; - print " --locale USR Specifies the user formats (see --defaults).\n"; + print " --locale LOC Specifies the user formats (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Region -> Regional\n"; print " format.\n"; print " . APIs: GetUserDefaultLCID(), GetThreadLocale().\n"; + print " . Powershell: Set-Culture LOC\n"; print " --system SYS Specifies the system locale (see --defaults).\n"; print " . Only takes effect after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n"; print " Administrative Language Settings -> Change system locale.\n"; print " . APIs: GetSystemDefaultLCID().\n"; + print " . Powershell: Set-WinSystemLocale -SystemLocale SYS\n"; print " --mui MUI Specifies the display language (see --defaults).\n"; print " . Only takes effect after a log out + log in.\n"; print " . Windows 10 GUI: Time & language -> Language -> Windows\n"; print " display language.\n"; print " . APIs: GetSystemPreferredUILanguages(),\n"; print " GetUserDefaultUILanguage(), GetThreadUILanguage().\n"; + print " . Powershell: Set-WinUILanguageOverride -Language MUI\n"; print " --keyboard KBD Specifies the keyboard layout (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Language -> Keyboard ->\n"; print " Override for default input method.\n"; + print " . Powershell: Set-WinDefaultInputMethodOverride -InputTip KBD-ID\n"; print " --country CTY Specifies the location using only the country part of the\n"; print " Windows locale (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Region -> Country.\n"; print " . APIs: GetUserGeoID().\n"; + print " . Powershell: Set-WinHomeLocation -GeoId CTY-ID\n"; print " --no-reboot Do not reboot Windows. Some locale changes will only take\n"; print " effect after the next reboot.\n"; print " --debug Show more detailed information about progress.\n"; -- 2.30.2

1 0