- Wine-Devel - list.winehq.org

[PATCH] po: Update Korean translation.
by Byeongsik Jeon Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- po/ko.po | 1425 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 752 insertions(+), 673 deletions(-) diff --git a/po/ko.po b/po/ko.po index a710bac179c..fb56ecbe66c 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,11 +1,12 @@ # Korean translations for Wine +# Byeongsik Jeon <bsjeon(a)hanmail.net>, 2021. # msgid "" 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-02-04 15:08+0900\n" +"PO-Revision-Date: 2021-11-24 00:22+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -19,26 +20,23 @@ msgid "Security" msgstr "보안" #: dlls/aclui/aclui.rc:32 -#, fuzzy #| msgid "&User name:" msgid "&Group or user names:" -msgstr "사용자 이름(&U):" +msgstr "그룹 또는 사용자 이름(&G):" #: dlls/aclui/aclui.rc:38 -#, fuzzy #| msgid "Yellow" msgid "Allow" -msgstr "노랑" +msgstr "허용" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "거부" #: dlls/aclui/aclui.rc:47 -#, fuzzy #| msgid "Permission denied" msgid "Permissions for %1" -msgstr "허가가 거부되었습니다" +msgstr "%1에 대한 사용권한" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -63,7 +61,7 @@ msgid "" "Remove." msgstr "" "다음 소프트웨어는 자동으로 제거됩니다. 프로그램을 제거하거나 설치된 구성요소" -"를 수정하려면, 목록에서 선택한 후 [수정/제거]를 클릭하세요." +"를 수정하려면, 목록에서 선택한 후 [수정] 또는 [제거]를 클릭하세요." #: dlls/appwiz.cpl/appwiz.rc:67 msgid "&Support Information" @@ -3693,37 +3691,34 @@ msgstr "조이스틱" #: dlls/joy.cpl/joy.rc:40 programs/winecfg/winecfg.rc:212 msgid "&Disable" -msgstr "사용하지 않음(&D)" +msgstr "사용 중지(&D)" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy #| msgid "Reset" msgid "&Reset" -msgstr "재설정" +msgstr "초기화(&R)" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" -msgstr "가능(&E)" +msgstr "사용(&E)" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy #| msgid "Edit Override" msgid "&Override" -msgstr "재정의 편집" +msgstr "재정의(&O)" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "연결됨" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy #| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "음성 입력 장치:" +msgstr "연결됨 (XINPUT 장치)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" -msgstr "불가능" +msgstr "사용 중지됨" #: dlls/joy.cpl/joy.rc:50 msgid "" @@ -3966,7 +3961,7 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "속성 '|'을(를) 정의할 수 없습니다. 개체가 확장 가능하지 않습니다." #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" @@ -3977,10 +3972,9 @@ msgid "Cannot modify non-writable property '|'" msgstr "쓰기 가능하지 않은 속성 '|'을(를) 수정할 수 없습니다" #: dlls/jscript/jscript.rc:77 -#, fuzzy #| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "'[object]'은(는) 날짜 개체가 아닙니다" +msgstr "'this'는 Map 개체가 아닙니다" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -5045,7 +5039,7 @@ msgstr "미디어를 적재 해제 불가능.\n" #: dlls/kernel32/winerror.mc:1348 msgid "Media changed.\n" -msgstr "미디어가 바뀌었습니다.\n" +msgstr "미디어가 변경되었습니다.\n" #: dlls/kernel32/winerror.mc:1353 msgid "I/O bus reset.\n" @@ -6137,7 +6131,7 @@ msgstr "이벤트 로그 파일이 가득 참.\n" #: dlls/kernel32/winerror.mc:2723 msgid "Event log file changed.\n" -msgstr "이벤트 로그 파일이 바뀌었습니다.\n" +msgstr "이벤트 로그 파일이 변경되었습니다.\n" #: dlls/kernel32/winerror.mc:2728 msgid "Installer service failed.\n" @@ -6976,10 +6970,9 @@ msgid "Resource is not currently available.\n" msgstr "현재 리소스를 사용할 수 없습니다.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy #| msgid "Class Name:" msgid "Classic Blue" -msgstr "클래스 이름:" +msgstr "클래식 파랑" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 @@ -6987,569 +6980,525 @@ msgid "Normal" msgstr "보통" #: dlls/localspl/localspl.rc:37 -#, fuzzy #| msgctxt "Drive letter" #| msgid "Letter" msgid "Letter" -msgstr "문자" +msgstr "레터" #: dlls/localspl/localspl.rc:38 -#, fuzzy #| msgctxt "Drive letter" #| msgid "Letter" msgid "Letter Small" -msgstr "문자" +msgstr "레터 소형" #: dlls/localspl/localspl.rc:39 -#, fuzzy #| msgid "&Table" msgid "Tabloid" -msgstr "표(&T)" +msgstr "타블로이드" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "회계 원장" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "리갈" #: dlls/localspl/localspl.rc:42 -#, fuzzy #| msgid "State" msgid "Statement" -msgstr "상태" +msgstr "Statement" #: dlls/localspl/localspl.rc:43 -#, fuzzy #| msgid "&Execute..." msgid "Executive" -msgstr "실행(&E)..." +msgstr "Executive" #: dlls/localspl/localspl.rc:44 -#, fuzzy #| msgctxt "All key" #| msgid "A" msgid "A3" -msgstr "A" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy #| msgctxt "All key" #| msgid "A" msgid "A4" -msgstr "A" +msgstr "A4" #: dlls/localspl/localspl.rc:46 -#, fuzzy #| msgid "Small" msgid "A4 Small" -msgstr "작게" +msgstr "A4 소형" #: dlls/localspl/localspl.rc:47 -#, fuzzy #| msgctxt "All key" #| msgid "A" msgid "A5" -msgstr "A" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "" +msgstr "Folio" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "" +msgstr "Quarto" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17" #: dlls/localspl/localspl.rc:54 -#, fuzzy #| msgid "Notepad" msgid "Note" -msgstr "메모장" +msgstr "노트" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "봉투 #9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "" +msgstr "봉투 #10" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "" +msgstr "봉투 #11" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "" +msgstr "봉투 #12" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "" +msgstr "봉투 #14" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" -msgstr "" +msgstr "C 크기 용지" #: dlls/localspl/localspl.rc:61 msgid "D size sheet" -msgstr "" +msgstr "D 크기 용지" #: dlls/localspl/localspl.rc:62 msgid "E size sheet" -msgstr "" +msgstr "E 크기 용지" #: dlls/localspl/localspl.rc:63 msgid "Envelope DL" -msgstr "" +msgstr "봉투 DL" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" -msgstr "" +msgstr "봉투 C5" #: dlls/localspl/localspl.rc:65 msgid "Envelope C3" -msgstr "" +msgstr "봉투 C3" #: dlls/localspl/localspl.rc:66 msgid "Envelope C4" -msgstr "" +msgstr "봉투 C4" #: dlls/localspl/localspl.rc:67 msgid "Envelope C6" -msgstr "" +msgstr "봉투 C6" #: dlls/localspl/localspl.rc:68 msgid "Envelope C65" -msgstr "" +msgstr "봉투 C65" #: dlls/localspl/localspl.rc:69 msgid "Envelope B4" -msgstr "" +msgstr "봉투 B4" #: dlls/localspl/localspl.rc:70 msgid "Envelope B5" -msgstr "" +msgstr "봉투 B5" #: dlls/localspl/localspl.rc:71 msgid "Envelope B6" -msgstr "" +msgstr "봉투 B6" #: dlls/localspl/localspl.rc:72 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "Envelope" -msgstr "포장된 PKCS 7" +msgstr "봉투" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" -msgstr "" +msgstr "봉투 Monarch" #: dlls/localspl/localspl.rc:74 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "6 3/4 Envelope" -msgstr "포장된 PKCS 7" +msgstr "6 3/4 봉투" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" -msgstr "" +msgstr "미국 표준 팬폴드" #: dlls/localspl/localspl.rc:76 msgid "German Std Fanfold" -msgstr "" +msgstr "독일 표준 팬폴드" #: dlls/localspl/localspl.rc:77 msgid "German Legal Fanfold" -msgstr "" +msgstr "독일 리갈 팬폴드" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 -#, fuzzy #| msgid "Japanese" msgid "Japanese Postcard" -msgstr "일본" +msgstr "일본 엽서" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" -msgstr "" +msgstr "봉투 초대장" #: dlls/localspl/localspl.rc:84 -#, fuzzy #| msgctxt "Drive letter" #| msgid "Letter" msgid "Letter Extra" -msgstr "문자" +msgstr "레터 엑스트라" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" -msgstr "" +msgstr "리갈 엑스트라" #: dlls/localspl/localspl.rc:86 msgid "Tabloid Extra" -msgstr "" +msgstr "타블로이드 엑스트라" #: dlls/localspl/localspl.rc:87 -#, fuzzy #| msgid "E&xtras" msgid "A4 Extra" -msgstr "추가(&X)" +msgstr "A4 엑스트라" #: dlls/localspl/localspl.rc:88 -#, fuzzy #| msgctxt "object state" #| msgid "traversed" msgid "Letter Transverse" -msgstr "방문됨" +msgstr "레터 가로" #: dlls/localspl/localspl.rc:89 -#, fuzzy #| msgctxt "object state" #| msgid "traversed" msgid "A4 Transverse" -msgstr "방문됨" +msgstr "A4 가로" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" -msgstr "" +msgstr "레터 엑스트라 가로" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "슈퍼 A" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "슈퍼 B" #: dlls/localspl/localspl.rc:93 -#, fuzzy #| msgctxt "Drive letter" #| msgid "Letter" msgid "Letter Plus" -msgstr "문자" +msgstr "레터 플러스" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "A4 플러스" #: dlls/localspl/localspl.rc:95 -#, fuzzy #| msgctxt "object state" #| msgid "traversed" msgid "A5 Transverse" -msgstr "방문됨" +msgstr "A5 가로" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" -msgstr "" +msgstr "B5 (JIS) 가로" #: dlls/localspl/localspl.rc:97 -#, fuzzy #| msgid "E&xtras" msgid "A3 Extra" -msgstr "추가(&X)" +msgstr "A3 엑스트라" #: dlls/localspl/localspl.rc:98 -#, fuzzy #| msgid "E&xtras" msgid "A5 Extra" -msgstr "추가(&X)" +msgstr "A5 엑스트라" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "B5 (ISO) 엑스트라" #: dlls/localspl/localspl.rc:100 -#, fuzzy #| msgctxt "All key" #| msgid "A" msgid "A2" -msgstr "A" +msgstr "A2" #: dlls/localspl/localspl.rc:101 -#, fuzzy #| msgctxt "object state" #| msgid "traversed" msgid "A3 Transverse" -msgstr "방문됨" +msgstr "A3 가로" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" -msgstr "" +msgstr "A3 엑스트라 가로" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "" +msgstr "일본 이중 엽서" #: dlls/localspl/localspl.rc:104 -#, fuzzy #| msgctxt "All key" #| msgid "A" msgid "A6" -msgstr "A" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "" +msgstr "일본 봉투 Kaku #2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "일본 봉투 Kaku #3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "일본 봉투 Chou #3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "일본 봉투 Chou #4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "레터 회전" #: dlls/localspl/localspl.rc:110 msgid "A3 Rotated" -msgstr "" +msgstr "A3 회전" #: dlls/localspl/localspl.rc:111 msgid "A4 Rotated" -msgstr "" +msgstr "A4 회전" #: dlls/localspl/localspl.rc:112 msgid "A5 Rotated" -msgstr "" +msgstr "A5 회전" #: dlls/localspl/localspl.rc:113 msgid "B4 (JIS) Rotated" -msgstr "" +msgstr "B4 (JIS) 회전" #: dlls/localspl/localspl.rc:114 msgid "B5 (JIS) Rotated" -msgstr "" +msgstr "B5 (JIS) 회전" #: dlls/localspl/localspl.rc:115 msgid "Japanese Postcard Rotated" -msgstr "" +msgstr "일본 엽서 회전" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "" +msgstr "이중 일본 엽서 회전" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" -msgstr "" +msgstr "A6 회전" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "" +msgstr "일본 봉투 Kaku #2 회전" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "일본 봉투 Kaku #3 회전" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "일본 봉투 Chou #3 회전" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "일본 봉투 Chou #4 회전" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" -msgstr "" +msgstr "B6 (JIS) 회전" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "" +msgstr "일본 봉투 You #4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "일본 봉투 You #4 회전" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "PRC 16K" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "PRC 32K" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "" +msgstr "PRC 32K(대)" #: dlls/localspl/localspl.rc:130 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #1" #: dlls/localspl/localspl.rc:131 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #2" #: dlls/localspl/localspl.rc:132 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #3" #: dlls/localspl/localspl.rc:133 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #4" #: dlls/localspl/localspl.rc:134 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #5" #: dlls/localspl/localspl.rc:135 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #6" #: dlls/localspl/localspl.rc:136 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #7" #: dlls/localspl/localspl.rc:137 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #8" #: dlls/localspl/localspl.rc:138 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #9" #: dlls/localspl/localspl.rc:139 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "PRC 16K 회전" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "PRC 32K 회전" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "" +msgstr "PRC 32K(대) 회전" #: dlls/localspl/localspl.rc:143 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #1 회전" #: dlls/localspl/localspl.rc:144 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #2 회전" #: dlls/localspl/localspl.rc:145 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #3 회전" #: dlls/localspl/localspl.rc:146 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #4 회전" #: dlls/localspl/localspl.rc:147 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #5 회전" #: dlls/localspl/localspl.rc:148 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #6 회전" #: dlls/localspl/localspl.rc:149 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #7 회전" #: dlls/localspl/localspl.rc:150 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #8 회전" #: dlls/localspl/localspl.rc:151 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #9 회전" #: dlls/localspl/localspl.rc:152 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #10 회전" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -10403,1703 +10352,1663 @@ 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" -msgstr "북아시아 표준 시간" +msgstr "북아시아 표준시" #: dlls/tzres/tzres.rc:268 msgid "North Asia Daylight Time" -msgstr "북아시아 일광 절약 시간" +msgstr "북아시아 일광 절약시" #: dlls/tzres/tzres.rc:269 msgid "(UTC+07:00) Krasnoyarsk" -msgstr "" +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" -msgstr "" +msgstr "(UTC+04:00) 트빌리시" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 msgid "UTC+12" -msgstr "" +msgstr "UTC+12" #: dlls/tzres/tzres.rc:392 -#, fuzzy #| msgid "Coordinated Universal Time" msgid "(UTC+12:00) Coordinated Universal Time+12" -msgstr "협정 세계시" +msgstr "(UTC+12:00) 협정 세계시+12" #: 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" -msgstr "" +msgstr "(UTC+05:45) 카트만두" #: dlls/tzres/tzres.rc:90 msgid "Cape Verde Standard Time" -msgstr "카보베르데 표준 시간" +msgstr "카보베르데 표준시" #: dlls/tzres/tzres.rc:91 msgid "Cape Verde Daylight Time" -msgstr "카보베르데 일광 절약 시간" +msgstr "카보베르데 일광 절약시" #: dlls/tzres/tzres.rc:92 msgid "(UTC-01:00) Cabo Verde Is." -msgstr "" +msgstr "(UTC-01:00) 카보베르데 제도" #: 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" -msgstr "" +msgstr "(UTC-05:00) 아이티" #: dlls/tzres/tzres.rc:111 msgid "Central European Standard Time" -msgstr "중앙 유럽 표준 시간" +msgstr "중앙 유럽 표준시" #: dlls/tzres/tzres.rc:112 msgid "Central European Daylight Time" -msgstr "중앙 유럽 일관 절약 시간" +msgstr "중앙 유럽 일관 절약시" #: dlls/tzres/tzres.rc:113 msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" -msgstr "" +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" -msgstr "" +msgstr "(UTC+01:00) 카사블랑카" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-08" -msgstr "" +msgstr "UTC-08" #: dlls/tzres/tzres.rc:401 -#, fuzzy #| msgid "Coordinated Universal Time" msgid "(UTC-08:00) Coordinated Universal Time-08" -msgstr "협정 세계시" +msgstr "" +"협정 세계시\n" +"(UTC-08:00) 협정 세계시-08" #: dlls/tzres/tzres.rc:39 -#, fuzzy #| msgid "Atlantic Standard Time" msgid "Altai Standard Time" -msgstr "대서양 표준 시간" +msgstr "알타이 표준시" #: dlls/tzres/tzres.rc:40 -#, fuzzy #| msgid "Atlantic Daylight Time" 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" -msgstr "" +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" -msgstr "" +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 -#, fuzzy #| msgid "Saint Pierre Standard Time" msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "생피에르 표준 시간" +msgstr "(UTC-03:00) 세인트 피에르 미켈론" #: dlls/tzres/tzres.rc:327 -#, fuzzy #| msgid "Samoa Standard Time" msgid "Sao Tome Standard Time" -msgstr "사모아 표준 시간" +msgstr "상투메 표준시" #: dlls/tzres/tzres.rc:328 -#, fuzzy #| msgid "Samoa Daylight Time" 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:366 msgid "Tonga Standard Time" -msgstr "통가 표준 시간" +msgstr "통가 표준시" #: dlls/tzres/tzres.rc:367 msgid "Tonga Daylight Time" -msgstr "통가 일괄 절약 시간" +msgstr "통가 일괄 절약시" #: dlls/tzres/tzres.rc:368 msgid "(UTC+13:00) Nuku'alofa" -msgstr "" +msgstr "(UTC+13:00) 누쿠알로파" #: dlls/tzres/tzres.rc:240 msgid "Mountain Standard Time (Mexico)" -msgstr "산지 표준 시간 (멕시코)" +msgstr "산지 표준시 (멕시코)" #: dlls/tzres/tzres.rc:241 msgid "Mountain Daylight Time (Mexico)" -msgstr "산지 일광 절약 시간 (멕시코)" +msgstr "산지 일광 절약시 (멕시코)" #: dlls/tzres/tzres.rc:242 msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" -msgstr "" +msgstr "(UTC-07:00) 치와와, 라파스, 마사틀란" #: dlls/tzres/tzres.rc:171 msgid "GMT Standard Time" -msgstr "GMT 표준 시간" +msgstr "GMT 표준시" #: dlls/tzres/tzres.rc:172 msgid "GMT Daylight Time" -msgstr "GMT 일광 절약 시간" +msgstr "GMT 일광 절약시" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" -msgstr "" +msgstr "(UTC+00: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" -msgstr "" +msgstr "(UTC+06:00) 아스타나" #: dlls/tzres/tzres.rc:213 msgid "Lord Howe Standard Time" -msgstr "로드하우 표준 시간" +msgstr "로드하우 표준시" #: dlls/tzres/tzres.rc:214 msgid "Lord Howe Daylight Time" -msgstr "로드하우 일광 절약 시간" +msgstr "로드하우 일광 절약시" #: dlls/tzres/tzres.rc:215 msgid "(UTC+10:30) Lord Howe Island" -msgstr "" +msgstr "(UTC+10:30) 로드하우 섬" #: 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" -msgstr "" +msgstr "(UTC+03:00) 바그다드" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 msgid "UTC+13" -msgstr "" +msgstr "UTC+13" #: dlls/tzres/tzres.rc:395 -#, fuzzy #| msgid "Coordinated Universal Time" msgid "(UTC+13:00) Coordinated Universal Time+13" -msgstr "협정 세계시" +msgstr "(UTC+13:00) 협정 세계시+13" #: 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" -msgstr "" +msgstr "(UTC+11:00) 마가단" #: dlls/tzres/tzres.rc:258 msgid "Newfoundland Standard Time" -msgstr "뉴펀들랜드 표준 시간" +msgstr "뉴펀들랜드 표준시" #: dlls/tzres/tzres.rc:259 msgid "Newfoundland Daylight Time" -msgstr "뉴펀들랜드 일광 절약 시간" +msgstr "뉴펀들랜드 일광 절약시" #: dlls/tzres/tzres.rc:260 msgid "(UTC-03:30) Newfoundland" -msgstr "" +msgstr "(UTC-03:30) 뉴펀들랜드" #: dlls/tzres/tzres.rc:345 -#, fuzzy #| msgid "Jordan Standard Time" msgid "Sudan Standard Time" -msgstr "요르단 표준 시간" +msgstr "수단 표준시" #: dlls/tzres/tzres.rc:346 -#, fuzzy #| msgid "Jordan Daylight Time" msgid "Sudan Daylight Time" -msgstr "요르단 일광 절약 시간" +msgstr "수단 일광 절약시" #: dlls/tzres/tzres.rc:347 msgid "(UTC+02:00) Khartoum" -msgstr "" +msgstr "(UTC+02:00) 하르툼" #: dlls/tzres/tzres.rc:435 msgid "West Pacific Standard Time" -msgstr "서태평양 표준 시간" +msgstr "서태평양 표준시" #: dlls/tzres/tzres.rc:436 msgid "West Pacific Daylight Time" -msgstr "서태평양 일광 절약 시간" +msgstr "서태평양 일광 절약시" #: dlls/tzres/tzres.rc:437 msgid "(UTC+10:00) Guam, Port Moresby" -msgstr "" +msgstr "(UTC+10:00) 괌, 포트모르즈비" #: dlls/tzres/tzres.rc:279 msgid "Pacific Standard Time" -msgstr "태평양 표준 시간" +msgstr "태평양 표준시" #: dlls/tzres/tzres.rc:280 msgid "Pacific Daylight Time" -msgstr "태평양 일광 절약 시간" +msgstr "태평양 일광 절약시" #: dlls/tzres/tzres.rc:281 msgid "(UTC-08:00) Pacific Time (US & Canada)" -msgstr "" +msgstr "(UTC-08:00) 태평양 표준시(미국과 캐나다)" #: 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" -msgstr "" +msgstr "(UTC+04:00) 바쿠" #: dlls/tzres/tzres.rc:219 msgid "Magallanes Standard Time" -msgstr "마갈란스 표준 시간" +msgstr "마갈란스 표준시" #: dlls/tzres/tzres.rc:220 msgid "Magallanes Daylight Time" -msgstr "마갈란스 일광 절약 시간" +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" -msgstr "" +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" -msgstr "" +msgstr "(UTC+02:00) 칼리닌그라드" #: dlls/tzres/tzres.rc:282 msgid "Pacific Standard Time (Mexico)" -msgstr "태평양 표준 시간 (멕시코)" +msgstr "태평양 표준시 (멕시코)" #: dlls/tzres/tzres.rc:283 msgid "Pacific Daylight Time (Mexico)" -msgstr "태평양 일광 절약 시간 (멕시코)" +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" -msgstr "" +msgstr "(UTC+02:00) 베이루트" #: dlls/tzres/tzres.rc:360 msgid "Tokyo Standard Time" -msgstr "도쿄 표준 시간" +msgstr "도쿄 표준시" #: dlls/tzres/tzres.rc:361 msgid "Tokyo Daylight Time" -msgstr "도쿄 일광 절약 시간" +msgstr "도쿄 일광 절약시" #: dlls/tzres/tzres.rc:362 msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" -msgstr "" +msgstr "(UTC+09:00) 오사카, 삿포로, 도쿄" #: dlls/tzres/tzres.rc:210 msgid "Line Islands Standard Time" -msgstr "라인 제도 표준 시간" +msgstr "라인 제도 표준시" #: dlls/tzres/tzres.rc:211 msgid "Line Islands Daylight Time" -msgstr "라인 제도 일광 절약 시간" +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" -msgstr "" +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" -msgstr "" +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" -msgstr "" +msgstr "러시아 표준 시간대 3" #: dlls/tzres/tzres.rc:305 msgid "(UTC+04:00) Izhevsk, Samara" -msgstr "" +msgstr "(UTC+04:00) 이젭스크, 사마라" #: dlls/tzres/tzres.rc:414 -#, fuzzy #| msgid "Tonga Standard Time" msgid "Volgograd Standard Time" -msgstr "통가 표준 시간" +msgstr "볼고그라드 표준시" #: dlls/tzres/tzres.rc:415 -#, fuzzy #| msgid "Tonga Daylight Time" msgid "Volgograd Daylight Time" -msgstr "통가 일괄 절약 시간" +msgstr "볼고그라드 일광 절약시" #: dlls/tzres/tzres.rc:416 msgid "(UTC+04:00) Volgograd" -msgstr "" +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" -msgstr "북아시아 동부 표준 시간" +msgstr "북아시아 동부 표준시" #: dlls/tzres/tzres.rc:265 msgid "North Asia East Daylight Time" -msgstr "북아시아 동부 일광 절약 시간" +msgstr "북아시아 동부 일광 절약시" #: dlls/tzres/tzres.rc:266 msgid "(UTC+08:00) Irkutsk" -msgstr "" +msgstr "(UTC+08:00) 이르쿠츠크" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-11" -msgstr "" +msgstr "UTC-11" #: dlls/tzres/tzres.rc:407 -#, fuzzy #| msgid "Coordinated Universal Time" msgid "(UTC-11:00) Coordinated Universal Time-11" -msgstr "협정 세계시" +msgstr "(UTC-11:00) 협정 세계시-11" #: 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:375 -#, fuzzy #| msgid "Turkey Standard Time" msgid "Turks And Caicos Standard Time" -msgstr "터키 표준 시간" +msgstr "터크스 케이커스 표준시" #: dlls/tzres/tzres.rc:376 -#, fuzzy #| msgid "Turkey Daylight Time" msgid "Turks And Caicos Daylight Time" -msgstr "터키 일광 절약 시간" +msgstr "터크스 케이커스 일광 절약시" #: dlls/tzres/tzres.rc:377 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" -msgstr "미얀마 표준 시간" +msgstr "미얀마 표준시" #: dlls/tzres/tzres.rc:244 msgid "Myanmar Daylight Time" -msgstr "미얀마 일광 절약 시간" +msgstr "미얀마 일광 절약시" #: dlls/tzres/tzres.rc:245 msgid "(UTC+06:30) Yangon (Rangoon)" -msgstr "" +msgstr "(UTC+06:30) 양곤 (랑군)" #: dlls/tzres/tzres.rc:387 dlls/tzres/tzres.rc:388 msgid "Coordinated Universal Time" msgstr "협정 세계시" #: dlls/tzres/tzres.rc:389 -#, fuzzy #| msgid "Coordinated Universal Time" msgid "(UTC) Coordinated Universal Time" -msgstr "협정 세계시" +msgstr "(UTC) 협정 세계시" #: 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" -msgstr "" +msgstr "(UTC+05:30) 첸나이, 콜카타, 뭄바이, 뉴델리" #: dlls/tzres/tzres.rc:180 msgid "GTB Standard Time" -msgstr "GTB 표준 시간" +msgstr "GTB 표준시" #: dlls/tzres/tzres.rc:181 msgid "GTB Daylight Time" -msgstr "GTB 일광 절약 시간" +msgstr "GTB 일광 절약시" #: dlls/tzres/tzres.rc:182 msgid "(UTC+02:00) Athens, Bucharest" -msgstr "" +msgstr "(UTC+02:00) 아테네, 부카레스트" #: dlls/tzres/tzres.rc:372 msgid "Turkey Standard Time" -msgstr "터키 표준 시간" +msgstr "터키 표준시" #: dlls/tzres/tzres.rc:373 msgid "Turkey Daylight Time" -msgstr "터키 일광 절약 시간" +msgstr "터키 일광 절약시" #: dlls/tzres/tzres.rc:374 msgid "(UTC+03:00) Istanbul" -msgstr "" +msgstr "(UTC+03:00) 이스탄불" #: dlls/tzres/tzres.rc:54 -#, fuzzy #| msgid "Arabian Standard Time" msgid "Astrakhan Standard Time" -msgstr "아라비아 표준 시간" +msgstr "아스트라한 표준시" #: dlls/tzres/tzres.rc:55 -#, fuzzy #| msgid "Arabian Daylight Time" msgid "Astrakhan Daylight Time" -msgstr "아라비아 일광 절약 시간" +msgstr "아스트라한 일광 절약시" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" -msgstr "" +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" -msgstr "" +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:441 -#, fuzzy #| msgid "Yakutsk Standard Time" msgid "Yukon Standard Time" -msgstr "야쿠츠크 표준 시간" +msgstr "유콘 표준시" #: dlls/tzres/tzres.rc:442 -#, fuzzy #| msgid "Yakutsk Daylight Time" msgid "Yukon Daylight Time" -msgstr "야쿠츠크 일광 절약 시간" +msgstr "유콘 일광 절약시" #: dlls/tzres/tzres.rc:443 msgid "(UTC-07:00) Yukon" -msgstr "" +msgstr "(UTC-07:00) 유콘" #: dlls/tzres/tzres.rc:351 msgid "Taipei Standard Time" -msgstr "타이베이 표준 시간" +msgstr "타이페이 표준시" #: dlls/tzres/tzres.rc:352 msgid "Taipei Daylight Time" -msgstr "타이베이 일광 절약 시간" +msgstr "타이페이 일광 절약시" #: dlls/tzres/tzres.rc:353 msgid "(UTC+08:00) Taipei" -msgstr "" +msgstr "(UTC+08:00) 타이페이" #: dlls/tzres/tzres.rc:423 msgid "W. Europe Standard Time" -msgstr "서유럽 표준 시간" +msgstr "서유럽 표준시" #: dlls/tzres/tzres.rc:424 msgid "W. Europe Daylight Time" -msgstr "서유럽 일광 절약 시간" +msgstr "서유럽 일광 절약시" #: dlls/tzres/tzres.rc:425 msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" -msgstr "" +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" -msgstr "" +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" -msgstr "" +msgstr "(UTC+05:00) 이슬라마바드, 카라치, 타슈켄트" #: dlls/tzres/tzres.rc:363 -#, fuzzy #| msgid "Tokyo Standard Time" msgid "Tomsk Standard Time" -msgstr "도쿄 표준 시간" +msgstr "톰스크 표준시" #: dlls/tzres/tzres.rc:364 -#, fuzzy #| msgid "Tokyo Daylight Time" msgid "Tomsk Daylight Time" -msgstr "도쿄 일광 절약 시간" +msgstr "톰스크 일광 절약시" #: dlls/tzres/tzres.rc:365 msgid "(UTC+07:00) Tomsk" -msgstr "" +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" -msgstr "" +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" -msgstr "" +msgstr "(UTC+10:00) 캔버라, 멜버른, 시드니" #: dlls/tzres/tzres.rc:246 msgid "N. Central Asia Standard Time" -msgstr "중앙 아시아 북부 표준 시간" +msgstr "중앙 아시아 북부 표준시" #: dlls/tzres/tzres.rc:247 msgid "N. Central Asia Daylight Time" -msgstr "중앙 아시아 북부 일광 절약 시간" +msgstr "중앙 아시아 북부 일광 절약시" #: dlls/tzres/tzres.rc:248 msgid "(UTC+07:00) Novosibirsk" -msgstr "" +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:369 -#, fuzzy #| msgid "Tasmania Standard Time" msgid "Transbaikal Standard Time" -msgstr "태즈매이니아 표준 시간" +msgstr "트란스바이칼 표준시" #: dlls/tzres/tzres.rc:370 -#, fuzzy #| msgid "Tasmania Daylight Time" msgid "Transbaikal Daylight Time" -msgstr "태즈매이니아 일광 절약 시간" +msgstr "트란스바이칼 일광 절약시" #: dlls/tzres/tzres.rc:371 msgid "(UTC+09:00) Chita" -msgstr "" +msgstr "(UTC+09:00) 치타" #: dlls/tzres/tzres.rc:141 -#, fuzzy #| msgid "W. Europe Standard Time" msgid "E. Europe Standard Time" -msgstr "서유럽 표준 시간" +msgstr "동유럽 표준시" #: dlls/tzres/tzres.rc:142 -#, fuzzy #| msgid "W. Europe Daylight Time" msgid "E. Europe Daylight Time" -msgstr "서유럽 일광 절약 시간" +msgstr "동유럽 일광 절약시" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" -msgstr "" +msgstr "(UTC+02:00) 키시네프" #: dlls/tzres/tzres.rc:120 msgid "Central Standard Time (Mexico)" -msgstr "중부 표준 시간 (멕시코)" +msgstr "중부 표준시 (멕시코)" #: dlls/tzres/tzres.rc:121 msgid "Central Daylight Time (Mexico)" -msgstr "중부 일광 절약 시간 (멕시코)" +msgstr "중부 일광 절약시 (멕시코)" #: dlls/tzres/tzres.rc:122 msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" -msgstr "" +msgstr "(UTC-06:00) 과달라하라, 멕시코시티, 몬테레이" #: dlls/tzres/tzres.rc:330 -#, fuzzy #| msgid "Samoa Standard Time" msgid "Saratov Standard Time" -msgstr "사모아 표준 시간" +msgstr "사라토브 표준시" #: dlls/tzres/tzres.rc:331 -#, fuzzy #| msgid "Samoa Daylight Time" msgid "Saratov Daylight Time" -msgstr "사모아 일광 절약 시간" +msgstr "사라토브 일광 절약시" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" -msgstr "" +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" -msgstr "산지 표준 시간" +msgstr "산지 표준시" #: dlls/tzres/tzres.rc:238 msgid "Mountain Daylight Time" -msgstr "산지 일광 절약 시간" +msgstr "산지 일광 절약시" #: dlls/tzres/tzres.rc:239 msgid "(UTC-07:00) Mountain Time (US & Canada)" -msgstr "" +msgstr "(UTC-07:00) 산지 표준시 (미국과 캐나다)" #: dlls/tzres/tzres.rc:381 msgid "US Eastern Standard Time" -msgstr "미국 동부 표준 시간" +msgstr "미국 동부 표준시" #: dlls/tzres/tzres.rc:382 msgid "US Eastern Daylight Time" -msgstr "미국 동부 일광 절약 시간" +msgstr "미국 동부 일광 절약시" #: dlls/tzres/tzres.rc:383 msgid "(UTC-05:00) Indiana (East)" -msgstr "" +msgstr "(UTC-05:00) 인디애나 (동부)" #: dlls/tzres/tzres.rc:321 -#, fuzzy #| msgid "Alaskan Standard Time" msgid "Sakhalin Standard Time" -msgstr "알래스카 표준 시간" +msgstr "사할린 표준시" #: dlls/tzres/tzres.rc:322 -#, fuzzy #| msgid "Alaskan Daylight Time" msgid "Sakhalin Daylight Time" -msgstr "알래스카 일광 절약 시간" +msgstr "사할린 일광 절약시" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" -msgstr "" +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:354 msgid "Tasmania Standard Time" -msgstr "태즈매이니아 표준 시간" +msgstr "태즈매이니아 표준시" #: dlls/tzres/tzres.rc:355 msgid "Tasmania Daylight Time" -msgstr "태즈매이니아 일광 절약 시간" +msgstr "태즈매이니아 일광 절약시" #: dlls/tzres/tzres.rc:356 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:396 dlls/tzres/tzres.rc:397 msgid "UTC-02" -msgstr "" +msgstr "UTC-02" #: dlls/tzres/tzres.rc:398 -#, fuzzy #| msgid "Coordinated Universal Time" msgid "(UTC-02:00) Coordinated Universal Time-02" -msgstr "협정 세계시" +msgstr "(UTC-02:00) 협정 세계시-02" #: dlls/tzres/tzres.rc:384 msgid "US Mountain Standard Time" -msgstr "미국 산지 표준 시간" +msgstr "미국 산지 표준시" #: dlls/tzres/tzres.rc:385 msgid "US Mountain Daylight Time" -msgstr "미국 산지 일광 절약 시간" +msgstr "미국 산지 일광 절약시" #: dlls/tzres/tzres.rc:386 msgid "(UTC-07:00) Arizona" -msgstr "" +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" -msgstr "중부 오스트레일리아 표준 시간" +msgstr "중부 오스트레일리아 표준시" #: dlls/tzres/tzres.rc:97 msgid "Cen. Australia Daylight Time" -msgstr "중부 오스트레일리아 일광 절약 시간" +msgstr "중부 오스트레일리아 일광 절약시" #: dlls/tzres/tzres.rc:98 msgid "(UTC+09:30) Adelaide" -msgstr "" +msgstr "(UTC+09:30) 애들레이드" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 msgid "UTC-09" -msgstr "" +msgstr "UTC-09" #: dlls/tzres/tzres.rc:404 -#, fuzzy #| msgid "Coordinated Universal Time" msgid "(UTC-09:00) Coordinated Universal Time-09" -msgstr "협정 세계시" +msgstr "(UTC-09:00) 협정 세계시-09" #: dlls/tzres/tzres.rc:342 msgid "Sri Lanka Standard Time" -msgstr "스리랑카 표준 시간" +msgstr "스리랑카 표준시" #: dlls/tzres/tzres.rc:343 msgid "Sri Lanka Daylight Time" -msgstr "스리랑카 일광 절약 시간" +msgstr "스리랑카 일광 절약시" #: dlls/tzres/tzres.rc:344 msgid "(UTC+05:30) Sri Jayawardenepura" -msgstr "" +msgstr "(UTC+05:30) 스리자야와르데네푸라" #: 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" -msgstr "" +msgstr "(UTC+04:30) 카불" #: dlls/tzres/tzres.rc:438 msgid "Yakutsk Standard Time" -msgstr "야쿠츠크 표준 시간" +msgstr "야쿠츠크 표준시" #: dlls/tzres/tzres.rc:439 msgid "Yakutsk Daylight Time" -msgstr "야쿠츠크 일광 절약 시간" +msgstr "야쿠츠크 일광 절약시" #: dlls/tzres/tzres.rc:440 msgid "(UTC+09:00) Yakutsk" -msgstr "" +msgstr "(UTC+09:00) 야쿠츠크" #: dlls/tzres/tzres.rc:309 msgid "SA Eastern Standard Time" -msgstr "SA 동부 표준 시간" +msgstr "SA 동부 표준시" #: dlls/tzres/tzres.rc:310 msgid "SA Eastern Daylight Time" -msgstr "SA 동부 일광 절약 시간" +msgstr "SA 동부 일광 절약시" #: dlls/tzres/tzres.rc:311 msgid "(UTC-03:00) Cayenne, Fortaleza" -msgstr "" +msgstr "(UTC-03:00) 카옌, 포르탈레자" #: 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" -msgstr "" +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:357 msgid "Tocantins Standard Time" -msgstr "토칸칭스 표준 시간" +msgstr "토칸칭스 표준시" #: dlls/tzres/tzres.rc:358 msgid "Tocantins Daylight Time" -msgstr "토칸칭스 일광 절약 시간" +msgstr "토칸칭스 일광 절약시" #: dlls/tzres/tzres.rc:359 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" -msgstr "" +msgstr "(UTC+03:00) 모스크바, 상트페테르부르크" #: dlls/tzres/tzres.rc:63 msgid "Aus Central W. Standard Time" -msgstr "오스트레일리아 중부 표준 시간" +msgstr "오스트레일리아 중부 표준시" #: dlls/tzres/tzres.rc:64 msgid "Aus Central W. Daylight Time" -msgstr "오스트레일리아 중부 일광 절약 시간" +msgstr "오스트레일리아 중부 일광 절약시" #: dlls/tzres/tzres.rc:65 msgid "(UTC+08:45) Eucla" -msgstr "" +msgstr "(UTC+08:45) 유클라" #: dlls/tzres/tzres.rc:294 msgid "Romance Standard Time" -msgstr "로망스 표준 시간" +msgstr "로망스 표준시" #: dlls/tzres/tzres.rc:295 msgid "Romance Daylight Time" -msgstr "로망스 일광 절약 시간" +msgstr "로망스 일광 절약시" #: dlls/tzres/tzres.rc:296 msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" -msgstr "" +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" -msgstr "" +msgstr "(UTC+05:00) 예카테린부르크" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 msgid "Russia Time Zone 11" -msgstr "" +msgstr "러시아 표준 시간대 11" #: dlls/tzres/tzres.rc:302 msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" -msgstr "" +msgstr "(UTC+12:00) 아나디리, 페트로파블로프스크-캄차스키" #: dlls/tzres/tzres.rc:432 -#, fuzzy #| msgid "West Asia Standard Time" msgid "West Bank Standard Time" -msgstr "서아시아 표준 시간" +msgstr "웨스트 뱅크 표준시" #: dlls/tzres/tzres.rc:433 -#, fuzzy #| msgid "West Asia Daylight Time" msgid "West Bank Daylight Time" -msgstr "서아시아 일광 절약 시간" +msgstr "웨스트 뱅크 일광 절약시" #: dlls/tzres/tzres.rc:434 msgid "(UTC+02:00) Gaza, Hebron" -msgstr "" +msgstr "(UTC+02:00) 가자, 헤브론" #: dlls/tzres/tzres.rc:348 msgid "Syria Standard Time" -msgstr "시리아 표준 시간" +msgstr "시리아 표준시" #: dlls/tzres/tzres.rc:349 msgid "Syria Daylight Time" -msgstr "시리아 일광 절약 시간" +msgstr "시리아 일광 절약시" #: dlls/tzres/tzres.rc:350 msgid "(UTC+02:00) Damascus" -msgstr "" +msgstr "(UTC+02:00) 다마스커스" #: dlls/tzres/tzres.rc:60 msgid "AUS Central Standard Time" -msgstr "오스트레일리아 중부 표준 시간" +msgstr "오스트레일리아 중부 표준시" #: dlls/tzres/tzres.rc:61 msgid "AUS Central Daylight Time" -msgstr "오스트레일리아 중부 일광 절약 시간" +msgstr "오스트레일리아 중부 일광 절약시" #: dlls/tzres/tzres.rc:62 msgid "(UTC+09:30) Darwin" -msgstr "" +msgstr "(UTC+09:30) 다윈" #: dlls/tzres/tzres.rc:177 msgid "Greenwich Standard Time" -msgstr "그리니치 표준 시간" +msgstr "그리니치 표준시" #: dlls/tzres/tzres.rc:178 msgid "Greenwich Daylight Time" -msgstr "그리니치 일광 절약 시간" +msgstr "그리니치 일광 절약시" #: dlls/tzres/tzres.rc:179 msgid "(UTC+00:00) Monrovia, Reykjavik" -msgstr "" +msgstr "(UTC+00:00) 몬로비아, 레이캬비크" #: dlls/tzres/tzres.rc:378 msgid "Ulaanbaatar Standard Time" -msgstr "울란바토르 표준 시간" +msgstr "울란바토르 표준시" #: dlls/tzres/tzres.rc:379 msgid "Ulaanbaatar Daylight Time" -msgstr "울란바토르 일광 절약 시간" +msgstr "울란바토르 일광 절약시" #: dlls/tzres/tzres.rc:380 msgid "(UTC+08:00) Ulaanbaatar" -msgstr "" +msgstr "(UTC+08:00) 울란바토르" #: dlls/tzres/tzres.rc:261 -#, fuzzy #| msgid "Morocco Standard Time" msgid "Norfolk Standard Time" -msgstr "모로코 표준 시간" +msgstr "노퍽 표준시" #: dlls/tzres/tzres.rc:262 -#, fuzzy #| msgid "Morocco Daylight Time" 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" -msgstr "" +msgstr "(UTC+02:00) 예루살렘" #: dlls/tzres/tzres.rc:78 msgid "Bangladesh Standard Time" -msgstr "발글라데시 표준 시간" +msgstr "발글라데시 표준시" #: dlls/tzres/tzres.rc:79 msgid "Bangladesh Daylight Time" -msgstr "방글라데시 일광 절약 시간" +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" -msgstr "SA 태평양 표준 시간" +msgstr "SA 태평양 표준시" #: dlls/tzres/tzres.rc:313 msgid "SA Pacific Daylight Time" -msgstr "SA 태평양 일광 절약 시간" +msgstr "SA 태평양 일광 절약시" #: dlls/tzres/tzres.rc:314 msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" -msgstr "" +msgstr "(UTC-05:00) 보고타, 리마, 키토, 리오 브랑코" #: dlls/tzres/tzres.rc:429 msgid "West Asia Standard Time" -msgstr "서아시아 표준 시간" +msgstr "서아시아 표준시" #: dlls/tzres/tzres.rc:430 msgid "West Asia Daylight Time" -msgstr "서아시아 일광 절약 시간" +msgstr "서아시아 일광 절약시" #: dlls/tzres/tzres.rc:431 msgid "(UTC+05:00) Ashgabat, Tashkent" -msgstr "" +msgstr "(UTC+05:00) 아슈하바트, 타슈켄트" #: dlls/tzres/tzres.rc:33 msgid "Alaskan Standard Time" -msgstr "알래스카 표준 시간" +msgstr "알래스카 표준시" #: dlls/tzres/tzres.rc:34 msgid "Alaskan Daylight Time" -msgstr "알래스카 일광 절약 시간" +msgstr "알래스카 일광 절약시" #: dlls/tzres/tzres.rc:35 msgid "(UTC-09:00) Alaska" -msgstr "" +msgstr "(UTC-09:00) 알래스카" #: dlls/tzres/tzres.rc:288 msgid "Paraguay Standard Time" -msgstr "파라과이 표준 시간" +msgstr "파라과이 표준시" #: dlls/tzres/tzres.rc:289 msgid "Paraguay Daylight Time" -msgstr "파라과이 일광 절약 시간" +msgstr "파라과이 일광 절약시" #: dlls/tzres/tzres.rc:290 msgid "(UTC-04:00) Asuncion" -msgstr "" +msgstr "(UTC-04:00) 아순시온" #: dlls/tzres/tzres.rc:132 msgid "Dateline Standard Time" -msgstr "날짜 변경선 표준 시간" +msgstr "날짜 변경선 표준시" #: dlls/tzres/tzres.rc:133 msgid "Dateline Daylight Time" -msgstr "날짜 변경선 일광 절약 시간" +msgstr "날짜 변경선 일광 절약시" #: dlls/tzres/tzres.rc:134 msgid "(UTC-12:00) International Date Line West" -msgstr "" +msgstr "(UTC-12:00) 날짜 변경선 서쪽" #: 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" -msgstr "" +msgstr "(UTC+02:00) 트리폴리" #: dlls/tzres/tzres.rc:75 msgid "Bahia Standard Time" -msgstr "바이아 표준 시간" +msgstr "바이아 표준시" #: dlls/tzres/tzres.rc:76 msgid "Bahia Daylight Time" -msgstr "바이아 일광 절약 시간" +msgstr "바이아 일광 절약시" #: dlls/tzres/tzres.rc:77 msgid "(UTC-03:00) Salvador" -msgstr "" +msgstr "(UTC-03:00) 살바도르" #: dlls/tzres/tzres.rc:408 msgid "Venezuela Standard Time" -msgstr "베네수엘라 표준 시간" +msgstr "베네수엘라 표준시" #: dlls/tzres/tzres.rc:409 msgid "Venezuela Daylight Time" -msgstr "베네수엘라 일광 절약 시간" +msgstr "베네수엘라 일광 절약시" #: dlls/tzres/tzres.rc:410 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" -msgstr "" +msgstr "(UTC-10:00) 하와이" #: dlls/tzres/tzres.rc:333 msgid "SE Asia Standard Time" -msgstr "동남 아시아 표준 시간" +msgstr "동남 아시아 표준시" #: dlls/tzres/tzres.rc:334 msgid "SE Asia Daylight Time" -msgstr "동남 아시아 일광 절약 시간" +msgstr "동남 아시아 일광 절약시" #: dlls/tzres/tzres.rc:335 msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" -msgstr "" +msgstr "(UTC+07:00) 방콕, 하노이, 자카르타" #: dlls/tzres/tzres.rc:291 -#, fuzzy #| msgid "Jordan Standard Time" msgid "Qyzylorda Standard Time" -msgstr "요르단 표준 시간" +msgstr "키질로르다 표준시" #: dlls/tzres/tzres.rc:292 -#, fuzzy #| msgid "Jordan Daylight Time" msgid "Qyzylorda Daylight Time" -msgstr "요르단 일광 절약 시간" +msgstr "키질로르다 일광 절약시" #: dlls/tzres/tzres.rc:293 msgid "(UTC+05:00) Qyzylorda" -msgstr "" +msgstr "(UTC+05:00) 키질로르다" #: dlls/tzres/tzres.rc:426 -#, fuzzy #| msgid "Tonga Standard Time" msgid "W. Mongolia Standard Time" -msgstr "통가 표준 시간" +msgstr "서몽골 표준시" #: dlls/tzres/tzres.rc:427 -#, fuzzy #| msgid "Tonga Daylight Time" msgid "W. Mongolia Daylight Time" -msgstr "통가 일괄 절약 시간" +msgstr "서몽골 일광 절약시" #: dlls/tzres/tzres.rc:428 msgid "(UTC+07:00) Hovd" -msgstr "" +msgstr "(UTC+07:00) 호브드" #: dlls/tzres/tzres.rc:255 msgid "New Zealand Standard Time" -msgstr "뉴질랜드 표준 시간" +msgstr "뉴질랜드 표준시" #: dlls/tzres/tzres.rc:256 msgid "New Zealand Daylight Time" -msgstr "뉴질랜드 일광 절약 시간" +msgstr "뉴질랜드 일광 절약시" #: dlls/tzres/tzres.rc:257 msgid "(UTC+12:00) Auckland, Wellington" -msgstr "" +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 -#, fuzzy #| msgid "Yakutsk Standard Time" msgid "Omsk Standard Time" -msgstr "야쿠츠크 표준 시간" +msgstr "옴스크 표준시" #: dlls/tzres/tzres.rc:274 -#, fuzzy #| msgid "Yakutsk Daylight Time" msgid "Omsk Daylight Time" -msgstr "야쿠츠크 일광 절약 시간" +msgstr "옴스크 일광 절약시" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" -msgstr "" +msgstr "(UTC+06:00) 옴스크" #: dlls/tzres/tzres.rc:105 msgid "Central Brazilian Standard Time" -msgstr "브라질 중부 표준 시간" +msgstr "브라질 중부 표준시" #: dlls/tzres/tzres.rc:106 msgid "Central Brazilian Daylight Time" -msgstr "브라질 중부 일광 절약 시간" +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" -msgstr "" +msgstr "(UTC+03:00) 민스크" #: dlls/tzres/tzres.rc:315 msgid "SA Western Standard Time" -msgstr "SA 서부 표준 시간" +msgstr "SA 서부 표준시" #: dlls/tzres/tzres.rc:316 msgid "SA Western Daylight Time" -msgstr "SA 서부 일광 절약 시간" +msgstr "SA 서부 일광 절약시" #: dlls/tzres/tzres.rc:317 msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" -msgstr "" +msgstr "(UTC-04:00) 조지타운, 라파스, 마노스, 산후안" #: 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" -msgstr "" +msgstr "(UTC-03:00) 그린란드" #: dlls/tzres/tzres.rc:147 msgid "Easter Island Standard Time" -msgstr "이스터 섬 표준 시간" +msgstr "이스터 섬 표준시" #: dlls/tzres/tzres.rc:148 msgid "Easter Island Daylight Time" -msgstr "이스터 섬 일광 절약 시간" +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" -msgstr "" +msgstr "러시아 표준 시간대 10" #: 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" -msgstr "" +msgstr "(UTC+02:00) 카이로" #: dlls/tzres/tzres.rc:153 msgid "Eastern Standard Time (Mexico)" -msgstr "동부 표준 시간 (멕시코)" +msgstr "동부 표준시 (멕시코)" #: dlls/tzres/tzres.rc:154 msgid "Eastern Daylight Time (Mexico)" -msgstr "동부 일광 절약 시간 (멕시코)" +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" -msgstr "모리셔스 표준 시간" +msgstr "모리셔스 표준시" #: dlls/tzres/tzres.rc:226 msgid "Mauritius Daylight Time" -msgstr "모리셔스 일광 절약 시간" +msgstr "모리셔스 일광 절약시" #: dlls/tzres/tzres.rc:227 msgid "(UTC+04:00) Port Louis" -msgstr "" +msgstr "(UTC+04:00) 포트루이스" #: dlls/tzres/tzres.rc:411 msgid "Vladivostok Standard Time" -msgstr "블라디보스토크 표준 시간" +msgstr "블라디보스토크 표준시" #: dlls/tzres/tzres.rc:412 msgid "Vladivostok Daylight Time" -msgstr "블라디보스토크 일광 절약 시간" +msgstr "블라디보스토크 일광 절약시" #: dlls/tzres/tzres.rc:413 msgid "(UTC+10:00) Vladivostok" -msgstr "" +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" -msgstr "" +msgstr "(UTC+09:00) 서울" #: dlls/tzres/tzres.rc:123 msgid "Chatham Islands Standard Time" -msgstr "채텀 섬 표준 시간" +msgstr "채텀 섬 표준시" #: dlls/tzres/tzres.rc:124 msgid "Chatham Islands Daylight Time" -msgstr "채텀 섬 일광 절약 시간" +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" -msgstr "동아프리카 표준 시간" +msgstr "동아프리카 표준시" #: dlls/tzres/tzres.rc:136 msgid "E. Africa Daylight Time" -msgstr "동아프리카 일광 절약 시간" +msgstr "동아프리카 일광 절약시" #: dlls/tzres/tzres.rc:137 msgid "(UTC+03:00) Nairobi" -msgstr "" +msgstr "(UTC+03:00) 나이로비" #: dlls/tzres/tzres.rc:165 msgid "FLE Standard Time" -msgstr "FLE 표준 시간" +msgstr "FLE 표준시" #: dlls/tzres/tzres.rc:166 msgid "FLE Daylight Time" -msgstr "FLE 일광 절약 시간" +msgstr "FLE 일광 절약시" #: dlls/tzres/tzres.rc:167 msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" -msgstr "" +msgstr "(UTC+02:00) 헬싱키, 키예프, 리가, 소피아, 탈린, 빌뉴스" #: dlls/tzres/tzres.rc:144 msgid "E. South America Standard Time" -msgstr "남아메리카 동부 표준 시간" +msgstr "남아메리카 동부 표준시" #: dlls/tzres/tzres.rc:145 msgid "E. South America Daylight Time" -msgstr "남아메리카 동부 일광 절약 시간" +msgstr "남아메리카 동부 일광 절약시" #: dlls/tzres/tzres.rc:146 msgid "(UTC-03:00) Brasilia" -msgstr "" +msgstr "(UTC-03:00) 브라질리아" #: dlls/tzres/tzres.rc:114 msgid "Central Pacific Standard Time" -msgstr "중앙 태평양 표준 시간" +msgstr "중앙 태평양 표준시" #: dlls/tzres/tzres.rc:115 msgid "Central Pacific Daylight Time" -msgstr "중앙 태평양 일광 절약 시간" +msgstr "중앙 태평양 일광 절약시" #: dlls/tzres/tzres.rc:116 msgid "(UTC+11:00) Solomon Is., New Caledonia" -msgstr "" +msgstr "(UTC+11:00) 마가단, 솔로몬 제도, 뉴칼레도니아" #: dlls/tzres/tzres.rc:420 msgid "W. Central Africa Standard Time" -msgstr "중앙아프리카 서부 표준 시간" +msgstr "중앙아프리카 서부 표준시" #: dlls/tzres/tzres.rc:421 msgid "W. Central Africa Daylight Time" -msgstr "중앙아프리카 서부 일광 절약 시간" +msgstr "중앙아프리카 서부 일광 절약시" #: dlls/tzres/tzres.rc:422 msgid "(UTC+01:00) West Central Africa" -msgstr "" +msgstr "(UTC+01:00) 서중앙 아프리카" #: dlls/tzres/tzres.rc:276 msgid "Pacific SA Standard Time" -msgstr "태평양 SA 표준 시간" +msgstr "태평양 SA 표준시" #: dlls/tzres/tzres.rc:277 msgid "Pacific SA Daylight Time" -msgstr "태평양 SA 일광 절약 시간" +msgstr "태평양 SA 일광 절약시" #: dlls/tzres/tzres.rc:278 msgid "(UTC-04:00) Santiago" -msgstr "" +msgstr "(UTC-04:00) 산티아고" #: dlls/tzres/tzres.rc:138 msgid "E. Australia Standard Time" -msgstr "오스트레일리아 동부 표준 시간" +msgstr "오스트레일리아 동부 표준시" #: dlls/tzres/tzres.rc:139 msgid "E. Australia Daylight Time" -msgstr "오스트레일리아 동부 일광 절약 시간" +msgstr "오스트레일리아 동부 일광 절약시" #: dlls/tzres/tzres.rc:140 msgid "(UTC+10:00) Brisbane" -msgstr "" +msgstr "(UTC+10:00) 브리즈번" #: dlls/tzres/tzres.rc:417 msgid "W. Australia Standard Time" -msgstr "오스트레일리아 서부 표준 시간" +msgstr "오스트레일리아 서부 표준시" #: dlls/tzres/tzres.rc:418 msgid "W. Australia Daylight Time" -msgstr "오스트레일리아 서부 일광 절약 시간" +msgstr "오스트레일리아 서부 일광 절약시" #: dlls/tzres/tzres.rc:419 msgid "(UTC+08:00) Perth" -msgstr "" +msgstr "(UTC+08:00) 퍼스" #: dlls/urlmon/urlmon.rc:32 dlls/wininet/wininet.rc:88 msgid "Security Warning" @@ -14296,7 +14205,7 @@ msgstr "색상(&C)" #: programs/conhost/conhost.rc:92 msgid "Configuration" -msgstr "설정" +msgstr "구성" #: programs/conhost/conhost.rc:95 msgid "Buffer zone" @@ -14382,7 +14291,7 @@ msgstr "설치 - 현재 설정" #: programs/conhost/conhost.rc:45 msgid "Configuration error" -msgstr "설정 오류" +msgstr "구성 오류" #: programs/conhost/conhost.rc:46 msgid "" @@ -14487,7 +14396,7 @@ msgstr "IPv4 주소" #: programs/ipconfig/ipconfig.rc:37 msgid "Hostname" -msgstr "호스트이름" +msgstr "호스트 이름" #: programs/ipconfig/ipconfig.rc:39 msgid "Node type" @@ -14531,7 +14440,7 @@ msgstr "IPv6 주소" #: programs/ipconfig/ipconfig.rc:38 msgid "Primary DNS suffix" -msgstr "" +msgstr "주 DNS 접미사" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information" @@ -14981,7 +14890,7 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"파일 '%s'이(가) 바뀌었습니다.\n" +"파일 '%s'이(가) 변경되었습니다.\n" "\n" "변결 내용을 저장하시겠습니까?" @@ -15027,7 +14936,7 @@ msgstr "TypeLib 보기(&V)..." #: programs/oleview/oleview.rc:35 msgid "&System Configuration" -msgstr "시스템 설정(&S)" +msgstr "시스템 구성(&S)" #: programs/oleview/oleview.rc:36 msgid "&Run the Registry Editor" @@ -15578,37 +15487,32 @@ msgid "Type \"REG %1 /?\" for help.\n" msgstr "도움말을 보려면 \"REG %1 /?\"를 입력하세요.\n" #: programs/reg/reg.rc:181 -#, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg: 시스템에서 지정한 레지스트리 키 또는 값을 찾을 수 없습니다\n" +msgstr "reg: 지정한 레지스트리 키를 액세스하거나 만들 수 없습니다\n" #: programs/reg/reg.rc:116 -#, fuzzy #| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "작업이 성공적으로 끝났습니다\n" +msgstr "reg: 작업이 성공적으로 끝났습니다\n" #: programs/reg/reg.rc:131 -#, fuzzy #| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "레지스트리 작업이 취소되었습니다\n" +msgstr "reg: 레지스트리 작업이 취소되었습니다\n" #: programs/reg/reg.rc:174 -#, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "reg: 시스템에서 지정한 레지스트리 키 또는 값을 찾을 수 없습니다\n" +msgstr "reg: 지정한 레지스트리 키를 찾을 수 없습니다\n" #: programs/reg/reg.rc:120 -#, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "reg: 시스템에서 지정한 레지스트리 키 또는 값을 찾을 수 없습니다\n" +msgstr "reg: 지정한 레지스트리 값을 찾을 수 없습니다\n" #: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -15619,7 +15523,6 @@ msgid "Type \"REG /?\" for help.\n" msgstr "도움말을 보려면 \"REG /?\"를 입력하세요.\n" #: programs/reg/reg.rc:35 -#, fuzzy #| msgid "" #| "Usage:\n" #| " REG [operation] [parameters]\n" @@ -15642,13 +15545,12 @@ msgid "" "\n" msgstr "" "구문:\n" -" REG [명령] [매개변수]\n" +" REG [작업] [매개변수]\n" "\n" -"지원하는 명령:\n" +"지원하는 작업:\n" " ADD | DELETE | IMPORT | EXPORT | QUERY\n" -"\n" -"각 명령에 관한 도움말:\n" -" REG [명령] /?\n" +"특정 작업에 대한 도움말을 보려면 다음을 입력하십시오.\n" +" REG [작업] /?\n" "\n" #: programs/reg/reg.rc:67 @@ -15700,6 +15602,52 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" +"\n" +" 레지스트리에 키를 추가하거나 지정된 레지스트리 키에 새 값을 추가합니다.\n" +"\n" +" <key>\n" +" 추가할 레지스트리 키입니다. 또는 [v]나 [/ve]를 지정한다면,\n" +" 새 레지스트리 데이터를 추가하려는 키입니다.\n" +"\n" +" Format: ROOT\\Subkey\n" +"\n" +" ROOT: 미리 정의된 레지스트리 키입니다. 다음 중 하나여야 합니다:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 선택한 ROOT 키 아래에 있는 레지스트리 키의 전체 경로.\n" +"\n" +" /v <value_name>\n" +" 추가할 레지스트리 값 이름.\n" +"\n" +" /ve\n" +" 비어 있는 레지스트리 값을 추가합니다. 이 옵션은 (기본)\n" +" 레지스트리 값을 수정합니다.\n" +"\n" +" /t <type>\n" +" 레지스트리에 추가할 데이터 유형. [/t]가 지정되면,\n" +" <type>은 다음 중 하나여야 합니다:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" [/t]가 지정되지 않은 경우 기본 데이터 유형은 REG_SZ입니다.\n" +"\n" +" /s <separator>\n" +" REG_MULTI_SZ에 대한 데이터 문자열에서 구분 기호로 사용할 문자를\n" +" 하나 지정합니다. [/s]를 생략하면 \"\\0\"이 구분 기호로 사용됩니다.\n" +"\n" +" /d <data>\n" +" 추가할 레지스트리 value_name에 할당할 데이터입니다.\n" +"\n" +" /f\n" +" 확인 절차 없이 기존 레지스트리를 수정합니다.\n" +"\n" #: programs/reg/reg.rc:202 msgid "" @@ -15735,6 +15683,35 @@ msgid "" "<key2>.\n" "\n" msgstr "" +"REG COPY <key1> <key2> [/s] [/f]\n" +"\n" +" 지정된 레지스트리 키의 내용을 다른 위치로 복사합니다.\n" +" 기본적으로, 이 작업은 레지스트리 값만 복사합니다. [/s]를\n" +" 사용하여 모든 하위 키와 값을 재귀적으로 복사합니다.\n" +"\n" +" <key1>, <key2>\n" +" 데이터의 소스(<key1>)와 목적지(<key2>)를 지정하는 레지스트리 키.\n" +" <key2>가 없으면 새로 만듭니다.\n" +"\n" +" Format: ROOT\\Subkey\n" +"\n" +" ROOT: 미리 정의된 레지스트리 키입니다. 다음 중 하나여야 합니다:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 선택한 ROOT 키 아래에 있는 레지스트리 키의 전체 경로.\n" +"\n" +" /s\n" +" <key1>의 모든 하위키와 값을 <key2>로 복사합니다.\n" +"\n" +" /f\n" +" 확인 절차 없이 <key2>의 모든 레지스트리 데이터를 덮어씁니다.\n" +" 이 옵션은 key2>에만 존재하는 하위키와 값을 수정하지 않습니다.\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -15774,6 +15751,42 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <key> [/v value_name | /ve | /va] [/f]\n" +"\n" +" (모든 하위키 및 값과 함께) 레지스트리 키를 삭제하거나, 지정한\n" +" 레지스트리 키에서 하나 이상의 값을 삭제합니다.\n" +"\n" +" <key>\n" +" 삭제할 레지스트리 키입니다. 또는 [v], [/ve] 또는 [va] 중 하나가 지정된다" +"면,\n" +" 하나 또는 이상의 데이터를 삭제하려는 키입니다.\n" +"\n" +" Format: ROOT\\Subkey\n" +"\n" +" ROOT: 미리 정의된 레지스트리 키입니다. 다음 중 하나여야 합니다:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 선택한 ROOT 키 아래에 있는 레지스트리 키의 전체 경로.\n" +"\n" +" /v <value_name>\n" +" 삭제하려는 레지스트리 값 이름.\n" +"\n" +" /ve\n" +" 비어 있는 레지스트리 값을 삭제합니다. 이 옵션은 (기본)\n" +" 레지스트리 값 이름의 데이터를 삭제합니다.\n" +"\n" +" /va\n" +" 레지스트리 키 아래의 모든 값을 삭제하니다.\n" +"\n" +" /f\n" +" 확인 절차 없이 (모든 하위키 및 값과 함께) 레지스트리 키를\n" +" 삭제합니다.\n" +"\n" #: programs/reg/reg.rc:170 msgid "" @@ -15805,6 +15818,33 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <key> <file> [/y]\n" +"\n" +" (모든 하위키와 값과 함계) 지정한 레지스트리 키를 파일로\n" +" 내보냅니다.\n" +"\n" +" <key>\n" +" 내보내려는 레지스트리 키입니다.\n" +"\n" +" Format: ROOT\\Subkey\n" +"\n" +" ROOT: 미리 정의된 레지스트리 키입니다. 다음 중 하나여야 합니다:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 선택한 ROOT 키 아래에 있는 레지스트리 키의 전체 경로.\n" +"\n" +" <file>\n" +" 레지스트리 키를 내보내려는 파일의 이름 및 경로입니다.\n" +" 이 파일의 확장자는 .reg 이어야 합니다.\n" +"\n" +" /y\n" +" 확인 절차 없이 기존 파일을 덮어씁니다.\n" +"\n" #: programs/reg/reg.rc:148 msgid "" @@ -15816,6 +15856,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <file>\n" +"\n" +" 지정한 파일에서 키, 값 및 데이터를 레지스트리로 가져옵니다.\n" +"\n" +" <file>\n" +" 가져올 레지스트리 파일의 이름 및 경로입니다.\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -15851,6 +15898,38 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <key> [/v value_name | /ve] [/s]\n" +"\n" +" 지정한 레지스트리 키를 쿼리하여 키 안의 모든 하위키, 값 및 데이터를 나열합" +"니다.\n" +" [/s]를 사용하면 각각의 하위키를 재귀적으로 쿼리합니다.\n" +"\n" +" <key>\n" +" 쿼리할 레지스트리 키입니다.\n" +"\n" +" Format: ROOT\\Subkey\n" +"\n" +" ROOT: 미리 정의된 레지스트리 키입니다. 다음 중 하나여야 합니다:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 선택한 ROOT 키 아래에 있는 레지스트리 키의 전체 경로.\n" +"\n" +" /v <value_name>\n" +" 쿼리할 레지스트리 값의 이름입니다. [/v]나 [/ve]를 지정하지 않은 경우,\n" +" <key> 아래의 모든 레지스트리 값이 나열됩니다.\n" +"\n" +" /ve\n" +" 비어있는 레지스트리 값을 쿼리합니다. 이 옵션은 (기본)\n" +" 레지스트리 값을 쿼리합니다.\n" +"\n" +" /s\n" +" <key> 및 그 하위키 아래의 모든 레지스트리 항목을 나열합니다.\n" +"\n" #: programs/reg/reg.rc:180 msgid "" @@ -15861,32 +15940,35 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" 32-bit 뷰를 사용하여 레지스트리에 액세스합니다.\n" +"\n" +" /reg:64\n" +" 64-bit 뷰를 사용하여 레지스트리에 액세스합니다.\n" +"\n" #: programs/reg/reg.rc:117 -#, fuzzy #| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: 키 이름이 잘못되었습니다\n" +msgstr "reg: 잘못된 레지스트리 키\n" #: programs/reg/reg.rc:119 msgid "reg: Unable to access remote machine\n" msgstr "reg: 원격 컴퓨터에 액세스할 수 없습니다\n" #: programs/reg/reg.rc:172 -#, fuzzy #| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "reg: 잘못된 시스템 키 [%1]\n" +msgstr "reg: 잘못된 시스템 키\n" #: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: 잘못된 옵션 [%1]. " #: programs/reg/reg.rc:122 -#, fuzzy #| msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "reg : 옵션 [/d] 다음에 유효한 16 진수 값이 있어야 합니다\n" +msgstr "reg : 옵션 [/d] 다음에 유효한 숫자 값이 있어야 합니다\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" @@ -15914,15 +15996,14 @@ msgstr "reg: 명령줄 매개변수가 잘못되었습니다\n" #: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" -msgstr "" +msgstr "reg: 원본 키와 대상 키는 같을 수 없습니다\n" #: programs/reg/reg.rc:205 -#, fuzzy #| msgid "The file '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "'%1' 파일이 이미 존재합니다. 덮어쓰시겠습니까?" +msgstr "'%1\\%2' 값이 이미 대상 키에 존재합니다. 덮어쓰시겠습니까?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" @@ -15937,10 +16018,9 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "레지스트리 키 '%1'을 제거하시겠습니까?" #: programs/reg/reg.rc:137 -#, fuzzy #| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "regedit: 레지스트리 '%1'을(를) 지울 수 없습니다.\n" +msgstr "reg: '%1'의 모든 레지스트리 값을 지울 수 없습니다.\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" @@ -15951,10 +16031,9 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: 인식되지 않는 이스케이프 시퀀스 [\\%1!c!]\n" #: programs/reg/reg.rc:175 -#, fuzzy #| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "레지스트리 키 '%1'을(를) 열 수 없습니다.\n" +msgstr "reg: 레지스트리 키 '%1'을(를) 가져올 수 없습니다.\n" #: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" @@ -16394,7 +16473,7 @@ msgstr "regedit: 명령에 유효하지 않은 구문이 있습니다.\n" #: programs/regedit/regedit.rc:187 msgid "Quits the Registry Editor" -msgstr "레지스트리 편집기 나가기" +msgstr "레지스트리 편집기 끝내기" #: programs/regedit/regedit.rc:188 msgid "Adds keys to the favorites list" @@ -16634,7 +16713,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: '%1' 제거 성공\n" #: programs/start/start.rc:57 -#, fuzzy #| msgid "" #| "Start a program, or open a document in the program normally used for " #| "files\n" @@ -16720,6 +16798,7 @@ msgstr "" " 실행했던 프로그램의 반환 코드입니다.\n" "/unix 유닉스 파일 이름을 사용하고, Windows 탐색기처럼 파일을\n" " 시작합니다.\n" +"/exec 지정한 파일을 실행합니다 (Wine 내부 용도).\n" "/ProgIDOpen 지정한 progID를 사용해서 문서를 엽니다.\n" "/? 도움말을 보여주고 끝냅니다.\n" @@ -16801,7 +16880,7 @@ msgstr "새 작업 (실행...)(&N)" #: programs/taskmgr/taskmgr.rc:39 msgid "E&xit Task Manager" -msgstr "작업 관리자 나가기(&X)" +msgstr "작업 관리자 끝내기(&X)" #: programs/taskmgr/taskmgr.rc:45 msgid "&Minimize On Use" @@ -17575,7 +17654,7 @@ msgstr "잘못된 옵션입니다" #: programs/taskmgr/taskmgr.rc:317 msgid "Unable to Access or Set Process Affinity" -msgstr "프로세프 선호도를 설정 또는 액세스할 수 없습니다" +msgstr "프로세스 선호도를 설정 또는 액세스할 수 없습니다" #: programs/taskmgr/taskmgr.rc:322 msgid "System Idle Process" @@ -17702,7 +17781,7 @@ msgstr "" #: programs/wineboot/wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." -msgstr "Wine 설정(%s)을 업데이트하고 있습니다. 잠시만 기다려주세요..." +msgstr "%s의 Wine 구성을 업데이트하고 있습니다. 잠시만 기다려주세요..." # 라이선스 문구는 번역하지 않습니다. #: programs/winecfg/winecfg.rc:140 @@ -17949,7 +18028,7 @@ msgstr "MIME 형식" #: programs/winecfg/winecfg.rc:303 msgid "Manage file &associations" -msgstr "Wine이 호스트 OS의 파일 연결을 수정합니다(&A)" +msgstr "Wine 관련 파일 연결을 데스크톱에 추가합니다(&A)" #: programs/winecfg/winecfg.rc:306 msgid "Folders" @@ -17985,7 +18064,7 @@ msgstr "그래픽" #: programs/winecfg/winecfg.rc:40 msgid "Desktop Integration" -msgstr "데스크톱" +msgstr "데스크톱 통합" #: programs/winecfg/winecfg.rc:41 msgid "Audio" @@ -18322,7 +18401,7 @@ msgstr "" #: programs/winedbg/winedbg.rc:62 msgid "Show &Details" -msgstr "자세히 보이기(^D)" +msgstr "자세히 보이기(&D)" #: programs/winedbg/winedbg.rc:67 msgid "Program Error Details" -- 2.34.0

