March 2022 - Wine-commits - list.winehq.org

Tim Clem : winemac.drv: Sort display modes.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: e66c9cadbb2f97d79a523927516d0649c4ae09e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e66c9cadbb2f97d79a523927… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Mar 22 11:06:02 2022 -0700 winemac.drv: Sort display modes. Mac driver version of a8b4cf7f2d3d1fbd79308a106a84e753cdac69e8. Combined with the previous patch that reordered synthesized modes, the Mac driver implementation of EnumDisplayModesEx now returns modes in the same order as the X11 driver. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 53 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index d43baf6bd68..023f7b80ed8 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -656,6 +656,48 @@ static BOOL mode_is_preferred(CGDisplayModeRef new_mode, CGDisplayModeRef old_mo #endif +static CFComparisonResult mode_compare(const void *p1, const void *p2, void *context) +{ + CGDisplayModeRef a = (CGDisplayModeRef)p1, b = (CGDisplayModeRef)p2; + size_t a_val, b_val; + double a_refresh_rate, b_refresh_rate; + + /* Sort by bpp descending, */ + a_val = display_mode_bits_per_pixel(a); + b_val = display_mode_bits_per_pixel(b); + if (a_val < b_val) + return kCFCompareGreaterThan; + else if (a_val > b_val) + return kCFCompareLessThan; + + /* then width ascending, */ + a_val = CGDisplayModeGetWidth(a); + b_val = CGDisplayModeGetWidth(b); + if (a_val < b_val) + return kCFCompareLessThan; + else if (a_val > b_val) + return kCFCompareGreaterThan; + + /* then height ascending, */ + a_val = CGDisplayModeGetHeight(a); + b_val = CGDisplayModeGetHeight(b); + if (a_val < b_val) + return kCFCompareLessThan; + else if (a_val > b_val) + return kCFCompareGreaterThan; + + /* then refresh rate descending. */ + a_refresh_rate = CGDisplayModeGetRefreshRate(a); + b_refresh_rate = CGDisplayModeGetRefreshRate(b); + if (a_refresh_rate < b_refresh_rate) + return kCFCompareGreaterThan; + else if (a_refresh_rate > b_refresh_rate) + return kCFCompareLessThan; + + return kCFCompareEqualTo; +} + + /*********************************************************************** * copy_display_modes * @@ -725,7 +767,16 @@ static CFArrayRef copy_display_modes(CGDirectDisplayID display, BOOL include_uns #endif modes = CGDisplayCopyAllDisplayModes(display, NULL); - return modes; + if (modes) + { + CFIndex count = CFArrayGetCount(modes); + CFMutableArrayRef sorted_modes = CFArrayCreateMutableCopy(NULL, count, modes); + CFRelease(modes); + CFArraySortValues(sorted_modes, CFRangeMake(0, count), mode_compare, NULL); + return sorted_modes; + } + + return NULL; }

1 0

Byeongsik Jeon : po: Update Korean translation.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: 5dddacbe7d2e47ef2f13c8a3c55b77cfe499e6c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dddacbe7d2e47ef2f13c8a3… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Wed Mar 23 11:30:05 2022 +0900 po: Update Korean translation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ko.po | 117 ++++++++++++++++++++++++++++----------------------------------- 1 file changed, 51 insertions(+), 66 deletions(-) diff --git a/po/ko.po b/po/ko.po index 34823747a8d..209366150ea 100644 --- a/po/ko.po +++ b/po/ko.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 11:19+0900\n" +"PO-Revision-Date: 2022-03-23 11:25+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -240,8 +240,8 @@ msgstr "" "다.\n" "\n" "참고: 배포판이 제공하는 wine-mono 패키지 사용을 추천합니다. 자세한 내용은 <a " -"href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a>를 보십" -"시오." +"href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a>를 참고" +"하세요." #: dlls/appwiz.cpl/appwiz.rc:31 msgid "Add/Remove Programs" @@ -3954,13 +3954,11 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "순환하는 __proto__ 값" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "확장 가능하지 않은 속성 '|'을(를) 정의할 수 없습니다" +msgstr "확장 가능하지 않은 개체에 대한 속성을 만들 수 없습니다" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible" @@ -6948,54 +6946,40 @@ msgid "This network connection does not exist.\n" msgstr "네트워크 연결이 없습니다.\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "잘못된 인터럽트 시간.\n" +msgstr "호출이 중단되었습니다.\n" #: dlls/kernel32/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "잘못된 핸들입니다.\n" +msgstr "파일 핸들이 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "잘못된 네트워크 주소.\n" +msgstr "주소가 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "잘못된 이름.\n" +msgstr "인수가 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:3778 msgid "Connection reset by peer.\n" -msgstr "피어가 연결을 초기화 했습니다.\n" +msgstr "피어가 연결을 다시 설정했습니다.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "포인트를 찾을 수 없습니다.\n" +msgstr "호스트를 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "특성을 찾을 수 없습니다.\n" +msgstr "일시적으로 호스트를 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "복구할 수 없는 오류가 발생했습니다.\n" +msgstr "복구할 수 없는 오류입니다.\n" #: dlls/kernel32/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "유효한 이름입니다만, 요청한 데이터 레코드가 없습니다.\n" #: dlls/kernel32/winerror.mc:3817 msgid "Not implemented.\n" @@ -7011,7 +6995,7 @@ msgstr "파일에서 서명을 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3824 msgid "Invalid call.\n" -msgstr "잘못된 호출.\n" +msgstr "잘못된 호출입니다.\n" #: dlls/kernel32/winerror.mc:3831 msgid "Resource is not currently available.\n" @@ -9135,8 +9119,8 @@ msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." msgstr "" -"공급자를 더 이상 사용할 수 없습니다. 공급자가 올바르게 설치되었는지 확인하십" -"시오." +"공급자를 더 이상 사용할 수 없습니다. 공급자가 올바르게 설치되었는지 확인하세" +"요." #: dlls/oledb32/version.rc:36 msgid "Data Link Properties" @@ -9427,7 +9411,7 @@ msgid "" "make sure the correct drive is selected below" msgstr "" "제조업체 설치 디스크를 삽입하고,\n" -"아래의 선택된 드라이브가 올바른지 확인하시오" +"아래의 선택된 드라이브가 올바른지 확인하세요" #: dlls/setupapi/setupapi.rc:57 msgid "Copy manufacturer's files from:" @@ -10193,7 +10177,8 @@ msgstr "'%1' 항목을 휴지통으로 보내시겠습니까?" #: dlls/shell32/shell32.rc:177 msgid "The item '%1' can't be sent to Trash. Do you want to delete it instead?" -msgstr "항목'%1'을(를) 휴지통으로 보낼 수 없습니다. 대신에 지우시겠습니까?" +msgstr "" +"항목'%1'을(를) 휴지통으로 보낼 수 없습니다. 대신 완전히 지우시겠습니까?" #: dlls/shell32/shell32.rc:184 msgid "" @@ -15141,7 +15126,7 @@ msgid "" msgstr "" "파일 '%s'이(가) 변경되었습니다.\n" "\n" -"변결 내용을 저장하시겠습니까?" +"변경 내용을 저장하시겠습니까?" #: programs/notepad/notepad.rc:83 msgid "'%s' could not be found." @@ -15781,7 +15766,7 @@ msgstr "" "지원하는 작업:\n" " ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" -"특정 작업에 대한 도움말을 보려면 다음을 입력하십시오.\n" +"특정 작업에 대한 도움말을 보려면 다음처럼 입력하세요.\n" " REG [작업] /?\n" "\n" @@ -16013,7 +15998,7 @@ msgstr "" " 레지스트리 값 이름의 데이터를 삭제합니다.\n" "\n" " /va\n" -" 레지스트리 키 아래의 모든 값을 삭제하니다.\n" +" 레지스트리 키 아래의 모든 값을 삭제합니다.\n" "\n" " /f\n" " 확인 절차 없이 (모든 하위키 및 값과 함께) 레지스트리 키를\n" @@ -17442,7 +17427,7 @@ msgstr "열 선택" #: programs/taskmgr/taskmgr.rc:519 msgid "" "Select the columns that will appear on the Process page of the Task Manager." -msgstr "작업 관리자의 프로세스 페이지에 표시될 열을 선택하십시오." +msgstr "작업 관리자의 프로세스 페이지에 표시될 열을 선택하세요." #: programs/taskmgr/taskmgr.rc:521 msgid "&Image Name" @@ -18426,7 +18411,7 @@ msgstr "" #: programs/winecfg/winecfg.rc:76 msgctxt "Drive letter" msgid "Letter" -msgstr "문자" +msgstr "드라이브" #: programs/winecfg/winecfg.rc:77 msgid "Target folder" @@ -18831,19 +18816,19 @@ msgstr "새 게임(&N)\tF2" #: programs/winemine/winemine.rc:42 msgid "Question &Marks" -msgstr "물음표(&M)" +msgstr "물음표 표시(&M)" #: programs/winemine/winemine.rc:44 msgid "&Beginner" -msgstr "초보자(&B)" +msgstr "초급(&B)" #: programs/winemine/winemine.rc:45 msgid "&Intermediate" -msgstr "중급자(&I)" +msgstr "중급(&I)" #: programs/winemine/winemine.rc:46 msgid "&Expert" -msgstr "전문가(&E)" +msgstr "고급(&E)" #: programs/winemine/winemine.rc:47 msgid "&Custom..." @@ -18851,15 +18836,15 @@ msgstr "사용자 정의(&C)..." #: programs/winemine/winemine.rc:49 msgid "&Fastest Times" -msgstr "가장 빠른 시간(&F)" +msgstr "기록 보기(&F)" #: programs/winemine/winemine.rc:54 msgid "&About WineMine" -msgstr "지뢰찾기 정보(&A)" +msgstr "지뢰 찾기 정보(&A)" #: programs/winemine/winemine.rc:61 msgid "Fastest Times" -msgstr "최단 시간" +msgstr "최단 시간 기록" #: programs/winemine/winemine.rc:63 msgid "Fastest times" @@ -18867,19 +18852,19 @@ msgstr "최단 시간" #: programs/winemine/winemine.rc:64 msgid "Beginner" -msgstr "초보자" +msgstr "초급" #: programs/winemine/winemine.rc:65 msgid "Intermediate" -msgstr "중급자" +msgstr "중급" #: programs/winemine/winemine.rc:66 msgid "Expert" -msgstr "전문가" +msgstr "고급" #: programs/winemine/winemine.rc:74 programs/winemine/winemine.rc:33 msgid "Reset Results" -msgstr "초기화 결과" +msgstr "초기화" #: programs/winemine/winemine.rc:80 msgid "Congratulations!" @@ -18891,31 +18876,31 @@ msgstr "이름을 입력해 주세요" #: programs/winemine/winemine.rc:90 msgid "Custom Game" -msgstr "사용자 지정 게임" +msgstr "사용자 정의" #: programs/winemine/winemine.rc:92 msgid "Rows" -msgstr "가로줄" +msgstr "높이" #: programs/winemine/winemine.rc:93 msgid "Columns" -msgstr "세로줄" +msgstr "너비" #: programs/winemine/winemine.rc:94 msgid "Mines" -msgstr "지뢰" +msgstr "지뢰 수" #: programs/winemine/winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "모든 결과를 잃습니다. 계속 진행하시겠습니까?" +msgstr "모든 기록이 초기화됩니다. 계속 진행하시겠습니까?" #: programs/winemine/winemine.rc:30 msgid "WineMine" -msgstr "지뢰찾기" +msgstr "지뢰 찾기" #: programs/winemine/winemine.rc:31 msgid "Nobody" -msgstr "아무개" +msgstr "익명" #: programs/winemine/winemine.rc:32 msgid "Copyright 2000 Joshua Thielen" @@ -18983,7 +18968,7 @@ msgstr "Wine 도움말" #: programs/winhlp32/winhlp32.rc:86 msgid "Error while reading the help file `%s'" -msgstr "도움말 파일 `%s'를 읽는 도중 오류 발생" +msgstr "도움말 파일 '%s'을(를) 읽는 동안 오류 발생" #: programs/winhlp32/winhlp32.rc:88 msgid "Summary" @@ -18999,31 +18984,31 @@ msgstr "도움말 파일 (*.hlp)" #: programs/winhlp32/winhlp32.rc:92 msgid "Cannot find '%s'. Do you want to find this file yourself?" -msgstr "%s을(를) 찾을 수 없습니다'. 이 파일을 직접 찾으시겠습니까?" +msgstr "'%s'을(를) 찾을 수 없습니다. 파일을 직접 찾으시겠습니까?" #: programs/winhlp32/winhlp32.rc:93 msgid "Cannot find a richedit implementation... Aborting" -msgstr "Richedit 구현을 찾을 수 없습니다... 취소중" +msgstr "Richedit 구현을 찾을 수 없습니다... 취소 중" #: programs/winhlp32/winhlp32.rc:94 msgid "Help topics: " -msgstr "도움말 목차: " +msgstr "도움말 항목: " #: programs/wmic/wmic.rc:28 msgid "Error: Command line not supported\n" -msgstr "오류: 명령 라인은 지원되지 않음\n" +msgstr "오류: 명령 줄은 지원하지 않습니다\n" #: programs/wmic/wmic.rc:29 msgid "Error: Alias not found\n" -msgstr "오류: Alias를 찾을 수 없음\n" +msgstr "오류: 별칭을 찾을 수 없습니다\n" #: programs/wmic/wmic.rc:30 msgid "Error: Invalid query\n" -msgstr "오류: 잘못된 질의\n" +msgstr "오류: 잘못된 질의입니다\n" #: programs/wmic/wmic.rc:31 msgid "Error: Invalid syntax for PATH\n" -msgstr "오류: 잘못된 키 이름\n" +msgstr "오류: 잘못된 구문입니다\n" #: programs/wordpad/wordpad.rc:31 msgid "&New...\tCtrl+N"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: 34ac3308d994a83173ab57f0bd107111f0e1c811 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34ac3308d994a83173ab57f0… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Mar 23 08:26:38 2022 +0200 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 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index 72bf87a8177..5cd36211cc2 100644 --- a/po/lt.po +++ b/po/lt.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: 2022-03-08 09:46+0200\n" +"PO-Revision-Date: 2022-03-23 08:26+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3976,13 +3976,11 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "Ciklinė __proto__ reikšmė" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "Negalima apibrėžti savybės „|“: objektas nėra išplečiamas" +msgstr "Negalima sukurti savybės neišplečiamam objektui" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible"

1 0

Floris Renaud : po: Update Dutch Translation.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: 17a8fd84547b335b5b0e27a370efd597cf73bee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17a8fd84547b335b5b0e27a3… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Wed Mar 23 16:55:47 2022 +0100 po: Update Dutch Translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/nl.po b/po/nl.po index 40692ed0bb3..21e4f45a65a 100644 --- a/po/nl.po +++ b/po/nl.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: 2022-03-08 13:40+0100\n" +"PO-Revision-Date: 2022-03-23 17:00+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -3987,13 +3987,11 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "Cyclische __proto__ waarde" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "Kan de eigenschap '|' niet definiëren: object is niet uitbreidbaar" +msgstr "Kan geen eigenschap maken voor een niet-uitbreidbaar object" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible"

1 0

Zebediah Figura : kernelbase: Do not return S_FALSE from UrlGetPartW().
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: a521bfd3f41ccfa30dc84043d5ac612f216198ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=a521bfd3f41ccfa30dc84043… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 22 23:28:00 2022 -0500 kernelbase: Do not return S_FALSE from UrlGetPartW(). Only return it from UrlGetPartA(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 3 ++- dlls/shlwapi/tests/url.c | 8 ++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 410d87ce620..be7754dade2 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4166,6 +4166,7 @@ HRESULT WINAPI UrlGetPartA(const char *url, char *out, DWORD *out_len, DWORD par len2 = WideCharToMultiByte(CP_ACP, 0, outW, len + 1, out, *out_len, NULL, NULL); *out_len = len2 - 1; heap_free(inW); + if (hr == S_OK && !*out_len) hr = S_FALSE; return hr; } @@ -4382,7 +4383,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p } TRACE("len=%ld %s\n", *out_len, wine_dbgstr_w(out)); - return *out_len ? S_OK : S_FALSE; + return S_OK; } BOOL WINAPI UrlIsA(const char *url, URLIS Urlis) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 476358c6d45..31581f82847 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -748,8 +748,6 @@ static void test_UrlGetPart(void) {"telnet://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "telnet:hostname"}, }; - winetest_mute_threshold = 5; - hr = UrlGetPartA(NULL, NULL, NULL, URL_PART_SCHEME, 0); ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); @@ -837,7 +835,7 @@ static void test_UrlGetPart(void) size = 1; wcscpy(bufferW, L"x"); hr = UrlGetPartW(urlW, bufferW, &size, part, flags); - todo_wine_if (tests[i].todo_hr || tests[i].hr == S_FALSE) + todo_wine_if (tests[i].todo_hr) { if (tests[i].hr == S_OK) ok(hr == E_POINTER, "Got hr %#lx.\n", hr); @@ -870,7 +868,7 @@ static void test_UrlGetPart(void) size = ARRAY_SIZE(bufferW); wcscpy(bufferW, L"x"); hr = UrlGetPartW(urlW, bufferW, &size, part, flags); - todo_wine_if ((tests[i].hr == S_FALSE || tests[i].todo_hr) && strcmp(url, "a:") && strcmp(url, "0:")) + todo_wine_if (tests[i].todo_hr && strcmp(url, "a:") && strcmp(url, "0:")) ok(hr == (tests[i].hr == S_FALSE ? S_OK : tests[i].hr), "Got hr %#lx.\n", hr); if (SUCCEEDED(hr)) { @@ -886,8 +884,6 @@ static void test_UrlGetPart(void) winetest_pop_context(); } - - winetest_mute_threshold = 42; } /* ########################### */

1 0

Zebediah Figura : kernelbase: Do not allow schemes to be less than two characters in UrlGetPart().
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: c2daf4f01e510d81d3627a91138de5f883db6d51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2daf4f01e510d81d3627a91… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 22 23:28:01 2022 -0500 kernelbase: Do not allow schemes to be less than two characters in UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 2 +- dlls/shlwapi/tests/url.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index be7754dade2..917fd644770 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4198,7 +4198,7 @@ static void parse_url( const WCHAR *url, struct parsed_url *pl ) memset(pl, 0, sizeof(*pl)); pl->scheme = url; work = parse_scheme( pl->scheme ); - if (*work != ':') return; + if (work < url + 2 || *work != ':') return; pl->scheme_len = work - pl->scheme; work++; if (!is_slash( work[0] ) || !is_slash( work[1] )) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 31581f82847..fb3df96e13d 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -714,8 +714,8 @@ static void test_UrlGetPart(void) {"scheme :", URL_PART_SCHEME, 0, S_FALSE, ""}, {"sch eme:", URL_PART_SCHEME, 0, S_FALSE, ""}, {":", URL_PART_SCHEME, 0, S_FALSE, ""}, - {"a:", URL_PART_SCHEME, 0, S_FALSE, "", .todo_hr = TRUE}, - {"0:", URL_PART_SCHEME, 0, S_FALSE, "", .todo_hr = TRUE}, + {"a:", URL_PART_SCHEME, 0, S_FALSE, ""}, + {"0:", URL_PART_SCHEME, 0, S_FALSE, ""}, {"ab:", URL_PART_SCHEME, 0, S_OK, "ab"}, {"about://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, @@ -868,7 +868,7 @@ static void test_UrlGetPart(void) size = ARRAY_SIZE(bufferW); wcscpy(bufferW, L"x"); hr = UrlGetPartW(urlW, bufferW, &size, part, flags); - todo_wine_if (tests[i].todo_hr && strcmp(url, "a:") && strcmp(url, "0:")) + todo_wine_if (tests[i].todo_hr) ok(hr == (tests[i].hr == S_FALSE ? S_OK : tests[i].hr), "Got hr %#lx.\n", hr); if (SUCCEEDED(hr)) {

1 0

Zebediah Figura : kernelbase: Do not parse username, password, and port separately for file URLs in UrlGetPart().
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: a110b2e68e635cabfb3c9d714f27cd9483f21d17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a110b2e68e635cabfb3c9d71… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 22 23:28:02 2022 -0500 kernelbase: Do not parse username, password, and port separately for file URLs in UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 109 ++++++++++++++++++++++++++--------------------- dlls/shlwapi/tests/url.c | 16 +++---- 2 files changed, 68 insertions(+), 57 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 917fd644770..fbe4728efda 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -72,6 +72,7 @@ struct parsed_url DWORD port_len; /* [out] size of Port (until "/" or eos) */ const WCHAR *query; /* [out] start of Query */ DWORD query_len; /* [out] size of Query (until eos) */ + DWORD scheme_number; }; static WCHAR *heap_strdupAtoW(const char *str) @@ -4201,49 +4202,69 @@ static void parse_url( const WCHAR *url, struct parsed_url *pl ) if (work < url + 2 || *work != ':') return; pl->scheme_len = work - pl->scheme; work++; + pl->scheme_number = get_scheme_code(pl->scheme, pl->scheme_len); if (!is_slash( work[0] ) || !is_slash( work[1] )) return; + work += 2; - pl->username = work + 2; - work = parse_url_element( pl->username, L":@/\\?#" ); - pl->username_len = work - pl->username; - if (*work == ':') + if (pl->scheme_number != URL_SCHEME_FILE) { - pl->password = work + 1; - work = parse_url_element( pl->password, L"@/\\?#" ); - pl->password_len = work - pl->password; - if (*work != '@') + pl->username = work; + work = parse_url_element( pl->username, L":@/\\?#" ); + pl->username_len = work - pl->username; + if (*work == ':') { - /* what we just parsed must be the hostname and port - * so reset pointers and clear then let it parse */ + pl->password = work + 1; + work = parse_url_element( pl->password, L"@/\\?#" ); + pl->password_len = work - pl->password; + if (*work == '@') + { + work++; + } + else + { + /* what we just parsed must be the hostname and port + * so reset pointers and clear then let it parse */ + pl->username_len = pl->password_len = 0; + work = pl->username; + pl->username = pl->password = 0; + } + } + else if (*work == '@') + { + /* no password */ + pl->password_len = 0; + pl->password = 0; + work++; + } + else + { + /* what was parsed was hostname, so reset pointers and let it parse */ pl->username_len = pl->password_len = 0; - work = pl->username - 1; + work = pl->username; pl->username = pl->password = 0; } } - else if (*work == '@') + + pl->hostname = work; + if (pl->scheme_number == URL_SCHEME_FILE) { - /* no password */ - pl->password_len = 0; - pl->password = 0; + work = parse_url_element( pl->hostname, L"/\\?#" ); + pl->hostname_len = work - pl->hostname; + if (pl->hostname_len >= 2 && pl->hostname[1] == ':') + pl->hostname_len = 0; } else { - /* what was parsed was hostname, so reset pointers and let it parse */ - pl->username_len = pl->password_len = 0; - work = pl->username - 1; - pl->username = pl->password = 0; - } - - pl->hostname = work + 1; - work = parse_url_element( pl->hostname, L":/\\?#" ); - pl->hostname_len = work - pl->hostname; + work = parse_url_element( pl->hostname, L":/\\?#" ); + pl->hostname_len = work - pl->hostname; - if (*work == ':') - { - pl->port = work + 1; - work = parse_url_element( pl->port, L"/\\?#" ); - pl->port_len = work - pl->port; + if (*work == ':') + { + pl->port = work + 1; + work = parse_url_element( pl->port, L"/\\?#" ); + pl->port_len = work - pl->port; + } } if ((pl->query = wcschr( work, '?' ))) @@ -4255,26 +4276,19 @@ static void parse_url( const WCHAR *url, struct parsed_url *pl ) HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD part, DWORD flags) { - DWORD scheme, size, schsize; LPCWSTR addr, schaddr; struct parsed_url pl; + DWORD size, schsize; TRACE("%s, %p, %p(%ld), %#lx, %#lx\n", wine_dbgstr_w(url), out, out_len, *out_len, part, flags); if (!url || !out || !out_len || !*out_len) return E_INVALIDARG; - addr = wcschr(url, ':'); - if (!addr) - scheme = URL_SCHEME_UNKNOWN; - else - scheme = get_scheme_code(url, addr - url); - parse_url(url, &pl); - switch (scheme) + switch (pl.scheme_number) { - case URL_SCHEME_FILE: case URL_SCHEME_FTP: case URL_SCHEME_GOPHER: case URL_SCHEME_HTTP: @@ -4285,6 +4299,11 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p case URL_SCHEME_SNEWS: break; + case URL_SCHEME_FILE: + if (part != URL_PART_SCHEME && part != URL_PART_QUERY && part != URL_PART_HOSTNAME) + return E_FAIL; + break; + default: if (part != URL_PART_SCHEME && part != URL_PART_QUERY) return E_FAIL; @@ -4299,16 +4318,8 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p break; case URL_PART_HOSTNAME: - if (scheme == URL_SCHEME_FILE && (!pl.hostname_len || (pl.hostname_len == 1 && *(pl.hostname + 1) == ':'))) - { - addr = NULL; - size = 0; - } - else - { - addr = pl.hostname; - size = pl.hostname_len; - } + addr = pl.hostname; + size = pl.hostname_len; break; case URL_PART_USERNAME: @@ -4342,7 +4353,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p return E_INVALIDARG; } - if (flags == URL_PARTFLAG_KEEPSCHEME && scheme != URL_SCHEME_FILE) + if (flags == URL_PARTFLAG_KEEPSCHEME && pl.scheme_number != URL_SCHEME_FILE) { if (!pl.scheme || !pl.scheme_len) return E_FAIL; diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index fb3df96e13d..7cf7097a9ba 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -596,7 +596,7 @@ static void test_UrlGetPart(void) DWORD flags; HRESULT hr; const char *expect; - BOOL todo_hr, todo_result; + BOOL todo_hr; } tests[] = { @@ -684,10 +684,10 @@ static void test_UrlGetPart(void) {"http:///index.html", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:"}, {"file://h o s t/c:/windows/file", URL_PART_HOSTNAME, 0, S_OK, "h o s t"}, {"file://h o s t/c:/windows/file", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "h o s t"}, - {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_USERNAME, 0, E_FAIL, .todo_hr = TRUE}, - {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_PASSWORD, 0, E_FAIL, .todo_hr = TRUE}, - {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_HOSTNAME, 0, S_OK, "foo:bar(a)localhost:21", .todo_result = TRUE}, - {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_PORT, 0, E_FAIL, .todo_hr = TRUE}, + {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_USERNAME, 0, E_FAIL}, + {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_PASSWORD, 0, E_FAIL}, + {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_HOSTNAME, 0, S_OK, "foo:bar(a)localhost:21"}, + {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_PORT, 0, E_FAIL}, {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_QUERY, 0, S_OK, "query=x"}, {"http://user:pass 123(a)www.wine hq.org", URL_PART_HOSTNAME, 0, S_OK, "www.wine hq.org"}, {"http://user:pass 123(a)www.wine hq.org", URL_PART_PASSWORD, 0, S_OK, "pass 123"}, @@ -799,7 +799,7 @@ static void test_UrlGetPart(void) { if (expect) { - todo_wine_if (tests[i].todo_hr || tests[i].todo_result) + todo_wine_if (tests[i].todo_hr) ok(size == strlen(expect) + 1, "Got size %lu.\n", size); } } @@ -820,7 +820,7 @@ static void test_UrlGetPart(void) ok(size == strlen(buffer), "Got size %lu.\n", size); if (expect) { - todo_wine_if (tests[i].todo_hr || tests[i].todo_result) + todo_wine_if (tests[i].todo_hr) ok(!strcmp(buffer, expect), "Got result %s.\n", debugstr_a(buffer)); } } @@ -854,7 +854,7 @@ static void test_UrlGetPart(void) { if (expect) { - todo_wine_if (tests[i].todo_hr || tests[i].todo_result) + todo_wine_if (tests[i].todo_hr) ok(size == strlen(expect) + 1, "Got size %lu.\n", size); } }

1 0

Zebediah Figura : kernelbase: Do not parse the hostname of internet URLs if they are missing a double slash.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: 26a3690796f8d9d17aa57b8bb2ebd4e4f3f6a623 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26a3690796f8d9d17aa57b8b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 22 23:28:03 2022 -0500 kernelbase: Do not parse the hostname of internet URLs if they are missing a double slash. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 4 ++++ dlls/shlwapi/tests/url.c | 59 ++++++++++++------------------------------------ 2 files changed, 19 insertions(+), 44 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index fbe4728efda..7eda9bd483c 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4204,7 +4204,11 @@ static void parse_url( const WCHAR *url, struct parsed_url *pl ) work++; pl->scheme_number = get_scheme_code(pl->scheme, pl->scheme_len); if (!is_slash( work[0] ) || !is_slash( work[1] )) + { + if (pl->scheme_number != URL_SCHEME_FILE) + pl->scheme_number = URL_SCHEME_UNKNOWN; return; + } work += 2; if (pl->scheme_number != URL_SCHEME_FILE) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 7cf7097a9ba..6957e244213 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -596,7 +596,6 @@ static void test_UrlGetPart(void) DWORD flags; HRESULT hr; const char *expect; - BOOL todo_hr; } tests[] = { @@ -657,8 +656,8 @@ static void test_UrlGetPart(void) {"http://user(a)host@q", URL_PART_USERNAME, 0, S_OK, "user"}, {"http://user(a)host@q", URL_PART_HOSTNAME, 0, S_OK, "host(a)q"}, - {"http:localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL, .todo_hr = TRUE}, - {"http:/localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL, .todo_hr = TRUE}, + {"http:localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL}, + {"http:/localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL}, {"http://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"http:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, @@ -780,13 +779,10 @@ static void test_UrlGetPart(void) size = 1; strcpy(buffer, "x"); hr = UrlGetPartA(url, buffer, &size, part, flags); - todo_wine_if (tests[i].todo_hr) - { - if (tests[i].hr == S_OK) - ok(hr == E_POINTER, "Got hr %#lx.\n", hr); - else - ok(hr == tests[i].hr, "Got hr %#lx.\n", hr); - } + if (tests[i].hr == S_OK) + ok(hr == E_POINTER, "Got hr %#lx.\n", hr); + else + ok(hr == tests[i].hr, "Got hr %#lx.\n", hr); if (hr == S_FALSE) { @@ -796,33 +792,20 @@ static void test_UrlGetPart(void) else { if (hr == E_POINTER) - { - if (expect) - { - todo_wine_if (tests[i].todo_hr) - ok(size == strlen(expect) + 1, "Got size %lu.\n", size); - } - } + ok(size == strlen(expect) + 1, "Got size %lu.\n", size); else - { ok(size == 1, "Got size %lu.\n", size); - } ok(!strcmp(buffer, "x"), "Got result %s.\n", debugstr_a(buffer)); } size = sizeof(buffer); strcpy(buffer, "x"); hr = UrlGetPartA(url, buffer, &size, part, flags); - todo_wine_if (tests[i].todo_hr) - ok(hr == tests[i].hr, "Got hr %#lx.\n", hr); + ok(hr == tests[i].hr, "Got hr %#lx.\n", hr); if (SUCCEEDED(hr)) { ok(size == strlen(buffer), "Got size %lu.\n", size); - if (expect) - { - todo_wine_if (tests[i].todo_hr) - ok(!strcmp(buffer, expect), "Got result %s.\n", debugstr_a(buffer)); - } + ok(!strcmp(buffer, expect), "Got result %s.\n", debugstr_a(buffer)); } else { @@ -835,13 +818,10 @@ static void test_UrlGetPart(void) size = 1; wcscpy(bufferW, L"x"); hr = UrlGetPartW(urlW, bufferW, &size, part, flags); - todo_wine_if (tests[i].todo_hr) - { - if (tests[i].hr == S_OK) - ok(hr == E_POINTER, "Got hr %#lx.\n", hr); - else - ok(hr == (tests[i].hr == S_FALSE ? S_OK : tests[i].hr), "Got hr %#lx.\n", hr); - } + if (tests[i].hr == S_OK) + ok(hr == E_POINTER, "Got hr %#lx.\n", hr); + else + ok(hr == (tests[i].hr == S_FALSE ? S_OK : tests[i].hr), "Got hr %#lx.\n", hr); if (SUCCEEDED(hr)) { @@ -851,25 +831,16 @@ static void test_UrlGetPart(void) else { if (hr == E_POINTER) - { - if (expect) - { - todo_wine_if (tests[i].todo_hr) - ok(size == strlen(expect) + 1, "Got size %lu.\n", size); - } - } + ok(size == strlen(expect) + 1, "Got size %lu.\n", size); else - { ok(size == 1, "Got size %lu.\n", size); - } ok(!wcscmp(bufferW, L"x"), "Got result %s.\n", debugstr_w(bufferW)); } size = ARRAY_SIZE(bufferW); wcscpy(bufferW, L"x"); hr = UrlGetPartW(urlW, bufferW, &size, part, flags); - todo_wine_if (tests[i].todo_hr) - ok(hr == (tests[i].hr == S_FALSE ? S_OK : tests[i].hr), "Got hr %#lx.\n", hr); + ok(hr == (tests[i].hr == S_FALSE ? S_OK : tests[i].hr), "Got hr %#lx.\n", hr); if (SUCCEEDED(hr)) { ok(size == wcslen(bufferW), "Got size %lu.\n", size);

1 0

Paul Gofman : nsiproxy: Avoid redundant pid mapping in tcp_conns_enumerate_all().
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: 6ba4c31e9d9033a1477df94149b31d531cff7327 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ba4c31e9d9033a1477df941… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 23 09:07:24 2022 +0000 nsiproxy: Avoid redundant pid mapping in tcp_conns_enumerate_all(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/tcp.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 0cd81ae86e5..491ac797100 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -540,7 +540,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * memset( &key, 0, sizeof(key) ); memset( &dyn, 0, sizeof(dyn) ); memset( &stat, 0, sizeof(stat) ); - pid_map = get_pid_map( &pid_map_size ); + if (static_data) pid_map = get_pid_map( &pid_map_size ); /* skip header line */ ptr = fgets( buf, sizeof(buf), fp ); @@ -558,15 +558,17 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * key.local.Ipv4.sin_port = htons( key.local.Ipv4.sin_port ); key.remote.Ipv4.sin_port = htons( key.remote.Ipv4.sin_port ); - stat.pid = find_owning_pid( pid_map, pid_map_size, inode ); - stat.create_time = 0; /* FIXME */ - stat.mod_info = 0; /* FIXME */ - if (num < *count) { if (key_data) *key_data++ = key; if (dynamic_data) *dynamic_data++ = dyn; - if (static_data) *static_data++ = stat; + if (static_data) + { + stat.pid = find_owning_pid( pid_map, pid_map_size, inode ); + stat.create_time = 0; /* FIXME */ + stat.mod_info = 0; /* FIXME */ + *static_data++ = stat; + } } num++; } @@ -601,16 +603,17 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * addr_scopes_size ); key.remote.Ipv6.sin6_scope_id = find_ipv6_addr_scope( &key.remote.Ipv6.sin6_addr, addr_scopes, addr_scopes_size ); - - stat.pid = find_owning_pid( pid_map, pid_map_size, inode ); - stat.create_time = 0; /* FIXME */ - stat.mod_info = 0; /* FIXME */ - if (num < *count) { if (key_data) *key_data++ = key; if (dynamic_data) *dynamic_data++ = dyn; - if (static_data) *static_data++ = stat; + if (static_data) + { + stat.pid = find_owning_pid( pid_map, pid_map_size, inode ); + stat.create_time = 0; /* FIXME */ + stat.mod_info = 0; /* FIXME */ + *static_data++ = stat; + } } num++; } @@ -649,7 +652,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * if (len <= sizeof(struct xinpgen)) goto err; addr_scopes = get_ipv6_addr_scope_table( &addr_scopes_size ); - pid_map = get_pid_map( &pid_map_size ); + if (static_data) pid_map = get_pid_map( &pid_map_size ); orig_xig = (struct xinpgen *)buf; xig = orig_xig; @@ -708,15 +711,17 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * addr_scopes_size ); } - stat.pid = find_owning_pid( pid_map, pid_map_size, (UINT_PTR)sock->so_pcb ); - stat.create_time = 0; /* FIXME */ - stat.mod_info = 0; /* FIXME */ - if (num < *count) { if (key_data) *key_data++ = key; if (dynamic_data) *dynamic_data++ = dyn; - if (static_data) *static_data++ = stat; + if (static_data) + { + stat.pid = find_owning_pid( pid_map, pid_map_size, (UINT_PTR)sock->so_pcb ); + stat.create_time = 0; /* FIXME */ + stat.mod_info = 0; /* FIXME */ + *static_data++ = stat; + } } num++; }

1 0

Paul Gofman : iphlpapi: Don't request redundant static data in get_extended_tcp_table().
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: 3c19c54aa0016e2bfcc17a3f2f2b460e2f2d063b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c19c54aa0016e2bfcc17a3f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 23 09:07:25 2022 +0000 iphlpapi: Don't request redundant static data in get_extended_tcp_table(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 041e712f44f..afc400d26c1 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3082,6 +3082,19 @@ static int tcp6_row_owner_cmp( const void *a, const void *b ) return RtlUshortByteSwap( rowA->dwRemotePort ) - RtlUshortByteSwap( rowB->dwRemotePort ); } +static BOOL tcp_table_needs_pids( ULONG table_class ) +{ + switch (table_class) + { + case TCP_TABLE_BASIC_LISTENER: + case TCP_TABLE_BASIC_CONNECTIONS: + case TCP_TABLE_BASIC_ALL: + return FALSE; + + } + return TRUE; +} + /************************************************************************************* * get_extended_tcp_table * @@ -3093,13 +3106,19 @@ static DWORD get_extended_tcp_table( void *table, DWORD *size, BOOL sort, ULONG DWORD err, count, needed, i, num = 0, row_size = 0; struct nsi_tcp_conn_key *key; struct nsi_tcp_conn_dynamic *dyn; - struct nsi_tcp_conn_static *stat; + struct nsi_tcp_conn_static *stat = NULL; if (!size) return ERROR_INVALID_PARAMETER; - err = NsiAllocateAndGetTable( 1, &NPI_MS_TCP_MODULEID, tcp_table_id( table_class ), (void **)&key, sizeof(*key), - NULL, 0, (void **)&dyn, sizeof(*dyn), - (void **)&stat, sizeof(*stat), &count, 0 ); + if (tcp_table_needs_pids( table_class )) + err = NsiAllocateAndGetTable( 1, &NPI_MS_TCP_MODULEID, tcp_table_id( table_class ), (void **)&key, sizeof(*key), + NULL, 0, (void **)&dyn, sizeof(*dyn), + (void **)&stat, sizeof(*stat), &count, 0 ); + else /* Don't retrieve the static data if not required as this is expensive to compute */ + err = NsiAllocateAndGetTable( 1, &NPI_MS_TCP_MODULEID, tcp_table_id( table_class ), (void **)&key, sizeof(*key), + NULL, 0, (void **)&dyn, sizeof(*dyn), + NULL, 0, &count, 0 ); + if (err) return err; for (i = 0; i < count; i++)

1 0