- Wine-devel - list.winehq.org

[PATCH] po: Update Korean translation.
by Byeongsik Jeon 07 Apr '22

07 Apr '22

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- po/ko.po | 121 ++++++++++++++++++++++++++----------------------------- 1 file changed, 57 insertions(+), 64 deletions(-) diff --git a/po/ko.po b/po/ko.po index f3d0acf62af..607c4a644c4 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: 2022-03-23 11:25+0900\n" +"PO-Revision-Date: 2022-04-02 01:13+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -3991,45 +3991,39 @@ msgstr "Wine" #: dlls/kernelbase/kernelbase.rc:29 msgid "Western Europe and United States" -msgstr "" +msgstr "서유럽 및 미국" #: dlls/kernelbase/kernelbase.rc:30 -#, fuzzy -#| msgid "Central European" msgid "Central Europe" msgstr "중앙 유럽어" #: dlls/kernelbase/kernelbase.rc:34 -#, fuzzy -#| msgid "Turkish" msgid "Turkic" msgstr "터키어" #: dlls/kernelbase/kernelbase.rc:36 msgid "Korean" -msgstr "" +msgstr "한국어" #: dlls/kernelbase/kernelbase.rc:37 -#, fuzzy -#| msgid "Operation Ceased" msgid "Traditional Chinese" -msgstr "작업 중지됨" +msgstr "중국어 번체" #: dlls/kernelbase/kernelbase.rc:38 msgid "Simplified Chinese" -msgstr "" +msgstr "중국어 간체" #: dlls/kernelbase/kernelbase.rc:43 msgid "Indic" -msgstr "" +msgstr "인도어" #: dlls/kernelbase/kernelbase.rc:44 msgid "Georgian" -msgstr "" +msgstr "그루지아어" #: dlls/kernelbase/kernelbase.rc:45 msgid "Armenian" -msgstr "" +msgstr "아르메니아어" #: dlls/kernelbase/winerror.mc:28 msgid "Success.\n" @@ -4189,7 +4183,7 @@ msgstr "지원되지 않는 요청.\n" #: dlls/kernelbase/winerror.mc:223 msgid "Remote machine not listening.\n" -msgstr "원격 머신 접속 실패.\n" +msgstr "원격 시스템 접속 실패.\n" #: dlls/kernelbase/winerror.mc:228 msgid "Duplicate network name.\n" @@ -6329,7 +6323,7 @@ msgstr "다른 버전이 설치되어 있음.\n" #: dlls/kernelbase/winerror.mc:2918 msgid "Invalid command line.\n" -msgstr "잘못된 명령 라인.\n" +msgstr "잘못된 명령줄.\n" #: dlls/kernelbase/winerror.mc:2923 msgid "Remote installation not allowed.\n" @@ -13838,12 +13832,12 @@ msgid "" "The prompt can also be changed by altering the PROMPT environment variable,\n" "so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'.\n" msgstr "" -"PROMPT은 명령 라인 프로프트를 설정합니다.\n" +"PROMPT는 명령줄 프롬프트를 설정합니다.\n" "\n" -"PROMPT 명령어 이후의 문자열(과 바로 이후의 공백)은 cmd가 입력을 기다리고\n" -"있을 때 명령 라인의 시작에 나타납니다.\n" +"PROMPT 명령어 이후의 문자열( 및 이후의 공백)은 CMD가 입력을 기다리고\n" +"있을 때 명령줄의 시작에 나타납니다.\n" "\n" -"아래 소개하는 문자열은 특별한 의미를 가집니다:\n" +"아래 나열된 문자열은 특별한 의미를 가집니다.\n" "\n" "$$ 달러 기호 $_ 라인피드 $b 파이프 기호 (|)\n" "$d 현재 날짜 $e 이스케이프 $g > 기호\n" @@ -13862,8 +13856,7 @@ msgid "" "A command line beginning with REM (followed by a space) performs no action,\n" "and can therefore be used as a comment in a batch file.\n" msgstr "" -"REM으로 시작하(고 뒤에 공백이 뒤따르)는 명령 라인은 어떤 동작도 하지 않습니" -"다.\n" +"REM( 및 공백)으로 시작하는 명령줄은 어떤 동작도 하지 않습니다.\n" "그러므로 배치 파일에서 주석으로 사용할 수 있습니다.\n" #: programs/cmd/cmd.rc:176 @@ -13923,7 +13916,7 @@ msgid "" "called from the command line.\n" msgstr "" "SHIFT는 배치 파일 안에서 매개변수 리스트의 처음 하나를 제거 위해서\n" -"사용합니다. 매개변수 2가 매개변수 1이 되는 식입니다. 이것은 명령 라인에서\n" +"사용합니다. 매개변수 2가 매개변수 1이 되는 식입니다. 이것은 명령줄에서\n" "사용했을 경우에는 아무 영향이 없습니다.\n" #: programs/cmd/cmd.rc:212 @@ -14652,7 +14645,7 @@ msgstr "사용법: ipconfig [ /? | /all ]\n" #: programs/ipconfig/ipconfig.rc:31 msgid "Error: Unknown or invalid command line parameters specified\n" -msgstr "오류: 없거나 잘못된 명령어 라인 매개변수가 지정됨\n" +msgstr "오류: 잘못된 명령줄 매개변수가 지정되었습니다\n" #: programs/ipconfig/ipconfig.rc:32 msgid "%1 adapter %2\n" @@ -15297,15 +15290,15 @@ msgstr "다른 이름으로 저장(&S)..." #: programs/oleview/oleview.rc:87 msgid "&Group by type kind" -msgstr "타입 종류에 따라 구분(&G)" +msgstr "유형별 구분(&G)" #: programs/oleview/oleview.rc:156 msgid "Connect to another machine" -msgstr "다른 머신에 접속" +msgstr "다른 시스템에 접속" #: programs/oleview/oleview.rc:159 msgid "&Machine name:" -msgstr "머신 이름(&M):" +msgstr "시스템 이름(&M):" #: programs/oleview/oleview.rc:167 msgid "System Configuration" @@ -15329,7 +15322,7 @@ msgid "" "They have no effect on Wine performance." msgstr "" "이 셋팅은 레지스트리 값만 바꿉니다.\n" -"Wine의 성능에는 영향을 미치지 않습니다." +"Wine 성능에는 영향이 없습니다." #: programs/oleview/oleview.rc:180 msgid "Default Interface Viewer" @@ -15381,7 +15374,7 @@ msgstr "TypeLib 파일 (*.tlb;*.olb;*.dll;*.ocx;*.exe)" #: programs/oleview/oleview.rc:105 msgid "Bind to file via a File Moniker" -msgstr "파일 별명으로 파일 연결" +msgstr "파일 모니커를 통해서 파일 연결" #: programs/oleview/oleview.rc:106 msgid "Open a TypeLib file and view the contents" @@ -15389,7 +15382,7 @@ msgstr "TypeLib 파일 열고 내용 보기" #: programs/oleview/oleview.rc:107 msgid "Change machine wide Distributed COM settings" -msgstr "머신 전체의 DCOM 설정 바꾸기" +msgstr "시스템 전체의 DCOM 설정 바꾸기" #: programs/oleview/oleview.rc:108 msgid "Run the Wine registry editor" @@ -15397,7 +15390,7 @@ msgstr "Wine 레지스트리 편집기 실행" #: programs/oleview/oleview.rc:109 msgid "Quit the application. Prompts to save changes" -msgstr "바뀐 것을 저장할지 물어보고 프로그램 끝내기" +msgstr "변경 사항을 저장할 지 물어본 후 프로그램 끝내기" #: programs/oleview/oleview.rc:110 msgid "Create an instance of the selected object" @@ -15405,7 +15398,7 @@ msgstr "선택된 개체의 인스턴트 만들기" #: programs/oleview/oleview.rc:111 msgid "Create an instance of the selected object on a specific machine" -msgstr "지정한 머신의 선택된 개체의 인스턴트 만들기" +msgstr "지정한 시스템에서 선택한 개체의 인스턴트 만들기" #: programs/oleview/oleview.rc:112 msgid "Release the currently selected object instance" @@ -15413,28 +15406,28 @@ msgstr "현재 선택된 개체 인스턴트 해제하기" #: programs/oleview/oleview.rc:113 msgid "Copy the GUID of the currently selected item to the clipboard" -msgstr "현재 선택된 항목의 GUID를 클립보드로 복사" +msgstr "클립보드로 현재 선택된 항목의 GUID 복사하기" #: programs/oleview/oleview.rc:114 msgid "Display the viewer for the selected item" -msgstr "선택된 항목의 뷰어 보기" +msgstr "선택된 항목에 대한 뷰어 보기" #: programs/oleview/oleview.rc:119 msgid "Toggle between expert and novice display mode" -msgstr "전문가와 초보자 모드 전환e" +msgstr "일반 및 고급 보기 모드 사이 전환" #: programs/oleview/oleview.rc:120 msgid "" "Toggle the display of component categories that are not meant to be visible" -msgstr "구성 요소 목록 보기(보이지 않더라도)" +msgstr "(표시 가능하지 않더라도 )컴포넌트 범주 보기 여부 전환" #: programs/oleview/oleview.rc:121 msgid "Show or hide the toolbar" -msgstr "도구 모음 보기/숨기기" +msgstr "도구 모음 보이기/숨기기" #: programs/oleview/oleview.rc:122 msgid "Show or hide the status bar" -msgstr "상태 표시줄 보기/숨기기" +msgstr "상태 표시줄 보이기/숨기기" #: programs/oleview/oleview.rc:123 msgid "Refresh all lists" @@ -15446,27 +15439,27 @@ msgstr "프로그램 정보, 버전, 저작권 보기" #: programs/oleview/oleview.rc:115 msgid "Ask for an in-process server when calling CoGetClassObject" -msgstr "CoGetClassObject을 호출할 때 인-프로세스 서버에 묻기" +msgstr "CoGetClassObject를 호출할 때 인-프로세스 서버에 묻기" #: programs/oleview/oleview.rc:116 msgid "Ask for an in-process handler when calling CoGetClassObject" -msgstr "CoGetClassObject을 호출할 때 인-프로세스 핸들러에 묻기" +msgstr "CoGetClassObject를 호출할 때 인-프로세스 핸들러에 묻기" #: programs/oleview/oleview.rc:117 msgid "Ask for a local server when calling CoGetClassObject" -msgstr "CoGetClassObject을 호출할 때 지역 서버에 묻기" +msgstr "CoGetClassObject를 호출할 때 로컬 서버에 묻기" #: programs/oleview/oleview.rc:118 msgid "Ask for a remote server when calling CoGetClassObject" -msgstr "CoGetClassObject을 호출할 때 원격 서버에 묻기" +msgstr "CoGetClassObject를 호출할 때 원격 서버에 묻기" #: programs/oleview/oleview.rc:130 msgid "ObjectClasses" -msgstr "ObjectClasses" +msgstr "개체 클래스" #: programs/oleview/oleview.rc:131 msgid "Grouped by Component Category" -msgstr "컴포턴트 분류" +msgstr "컴포넌트 범주별 그룹화" #: programs/oleview/oleview.rc:132 msgid "OLE 1.0 Objects" @@ -15482,11 +15475,11 @@ msgstr "모든 개체" #: programs/oleview/oleview.rc:135 msgid "Application IDs" -msgstr "프로그램 IDs" +msgstr "프로그램 ID" #: programs/oleview/oleview.rc:136 msgid "Type Libraries" -msgstr "라이브러리 형식" +msgstr "라이브러리 유형" #: programs/oleview/oleview.rc:137 msgid "ver." @@ -15498,7 +15491,7 @@ msgstr "인터페이스" #: programs/oleview/oleview.rc:140 msgid "Registry" -msgstr "레지스트리" +msgstr "등록" #: programs/oleview/oleview.rc:141 msgid "Implementation" @@ -15526,11 +15519,11 @@ msgstr "LoadTypeLib( %1 ) 실패 ($%2!x!)" #: programs/oleview/oleview.rc:151 msgid "Inherited Interfaces" -msgstr "상속 인터페이스" +msgstr "상속된 인터페이스" #: programs/oleview/oleview.rc:126 msgid "Save as an .IDL or .H file" -msgstr ".IDL 이나 .H file로 저장" +msgstr ".IDL 또는 .H 파일로 저장" #: programs/oleview/oleview.rc:127 msgid "Close window" @@ -15538,7 +15531,7 @@ msgstr "창 닫기" #: programs/oleview/oleview.rc:128 msgid "Group typeinfos by kind" -msgstr "타입정보를 타입에 따라 분류" +msgstr "종류별 타입정보 그룹화" #: programs/progman/progman.rc:33 msgid "&New..." @@ -15652,7 +15645,7 @@ msgstr "프로그램 속성" #: programs/progman/progman.rc:172 programs/progman/progman.rc:212 msgid "&Command line:" -msgstr "명령 라인(&C):" +msgstr "명령줄(&C):" #: programs/progman/progman.rc:174 msgid "&Working directory:" @@ -15664,7 +15657,7 @@ msgstr "키 조합(&K):" #: programs/progman/progman.rc:179 programs/progman/progman.rc:215 msgid "&Minimize at launch" -msgstr "실행시 최소화(&M)" +msgstr "실행할 때 최소화(&M)" #: programs/progman/progman.rc:183 msgid "Change &icon..." @@ -17036,7 +17029,7 @@ msgstr "" #: programs/start/start.rc:61 msgid "Could not translate the specified Unix filename to a DOS filename." -msgstr "지정한 Unix 파일 이름을 DOS 파일 이름으로 바꿀 수 없습니다." +msgstr "지정한 UNIX 파일 이름을 DOS 파일 이름으로 바꿀 수 없습니다." #: programs/taskkill/taskkill.rc:30 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" @@ -17044,42 +17037,42 @@ msgstr "사용법: taskkill [/?] [/f] [/im 프로세스이름 | /pid 프로세 #: programs/taskkill/taskkill.rc:31 msgid "Error: Unknown or invalid command line option specified.\n" -msgstr "오류: 없거나 잘못된 명령라인 옵션이 지정되었습니다.\n" +msgstr "오류: 잘못된 명령줄 옵션이 지정되었습니다.\n" #: programs/taskkill/taskkill.rc:32 msgid "Error: Invalid command line parameter specified.\n" -msgstr "오류: 잘못된 명령어 라인 옵션이 지정되었습니다.\n" +msgstr "오류: 잘못된 명령줄 매개변수가 지정되었습니다.\n" #: programs/taskkill/taskkill.rc:33 msgid "Error: One of options /im or /pid must be specified.\n" -msgstr "오류: /im 니 /pid 옵션중의 하나는 반드시 지정되어야합니다.\n" +msgstr "오류: /im 또는 /pid 옵션 중 하나는 반드시 지정되어야합니다.\n" #: programs/taskkill/taskkill.rc:34 msgid "Error: Option %1 expects a command line parameter.\n" msgstr "" -"오류: 옵션 %1은(는) 하나의 명령어라인 매개변수가 올것으로 예상합니다.\n" +"오류: %1 옵션은 명령줄 매개변수가 있어야 합니다.\n" #: programs/taskkill/taskkill.rc:35 msgid "Error: Options /im and /pid are mutually exclusive.\n" -msgstr "오류: 옵션 /im과 /pid는 함께 사용할 수 없습니다.\n" +msgstr "오류: /im 및 /pid 옵션은 함께 사용할 수 없습니다.\n" #: programs/taskkill/taskkill.rc:36 msgid "Close message sent to top-level windows of process with PID %1!u!.\n" -msgstr "PID %1!u! 의 프로세스의 최상위 창에 닫는 메시지 보냈습니다.\n" +msgstr "PID %1!u! 프로세스의 최상위 창에 닫기 메시지를 보냈습니다.\n" #: programs/taskkill/taskkill.rc:37 msgid "" "Close message sent to top-level windows of process \"%1\" with PID %2!u!.\n" msgstr "" -"PID %2!u! 의 프로세스 \"%1\"의 최상위 창에 닫으라는 메시지를 보냈습니다.\n" +"PID %2!u! 프로세스 \"%1\"의 최상위 창에 닫기 메시지를 보냈습니다.\n" #: programs/taskkill/taskkill.rc:38 msgid "Process with PID %1!u! was forcibly terminated.\n" -msgstr "PID %1!u! 의 프로세스는 강제로 종료되었습니다.\n" +msgstr "PID %1!u! 프로세스를 강제로 종료하였습니다.\n" #: programs/taskkill/taskkill.rc:39 msgid "Process \"%1\" with PID %2!u! was forcibly terminated.\n" -msgstr "PID %2!u!인 프로세스 \"%1\"은(는) 강제로 종료되엇습니다.\n" +msgstr "PID %2!u! 프로세스 \"%1\"을(를) 강제로 종료하였습니다.\n" #: programs/taskkill/taskkill.rc:40 msgid "Error: Could not find process \"%1\".\n" @@ -17091,7 +17084,7 @@ msgstr "오류: 프로세스 목록을 열거할 수 없습니다.\n" #: programs/taskkill/taskkill.rc:42 msgid "Error: Unable to terminate process \"%1\".\n" -msgstr "오류: \"%1\" 프로세스를 중단시킬 수 없습니다.\n" +msgstr "오류: \"%1\" 프로세스를 중단할 수 없습니다.\n" #: programs/taskkill/taskkill.rc:43 msgid "Error: Process self-termination is not permitted.\n" @@ -18705,7 +18698,7 @@ msgstr "이름 정렬(&S)" #: programs/winefile/winefile.rc:55 msgid "Sort &by Type" -msgstr "종류별 정렬(&B)" +msgstr "유형별 정렬(&B)" #: programs/winefile/winefile.rc:56 msgid "Sort by Si&ze" -- 2.35.1