1 0

[PATCH 12/12] winecoreaudio: Move release_capture_buffer to the unixlib.
by Huw Davies Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 29 +++++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 32 +++++------------------------- dlls/winecoreaudio.drv/unixlib.h | 8 ++++++++ 3 files changed, 42 insertions(+), 27 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index ae44b562c22..d723291bb24 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1457,6 +1457,34 @@ end: return STATUS_SUCCESS; } +static NTSTATUS release_capture_buffer(void *args) +{ + struct release_capture_buffer_params *params = args; + struct coreaudio_stream *stream = params->stream; + + OSSpinLockLock(&stream->lock); + + if(!params->done){ + stream->getbuf_last = 0; + params->result = S_OK; + }else if(!stream->getbuf_last) + params->result = AUDCLNT_E_OUT_OF_ORDER; + else if(stream->getbuf_last != params->done) + params->result = AUDCLNT_E_INVALID_SIZE; + else{ + stream->written_frames += params->done; + stream->held_frames -= params->done; + stream->lcl_offs_frames += params->done; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->getbuf_last = 0; + params->result = S_OK; + } + + OSSpinLockUnlock(&stream->lock); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1468,6 +1496,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_render_buffer, release_render_buffer, get_capture_buffer, + release_capture_buffer, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 84525ac8a53..717e64b2283 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1386,36 +1386,14 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( IAudioCaptureClient *iface, UINT32 done) { ACImpl *This = impl_from_IAudioCaptureClient(iface); + struct release_capture_buffer_params params; TRACE("(%p)->(%u)\n", This, done); - OSSpinLockLock(&This->stream->lock); - - if(!done){ - This->stream->getbuf_last = 0; - OSSpinLockUnlock(&This->stream->lock); - return S_OK; - } - - if(!This->stream->getbuf_last){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(This->stream->getbuf_last != done){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_INVALID_SIZE; - } - - This->stream->written_frames += done; - This->stream->held_frames -= done; - This->stream->lcl_offs_frames += done; - This->stream->lcl_offs_frames %= This->stream->bufsize_frames; - This->stream->getbuf_last = 0; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.done = done; + UNIX_CALL(release_capture_buffer, &params); + return params.result; } static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 2211f1048a3..9bb636fd625 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -120,6 +120,13 @@ struct get_capture_buffer_params UINT64 *qpcpos; }; +struct release_capture_buffer_params +{ + struct coreaudio_stream *stream; + UINT32 done; + HRESULT result; +}; + struct get_mix_format_params { EDataFlow flow; @@ -170,6 +177,7 @@ enum unix_funcs unix_get_render_buffer, unix_release_render_buffer, unix_get_capture_buffer, + unix_release_capture_buffer, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 11/12] winecoreaudio: Move get_capture_buffer to the unixlib.
by Huw Davies Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 56 ++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 55 +++++------------------------ dlls/winecoreaudio.drv/unixlib.h | 12 +++++++ 3 files changed, 77 insertions(+), 46 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 2519a6bcfaa..ae44b562c22 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1402,6 +1402,61 @@ static NTSTATUS release_render_buffer(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_capture_buffer(void *args) +{ + struct get_capture_buffer_params *params = args; + struct coreaudio_stream *stream = params->stream; + UINT32 chunk_bytes, chunk_frames; + LARGE_INTEGER stamp, freq; + + OSSpinLockLock(&stream->lock); + + if(stream->getbuf_last){ + params->result = AUDCLNT_E_OUT_OF_ORDER; + goto end; + } + + capture_resample(stream); + + *params->frames = 0; + + if(stream->held_frames < stream->period_frames){ + params->result = AUDCLNT_S_BUFFER_EMPTY; + goto end; + } + + *params->flags = 0; + chunk_frames = stream->bufsize_frames - stream->lcl_offs_frames; + if(chunk_frames < stream->period_frames){ + chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; + if(!stream->tmp_buffer){ + stream->tmp_buffer_size = stream->period_frames * stream->fmt->nBlockAlign; + NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, + &stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE); + } + *params->data = stream->tmp_buffer; + memcpy(*params->data, stream->local_buffer + stream->lcl_offs_frames * stream->fmt->nBlockAlign, + chunk_bytes); + memcpy(*params->data + chunk_bytes, stream->local_buffer, + stream->period_frames * stream->fmt->nBlockAlign - chunk_bytes); + }else + *params->data = stream->local_buffer + stream->lcl_offs_frames * stream->fmt->nBlockAlign; + + stream->getbuf_last = *params->frames = stream->period_frames; + + if(params->devpos) + *params->devpos = stream->written_frames; + if(params->qpcpos){ /* fixme: qpc of recording time */ + NtQueryPerformanceCounter(&stamp, &freq); + *params->qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + params->result = S_OK; + +end: + OSSpinLockUnlock(&stream->lock); + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1412,6 +1467,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = reset, get_render_buffer, release_render_buffer, + get_capture_buffer, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 1874382304b..84525ac8a53 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1359,7 +1359,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, UINT64 *qpcpos) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - UINT32 chunk_bytes, chunk_frames; + struct get_capture_buffer_params params; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -1372,51 +1372,14 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, if(!frames || !flags) return E_POINTER; - OSSpinLockLock(&This->stream->lock); - - if(This->stream->getbuf_last){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_OUT_OF_ORDER; - } - - capture_resample(This); - - if(This->stream->held_frames < This->stream->period_frames){ - *frames = 0; - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_S_BUFFER_EMPTY; - } - - *flags = 0; - - chunk_frames = This->stream->bufsize_frames - This->stream->lcl_offs_frames; - if(chunk_frames < This->stream->period_frames){ - chunk_bytes = chunk_frames * This->stream->fmt->nBlockAlign; - if(!This->stream->tmp_buffer){ - This->stream->tmp_buffer_size = This->stream->period_frames * This->stream->fmt->nBlockAlign; - NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, 0, - &This->stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE); - } - *data = This->stream->tmp_buffer; - memcpy(*data, This->stream->local_buffer + This->stream->lcl_offs_frames * This->stream->fmt->nBlockAlign, chunk_bytes); - memcpy((*data) + chunk_bytes, This->stream->local_buffer, This->stream->period_frames * This->stream->fmt->nBlockAlign - chunk_bytes); - }else - *data = This->stream->local_buffer + This->stream->lcl_offs_frames * This->stream->fmt->nBlockAlign; - - This->stream->getbuf_last = *frames = This->stream->period_frames; - - if(devpos) - *devpos = This->stream->written_frames; - if(qpcpos){ /* fixme: qpc of recording time */ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.data = data; + params.frames = frames; + params.flags = flags; + params.devpos = devpos; + params.qpcpos = qpcpos; + UNIX_CALL(get_capture_buffer, &params); + return params.result; } static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 80f42741e34..2211f1048a3 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -109,6 +109,17 @@ struct release_render_buffer_params HRESULT result; }; +struct get_capture_buffer_params +{ + struct coreaudio_stream *stream; + HRESULT result; + BYTE **data; + UINT32 *frames; + DWORD *flags; + UINT64 *devpos; + UINT64 *qpcpos; +}; + struct get_mix_format_params { EDataFlow flow; @@ -158,6 +169,7 @@ enum unix_funcs unix_reset, unix_get_render_buffer, unix_release_render_buffer, + unix_get_capture_buffer, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 10/12] winecoreaudio: Move release_render_buffer to the unixlib.
by Huw Davies Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 45 ++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 73 +++--------------------------- dlls/winecoreaudio.drv/unixlib.h | 9 ++++ 3 files changed, 60 insertions(+), 67 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 0bf21cd6c7d..2519a6bcfaa 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1358,6 +1358,50 @@ end: return STATUS_SUCCESS; } +static NTSTATUS release_render_buffer(void *args) +{ + struct release_render_buffer_params *params = args; + struct coreaudio_stream *stream = params->stream; + BYTE *buffer; + + OSSpinLockLock(&stream->lock); + + if(!params->frames){ + stream->getbuf_last = 0; + params->result = S_OK; + }else if(!stream->getbuf_last) + params->result = AUDCLNT_E_OUT_OF_ORDER; + else if(params->frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)) + params->result = AUDCLNT_E_INVALID_SIZE; + else{ + if(stream->getbuf_last >= 0) + buffer = stream->local_buffer + stream->wri_offs_frames * stream->fmt->nBlockAlign; + else + buffer = stream->tmp_buffer; + + if(params->flags & AUDCLNT_BUFFERFLAGS_SILENT) + silence_buffer(stream, buffer, params->frames); + + if(stream->getbuf_last < 0) + ca_wrap_buffer(stream->local_buffer, + stream->wri_offs_frames * stream->fmt->nBlockAlign, + stream->bufsize_frames * stream->fmt->nBlockAlign, + buffer, params->frames * stream->fmt->nBlockAlign); + + stream->wri_offs_frames += params->frames; + stream->wri_offs_frames %= stream->bufsize_frames; + stream->held_frames += params->frames; + stream->written_frames += params->frames; + stream->getbuf_last = 0; + + params->result = S_OK; + } + + OSSpinLockUnlock(&stream->lock); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1367,6 +1411,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = stop, reset, get_render_buffer, + release_render_buffer, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 5dca497594a..1874382304b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -683,30 +683,6 @@ static HRESULT get_audio_session(const GUID *sessionguid, return S_OK; } -static void ca_wrap_buffer(BYTE *dst, UINT32 dst_offs, UINT32 dst_bytes, - BYTE *src, UINT32 src_bytes) -{ - UINT32 chunk_bytes = dst_bytes - dst_offs; - - if(chunk_bytes < src_bytes){ - memcpy(dst + dst_offs, src, chunk_bytes); - memcpy(dst, src + chunk_bytes, src_bytes - chunk_bytes); - }else - memcpy(dst + dst_offs, src, src_bytes); -} - -static void silence_buffer(struct coreaudio_stream *stream, BYTE *buffer, UINT32 frames) -{ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; - if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || - (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - stream->fmt->wBitsPerSample == 8) - memset(buffer, 128, frames * stream->fmt->nBlockAlign); - else - memset(buffer, 0, frames * stream->fmt->nBlockAlign); -} - static void capture_resample(ACImpl *This) { UNIX_CALL(capture_resample, This->stream); @@ -1322,52 +1298,15 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( IAudioRenderClient *iface, UINT32 frames, DWORD flags) { ACImpl *This = impl_from_IAudioRenderClient(iface); - BYTE *buffer; + struct release_render_buffer_params params; TRACE("(%p)->(%u, %x)\n", This, frames, flags); - OSSpinLockLock(&This->stream->lock); - - if(!frames){ - This->stream->getbuf_last = 0; - OSSpinLockUnlock(&This->stream->lock); - return S_OK; - } - - if(!This->stream->getbuf_last){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(frames > (This->stream->getbuf_last >= 0 ? This->stream->getbuf_last : -This->stream->getbuf_last)){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_INVALID_SIZE; - } - - if(This->stream->getbuf_last >= 0) - buffer = This->stream->local_buffer + This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign; - else - buffer = This->stream->tmp_buffer; - - if(flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(This->stream, buffer, frames); - - if(This->stream->getbuf_last < 0) - ca_wrap_buffer(This->stream->local_buffer, - This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign, - This->stream->bufsize_frames * This->stream->fmt->nBlockAlign, - buffer, frames * This->stream->fmt->nBlockAlign); - - - This->stream->wri_offs_frames += frames; - This->stream->wri_offs_frames %= This->stream->bufsize_frames; - This->stream->held_frames += frames; - This->stream->written_frames += frames; - This->stream->getbuf_last = 0; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.frames = frames; + params.flags = flags; + UNIX_CALL(release_render_buffer, &params); + return params.result; } static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index e2ae457e705..80f42741e34 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -101,6 +101,14 @@ struct get_render_buffer_params BYTE **data; }; +struct release_render_buffer_params +{ + struct coreaudio_stream *stream; + UINT32 frames; + DWORD flags; + HRESULT result; +}; + struct get_mix_format_params { EDataFlow flow; @@ -149,6 +157,7 @@ enum unix_funcs unix_stop, unix_reset, unix_get_render_buffer, + unix_release_render_buffer, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 09/12] winecoreaudio: Move get_render_buffer to the unixlib.
by Huw Davies Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 60 +++++++++++++++++++++++- dlls/winecoreaudio.drv/mmdevdrv.c | 75 +++--------------------------- dlls/winecoreaudio.drv/unixlib.h | 10 +++- 3 files changed, 73 insertions(+), 72 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index ee34cd29de1..0bf21cd6c7d 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -699,6 +699,9 @@ static NTSTATUS release_stream( void *args ) if(stream->local_buffer) NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &stream->local_buffer_size, MEM_RELEASE); + if(stream->tmp_buffer) + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, + &stream->tmp_buffer_size, MEM_RELEASE); free(stream->fmt); params->result = S_OK; return STATUS_SUCCESS; @@ -1230,9 +1233,9 @@ static NTSTATUS get_current_padding(void *args) struct get_current_padding_params *params = args; struct coreaudio_stream *stream = params->stream; - if(params->lock) OSSpinLockLock(&stream->lock); + OSSpinLockLock(&stream->lock); *params->padding = get_current_padding_nolock(stream); - if(params->lock) OSSpinLockUnlock(&stream->lock); + OSSpinLockUnlock(&stream->lock); params->result = S_OK; return STATUS_SUCCESS; } @@ -1303,6 +1306,58 @@ static NTSTATUS reset(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_render_buffer(void *args) +{ + struct get_render_buffer_params *params = args; + struct coreaudio_stream *stream = params->stream; + UINT32 pad; + + OSSpinLockLock(&stream->lock); + + pad = get_current_padding_nolock(stream); + + if(stream->getbuf_last){ + params->result = AUDCLNT_E_OUT_OF_ORDER; + goto end; + } + if(!params->frames){ + params->result = S_OK; + goto end; + } + if(pad + params->frames > stream->bufsize_frames){ + params->result = AUDCLNT_E_BUFFER_TOO_LARGE; + goto end; + } + + if(stream->wri_offs_frames + params->frames > stream->bufsize_frames){ + if(stream->tmp_buffer_frames < params->frames){ + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, + &stream->tmp_buffer_size, MEM_RELEASE); + stream->tmp_buffer_size = params->frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, + &stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE)){ + stream->tmp_buffer_frames = 0; + params->result = E_OUTOFMEMORY; + goto end; + } + stream->tmp_buffer_frames = params->frames; + } + *params->data = stream->tmp_buffer; + stream->getbuf_last = -params->frames; + }else{ + *params->data = stream->local_buffer + stream->wri_offs_frames * stream->fmt->nBlockAlign; + stream->getbuf_last = params->frames; + } + + silence_buffer(stream, *params->data, params->frames); + params->result = S_OK; + +end: + OSSpinLockUnlock(&stream->lock); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1311,6 +1366,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = start, stop, reset, + get_render_buffer, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index cf2c23a0f40..5dca497594a 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -554,9 +554,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) CloseHandle(event); } if(This->stream){ - if(This->stream->tmp_buffer) - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, - &This->stream->tmp_buffer_size, MEM_RELEASE); params.stream = This->stream; UNIX_CALL(release_stream, &params); } @@ -871,21 +868,6 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, return params.result; } -static HRESULT AudioClient_GetCurrentPadding_nolock(ACImpl *This, - UINT32 *numpad) -{ - struct get_current_padding_params params; - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.padding = numpad; - params.lock = FALSE; - UNIX_CALL(get_current_padding, &params); - return params.result; -} - static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, UINT32 *numpad) { @@ -902,7 +884,6 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, params.stream = This->stream; params.padding = numpad; - params.lock = TRUE; UNIX_CALL(get_current_padding, &params); return params.result; } @@ -1322,8 +1303,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) { ACImpl *This = impl_from_IAudioRenderClient(iface); - UINT32 pad; - HRESULT hr; + struct get_render_buffer_params params; TRACE("(%p)->(%u, %p)\n", This, frames, data); @@ -1331,54 +1311,11 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return E_POINTER; *data = NULL; - OSSpinLockLock(&This->stream->lock); - - if(This->stream->getbuf_last){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(!frames){ - OSSpinLockUnlock(&This->stream->lock); - return S_OK; - } - - hr = AudioClient_GetCurrentPadding_nolock(This, &pad); - if(FAILED(hr)){ - OSSpinLockUnlock(&This->stream->lock); - return hr; - } - - if(pad + frames > This->stream->bufsize_frames){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_BUFFER_TOO_LARGE; - } - - if(This->stream->wri_offs_frames + frames > This->stream->bufsize_frames){ - if(This->stream->tmp_buffer_frames < frames){ - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, - &This->stream->tmp_buffer_size, MEM_RELEASE); - This->stream->tmp_buffer_size = frames * This->stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, 0, - &This->stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE)){ - This->stream->tmp_buffer_frames = 0; - OSSpinLockUnlock(&This->stream->lock); - return E_OUTOFMEMORY; - } - This->stream->tmp_buffer_frames = frames; - } - *data = This->stream->tmp_buffer; - This->stream->getbuf_last = -frames; - }else{ - *data = This->stream->local_buffer + This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign; - This->stream->getbuf_last = frames; - } - - silence_buffer(This->stream, *data, frames); - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.frames = frames; + params.data = data; + UNIX_CALL(get_render_buffer, &params); + return params.result; } static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 450293052c7..e2ae457e705 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -93,6 +93,14 @@ struct reset_params HRESULT result; }; +struct get_render_buffer_params +{ + struct coreaudio_stream *stream; + UINT32 frames; + HRESULT result; + BYTE **data; +}; + struct get_mix_format_params { EDataFlow flow; @@ -128,7 +136,6 @@ struct get_latency_params struct get_current_padding_params { struct coreaudio_stream *stream; - BOOL lock; /* temporary */ HRESULT result; UINT32 *padding; }; @@ -141,6 +148,7 @@ enum unix_funcs unix_start, unix_stop, unix_reset, + unix_get_render_buffer, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 08/12] winecoreaudio: Move reset to the unixlib.
by Huw Davies Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 29 ++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 31 ++++-------------------------- dlls/winecoreaudio.drv/unixlib.h | 7 +++++++ 3 files changed, 40 insertions(+), 27 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 5a49a786f48..ee34cd29de1 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1275,6 +1275,34 @@ static NTSTATUS stop(void *args) return STATUS_SUCCESS; } +static NTSTATUS reset(void *args) +{ + struct reset_params *params = args; + struct coreaudio_stream *stream = params->stream; + + OSSpinLockLock(&stream->lock); + + if(stream->playing) + params->result = AUDCLNT_E_NOT_STOPPED; + else if(stream->getbuf_last) + params->result = AUDCLNT_E_BUFFER_OPERATION_PENDING; + else{ + if(stream->flow == eRender) + stream->written_frames = 0; + else + stream->written_frames += stream->held_frames; + stream->held_frames = 0; + stream->lcl_offs_frames = 0; + stream->wri_offs_frames = 0; + stream->cap_offs_frames = 0; + stream->cap_held_frames = 0; + params->result = S_OK; + } + + OSSpinLockUnlock(&stream->lock); + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1282,6 +1310,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, start, stop, + reset, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index e214a85c0d3..cf2c23a0f40 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1041,39 +1041,16 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct reset_params params; TRACE("(%p)\n", This); if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - OSSpinLockLock(&This->stream->lock); - - if(This->stream->playing){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_NOT_STOPPED; - } - - if(This->stream->getbuf_last){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_BUFFER_OPERATION_PENDING; - } - - if(This->dataflow == eRender){ - This->stream->written_frames = 0; - }else{ - This->stream->written_frames += This->stream->held_frames; - } - - This->stream->held_frames = 0; - This->stream->lcl_offs_frames = 0; - This->stream->wri_offs_frames = 0; - This->stream->cap_offs_frames = 0; - This->stream->cap_held_frames = 0; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + UNIX_CALL(reset, &params); + return params.result; } static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index c3da84c2c7a..450293052c7 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -87,6 +87,12 @@ struct stop_params HRESULT result; }; +struct reset_params +{ + struct coreaudio_stream *stream; + HRESULT result; +}; + struct get_mix_format_params { EDataFlow flow; @@ -134,6 +140,7 @@ enum unix_funcs unix_release_stream, unix_start, unix_stop, + unix_reset, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 07/12] winecoreaudio: Move stop to the unixlib.
by Huw Davies Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 20 ++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 16 ++++------------ dlls/winecoreaudio.drv/unixlib.h | 7 +++++++ 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 133ab3da124..5a49a786f48 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1256,12 +1256,32 @@ static NTSTATUS start(void *args) return STATUS_SUCCESS; } +static NTSTATUS stop(void *args) +{ + struct stop_params *params = args; + struct coreaudio_stream *stream = params->stream; + + OSSpinLockLock(&stream->lock); + + if(!stream->playing) + params->result = S_FALSE; + else{ + stream->playing = FALSE; + params->result = S_OK; + } + + OSSpinLockUnlock(&stream->lock); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, create_stream, release_stream, start, + stop, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 30858931338..e214a85c0d3 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1026,24 +1026,16 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct stop_params params; TRACE("(%p)\n", This); if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - OSSpinLockLock(&This->stream->lock); - - if(!This->stream->playing){ - OSSpinLockUnlock(&This->stream->lock); - return S_FALSE; - } - - This->stream->playing = FALSE; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + UNIX_CALL(stop, &params); + return params.result; } static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index b4e9e5bf950..c3da84c2c7a 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -81,6 +81,12 @@ struct start_params HRESULT result; }; +struct stop_params +{ + struct coreaudio_stream *stream; + HRESULT result; +}; + struct get_mix_format_params { EDataFlow flow; @@ -127,6 +133,7 @@ enum unix_funcs unix_create_stream, unix_release_stream, unix_start, + unix_stop, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 06/12] winecoreaudio: Move start to the unixlib.
by Huw Davies Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 20 +++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 39 ++++++++++++------------------ dlls/winecoreaudio.drv/unixlib.h | 7 ++++++ 3 files changed, 43 insertions(+), 23 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 76febf1eb91..133ab3da124 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1237,11 +1237,31 @@ static NTSTATUS get_current_padding(void *args) return STATUS_SUCCESS; } +static NTSTATUS start(void *args) +{ + struct start_params *params = args; + struct coreaudio_stream *stream = params->stream; + + OSSpinLockLock(&stream->lock); + + if(stream->playing) + params->result = AUDCLNT_E_NOT_STOPPED; + else{ + stream->playing = TRUE; + params->result = S_OK; + } + + OSSpinLockUnlock(&stream->lock); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, create_stream, release_stream, + start, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 5d140665a83..30858931338 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -996,38 +996,31 @@ void CALLBACK ca_period_cb(void *user, BOOLEAN timer) static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct start_params params; TRACE("(%p)\n", This); if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - OSSpinLockLock(&This->stream->lock); - - if(This->stream->playing){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_NOT_STOPPED; - } - - if((This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !This->event){ - OSSpinLockUnlock(&This->stream->lock); + if((This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !This->event) return AUDCLNT_E_EVENTHANDLE_NOT_SET; - } - - if(This->event && !This->timer) - if(!CreateTimerQueueTimer(&This->timer, g_timer_q, ca_period_cb, - This, 0, This->period_ms, WT_EXECUTEINTIMERTHREAD)){ - This->timer = NULL; - OSSpinLockUnlock(&This->stream->lock); - WARN("Unable to create timer: %u\n", GetLastError()); - return E_OUTOFMEMORY; - } - - This->stream->playing = TRUE; - OSSpinLockUnlock(&This->stream->lock); + params.stream = This->stream; + UNIX_CALL(start, &params); - return S_OK; + if(SUCCEEDED(params.result)){ + if(This->event && !This->timer){ + if(!CreateTimerQueueTimer(&This->timer, g_timer_q, ca_period_cb, This, 0, + This->period_ms, WT_EXECUTEINTIMERTHREAD)){ + This->timer = NULL; + IAudioClient3_Stop(iface); + WARN("Unable to create timer: %u\n", GetLastError()); + return E_OUTOFMEMORY; + } + } + } + return params.result; } static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 072ffd233c3..b4e9e5bf950 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -75,6 +75,12 @@ struct release_stream_params HRESULT result; }; +struct start_params +{ + struct coreaudio_stream *stream; + HRESULT result; +}; + struct get_mix_format_params { EDataFlow flow; @@ -120,6 +126,7 @@ enum unix_funcs unix_get_endpoint_ids, unix_create_stream, unix_release_stream, + unix_start, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 05/12] winecoreaudio: Move get_current_padding to the unixlib.
by Huw Davies Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 19 +++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 27 +++++++++++++-------------- dlls/winecoreaudio.drv/unixlib.h | 9 +++++++++ 3 files changed, 41 insertions(+), 14 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 2d5aa29555a..76febf1eb91 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1219,6 +1219,24 @@ static NTSTATUS get_latency(void *args) return STATUS_SUCCESS; } +static UINT32 get_current_padding_nolock(struct coreaudio_stream *stream) +{ + if(stream->flow == eCapture) capture_resample(stream); + return stream->held_frames; +} + +static NTSTATUS get_current_padding(void *args) +{ + struct get_current_padding_params *params = args; + struct coreaudio_stream *stream = params->stream; + + if(params->lock) OSSpinLockLock(&stream->lock); + *params->padding = get_current_padding_nolock(stream); + if(params->lock) OSSpinLockUnlock(&stream->lock); + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1228,6 +1246,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = is_format_supported, get_buffer_size, get_latency, + get_current_padding, capture_resample /* temporary */ }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 63deb458f1a..5d140665a83 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -874,22 +874,23 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, static HRESULT AudioClient_GetCurrentPadding_nolock(ACImpl *This, UINT32 *numpad) { + struct get_current_padding_params params; + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - if(This->dataflow == eCapture) - capture_resample(This); - - *numpad = This->stream->held_frames; - - return S_OK; + params.stream = This->stream; + params.padding = numpad; + params.lock = FALSE; + UNIX_CALL(get_current_padding, &params); + return params.result; } static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, UINT32 *numpad) { ACImpl *This = impl_from_IAudioClient3(iface); - HRESULT hr; + struct get_current_padding_params params; TRACE("(%p)->(%p)\n", This, numpad); @@ -899,13 +900,11 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - OSSpinLockLock(&This->stream->lock); - - hr = AudioClient_GetCurrentPadding_nolock(This, numpad); - - OSSpinLockUnlock(&This->stream->lock); - - return hr; + params.stream = This->stream; + params.padding = numpad; + params.lock = TRUE; + UNIX_CALL(get_current_padding, &params); + return params.result; } static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index dd86cd81973..072ffd233c3 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -107,6 +107,14 @@ struct get_latency_params REFERENCE_TIME *latency; }; +struct get_current_padding_params +{ + struct coreaudio_stream *stream; + BOOL lock; /* temporary */ + HRESULT result; + UINT32 *padding; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -116,6 +124,7 @@ enum unix_funcs unix_is_format_supported, unix_get_buffer_size, unix_get_latency, + unix_get_current_padding, unix_capture_resample /* temporary */ }; -- 2.23.0

2 1

[PATCH 04/12] winecoreaudio: Move get_latency to the unixlib.
by Huw Davies Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 93 ++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 119 ++--------------------------- dlls/winecoreaudio.drv/unixlib.h | 8 ++ 3 files changed, 109 insertions(+), 111 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 56504a8b7b0..2d5aa29555a 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1127,6 +1127,98 @@ static NTSTATUS get_buffer_size(void *args) return STATUS_SUCCESS; } +static HRESULT ca_get_max_stream_latency(struct coreaudio_stream *stream, UInt32 *max) +{ + AudioObjectPropertyAddress addr; + AudioStreamID *ids; + UInt32 size; + OSStatus sc; + int nstreams, i; + + addr.mScope = get_scope(stream->flow); + addr.mElement = 0; + addr.mSelector = kAudioDevicePropertyStreams; + + sc = AudioObjectGetPropertyDataSize(stream->dev_id, &addr, 0, NULL, &size); + if(sc != noErr){ + WARN("Unable to get size for _Streams property: %x\n", (int)sc); + return osstatus_to_hresult(sc); + } + + ids = malloc(size); + if(!ids) + return E_OUTOFMEMORY; + + sc = AudioObjectGetPropertyData(stream->dev_id, &addr, 0, NULL, &size, ids); + if(sc != noErr){ + WARN("Unable to get _Streams property: %x\n", (int)sc); + free(ids); + return osstatus_to_hresult(sc); + } + + nstreams = size / sizeof(AudioStreamID); + *max = 0; + + addr.mSelector = kAudioStreamPropertyLatency; + for(i = 0; i < nstreams; ++i){ + UInt32 latency; + + size = sizeof(latency); + sc = AudioObjectGetPropertyData(ids[i], &addr, 0, NULL, &size, &latency); + if(sc != noErr){ + WARN("Unable to get _Latency property: %x\n", (int)sc); + continue; + } + + if(latency > *max) + *max = latency; + } + + free(ids); + + return S_OK; +} + +static NTSTATUS get_latency(void *args) +{ + struct get_latency_params *params = args; + struct coreaudio_stream *stream = params->stream; + UInt32 latency, stream_latency, size; + AudioObjectPropertyAddress addr; + OSStatus sc; + + OSSpinLockLock(&stream->lock); + + addr.mScope = get_scope(stream->flow); + addr.mSelector = kAudioDevicePropertyLatency; + addr.mElement = 0; + + size = sizeof(latency); + sc = AudioObjectGetPropertyData(stream->dev_id, &addr, 0, NULL, &size, &latency); + if(sc != noErr){ + WARN("Couldn't get _Latency property: %x\n", (int)sc); + OSSpinLockUnlock(&stream->lock); + params->result = osstatus_to_hresult(sc); + return STATUS_SUCCESS; + } + + params->result = ca_get_max_stream_latency(stream, &stream_latency); + if(FAILED(params->result)){ + OSSpinLockUnlock(&stream->lock); + return STATUS_SUCCESS; + } + + latency += stream_latency; + /* pretend we process audio in Period chunks, so max latency includes + * the period time */ + *params->latency = muldiv(latency, 10000000, stream->fmt->nSamplesPerSec) + + stream->period_ms * 10000; + + OSSpinLockUnlock(&stream->lock); + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1135,6 +1227,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_mix_format, is_format_supported, get_buffer_size, + get_latency, capture_resample /* temporary */ }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index cd33cababd1..63deb458f1a 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -130,7 +130,6 @@ struct ACImpl { float *vols; AudioDeviceID adevid; - AudioObjectPropertyScope scope; HANDLE timer; AudioSession *session; @@ -263,19 +262,6 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } -static HRESULT osstatus_to_hresult(OSStatus sc) -{ - switch(sc){ - case kAudioFormatUnsupportedDataFormatError: - case kAudioFormatUnknownFormatError: - case kAudioDeviceUnsupportedFormatError: - return AUDCLNT_E_UNSUPPORTED_FORMAT; - case kAudioHardwareBadDeviceError: - return AUDCLNT_E_DEVICE_INVALIDATED; - } - return E_FAIL; -} - static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -481,6 +467,9 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient if(!get_deviceid_by_guid(guid, &adevid, &dataflow)) return AUDCLNT_E_DEVICE_INVALIDATED; + if(dataflow != eRender && dataflow != eCapture) + return E_INVALIDARG; + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY; @@ -494,15 +483,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->dataflow = dataflow; - if(dataflow == eRender) - This->scope = kAudioDevicePropertyScopeOutput; - else if(dataflow == eCapture) - This->scope = kAudioDevicePropertyScopeInput; - else{ - HeapFree(GetProcessHeap(), 0, This); - return E_INVALIDARG; - } - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); @@ -871,68 +851,11 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, return params.result; } -static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) -{ - AudioObjectPropertyAddress addr; - AudioStreamID *ids; - UInt32 size; - OSStatus sc; - int nstreams, i; - - addr.mScope = This->scope; - addr.mElement = 0; - addr.mSelector = kAudioDevicePropertyStreams; - - sc = AudioObjectGetPropertyDataSize(This->adevid, &addr, 0, NULL, - &size); - if(sc != noErr){ - WARN("Unable to get size for _Streams property: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - - ids = HeapAlloc(GetProcessHeap(), 0, size); - if(!ids) - return E_OUTOFMEMORY; - - sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, ids); - if(sc != noErr){ - WARN("Unable to get _Streams property: %x\n", (int)sc); - HeapFree(GetProcessHeap(), 0, ids); - return osstatus_to_hresult(sc); - } - - nstreams = size / sizeof(AudioStreamID); - *max = 0; - - addr.mSelector = kAudioStreamPropertyLatency; - for(i = 0; i < nstreams; ++i){ - UInt32 latency; - - size = sizeof(latency); - sc = AudioObjectGetPropertyData(ids[i], &addr, 0, NULL, - &size, &latency); - if(sc != noErr){ - WARN("Unable to get _Latency property: %x\n", (int)sc); - continue; - } - - if(latency > *max) - *max = latency; - } - - HeapFree(GetProcessHeap(), 0, ids); - - return S_OK; -} - static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, REFERENCE_TIME *out) { ACImpl *This = impl_from_IAudioClient3(iface); - UInt32 latency, stream_latency, size; - AudioObjectPropertyAddress addr; - OSStatus sc; - HRESULT hr; + struct get_latency_params params; TRACE("(%p)->(%p)\n", This, out); @@ -942,36 +865,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - OSSpinLockLock(&This->stream->lock); - - addr.mScope = This->scope; - addr.mSelector = kAudioDevicePropertyLatency; - addr.mElement = 0; - - size = sizeof(latency); - sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, - &size, &latency); - if(sc != noErr){ - WARN("Couldn't get _Latency property: %x\n", (int)sc); - OSSpinLockUnlock(&This->stream->lock); - return osstatus_to_hresult(sc); - } - - hr = ca_get_max_stream_latency(This, &stream_latency); - if(FAILED(hr)){ - OSSpinLockUnlock(&This->stream->lock); - return hr; - } - - latency += stream_latency; - /* pretend we process audio in Period chunks, so max latency includes - * the period time */ - *out = MulDiv(latency, 10000000, This->stream->fmt->nSamplesPerSec) - + This->stream->period_ms * 10000; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.latency = out; + UNIX_CALL(get_latency, &params); + return params.result; } static HRESULT AudioClient_GetCurrentPadding_nolock(ACImpl *This, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 7e08b347b02..dd86cd81973 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -100,6 +100,13 @@ struct get_buffer_size_params UINT32 *frames; }; +struct get_latency_params +{ + struct coreaudio_stream *stream; + HRESULT result; + REFERENCE_TIME *latency; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -108,6 +115,7 @@ enum unix_funcs unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, + unix_get_latency, unix_capture_resample /* temporary */ }; -- 2.23.0

2 1