1 0

[PATCH v2 1/2] winex11: Prevent the call sequence change between xim preedit callback and key event handlers.
by Byeongsik Jeon 07 Apr '22

07 Apr '22

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v2: rework. update merge_events(). "xim preedit callback" is called from within the XFilterEvent(). Because of the [2/2]'s action, the strings on the 'ERASED' line are erased. ### xim server sended event sequence ### preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string 'ㄱ' preedit draw:: caret 1 chg_first 0 chg_length 1 string '가' preedit draw:: caret 1 chg_first 0 chg_length 1 string '간' preedit draw:: caret 0 chg_first 0 chg_length 1 NULL preedit done:: lookup chars:: keycode 0 string 3 '가' <== HERE preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string '나' ### Wine process_events() simulated event sequence ### preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string 'ㄱ' preedit draw:: caret 1 chg_first 0 chg_length 1 string '가' preedit draw:: caret 1 chg_first 0 chg_length 1 string '간' preedit draw:: caret 0 chg_first 0 chg_length 1 NULL preedit done:: preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string '나' <== ERASED lookup chars:: keycode 0 string 3 '가' <== HERE dlls/winex11.drv/event.c | 60 ++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index c20ceeacca1..581e28787a0 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -261,10 +261,11 @@ static Bool filter_event( Display *display, XEvent *event, char *arg ) enum event_merge_action { - MERGE_DISCARD, /* discard the old event */ - MERGE_HANDLE, /* handle the old event */ + MERGE_FLUSH, /* handle all the events */ MERGE_KEEP, /* keep the old event for future merging */ - MERGE_IGNORE /* ignore the new event, keep the old one */ + MERGE_IGNORE, /* ignore the new event, keep the old one */ + MERGE_DISCARD, /* discard the old event */ + MERGE_HANDLE /* handle the old event */ }; /*********************************************************************** @@ -316,6 +317,19 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) { switch (prev->type) { + case 0: + switch (next->type) + { + case ConfigureNotify: + case MotionNotify: +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + case GenericEvent: +#endif + return MERGE_DISCARD; + default: + return MERGE_KEEP; + } + break; case ConfigureNotify: switch (next->type) { @@ -325,7 +339,7 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) TRACE( "discarding duplicate ConfigureNotify for window %lx\n", prev->xany.window ); return MERGE_DISCARD; } - break; + return MERGE_HANDLE; case Expose: case PropertyNotify: return MERGE_KEEP; @@ -340,30 +354,30 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) TRACE( "discarding duplicate MotionNotify for window %lx\n", prev->xany.window ); return MERGE_DISCARD; } - break; + return MERGE_HANDLE; #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H case GenericEvent: - if (next->xcookie.extension != xinput2_opcode) break; - if (next->xcookie.evtype != XI_RawMotion) break; - if (x11drv_thread_data()->warp_serial) break; + if (next->xcookie.extension != xinput2_opcode) return MERGE_HANDLE; + if (next->xcookie.evtype != XI_RawMotion) return MERGE_HANDLE; + if (x11drv_thread_data()->warp_serial) return MERGE_HANDLE; return MERGE_KEEP; } break; case GenericEvent: - if (prev->xcookie.extension != xinput2_opcode) break; - if (prev->xcookie.evtype != XI_RawMotion) break; + if (prev->xcookie.extension != xinput2_opcode) return MERGE_HANDLE; + if (prev->xcookie.evtype != XI_RawMotion) return MERGE_HANDLE; switch (next->type) { case GenericEvent: - if (next->xcookie.extension != xinput2_opcode) break; - if (next->xcookie.evtype != XI_RawMotion) break; - if (x11drv_thread_data()->warp_serial) break; + if (next->xcookie.extension != xinput2_opcode) return MERGE_HANDLE; + if (next->xcookie.evtype != XI_RawMotion) return MERGE_HANDLE; + if (x11drv_thread_data()->warp_serial) return MERGE_HANDLE; return merge_raw_motion_events( prev->xcookie.data, next->xcookie.data ); #endif } break; } - return MERGE_HANDLE; + return MERGE_FLUSH; } @@ -445,23 +459,29 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X else continue; /* filtered, ignore it */ } + get_event_data( &event ); - if (prev_event.type) action = merge_events( &prev_event, &event ); + action = merge_events( &prev_event, &event ); switch( action ) { - case MERGE_HANDLE: /* handle prev, keep new */ + case MERGE_FLUSH: /* handle all the events */ queued |= call_event_handler( display, &prev_event ); - /* fall through */ - case MERGE_DISCARD: /* discard prev, keep new */ free_event_data( &prev_event ); - prev_event = event; - break; + prev_event.type = 0; + /* fall through */ case MERGE_KEEP: /* handle new, keep prev for future merging */ queued |= call_event_handler( display, &event ); /* fall through */ case MERGE_IGNORE: /* ignore new, keep prev for future merging */ free_event_data( &event ); break; + case MERGE_HANDLE: /* handle prev, keep new */ + queued |= call_event_handler( display, &prev_event ); + /* fall through */ + case MERGE_DISCARD: /* discard prev, keep new */ + free_event_data( &prev_event ); + prev_event = event; + break; } } if (prev_event.type) queued |= call_event_handler( display, &prev_event ); -- 2.35.1

1 1

[PATCH vkd3d 1/5] tests: Use a vertex buffer to draw quads for shader tests.
by Zebediah Figura 07 Apr '22

07 Apr '22

For compatibility with shader models before 4.0. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- tests/shader_runner.c | 71 +++++++++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 22 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index d3d131164..0ad2d56c7 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -314,6 +314,24 @@ static void parse_input_layout_directive(struct shader_runner *runner, const cha element->index = 0; } +static void set_resource(struct shader_runner *runner, struct resource *resource) +{ + size_t i; + + for (i = 0; i < runner->resource_count; ++i) + { + if (runner->resources[i]->slot == resource->slot && runner->resources[i]->type == resource->type) + { + runner->ops->destroy_resource(runner, runner->resources[i]); + runner->resources[i] = resource; + return; + } + } + + runner->resources = realloc(runner->resources, (runner->resource_count + 1) * sizeof(*runner->resources)); + runner->resources[runner->resource_count++] = resource; +} + static void set_uniforms(struct shader_runner *runner, size_t offset, size_t count, const void *uniforms) { runner->uniform_count = align(max(runner->uniform_count, offset + count), 4); @@ -326,17 +344,44 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) { if (match_string(line, "draw quad", &line)) { + struct resource_params params; + struct input_element *element; + + static const struct vec2 quad[] = + { + {-1.0f, -1.0f}, + {-1.0f, 1.0f}, + { 1.0f, -1.0f}, + { 1.0f, 1.0f}, + }; + static const char vs_source[] = - "void main(uint id : SV_VertexID, out float4 position : SV_Position)\n" + "void main(inout float4 position : sv_position)\n" "{\n" - " float2 coords = float2((id << 1) & 2, id & 2);\n" - " position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1);\n" "}"; + vkd3d_array_reserve((void **)&runner->input_elements, &runner->input_element_capacity, + 1, sizeof(*runner->input_elements)); + element = &runner->input_elements[0]; + element->name = strdup("sv_position"); + element->slot = 0; + element->format = DXGI_FORMAT_R32G32_FLOAT; + element->texel_size = sizeof(*quad); + element->index = 0; + runner->input_element_count = 1; + + memset(&params, 0, sizeof(params)); + params.slot = 0; + params.type = RESOURCE_TYPE_VERTEX_BUFFER; + params.data = malloc(sizeof(quad)); + memcpy(params.data, quad, sizeof(quad)); + params.data_size = sizeof(quad); + set_resource(runner, runner->ops->create_resource(runner, &params)); + if (!runner->vs_source) runner->vs_source = strdup(vs_source); - runner->ops->draw(runner, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST, 3); + runner->ops->draw(runner, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP, 4); } else if (match_string(line, "draw", &line)) { @@ -482,24 +527,6 @@ static struct sampler *get_sampler(struct shader_runner *runner, unsigned int sl return NULL; } -static void set_resource(struct shader_runner *runner, struct resource *resource) -{ - size_t i; - - for (i = 0; i < runner->resource_count; ++i) - { - if (runner->resources[i]->slot == resource->slot && runner->resources[i]->type == resource->type) - { - runner->ops->destroy_resource(runner, runner->resources[i]); - runner->resources[i] = resource; - return; - } - } - - runner->resources = realloc(runner->resources, (runner->resource_count + 1) * sizeof(*runner->resources)); - runner->resources[runner->resource_count++] = resource; -} - unsigned int get_vb_stride(const struct shader_runner *runner, unsigned int slot) { unsigned int stride = 0; -- 2.35.1

3 16

[PATCH] dlls/dmstyle: don't cast size_t to DWORD in trace, use %I instead
by Eric Pouech 07 Apr '22

07 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dmstyle/style.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 87b7eed09029..9048984adea9 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -508,7 +508,7 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL); cnt = (Chunk.dwSize - sizeof(DWORD)); TRACE_(dmfile)(" - dwSize: %lu\n", dwSize); - TRACE_(dmfile)(" - cnt: %lu (%lu / %lu)\n", cnt / dwSize, (DWORD)(Chunk.dwSize - sizeof(DWORD)), dwSize); + TRACE_(dmfile)(" - cnt: %lu (%Iu / %lu)\n", cnt / dwSize, Chunk.dwSize - sizeof(DWORD), dwSize); if (cnt % dwSize != 0) { ERR("Invalid Array Size\n"); return E_FAIL; @@ -524,7 +524,7 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL); cnt = (Chunk.dwSize - sizeof(DWORD)); TRACE_(dmfile)(" - dwSize: %lu\n", dwSize); - TRACE_(dmfile)(" - cnt: %lu (%lu / %lu)\n", cnt / dwSize, (DWORD)(Chunk.dwSize - sizeof(DWORD)), dwSize); + TRACE_(dmfile)(" - cnt: %lu (%Iu / %lu)\n", cnt / dwSize, Chunk.dwSize - sizeof(DWORD), dwSize); if (cnt % dwSize != 0) { ERR("Invalid Array Size\n"); return E_FAIL;

2 1

[PATCH 1/3] kernel32/tests: Load all test function pointers on init.
by Rémi Bernon 07 Apr '22

07 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 7469de223b8..c9d25c55e2d 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -40,9 +40,28 @@ /* use function pointers to avoid warnings for invalid parameter tests */ static LPVOID (WINAPI *pHeapAlloc)(HANDLE,DWORD,SIZE_T); static LPVOID (WINAPI *pHeapReAlloc)(HANDLE,DWORD,LPVOID,SIZE_T); -static BOOL (WINAPI *pHeapQueryInformation)(HANDLE, HEAP_INFORMATION_CLASS, PVOID, SIZE_T, PSIZE_T); -static BOOL (WINAPI *pGetPhysicallyInstalledSystemMemory)(ULONGLONG *); -static ULONG (WINAPI *pRtlGetNtGlobalFlags)(void); +static BOOL (WINAPI *pGetPhysicallyInstalledSystemMemory)( ULONGLONG * ); + +#define MAKE_FUNC(f) static typeof(f) *p ## f +MAKE_FUNC( HeapQueryInformation ); +MAKE_FUNC( GlobalFlags ); +MAKE_FUNC( RtlGetNtGlobalFlags ); +#undef MAKE_FUNC + +static void load_functions(void) +{ + HMODULE kernel32 = GetModuleHandleW( L"kernel32.dll" ); + HMODULE ntdll = GetModuleHandleW( L"ntdll.dll" ); + +#define LOAD_FUNC(m, f) p ## f = (void *)GetProcAddress( m, #f ); + LOAD_FUNC( kernel32, HeapAlloc ); + LOAD_FUNC( kernel32, HeapReAlloc ); + LOAD_FUNC( kernel32, HeapQueryInformation ); + LOAD_FUNC( kernel32, GetPhysicallyInstalledSystemMemory ); + LOAD_FUNC( kernel32, GlobalFlags ); + LOAD_FUNC( ntdll, RtlGetNtGlobalFlags ); +#undef LOAD_FUNC +} struct heap { @@ -1079,7 +1098,6 @@ static void test_HeapQueryInformation(void) SIZE_T size; BOOL ret; - pHeapQueryInformation = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "HeapQueryInformation"); if (!pHeapQueryInformation) { win_skip("HeapQueryInformation is not available\n"); @@ -1462,12 +1480,10 @@ static void test_child_heap( const char *arg ) static void test_GetPhysicallyInstalledSystemMemory(void) { - HMODULE kernel32 = GetModuleHandleA("kernel32.dll"); MEMORYSTATUSEX memstatus; ULONGLONG total_memory; BOOL ret; - pGetPhysicallyInstalledSystemMemory = (void *)GetProcAddress(kernel32, "GetPhysicallyInstalledSystemMemory"); if (!pGetPhysicallyInstalledSystemMemory) { win_skip("GetPhysicallyInstalledSystemMemory is not available\n"); @@ -1575,10 +1591,7 @@ START_TEST(heap) int argc; char **argv; - pHeapAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapAlloc" ); - pHeapReAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapReAlloc" ); - - pRtlGetNtGlobalFlags = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "RtlGetNtGlobalFlags" ); + load_functions(); argc = winetest_get_mainargs( &argv ); if (argc >= 3) -- 2.35.1

1 2

[PATCH] ucrtbase/tests: Add a test for wcsnicmp() with limit -1.
by Dmitry Timoshkov 07 Apr '22

07 Apr '22

To show that it's valid unlike _strnicmp(). Based on _strnicmp() test. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ucrtbase/tests/string.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 9446a1e4d5c..806ae08f253 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -491,6 +491,20 @@ static void test__strnicmp(void) ok(!ret, "got %d.\n", ret); } +static void test_wcsnicmp(void) +{ + static const wchar_t str1[] = L"TEST"; + static const wchar_t str2[] = L"test"; + int ret; + + errno = 0xdeadbeef; + ret = wcsnicmp(str1, str2, -1); + ok(!ret, "got %d.\n", ret); + + ret = wcsnicmp(str1, str2, 0x7fffffff); + ok(!ret, "got %d.\n", ret); +} + static void test_SpecialCasing(void) { int i; @@ -602,6 +616,7 @@ START_TEST(string) test_mbsspn(); test_wcstok(); test__strnicmp(); + test_wcsnicmp(); test_SpecialCasing(); test__mbbtype_l(); } -- 2.35.1

2 1

[tools 1/2] c2man: Recognize file extensions in forward specifications.
by Jinoh Kang 07 Apr '22

07 Apr '22

Today, c2man assumes that there is no file extension in the DLL name part of a forward specification. This causes forwarded exports to krnl386.exe16 from kernel32 to be recognized incorrectly. For example, the spec index file for kernel32 contains the following incorrect entry: VxDCall0() (forwarded to exe16.VxDCall0() in krnl386()) Fix this by correctly handling DLL names with file extensions in forward specifications. We omit the extension in the link destination, but not the link text itself. The line above is now changed into: VxDCall0() (forwarded to VxDCall0() in {{krnl386.exe16}}{{krnl386}}) We switch to the double-brace syntax for the DLL hyperlink, since the "<id>()" syntax cannot accept strings with dots in them. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- c2man.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/c2man.pl b/c2man.pl index 0fe9e78..883a888 100755 --- a/c2man.pl +++ b/c2man.pl @@ -1229,9 +1229,9 @@ sub output_spec($) # @$_ => ordinal, call convention, exported name, implementation name, flags; if (@$_[$EXPORT_CALL] eq "forward") { - my $forward_dll = @$_[$EXPORT_IMPNAME]; - $forward_dll =~ s/\.(.*)//; - $line = @$_[$EXPORT_EXPNAME]." (forward to ".$1."() in ".$forward_dll."())"; + if (@$_[$EXPORT_IMPNAME] =~ /^(?:([^.]*)((?:\..*)?)\.)?([^.]*)$/) { + $line = @$_[$EXPORT_EXPNAME]." (forward to ".$3."() in {{".$1.$2."}}{{".$1."}})"; + } } elsif (@$_[$EXPORT_CALL] eq "extern") { -- 2.34.1

1 1

[PATCH] ws2_32: Allow getsockname after AcceptEx
by David Curtiss 07 Apr '22

07 Apr '22

.NET 6's HTTP/Socket code queries this. Winsock allows getsockname on the AcceptEx AcceptSocket, but only if SO_UPDATE_ACCEPT_CONTEXT is set. Signed-off-by: David Curtiss <david.curtiss(a)ni.com> --- dlls/ws2_32/tests/sock.c | 9 +++++++++ server/sock.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d501930b32d..93f4f420c66 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7718,6 +7718,15 @@ static void test_AcceptEx(void) ok(bret, "GetOverlappedResult failed, error %ld\n", GetLastError()); ok(bytesReturned == 0, "bytesReturned isn't supposed to be %ld\n", bytesReturned); + /* Try to call getsockname on the acceptor socket. + * + * On Windows, this requires setting SO_UPDATE_ACCEPT_CONTEXT. */ + iret = setsockopt(acceptor, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT, (char *)&listener, sizeof(SOCKET)); + ok(!iret, "Failed to set accept context %ld\n", GetLastError()); + iret = getsockname(acceptor, (struct sockaddr *)&peerAddress, &remoteSize); + ok(!iret, "getsockname failed.\n"); + ok(remoteSize == sizeof(struct sockaddr_in), "got remote size %u\n", remoteSize); + closesocket(connector); connector = INVALID_SOCKET; closesocket(acceptor); diff --git a/server/sock.c b/server/sock.c index b403541fcbf..22fcce50312 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2701,7 +2701,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } case IOCTL_AFD_GETSOCKNAME: - if (!sock->bound) + if (!sock->addr_len) { set_error( STATUS_INVALID_PARAMETER ); return; -- 2.25.1

1 0

[PATCH 7/7] win32u: Don't use CDECL for user driver functions.
by Jacek Caban 07 Apr '22

07 Apr '22

2 1

[PATCH 6/7] win32u: Move __wine_set_user_driver implementation from user32.
by Jacek Caban 07 Apr '22

07 Apr '22

3 2