- wine-devel - winehq.org

[PATCH] dxtrans: Add DllGetClassObject stub
by Alex Henrie 25 Oct '21

25 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51917 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/dxtrans/Makefile.in | 3 +++ dlls/dxtrans/dxtrans.spec | 2 +- dlls/dxtrans/main.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 dlls/dxtrans/main.c diff --git a/dlls/dxtrans/Makefile.in b/dlls/dxtrans/Makefile.in index b5c1602917f..cf669277b93 100644 --- a/dlls/dxtrans/Makefile.in +++ b/dlls/dxtrans/Makefile.in @@ -1 +1,4 @@ MODULE = dxtrans.dll + +C_SRCS = \ + main.c diff --git a/dlls/dxtrans/dxtrans.spec b/dlls/dxtrans/dxtrans.spec index 7c2d605e534..b8ff0297a1b 100644 --- a/dlls/dxtrans/dxtrans.spec +++ b/dlls/dxtrans/dxtrans.spec @@ -6,6 +6,6 @@ @ stub ?DXOverArrayMMX@@YGXPAVDXPMSAMPLE@@PBV1@K@Z @ stdcall -private DllCanUnloadNow() @ stub DllEnumClassObjects -@ stub DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/dxtrans/main.c b/dlls/dxtrans/main.c new file mode 100644 index 00000000000..2b87e9f69c4 --- /dev/null +++ b/dlls/dxtrans/main.c @@ -0,0 +1,35 @@ +/* + * DirectX Transitions + * + * Copyright 2021 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxtrans); + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("(%s, %s, %p) stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} -- 2.33.1

1 0

[PATCH] gdi32: Accept 16-bit handles in get_dc_attr().
by Oleh Nykyforchyn 24 Oct '21

24 Oct '21

When background is erased in a 16 bit app, a handle to DC is passed through USER16 functions, namely CallWindowProc16 (USER.122) and DefDriverProc16 (USER.255), whose respective parameters are of type WPARAM16, hence the upper part of the handle is cut. Later the returned handle is rejected by get_dc_attr() in GDI32 because its type is 0, although such handles are accepted by handle_entry(). This results in black and not cleared background. Allowing type==0 in get_dc_attr() solves the problem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51899 Signed-off-by: Oleh Nykyforchyn <oleh.nyk(a)gmail.com> --- dlls/gdi32/dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 1511c565194..a161b3cb640 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -56,7 +56,7 @@ DC_ATTR *get_dc_attr( HDC hdc ) { DWORD type = gdi_handle_type( hdc ); DC_ATTR *dc_attr; - if ((type & 0x1f0000) != NTGDI_OBJ_DC || !(dc_attr = get_gdi_client_ptr( hdc, 0 ))) + if ((type && (type & 0x1f0000) != NTGDI_OBJ_DC) || !(dc_attr = get_gdi_client_ptr( hdc, 0 ))) { SetLastError( ERROR_INVALID_HANDLE ); return NULL; -- 2.33.0

2 4

[PATCH v3] po: Update Traditional Chinese translation.
by Chan Chilung 23 Oct '21

23 Oct '21

Signed-off-by: Chan Chilung <eason066(a)gmail.com> --- v3: Applied suggestions from review for v2. po/zh_TW.po | 1288 ++++++++++++++++++++++++--------------------------- 1 file changed, 603 insertions(+), 685 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index a8312e8bcec..52c9749f922 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,9 +5,9 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-07-28 00:06+0800\n" -"Last-Translator: Wei-Lun Chao <bluebat(a)member.fsf.org>\n" -"Language-Team: Chinese (traditional) <zh-l10n(a)linux.org.tw>\n" +"PO-Revision-Date: 2021-10-23 18:45+0800\n" +"Last-Translator: Chan Chilung <eason066(a)gmail.com>\n" +"Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,36 +20,30 @@ 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 "Access denied.\n" msgid "Permissions for %1" -msgstr "存取被拒。\n" +msgstr "%1 的權限" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" -msgstr "安裝/移除" +msgstr "安裝/解除安裝" #: dlls/appwiz.cpl/appwiz.rc:61 msgid "" "To install a new program from a floppy disk, CD-ROM drive, or your hard " "drive, click Install." -msgstr "要從軟碟、光碟或硬碟安裝新程式，請按「安裝」。" +msgstr "要從軟碟、光碟或硬碟安裝新程式，請按 [安裝]。" #: dlls/appwiz.cpl/appwiz.rc:62 msgid "&Install..." @@ -61,8 +55,8 @@ msgid "" "to modify its installed components, select it from the list and click Modify/" "Remove." msgstr "" -"下列軟體可以自動解除安裝。從清單中選取它並按下「新增/移除」，可以移除程式或" -"者調整已安裝元件。" +"下列軟體可以自動解除安裝。要移除程式或者調整已安裝元件，請從清單中選取程式" +"並按下 [修改/移除]。" #: dlls/appwiz.cpl/appwiz.rc:67 msgid "&Support Information" @@ -123,39 +117,39 @@ msgstr "確定" #: dlls/appwiz.cpl/appwiz.rc:79 msgid "The following information can be used to get technical support for %s:" -msgstr "%s 技術支援資訊：" +msgstr "以下資訊可協助取得 %s 的技術支援:" #: dlls/appwiz.cpl/appwiz.rc:80 msgid "Publisher:" -msgstr "生產商：" +msgstr "發行者:" #: dlls/appwiz.cpl/appwiz.rc:81 programs/winefile/winefile.rc:165 msgid "Version:" -msgstr "版本：" +msgstr "版本:" #: dlls/appwiz.cpl/appwiz.rc:82 msgid "Contact:" -msgstr "聯絡人：" +msgstr "聯絡人:" #: dlls/appwiz.cpl/appwiz.rc:83 msgid "Support Information:" -msgstr "支援資訊：" +msgstr "支援資訊:" #: dlls/appwiz.cpl/appwiz.rc:84 msgid "Support Telephone:" -msgstr "支援電話：" +msgstr "支援電話:" #: dlls/appwiz.cpl/appwiz.rc:85 msgid "Readme:" -msgstr "產品說明：" +msgstr "產品說明:" #: dlls/appwiz.cpl/appwiz.rc:86 msgid "Product Updates:" -msgstr "產品更新：" +msgstr "產品更新:" #: dlls/appwiz.cpl/appwiz.rc:87 msgid "Comments:" -msgstr "備註：" +msgstr "備註:" #: dlls/appwiz.cpl/appwiz.rc:100 msgid "Wine Gecko Installer" @@ -174,8 +168,8 @@ msgstr "" "Wine 需要安裝 Gecko 套件才能正確顯示嵌在應用程式中的 HTML 網頁。Wine 可以自動" "幫您下載並安裝 Gecko。\n" "\n" -"備註：建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" -"Gecko\">https://wiki.winehq.org/Gecko</a>" +"備註: 建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" +"Gecko\">https://wiki.winehq.org/Gecko</a>。" #: dlls/appwiz.cpl/appwiz.rc:109 dlls/appwiz.cpl/appwiz.rc:124 msgid "&Install" @@ -241,8 +235,8 @@ msgstr "" "Wine 需要安裝 wine-mono 套件才能正確執行 .NET 應用程式。Wine 可以自動幫您下載" "並安裝它。\n" "\n" -"備註：建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" -"Mono\">https://wiki.winehq.org/Mono</a>" +"備註: 建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" +"Mono\">https://wiki.winehq.org/Mono</a>。" #: dlls/appwiz.cpl/appwiz.rc:31 msgid "Add/Remove Programs" @@ -263,7 +257,7 @@ msgstr "應用程式" msgid "" "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " "entry for this program from the registry?" -msgstr "無法執行移除程式 %s。您想將這個移除程式從註冊表中刪除嗎？" +msgstr "無法執行移除程式「%s」。您想將這個移除程式從註冊表中移除嗎？" #: dlls/appwiz.cpl/appwiz.rc:36 msgid "Not specified" @@ -277,7 +271,7 @@ msgstr "名稱" #: dlls/appwiz.cpl/appwiz.rc:39 msgid "Publisher" -msgstr "生產商" +msgstr "發行者" #: dlls/appwiz.cpl/appwiz.rc:40 dlls/cryptui/cryptui.rc:54 msgid "Version" @@ -323,7 +317,7 @@ msgstr "壓縮選項" #: dlls/avifil32/avifil32.rc:45 msgid "&Choose a stream:" -msgstr "選擇來源(&C)：" +msgstr "選擇來源(&C):" #: dlls/avifil32/avifil32.rc:48 programs/wordpad/wordpad.rc:76 msgid "&Options..." @@ -331,7 +325,7 @@ msgstr "選項(&O)..." #: dlls/avifil32/avifil32.rc:49 msgid "&Interleave every" -msgstr "交錯(&I)" +msgstr "交錯(&I): 每隔" #: dlls/avifil32/avifil32.rc:51 dlls/msvfw32/msvfw32.rc:51 msgid "frames" @@ -339,11 +333,11 @@ msgstr "影格數" #: dlls/avifil32/avifil32.rc:52 msgid "Current format:" -msgstr "目前格式：" +msgstr "目前格式:" #: dlls/avifil32/avifil32.rc:30 msgid "Waveform: %s" -msgstr "波形：%s" +msgstr "波形: %s" #: dlls/avifil32/avifil32.rc:31 msgid "Waveform" @@ -363,7 +357,7 @@ msgstr "音訊" #: dlls/avifil32/avifil32.rc:36 msgid "Wine AVI-default-filehandler" -msgstr "Wine AVI-預設處理器" +msgstr "Wine AVI 預設處理器" #: dlls/avifil32/avifil32.rc:37 msgid "uncompressed" @@ -375,29 +369,27 @@ msgstr "正在取消..." #: dlls/browseui/browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "剩餘 %1!u! %2" #: dlls/browseui/browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "剩餘 %1!u! %2 %3!u! %4" #: dlls/browseui/browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "秒(&S)" +msgstr "秒" #: dlls/browseui/browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "分" #: dlls/browseui/browseui.rc:33 msgid "hours" -msgstr "" +msgstr "小時" #: dlls/comctl32/comctl32.rc:68 programs/winefile/winefile.rc:156 msgid "Properties for %s" -msgstr "屬性 %s" +msgstr "%s 的內容" #: dlls/comctl32/comctl32.rc:73 dlls/comdlg32/comdlg32.rc:265 msgid "&Apply" @@ -438,7 +430,7 @@ msgstr "關閉(&C)" #: dlls/comctl32/comctl32.rc:101 msgid "R&eset" -msgstr "重置(&e)" +msgstr "重置(&E)" #: dlls/comctl32/comctl32.rc:102 dlls/comdlg32/comdlg32.rc:173 #: dlls/comdlg32/comdlg32.rc:195 dlls/comdlg32/comdlg32.rc:266 @@ -458,7 +450,7 @@ msgstr "重置(&e)" #: programs/winemine/winemine.rc:53 programs/winhlp32/winhlp32.rc:57 #: programs/wordpad/wordpad.rc:102 msgid "&Help" -msgstr "求助(&H)" +msgstr "說明(&H)" #: dlls/comctl32/comctl32.rc:103 msgid "Move &Up" @@ -470,7 +462,7 @@ msgstr "下移(&D)" #: dlls/comctl32/comctl32.rc:105 msgid "A&vailable buttons:" -msgstr "可用工具列按鈕(&V)：" +msgstr "可用工具列按鈕(&V):" #: dlls/comctl32/comctl32.rc:107 msgid "&Add ->" @@ -482,7 +474,7 @@ msgstr "<- 移除(&R)" #: dlls/comctl32/comctl32.rc:109 msgid "&Toolbar buttons:" -msgstr "目前工具列按鈕(&T)：" +msgstr "目前工具列按鈕(&T):" #: dlls/comctl32/comctl32.rc:42 msgid "Separator" @@ -508,16 +500,12 @@ msgid "&Retry" msgstr "重試(&R)" #: dlls/comctl32/comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "隱藏分頁(&T)" +msgstr "隱藏詳細資訊" #: dlls/comctl32/comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "詳細資料" +msgstr "顯示詳細資訊" #: dlls/comctl32/comctl32.rc:31 dlls/cryptui/cryptui.rc:235 #: programs/regedit/regedit.rc:286 programs/taskmgr/taskmgr.rc:434 @@ -528,7 +516,7 @@ msgstr "關閉" #: dlls/comctl32/comctl32.rc:36 msgid "Today:" -msgstr "今天：" +msgstr "今天:" #: dlls/comctl32/comctl32.rc:37 msgid "Go to today" @@ -543,19 +531,19 @@ msgstr "開啟" #: dlls/comdlg32/comdlg32.rc:161 dlls/comdlg32/comdlg32.rc:183 msgid "File &Name:" -msgstr "檔案名稱(&N)：" +msgstr "檔案名稱(&N):" #: dlls/comdlg32/comdlg32.rc:164 dlls/comdlg32/comdlg32.rc:186 msgid "&Directories:" -msgstr "目錄(&D)：" +msgstr "目錄(&D):" #: dlls/comdlg32/comdlg32.rc:167 dlls/comdlg32/comdlg32.rc:189 msgid "List Files of &Type:" -msgstr "檔案類型(&T)：" +msgstr "檔案類型(&T):" #: dlls/comdlg32/comdlg32.rc:169 dlls/comdlg32/comdlg32.rc:191 msgid "Dri&ves:" -msgstr "磁碟機(&V)：" +msgstr "磁碟機(&V):" #: dlls/comdlg32/comdlg32.rc:174 dlls/comdlg32/comdlg32.rc:196 #: dlls/shell32/shell32.rc:368 dlls/shell32/shell32.rc:405 @@ -579,7 +567,7 @@ msgstr "列印" #: dlls/comdlg32/comdlg32.rc:205 msgid "Printer:" -msgstr "印表機：" +msgstr "印表機:" #: dlls/comdlg32/comdlg32.rc:207 dlls/comdlg32/comdlg32.rc:375 msgid "Print range" @@ -604,15 +592,15 @@ msgstr "設定(&S)" #: dlls/comdlg32/comdlg32.rc:214 msgid "&From:" -msgstr "從(&F)：" +msgstr "從(&F):" #: dlls/comdlg32/comdlg32.rc:215 msgid "&To:" -msgstr "到(&T)：" +msgstr "到(&T):" #: dlls/comdlg32/comdlg32.rc:216 dlls/wineps.drv/wineps.rc:42 msgid "Print &Quality:" -msgstr "列印品質(&Q)：" +msgstr "列印品質(&Q):" #: dlls/comdlg32/comdlg32.rc:218 msgid "Print to Fi&le" @@ -641,7 +629,7 @@ msgstr "[無]" #: dlls/comdlg32/comdlg32.rc:231 msgid "Specific &Printer" -msgstr "特定的印表機(&P)" +msgstr "指定的印表機(&P)" #: dlls/comdlg32/comdlg32.rc:236 dlls/comdlg32/comdlg32.rc:419 #: dlls/comdlg32/comdlg32.rc:443 dlls/wineps.drv/wineps.rc:34 @@ -676,16 +664,16 @@ msgstr "字型" #: dlls/comdlg32/comdlg32.rc:254 msgid "&Font:" -msgstr "字型(&F)：" +msgstr "字型(&F):" #: dlls/comdlg32/comdlg32.rc:257 msgid "Font St&yle:" -msgstr "字型樣式(&Y)：" +msgstr "字型樣式(&Y):" #: dlls/comdlg32/comdlg32.rc:260 dlls/comdlg32/comdlg32.rc:439 #: programs/winecfg/winecfg.rc:292 msgid "&Size:" -msgstr "大小(&S)：" +msgstr "大小(&S):" #: dlls/comdlg32/comdlg32.rc:267 msgid "Effects" @@ -701,7 +689,7 @@ msgstr "底線(&U)" #: dlls/comdlg32/comdlg32.rc:270 programs/winecfg/winecfg.rc:290 msgid "&Color:" -msgstr "配色(&C)：" +msgstr "色彩(&C):" #: dlls/comdlg32/comdlg32.rc:273 msgid "Sample" @@ -709,7 +697,7 @@ msgstr "範例" #: dlls/comdlg32/comdlg32.rc:275 msgid "Scr&ipt:" -msgstr "腳本(&I)：" +msgstr "指令碼(&I):" #: dlls/comdlg32/comdlg32.rc:283 dlls/comdlg32/comdlg32.rc:288 msgid "Color" @@ -717,56 +705,54 @@ msgstr "色彩" #: dlls/comdlg32/comdlg32.rc:286 msgid "&Basic Colors:" -msgstr "基本色彩(&B)：" +msgstr "基本色彩(&B):" #: dlls/comdlg32/comdlg32.rc:287 msgid "&Custom Colors:" -msgstr "自定色彩(&C)：" +msgstr "自訂色彩(&C):" #: dlls/comdlg32/comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|純色(&O)" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" -msgstr "紅(&R)：" +msgstr "紅(&R):" #: dlls/comdlg32/comdlg32.rc:292 msgid "&Green:" -msgstr "綠(&G)：" +msgstr "綠(&G):" #: dlls/comdlg32/comdlg32.rc:294 msgid "&Blue:" -msgstr "藍(&B)：" +msgstr "藍(&B):" #: dlls/comdlg32/comdlg32.rc:296 msgid "&Hue:" -msgstr "色調(&H)：" +msgstr "色調(&H):" #: dlls/comdlg32/comdlg32.rc:298 msgctxt "Saturation" msgid "&Sat:" -msgstr "飽和度(&S)：" +msgstr "飽和度(&S):" #: dlls/comdlg32/comdlg32.rc:300 msgctxt "Luminance" msgid "&Lum:" -msgstr "亮度(&L)：" +msgstr "亮度(&L):" #: dlls/comdlg32/comdlg32.rc:310 msgid "&Add to Custom Colors" -msgstr "新增自定色彩(&A)" +msgstr "新增自訂色彩(&A)" #: dlls/comdlg32/comdlg32.rc:311 msgid "&Define Custom Colors >>" -msgstr "定義自定色彩(&D) >>" +msgstr "定義自訂色彩(&D) >>" #: dlls/comdlg32/comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "否(&N)" +msgstr "&o" #: dlls/comdlg32/comdlg32.rc:318 programs/regedit/regedit.rc:275 #: programs/regedit/regedit.rc:285 @@ -775,7 +761,7 @@ msgstr "搜尋" #: dlls/comdlg32/comdlg32.rc:321 dlls/comdlg32/comdlg32.rc:340 msgid "Fi&nd What:" -msgstr "搜尋目標(&N)：" +msgstr "搜尋目標(&N):" #: dlls/comdlg32/comdlg32.rc:323 dlls/comdlg32/comdlg32.rc:344 msgid "Match &Whole Word Only" @@ -807,7 +793,7 @@ msgstr "取代" #: dlls/comdlg32/comdlg32.rc:342 msgid "Re&place With:" -msgstr "取代為(&P)：" +msgstr "取代為(&P):" #: dlls/comdlg32/comdlg32.rc:348 msgid "&Replace" @@ -822,7 +808,7 @@ msgstr "取代全部(&A)" #: dlls/shell32/shell32.rc:108 programs/clock/clock.rc:31 #: programs/conhost/conhost.rc:34 msgid "&Properties" -msgstr "屬性(&P)" +msgstr "內容(&P)" #: dlls/comdlg32/comdlg32.rc:364 msgid "Print to fi&le" @@ -831,23 +817,23 @@ msgstr "列印至檔案(&L)" #: dlls/comdlg32/comdlg32.rc:365 dlls/comdlg32/comdlg32.rc:401 #: dlls/msacm32/msacm32.rc:34 programs/winefile/winefile.rc:137 msgid "&Name:" -msgstr "名稱(&N)：" +msgstr "名稱(&N):" #: dlls/comdlg32/comdlg32.rc:366 dlls/comdlg32/comdlg32.rc:404 msgid "Status:" -msgstr "狀態：" +msgstr "狀態:" #: dlls/comdlg32/comdlg32.rc:368 dlls/comdlg32/comdlg32.rc:406 msgid "Type:" -msgstr "類型：" +msgstr "類型:" #: dlls/comdlg32/comdlg32.rc:370 dlls/comdlg32/comdlg32.rc:408 msgid "Where:" -msgstr "位置：" +msgstr "位置:" #: dlls/comdlg32/comdlg32.rc:372 dlls/comdlg32/comdlg32.rc:410 msgid "Comment:" -msgstr "備註：" +msgstr "備註:" #: dlls/comdlg32/comdlg32.rc:377 msgid "Pa&ges" @@ -859,11 +845,11 @@ msgstr "選擇(&S)" #: dlls/comdlg32/comdlg32.rc:381 msgid "&from:" -msgstr "從(&F)：" +msgstr "從(&F):" #: dlls/comdlg32/comdlg32.rc:382 msgid "&to:" -msgstr "到(&T)：" +msgstr "到(&T):" #: dlls/comdlg32/comdlg32.rc:384 msgid "Copies" @@ -871,7 +857,7 @@ msgstr "份數" #: dlls/comdlg32/comdlg32.rc:385 msgid "Number of &copies:" -msgstr "份數(&C)：" +msgstr "份數(&C):" #: dlls/comdlg32/comdlg32.rc:387 msgid "C&ollate" @@ -879,11 +865,11 @@ msgstr "自動分頁(&O)" #: dlls/comdlg32/comdlg32.rc:414 programs/winecfg/winecfg.rc:298 msgid "Si&ze:" -msgstr "大小(&Z)：" +msgstr "大小(&Z):" #: dlls/comdlg32/comdlg32.rc:416 msgid "&Source:" -msgstr "來源(&S)：" +msgstr "來源(&S):" #: dlls/comdlg32/comdlg32.rc:421 msgid "P&ortrait" @@ -899,7 +885,7 @@ msgstr "設定頁面" #: dlls/comdlg32/comdlg32.rc:441 msgid "&Tray:" -msgstr "進紙匣(&T)：" +msgstr "進紙匣(&T):" #: dlls/comdlg32/comdlg32.rc:444 dlls/wineps.drv/wineps.rc:35 msgid "&Portrait" @@ -907,19 +893,19 @@ msgstr "縱向(&P)" #: dlls/comdlg32/comdlg32.rc:447 msgid "L&eft:" -msgstr "左(&E)：" +msgstr "左(&E):" #: dlls/comdlg32/comdlg32.rc:449 programs/notepad/notepad.rc:112 msgid "&Right:" -msgstr "右(&R)：" +msgstr "右(&R):" #: dlls/comdlg32/comdlg32.rc:451 msgid "T&op:" -msgstr "上(&O)：" +msgstr "上(&O):" #: dlls/comdlg32/comdlg32.rc:453 programs/notepad/notepad.rc:114 msgid "&Bottom:" -msgstr "下(&B)：" +msgstr "下(&B):" #: dlls/comdlg32/comdlg32.rc:457 msgid "P&rinter..." @@ -927,19 +913,19 @@ msgstr "印表機(&R)..." #: dlls/comdlg32/comdlg32.rc:465 dlls/comdlg32/comdlg32.rc:490 msgid "Look &in:" -msgstr "搜尋位置(&I)：" +msgstr "搜尋位置(&I):" #: dlls/comdlg32/comdlg32.rc:471 dlls/comdlg32/comdlg32.rc:497 msgid "File &name:" -msgstr "檔案名稱(&N)：" +msgstr "檔案名稱(&N):" #: dlls/comdlg32/comdlg32.rc:475 dlls/comdlg32/comdlg32.rc:501 msgid "Files of &type:" -msgstr "檔案類型(&T)：" +msgstr "檔案類型(&T):" #: dlls/comdlg32/comdlg32.rc:478 dlls/comdlg32/comdlg32.rc:504 msgid "Open as &read-only" -msgstr "開啟成唯讀(&R)" +msgstr "以唯讀方式開啟(&R)" #: dlls/comdlg32/comdlg32.rc:480 dlls/comdlg32/comdlg32.rc:506 #: dlls/comdlg32/comdlg32.rc:524 dlls/shdoclc/shdoclc.rc:127 @@ -949,11 +935,11 @@ msgstr "開啟(&O)" #: dlls/comdlg32/comdlg32.rc:517 msgid "File name:" -msgstr "檔案名稱：" +msgstr "檔案名稱:" #: dlls/comdlg32/comdlg32.rc:520 msgid "Files of type:" -msgstr "檔案類型：" +msgstr "檔案類型:" #: dlls/comdlg32/comdlg32.rc:33 dlls/vbscript/vbscript.rc:35 msgid "File not found" @@ -961,7 +947,7 @@ msgstr "找不到檔案" #: dlls/comdlg32/comdlg32.rc:34 msgid "Please verify that the correct file name was given" -msgstr "請檢查是否給予正確的檔案名稱。" +msgstr "請檢查是否給予正確的檔案名稱" #: dlls/comdlg32/comdlg32.rc:35 msgid "" @@ -969,7 +955,7 @@ msgid "" "Do you want to create file?" msgstr "" "找不到檔案\n" -"是否建立新檔案？" +"是否建立新檔案?" #: dlls/comdlg32/comdlg32.rc:36 msgid "" @@ -977,23 +963,23 @@ msgid "" "Do you want to replace it?" msgstr "" "檔案已經存在。\n" -"要取代嗎？" +"您要取代它嗎?" #: dlls/comdlg32/comdlg32.rc:37 msgid "Invalid character(s) in path" -msgstr "檔案名稱中存在無效的字元" +msgstr "路徑中存在無效的字元" #: dlls/comdlg32/comdlg32.rc:38 msgid "" "A filename cannot contain any of the following characters:\n" " / : < > |" msgstr "" -"檔案名中不能包含任何一下字元:\n" +"檔案名稱中不能包含以下任何一個字元:\n" " / : < > |" #: dlls/comdlg32/comdlg32.rc:39 msgid "Path does not exist" -msgstr "資料夾不存在" +msgstr "路徑不存在" #: dlls/comdlg32/comdlg32.rc:40 msgid "File does not exist" @@ -1001,7 +987,7 @@ msgstr "檔案不存在" #: dlls/comdlg32/comdlg32.rc:41 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "已選項目包含非資料夾物件" #: dlls/comdlg32/comdlg32.rc:46 msgid "Up One Level" @@ -1106,7 +1092,7 @@ msgstr "白色" #: dlls/comdlg32/comdlg32.rc:57 msgid "Unreadable Entry" -msgstr "數值不可讀" +msgstr "無法讀取的數值" #: dlls/comdlg32/comdlg32.rc:59 msgid "" @@ -1114,19 +1100,19 @@ msgid "" "Please enter a value between %1!d! and %2!d!." msgstr "" "輸入值不在頁數範圍內。\n" -"請輸入一個 %1!d! 和 %2!d! 之間的值。" +"請輸入一個介於 %1!d! 和 %2!d! 之間的值。" #: dlls/comdlg32/comdlg32.rc:61 msgid "The 'from' entry cannot exceed the 'to' entry." -msgstr "起始值不能大於終點值。" +msgstr "「從」項的值不能大於「到」項的值。" #: dlls/comdlg32/comdlg32.rc:63 msgid "" "Margins overlap or fall outside Paper boundaries.\n" "Please reenter margins." msgstr "" -"邊緣空白重疊或落於邊界外，\n" -"請重新輸入邊緣空白。" +"頁面邊距重疊或落於邊界外。\n" +"請重新輸入頁面邊距。" #: dlls/comdlg32/comdlg32.rc:65 msgid "The 'Number of copies' field cannot be empty." @@ -1137,8 +1123,8 @@ msgid "" "This large number of copies is not supported by your printer.\n" "Please enter a value between 1 and %d." msgstr "" -"您的印表機不支持這麼大的份數。\n" -"請輸入一個 1 和 %d 之間的數。" +"您的印表機不支援列印這麼大的份數。\n" +"請輸入一個介於 1 和 %d 之間的數值。" #: dlls/comdlg32/comdlg32.rc:68 msgid "A printer error occurred." @@ -1162,19 +1148,19 @@ msgstr "發生錯誤。" #: dlls/comdlg32/comdlg32.rc:73 msgid "Unknown printer driver." -msgstr "找不到印表機驅動程式。" +msgstr "不明的印表機驅動程式。" #: dlls/comdlg32/comdlg32.rc:76 msgid "" "Before you can perform printer-related tasks such as page setup or printing " "a document, you need to install a printer. Please install one and retry." msgstr "" -"在使用與印表機有關功能(版面設定, 列印檔案)之前, 您必須先安裝印表機。請安裝一" -"個印表機後再試。" +"您必須先安裝印表機才能使用與印表機有關的功能 (如: 版面設定，列印檔案)。" +"請安裝印表機後再試一次。" #: dlls/comdlg32/comdlg32.rc:142 msgid "Select a font size between %1!d! and %2!d! points." -msgstr "選取介於 %1!d! 和 %2!d! 點的字型尺寸。" +msgstr "選取介於 %1!d! 和 %2!d! 點之間的字型大小。" #: dlls/comdlg32/comdlg32.rc:143 dlls/ieframe/ieframe.rc:35 msgid "&Save" @@ -1182,7 +1168,7 @@ msgstr "儲存(&S)" #: dlls/comdlg32/comdlg32.rc:144 msgid "Save &in:" -msgstr "儲存至(&I)：" +msgstr "儲存至(&I):" #: dlls/comdlg32/comdlg32.rc:145 msgid "Save" @@ -1193,14 +1179,12 @@ msgid "Open File" msgstr "開啟檔案" #: dlls/comdlg32/comdlg32.rc:148 -#, fuzzy -#| msgid "New Folder" msgid "Select Folder" -msgstr "新資料夾" +msgstr "選擇資料夾" #: dlls/comdlg32/comdlg32.rc:149 msgid "Font size has to be a number." -msgstr "" +msgstr "字型大小必須是數字。" #: dlls/comdlg32/comdlg32.rc:84 programs/oleview/oleview.rc:98 msgid "Ready" @@ -1208,107 +1192,107 @@ msgstr "待命" #: dlls/comdlg32/comdlg32.rc:85 msgid "Paused; " -msgstr "暫停；" +msgstr "暫停; " #: dlls/comdlg32/comdlg32.rc:86 msgid "Error; " -msgstr "錯誤；" +msgstr "錯誤; " #: dlls/comdlg32/comdlg32.rc:87 msgid "Pending deletion; " -msgstr "等待刪除；" +msgstr "刪除擱置中; " #: dlls/comdlg32/comdlg32.rc:88 msgid "Paper jam; " -msgstr "卡紙；" +msgstr "卡紙; " #: dlls/comdlg32/comdlg32.rc:89 msgid "Out of paper; " -msgstr "無紙；" +msgstr "無紙; " #: dlls/comdlg32/comdlg32.rc:90 msgid "Feed paper manual; " -msgstr "手動進紙；" +msgstr "手動進紙; " #: dlls/comdlg32/comdlg32.rc:91 msgid "Paper problem; " -msgstr "紙張問題；" +msgstr "紙張問題; " #: dlls/comdlg32/comdlg32.rc:92 msgid "Printer offline; " -msgstr "印表機離線；" +msgstr "印表機離線; " #: dlls/comdlg32/comdlg32.rc:93 msgid "I/O Active; " -msgstr "I/O 活動；" +msgstr "I/O 活動; " #: dlls/comdlg32/comdlg32.rc:94 msgid "Busy; " -msgstr "忙碌中；" +msgstr "忙碌中; " #: dlls/comdlg32/comdlg32.rc:95 msgid "Printing; " -msgstr "正在列印；" +msgstr "正在列印; " #: dlls/comdlg32/comdlg32.rc:96 msgid "Output tray is full; " -msgstr "出紙匣已滿；" +msgstr "出紙匣已滿; " #: dlls/comdlg32/comdlg32.rc:97 msgid "Not available; " -msgstr "不可用；" +msgstr "不可用; " #: dlls/comdlg32/comdlg32.rc:98 msgid "Waiting; " -msgstr "等待；" +msgstr "正在等待; " #: dlls/comdlg32/comdlg32.rc:99 msgid "Processing; " -msgstr "正在處理；" +msgstr "正在處理; " #: dlls/comdlg32/comdlg32.rc:100 msgid "Initializing; " -msgstr "正在初始化；" +msgstr "正在初始化; " #: dlls/comdlg32/comdlg32.rc:101 msgid "Warming up; " -msgstr "預熱中；" +msgstr "預熱中; " #: dlls/comdlg32/comdlg32.rc:102 msgid "Toner low; " -msgstr "墨水量低；" +msgstr "墨水量低; " #: dlls/comdlg32/comdlg32.rc:103 msgid "No toner; " -msgstr "墨水用盡；" +msgstr "墨水用盡; " #: dlls/comdlg32/comdlg32.rc:104 msgid "Page punt; " -msgstr "頁處理記憶體超支；" +msgstr "頁處理記憶體超支; " #: dlls/comdlg32/comdlg32.rc:105 msgid "Interrupted by user; " -msgstr "已被使用者中斷；" +msgstr "被使用者中斷; " #: dlls/comdlg32/comdlg32.rc:106 msgid "Out of memory; " -msgstr "記憶體不足；" +msgstr "記憶體不足; " #: dlls/comdlg32/comdlg32.rc:107 msgid "The printer door is open; " -msgstr "印表機蓋是打開的；" +msgstr "印表機蓋已打開; " #: dlls/comdlg32/comdlg32.rc:108 msgid "Print server unknown; " -msgstr "找不到列印伺服器；" +msgstr "不明的列印伺服器; " #: dlls/comdlg32/comdlg32.rc:109 msgid "Power save mode; " -msgstr "省電狀態；" +msgstr "省電模式; " #: dlls/comdlg32/comdlg32.rc:78 msgid "Default Printer; " -msgstr "預設印表機；" +msgstr "預設印表機; " #: dlls/comdlg32/comdlg32.rc:79 msgid "There are %d documents in the queue" @@ -1316,11 +1300,11 @@ msgstr "有 %d 個文件正在等待列印" #: dlls/comdlg32/comdlg32.rc:80 msgid "Margins [inches]" -msgstr "邊緣空白 [英寸]" +msgstr "頁面邊距 [英寸]" #: dlls/comdlg32/comdlg32.rc:81 msgid "Margins [mm]" -msgstr "邊緣空白 [毫米]" +msgstr "頁面邊距 [毫米]" #: dlls/comdlg32/comdlg32.rc:82 dlls/sane.ds/sane.rc:33 msgctxt "unit: millimeters" @@ -1329,12 +1313,12 @@ msgstr "毫米" #: dlls/credui/credui.rc:45 msgid "&User name:" -msgstr "使用者名稱(&U)：" +msgstr "使用者名稱(&U):" #: dlls/credui/credui.rc:48 dlls/cryptui/cryptui.rc:402 #: dlls/oledb32/version.rc:81 msgid "&Password:" -msgstr "密碼(&P)：" +msgstr "密碼(&P):" #: dlls/credui/credui.rc:50 msgid "&Remember my password" @@ -1346,7 +1330,7 @@ msgstr "連接到 %s" #: dlls/credui/credui.rc:31 msgid "Connecting to %s" -msgstr "正在連接到 %s" +msgstr "正在連線到 %s" #: dlls/credui/credui.rc:32 msgid "Logon unsuccessful" @@ -1357,8 +1341,8 @@ msgid "" "Make sure that your user name\n" "and password are correct." msgstr "" -"請確認您輸入的使用者名稱和密碼\n" -"是否正確。" +"請確認您輸入的使用者名稱\n" +"和密碼是否正確。" #: dlls/credui/credui.rc:35 msgid "" @@ -1369,8 +1353,7 @@ msgid "" msgstr "" "開啟大寫鎖定可能導致您輸入錯誤的密碼。\n" "\n" -"請在輸入密碼前按下 Caps Lock 鍵，解除\n" -"大寫鎖定。" +"您可以按下 Caps Lock 鍵以解除大寫鎖定，然後再輸入密碼。" #: dlls/credui/credui.rc:34 msgid "Caps Lock is On" @@ -1378,7 +1361,7 @@ msgstr "大寫鎖定已開啟" #: dlls/crypt32/crypt32.rc:30 msgid "Authority Key Identifier" -msgstr "授權金鑰識別碼" +msgstr "授權單位金鑰識別元" #: dlls/crypt32/crypt32.rc:31 msgid "Key Attributes" @@ -1394,7 +1377,7 @@ msgstr "主體替代名稱" #: dlls/crypt32/crypt32.rc:34 msgid "Issuer Alternative Name" -msgstr "發證者替代名稱" +msgstr "簽發者替代名稱" #: dlls/crypt32/crypt32.rc:35 msgid "Basic Constraints" @@ -1406,7 +1389,7 @@ msgstr "金鑰用法" #: dlls/crypt32/crypt32.rc:37 msgid "Certificate Policies" -msgstr "憑證策略" +msgstr "憑證原則" #: dlls/crypt32/crypt32.rc:38 msgid "Subject Key Identifier" @@ -1418,7 +1401,7 @@ msgstr "CRL 原因編碼" #: dlls/crypt32/crypt32.rc:40 msgid "CRL Distribution Points" -msgstr "CRL 發布點" +msgstr "CRL 發佈點" #: dlls/crypt32/crypt32.rc:41 msgid "Enhanced Key Usage" @@ -1438,7 +1421,7 @@ msgstr "下一個更新位置" #: dlls/crypt32/crypt32.rc:45 msgid "Yes or No Trust" -msgstr "是或否信賴" +msgstr "信任或不信任" #: dlls/crypt32/crypt32.rc:46 msgid "Email Address" @@ -1446,7 +1429,7 @@ msgstr "電子郵件地址" #: dlls/crypt32/crypt32.rc:47 msgid "Unstructured Name" -msgstr "無結構的名稱" +msgstr "非結構化名稱" #: dlls/crypt32/crypt32.rc:48 msgid "Content Type" @@ -1462,7 +1445,7 @@ msgstr "簽署時間" #: dlls/crypt32/crypt32.rc:51 msgid "Counter Sign" -msgstr "計數器符號" +msgstr "副署" #: dlls/crypt32/crypt32.rc:52 msgid "Challenge Password" @@ -1470,7 +1453,7 @@ msgstr "挑戰密碼" #: dlls/crypt32/crypt32.rc:53 msgid "Unstructured Address" -msgstr "無結構的位址" +msgstr "非結構化位址" #: dlls/crypt32/crypt32.rc:54 msgid "S/MIME Capabilities" @@ -1478,7 +1461,7 @@ msgstr "S/MIME 能力" #: dlls/crypt32/crypt32.rc:55 msgid "Prefer Signed Data" -msgstr "偏好已簽署資料" +msgstr "已簽署資料優先" #: dlls/crypt32/crypt32.rc:56 dlls/cryptdlg/cryptdlg.rc:34 msgctxt "Certification Practice Statement" @@ -1495,7 +1478,7 @@ msgstr "線上憑證狀態協定" #: dlls/crypt32/crypt32.rc:59 msgid "Certification Authority Issuer" -msgstr "憑證授權發證者" +msgstr "憑證授權單位簽發者" #: dlls/crypt32/crypt32.rc:60 msgid "Certification Template Name" @@ -1511,27 +1494,27 @@ msgstr "憑證複本" #: dlls/crypt32/crypt32.rc:63 msgid "Netscape Cert Type" -msgstr "Netscape 憑證型態" +msgstr "Netscape 憑證類型" #: dlls/crypt32/crypt32.rc:64 msgid "Netscape Base URL" -msgstr "Netscape 基準網址" +msgstr "Netscape 基本網址" #: dlls/crypt32/crypt32.rc:65 msgid "Netscape Revocation URL" -msgstr "Netscape 廢止網址" +msgstr "Netscape 撤銷網址" #: dlls/crypt32/crypt32.rc:66 msgid "Netscape CA Revocation URL" -msgstr "Netscape CA 廢止網址" +msgstr "Netscape CA 撤銷網址" #: dlls/crypt32/crypt32.rc:67 msgid "Netscape Cert Renewal URL" -msgstr "Netscape 憑證重申網址" +msgstr "Netscape 憑證更新網址" #: dlls/crypt32/crypt32.rc:68 msgid "Netscape CA Policy URL" -msgstr "Netscape CA 策略網址" +msgstr "Netscape CA 原則網址" #: dlls/crypt32/crypt32.rc:69 msgid "Netscape SSL ServerName" @@ -1583,7 +1566,7 @@ msgstr "姓氏" #: dlls/crypt32/crypt32.rc:81 msgid "Domain Component" -msgstr "區域部分" +msgstr "網域元件" #: dlls/crypt32/crypt32.rc:82 msgid "Street Address" @@ -1591,7 +1574,7 @@ msgstr "街道地址" #: dlls/crypt32/crypt32.rc:83 msgid "Serial Number" -msgstr "門牌號碼" +msgstr "序號" #: dlls/crypt32/crypt32.rc:84 msgid "CA Version" @@ -1603,7 +1586,7 @@ msgstr "交叉 CA 版本" #: dlls/crypt32/crypt32.rc:86 msgid "Serialized Signature Serial Number" -msgstr "序列化的簽名序號" +msgstr "序列化簽章序號" #: dlls/crypt32/crypt32.rc:87 msgid "Principal Name" @@ -1615,7 +1598,7 @@ msgstr "Windows 產品更新" #: dlls/crypt32/crypt32.rc:89 msgid "Enrollment Name Value Pair" -msgstr "註冊名稱值對" +msgstr "註冊名稱值配對" #: dlls/crypt32/crypt32.rc:90 msgid "OS Version" @@ -1627,7 +1610,7 @@ msgstr "註冊 CSP" #: dlls/crypt32/crypt32.rc:92 msgid "CRL Number" -msgstr "CRL 數字" +msgstr "CRL 號碼" #: dlls/crypt32/crypt32.rc:93 msgid "Delta CRL Indicator" @@ -1635,7 +1618,7 @@ msgstr "Delta CRL 指示器" #: dlls/crypt32/crypt32.rc:94 msgid "Issuing Distribution Point" -msgstr "議題發布點" +msgstr "發行發佈點" #: dlls/crypt32/crypt32.rc:95 msgid "Freshest CRL" @@ -1647,27 +1630,27 @@ msgstr "名稱條件約束" #: dlls/crypt32/crypt32.rc:97 msgid "Policy Mappings" -msgstr "策略映射" +msgstr "原則對應" #: dlls/crypt32/crypt32.rc:98 msgid "Policy Constraints" -msgstr "策略條件約束" +msgstr "原則條件約束" #: dlls/crypt32/crypt32.rc:99 msgid "Cross-Certificate Distribution Points" -msgstr "交叉憑證發布點" +msgstr "交叉憑證發佈點" #: dlls/crypt32/crypt32.rc:100 msgid "Application Policies" -msgstr "應用程式策略" +msgstr "應用程式原則" #: dlls/crypt32/crypt32.rc:101 msgid "Application Policy Mappings" -msgstr "應用程式策略映射" +msgstr "應用程式原則對應" #: dlls/crypt32/crypt32.rc:102 msgid "Application Policy Constraints" -msgstr "應用程式策略條件約束" +msgstr "應用程式原則條件約束" #: dlls/crypt32/crypt32.rc:103 msgid "CMC Data" @@ -1723,11 +1706,11 @@ msgstr "前一個 CA 憑證雜湊" #: dlls/crypt32/crypt32.rc:116 msgid "Virtual Base CRL Number" -msgstr "虛擬基底 CRL 數字" +msgstr "虛擬基本 CRL 數目" #: dlls/crypt32/crypt32.rc:117 msgid "Next CRL Publish" -msgstr "下一個 CRL 發布" +msgstr "下一個 CRL 發佈" #: dlls/crypt32/crypt32.rc:118 msgid "CA Encryption Certificate" @@ -1751,27 +1734,27 @@ msgstr "虛設簽署人" #: dlls/crypt32/crypt32.rc:123 msgid "Encrypted Private Key" -msgstr "加密的私鑰" +msgstr "已加密的私鑰" #: dlls/crypt32/crypt32.rc:124 msgid "Published CRL Locations" -msgstr "發布的 CRL 位置" +msgstr "已發行的 CRL 位置" #: dlls/crypt32/crypt32.rc:125 msgid "Enforce Certificate Chain Policy" -msgstr "強制憑證鏈策略" +msgstr "強制憑證鏈結原則" #: dlls/crypt32/crypt32.rc:126 msgid "Transaction Id" -msgstr "異動作業識別號" +msgstr "異動作業識別碼" #: dlls/crypt32/crypt32.rc:127 msgid "Sender Nonce" -msgstr "當前傳送者" +msgstr "發送者的一次性隨機數" #: dlls/crypt32/crypt32.rc:128 msgid "Recipient Nonce" -msgstr "當前收件者" +msgstr "收件者的一次性隨機數" #: dlls/crypt32/crypt32.rc:129 msgid "Reg Info" @@ -1779,11 +1762,11 @@ msgstr "註冊資訊" #: dlls/crypt32/crypt32.rc:130 msgid "Get Certificate" -msgstr "提取憑證" +msgstr "取得憑證" #: dlls/crypt32/crypt32.rc:131 msgid "Get CRL" -msgstr "提取 CRL" +msgstr "取得 CRL" #: dlls/crypt32/crypt32.rc:132 msgid "Revoke Request" @@ -1791,11 +1774,11 @@ msgstr "取消要求" #: dlls/crypt32/crypt32.rc:133 msgid "Query Pending" -msgstr "查詢擱置" +msgstr "查詢擱置中" #: dlls/crypt32/crypt32.rc:134 dlls/cryptui/cryptui.rc:95 msgid "Certificate Trust List" -msgstr "憑證信賴清單" +msgstr "憑證信任清單" #: dlls/crypt32/crypt32.rc:135 msgid "Archived Key Certificate Hash" @@ -1803,11 +1786,11 @@ msgstr "封存的金鑰憑證雜湊" #: dlls/crypt32/crypt32.rc:136 msgid "Private Key Usage Period" -msgstr "私鑰使用週期" +msgstr "私鑰使用期限" #: dlls/crypt32/crypt32.rc:137 msgid "Client Information" -msgstr "客戶端資訊" +msgstr "用戶端資訊" #: dlls/crypt32/crypt32.rc:138 msgid "Server Authentication" @@ -1815,7 +1798,7 @@ msgstr "伺服器認證" #: dlls/crypt32/crypt32.rc:139 msgid "Client Authentication" -msgstr "客戶端認證" +msgstr "用戶端認證" #: dlls/crypt32/crypt32.rc:140 msgid "Code Signing" @@ -1831,7 +1814,7 @@ msgstr "時間戳記" #: dlls/crypt32/crypt32.rc:143 msgid "Microsoft Trust List Signing" -msgstr "Microsoft 信賴清單簽署" +msgstr "Microsoft 信任清單簽署" #: dlls/crypt32/crypt32.rc:144 msgid "Microsoft Time Stamping" @@ -1843,7 +1826,7 @@ msgstr "IP 安全終端系統" #: dlls/crypt32/crypt32.rc:146 msgid "IP security tunnel termination" -msgstr "IP 安全遂道終端" +msgstr "IP 安全隧道終端" #: dlls/crypt32/crypt32.rc:147 msgid "IP security user" @@ -1855,19 +1838,19 @@ msgstr "加密檔案系統" #: dlls/crypt32/crypt32.rc:149 dlls/cryptui/cryptui.rc:133 msgid "Windows Hardware Driver Verification" -msgstr "Windows 硬體驅動程式查核" +msgstr "Windows 硬體驅動程式驗證" #: dlls/crypt32/crypt32.rc:150 dlls/cryptui/cryptui.rc:134 msgid "Windows System Component Verification" -msgstr "Windows 系統成分查核" +msgstr "Windows 系統元件驗證" #: dlls/crypt32/crypt32.rc:151 dlls/cryptui/cryptui.rc:135 msgid "OEM Windows System Component Verification" -msgstr "OEM Windows 系統成分查核" +msgstr "OEM Windows 系統元件驗證" #: dlls/crypt32/crypt32.rc:152 dlls/cryptui/cryptui.rc:136 msgid "Embedded Windows System Component Verification" -msgstr "嵌入式 Windows 系統成分查核" +msgstr "嵌入式 Windows 系統元件驗證" #: dlls/crypt32/crypt32.rc:153 dlls/cryptui/cryptui.rc:143 msgid "Key Pack Licenses" @@ -1875,11 +1858,11 @@ msgstr "金鑰包裝授權" #: dlls/crypt32/crypt32.rc:154 dlls/cryptui/cryptui.rc:144 msgid "License Server Verification" -msgstr "授權伺服器查核" +msgstr "授權伺服器驗證" #: dlls/crypt32/crypt32.rc:155 dlls/cryptui/cryptui.rc:146 msgid "Smart Card Logon" -msgstr "智慧卡登錄" +msgstr "智慧卡登入" #: dlls/crypt32/crypt32.rc:156 dlls/cryptui/cryptui.rc:142 msgid "Digital Rights" @@ -1887,7 +1870,7 @@ msgstr "數位權限" #: dlls/crypt32/crypt32.rc:157 dlls/cryptui/cryptui.rc:138 msgid "Qualified Subordination" -msgstr "合格的隸屬" +msgstr "合格的分類" #: dlls/crypt32/crypt32.rc:158 dlls/cryptui/cryptui.rc:139 msgid "Key Recovery" @@ -1911,7 +1894,7 @@ msgstr "根清單簽署人" #: dlls/crypt32/crypt32.rc:163 msgid "All application policies" -msgstr "所有應用程式策略" +msgstr "所有應用程式原則" #: dlls/crypt32/crypt32.rc:164 dlls/cryptui/cryptui.rc:149 msgid "Directory Service Email Replication" @@ -1919,19 +1902,19 @@ msgstr "目錄服務電子郵件複寫" #: dlls/crypt32/crypt32.rc:165 dlls/cryptui/cryptui.rc:145 msgid "Certificate Request Agent" -msgstr "憑證請求代理程式" +msgstr "憑證要求代理" #: dlls/crypt32/crypt32.rc:166 dlls/cryptui/cryptui.rc:141 msgid "Lifetime Signing" -msgstr "生命期簽署" +msgstr "永久簽署" #: dlls/crypt32/crypt32.rc:167 msgid "All issuance policies" -msgstr "所有發布策略" +msgstr "所有發佈原則" #: dlls/crypt32/crypt32.rc:172 msgid "Trusted Root Certification Authorities" -msgstr "信賴的根憑證授權者" +msgstr "信任的根憑證授權單位" #: dlls/crypt32/crypt32.rc:173 msgid "Personal" @@ -1939,7 +1922,7 @@ msgstr "個人的" #: dlls/crypt32/crypt32.rc:174 msgid "Intermediate Certification Authorities" -msgstr "中介憑證授權者" +msgstr "中介憑證授權單位" #: dlls/crypt32/crypt32.rc:175 msgid "Other People" @@ -1947,11 +1930,11 @@ msgstr "其他人" #: dlls/crypt32/crypt32.rc:176 msgid "Trusted Publishers" -msgstr "信賴的發行者" +msgstr "信任的發行者" #: dlls/crypt32/crypt32.rc:177 msgid "Untrusted Certificates" -msgstr "不可信的憑證" +msgstr "不信任的憑證" #: dlls/crypt32/crypt32.rc:182 msgid "KeyID=" @@ -1959,7 +1942,7 @@ msgstr "KeyID=" #: dlls/crypt32/crypt32.rc:183 msgid "Certificate Issuer" -msgstr "憑證發證者" +msgstr "憑證簽發者" #: dlls/crypt32/crypt32.rc:184 msgid "Certificate Serial Number=" @@ -1995,11 +1978,11 @@ msgstr "遮罩=" #: dlls/crypt32/crypt32.rc:192 msgid "Registered ID=" -msgstr "已註冊的識別號=" +msgstr "已註冊的識別碼=" #: dlls/crypt32/crypt32.rc:193 msgid "Unknown Key Usage" -msgstr "不明金鑰用法" +msgstr "不明的金鑰使用方法" #: dlls/crypt32/crypt32.rc:194 msgid "Subject Type=" @@ -2025,7 +2008,7 @@ msgstr "無" #: dlls/crypt32/crypt32.rc:199 msgid "Information Not Available" -msgstr "資訊無法使用" +msgstr "沒有可用資訊" #: dlls/crypt32/crypt32.rc:200 msgid "Authority Info Access" @@ -2042,23 +2025,23 @@ msgstr "OCSP" #: dlls/crypt32/crypt32.rc:203 msgid "CA Issuers" -msgstr "CA 發證者" +msgstr "CA 簽發者" #: dlls/crypt32/crypt32.rc:204 msgid "Unknown Access Method" -msgstr "不明存取方法" +msgstr "不明的存取方法" #: dlls/crypt32/crypt32.rc:205 msgid "Alternative Name" -msgstr "另類名稱" +msgstr "替代名稱" #: dlls/crypt32/crypt32.rc:206 msgid "CRL Distribution Point" -msgstr "CRL 發布點" +msgstr "CRL 發佈點" #: dlls/crypt32/crypt32.rc:207 msgid "Distribution Point Name" -msgstr "發布點名稱" +msgstr "發佈點名稱" #: dlls/crypt32/crypt32.rc:208 msgid "Full Name" @@ -2074,19 +2057,19 @@ msgstr "CRL 原因=" #: dlls/crypt32/crypt32.rc:211 msgid "CRL Issuer" -msgstr "CRL 發證者" +msgstr "CRL 簽發者" #: dlls/crypt32/crypt32.rc:212 msgid "Key Compromise" -msgstr "金鑰折衷" +msgstr "金鑰洩露" #: dlls/crypt32/crypt32.rc:213 msgid "CA Compromise" -msgstr "CA 折衷" +msgstr "CA 洩露" #: dlls/crypt32/crypt32.rc:214 msgid "Affiliation Changed" -msgstr "會籍變更" +msgstr "聯盟已變更" #: dlls/crypt32/crypt32.rc:215 msgid "Superseded" @@ -2094,11 +2077,11 @@ msgstr "已取代" #: dlls/crypt32/crypt32.rc:216 msgid "Operation Ceased" -msgstr "作業終了" +msgstr "作業已停止" #: dlls/crypt32/crypt32.rc:217 msgid "Certificate Hold" -msgstr "憑證暫停" +msgstr "持有的憑證" #: dlls/crypt32/crypt32.rc:218 msgid "Financial Information=" @@ -2110,11 +2093,11 @@ msgstr "可用" #: dlls/crypt32/crypt32.rc:220 msgid "Not Available" -msgstr "無法使用" +msgstr "不可用" #: dlls/crypt32/crypt32.rc:221 msgid "Meets Criteria=" -msgstr "會面準則=" +msgstr "符合準則=" #: dlls/crypt32/crypt32.rc:222 dlls/cryptui/cryptui.rc:166 #: dlls/oleaut32/oleaut32.rc:32 dlls/wininet/wininet.rc:94 @@ -2130,7 +2113,7 @@ msgstr "否" #: dlls/crypt32/crypt32.rc:224 msgid "Digital Signature" -msgstr "數位簽名" +msgstr "數位簽章" #: dlls/crypt32/crypt32.rc:225 msgid "Non-Repudiation" @@ -2142,11 +2125,11 @@ msgstr "金鑰編密" #: dlls/crypt32/crypt32.rc:227 msgid "Data Encipherment" -msgstr "資料加密" +msgstr "資料編密" #: dlls/crypt32/crypt32.rc:228 msgid "Key Agreement" -msgstr "金鑰協定" +msgstr "金鑰合約" #: dlls/crypt32/crypt32.rc:229 msgid "Certificate Signing" @@ -2170,7 +2153,7 @@ msgstr "只解開密文" #: dlls/crypt32/crypt32.rc:234 msgid "SSL Client Authentication" -msgstr "SSL 客戶端認證" +msgstr "SSL 用戶端認證" #: dlls/crypt32/crypt32.rc:235 msgid "SSL Server Authentication" @@ -2182,7 +2165,7 @@ msgstr "S/MIME" #: dlls/crypt32/crypt32.rc:237 msgid "Signature" -msgstr "簽名" +msgstr "簽章" #: dlls/crypt32/crypt32.rc:238 msgid "SSL CA" @@ -2194,23 +2177,23 @@ msgstr "S/MIME CA" #: dlls/crypt32/crypt32.rc:240 msgid "Signature CA" -msgstr "簽名 CA" +msgstr "簽章 CA" #: dlls/cryptdlg/cryptdlg.rc:30 msgid "Certificate Policy" -msgstr "憑證策略" +msgstr "憑證原則" #: dlls/cryptdlg/cryptdlg.rc:31 msgid "Policy Identifier: " -msgstr "策略識別碼：" +msgstr "原則識別碼: " #: dlls/cryptdlg/cryptdlg.rc:32 msgid "Policy Qualifier Info" -msgstr "策略限定元資訊" +msgstr "原則限定元資訊" #: dlls/cryptdlg/cryptdlg.rc:33 msgid "Policy Qualifier Id=" -msgstr "策略限定元識別號=" +msgstr "原則限定元識別碼=" #: dlls/cryptdlg/cryptdlg.rc:36 msgid "Qualifier" @@ -2244,15 +2227,15 @@ msgstr "安裝憑證(&I)..." #: dlls/cryptui/cryptui.rc:197 msgid "Issuer &Statement" -msgstr "發證者敘述(&S)" +msgstr "簽發者敘述(&S)" #: dlls/cryptui/cryptui.rc:205 msgid "&Show:" -msgstr "顯示(&S)：" +msgstr "顯示(&S):" #: dlls/cryptui/cryptui.rc:210 msgid "&Edit Properties..." -msgstr "編輯屬性(&E)..." +msgstr "編輯內容(&E)..." #: dlls/cryptui/cryptui.rc:211 msgid "&Copy to File..." @@ -2272,7 +2255,7 @@ msgstr "檢視憑證(&V)" #: dlls/cryptui/cryptui.rc:223 msgid "Certificate &status:" -msgstr "憑證狀態(&S)：" +msgstr "憑證狀態(&S):" #: dlls/cryptui/cryptui.rc:229 msgid "Disclaimer" @@ -2284,12 +2267,12 @@ msgstr "更多資訊(&I)" #: dlls/cryptui/cryptui.rc:244 msgid "&Friendly name:" -msgstr "易記名稱(&F)：" +msgstr "易記名稱(&F):" #: dlls/cryptui/cryptui.rc:246 programs/progman/progman.rc:154 #: programs/progman/progman.rc:170 msgid "&Description:" -msgstr "描述(&D)：" +msgstr "描述(&D):" #: dlls/cryptui/cryptui.rc:248 msgid "Certificate purposes" @@ -2305,32 +2288,32 @@ msgstr "停用這個憑證的全部目的(&I)" #: dlls/cryptui/cryptui.rc:253 msgid "Enable &only the following purposes for this certificate:" -msgstr "只有啟用這個憑證的下列目的(&O)：" +msgstr "只啟用這個憑證的下列目的(&O):" #: dlls/cryptui/cryptui.rc:258 msgid "Add &Purpose..." -msgstr "加入目的(&P)..." +msgstr "新增目的(&P)..." #: dlls/cryptui/cryptui.rc:262 msgid "Add Purpose" -msgstr "加入目的" +msgstr "新增目的" #: dlls/cryptui/cryptui.rc:265 msgid "" "Add the object identifier (OID) for the certificate purpose you wish to add:" -msgstr "加入您所希望的憑證目的物件識別符號 (OID)：" +msgstr "新增您希望加入的憑證目的的物件識別碼 (OID):" #: dlls/cryptui/cryptui.rc:273 dlls/cryptui/cryptui.rc:69 msgid "Select Certificate Store" -msgstr "選取憑證儲存處" +msgstr "選取憑證存放區" #: dlls/cryptui/cryptui.rc:276 msgid "Select the certificate store you want to use:" -msgstr "選取您要使用的憑證儲存處：" +msgstr "選取您要使用的憑證存放區:" #: dlls/cryptui/cryptui.rc:279 msgid "&Show physical stores" -msgstr "顯示實體儲存(&S)" +msgstr "顯示實體存放區(&S)" #: dlls/cryptui/cryptui.rc:285 dlls/cryptui/cryptui.rc:296 #: dlls/cryptui/cryptui.rc:313 dlls/cryptui/cryptui.rc:327 @@ -2354,16 +2337,16 @@ msgid "" "\n" "To continue, click Next." msgstr "" -"這個精靈協助您從檔案匯入憑證、憑證撤銷清單以及憑證信賴清單到憑證儲存處。\n" +"這個精靈協助您從檔案匯入憑證、憑證撤銷清單以及憑證信任清單到憑證存放區。\n" "\n" -"憑證可用於識別您或您正在通訊的電腦。它也可以用於認證以及對訊息簽署。憑證儲" -"存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" +"憑證可用於識別您或您用以通訊的電腦。它也可以用於認證以及簽署訊息。" +"憑證存放區收藏了憑證、憑證撤銷清單以及憑證信任清單。\n" "\n" -"要繼續，請按下一步。" +"請按 [下一步] 繼續。" #: dlls/cryptui/cryptui.rc:299 dlls/cryptui/cryptui.rc:435 msgid "&File name:" -msgstr "檔案名稱(&F)：" +msgstr "檔案名稱(&F):" #: dlls/cryptui/cryptui.rc:301 dlls/cryptui/cryptui.rc:323 #: dlls/cryptui/cryptui.rc:437 programs/winecfg/winecfg.rc:311 @@ -2375,7 +2358,7 @@ msgid "" "Note: The following file formats may contain more than one certificate, " "certificate revocation list, or certificate trust list:" msgstr "" -"註記：下列檔案格式也許會包含超過一個的憑證、憑證撤銷清單或憑證信賴清單：" +"註記: 下列檔案格式也許會包含超過一個的憑證、憑證撤銷清單或憑證信任清單:" #: dlls/cryptui/cryptui.rc:304 msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" @@ -2388,21 +2371,21 @@ msgstr "個人資訊交換/PKCS #12 (*.pfx; *.p12)" #: dlls/cryptui/cryptui.rc:308 dlls/cryptui/cryptui.rc:81 #: dlls/cryptui/cryptui.rc:162 msgid "Microsoft Serialized Certificate Store (*.sst)" -msgstr "Microsoft 序列化憑證儲存處 (*.sst)" +msgstr "Microsoft 序列化憑證存放區 (*.sst)" #: dlls/cryptui/cryptui.rc:316 msgid "" "Wine can automatically select the certificate store, or you can specify a " "location for the certificates." -msgstr "Wine 可以自動選取憑證儲存處，或者您可以指定用於憑證的位置。" +msgstr "Wine 可以自動選取憑證存放區，或者您可以指定用於憑證的位置。" #: dlls/cryptui/cryptui.rc:318 msgid "&Automatically select certificate store" -msgstr "自動選取憑證儲存處(&A)" +msgstr "自動選取憑證存放區(&A)" #: dlls/cryptui/cryptui.rc:320 msgid "&Place all certificates in the following store:" -msgstr "將所有憑證放置於下列儲存(&P)：" +msgstr "將所有憑證放置於下列存放區(&P):" #: dlls/cryptui/cryptui.rc:330 msgid "Completing the Certificate Import Wizard" @@ -2410,11 +2393,11 @@ msgstr "正在完成憑證匯入精靈" #: dlls/cryptui/cryptui.rc:332 msgid "You have successfully completed the Certificate Import Wizard." -msgstr "您已經成功地完成憑證匯入精靈。" +msgstr "您已經成功完成憑證匯入精靈。" #: dlls/cryptui/cryptui.rc:334 dlls/cryptui/cryptui.rc:448 msgid "You have specified the following settings:" -msgstr "您已指定下列設定值：" +msgstr "您已指定下列設定值:" #: dlls/cryptui/cryptui.rc:342 dlls/cryptui/cryptui.rc:122 #: dlls/inetcpl.cpl/inetcpl.rc:111 @@ -2423,7 +2406,7 @@ msgstr "憑證" #: dlls/cryptui/cryptui.rc:345 msgid "I&ntended purpose:" -msgstr "預定目的(&N)：" +msgstr "預定目的(&N):" #: dlls/cryptui/cryptui.rc:349 msgid "&Import..." @@ -2462,11 +2445,11 @@ msgstr "憑證目的" #: dlls/cryptui/cryptui.rc:364 msgid "" "Select one or more purposes to be listed when Advanced Purposes is selected." -msgstr "當進階目的已選時選取一或多個要列出的目的。" +msgstr "選取一個或多個在進階目的已選取時要列出的目的。" #: dlls/cryptui/cryptui.rc:366 msgid "&Certificate purposes:" -msgstr "憑證目的(&C)：" +msgstr "憑證目的(&C):" #: dlls/cryptui/cryptui.rc:375 dlls/cryptui/cryptui.rc:386 #: dlls/cryptui/cryptui.rc:399 dlls/cryptui/cryptui.rc:409 @@ -2491,12 +2474,12 @@ msgid "" "\n" "To continue, click Next." msgstr "" -"這個精靈協助您從憑證儲存處匯出憑證、憑證撤銷清單以及憑證信賴清單到檔案。\n" +"這個精靈協助您從憑證存放區匯出憑證、憑證撤銷清單以及憑證信任清單到檔案。\n" "\n" -"憑證可用於識別您或您用以通訊的電腦。它也可以被用於認證以及簽署訊息。憑證儲存" -"處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" +"憑證可用於識別您或您用以通訊的電腦。它也可以用於認證以及簽署訊息。" +"憑證存放區收藏了憑證、憑證撤銷清單以及憑證信任清單。\n" "\n" -"要繼續請按下一步。" +"請按 [下一步] 繼續。" #: dlls/cryptui/cryptui.rc:389 msgid "" @@ -2506,23 +2489,23 @@ msgstr "如果您選擇要匯出私鑰，將於後續頁面向您提示要求密 #: dlls/cryptui/cryptui.rc:390 msgid "Do you wish to export the private key?" -msgstr "您要匯出私鑰嗎？" +msgstr "您要匯出私鑰嗎?" #: dlls/cryptui/cryptui.rc:391 msgid "&Yes, export the private key" -msgstr "是(&Y)，匯出私鑰。" +msgstr "是，匯出私鑰(&Y)" #: dlls/cryptui/cryptui.rc:393 msgid "N&o, do not export the private key" -msgstr "否(&N)，不要匯出私鑰。" +msgstr "否，不要匯出私鑰(&O)" #: dlls/cryptui/cryptui.rc:404 msgid "&Confirm password:" -msgstr "確認密碼(&C)：" +msgstr "確認密碼(&C):" #: dlls/cryptui/cryptui.rc:412 msgid "Select the format you want to use:" -msgstr "請選擇您要使用的格式：" +msgstr "請選擇您要使用的格式:" #: dlls/cryptui/cryptui.rc:413 msgid "&DER-encoded X.509 (*.cer)" @@ -2530,7 +2513,7 @@ msgstr "&DER-encoded X.509 (*.cer)" #: dlls/cryptui/cryptui.rc:415 msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64-encoded X.509 (*.cer)：" +msgstr "Ba&se64-encoded X.509 (*.cer):" #: dlls/cryptui/cryptui.rc:417 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" @@ -2562,19 +2545,15 @@ msgstr "正在完成憑證匯出精靈" #: dlls/cryptui/cryptui.rc:446 msgid "You have successfully completed the Certificate Export Wizard." -msgstr "您已經成功地完成憑證匯出精靈" +msgstr "您已經成功完成憑證匯出精靈。" #: dlls/cryptui/cryptui.rc:456 dlls/cryptui/cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "選取憑證儲存處" +msgstr "選取憑證" #: dlls/cryptui/cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "選取您要使用的憑證儲存處：" +msgstr "選取您要使用的憑證" #: dlls/cryptui/cryptui.rc:30 dlls/cryptui/cryptui.rc:93 msgid "Certificate" @@ -2588,21 +2567,23 @@ msgstr "憑證資訊" msgid "" "This certificate has an invalid signature. The certificate may have been " "altered or corrupted." -msgstr "這個憑證的簽名無效。憑證也許已被改變或已損壞。" +msgstr "這個憑證的簽章無效。憑證可能已被更改或損壞。" #: dlls/cryptui/cryptui.rc:33 msgid "" "This root certificate is not trusted. To trust it, add it to your system's " "trusted root certificate store." -msgstr "這個根憑證未被信賴。要信賴它，就將它加入您系統的信賴根憑證儲存處。" +msgstr "" +"這個根憑證不受信任。如果您要信任它，請將這個憑證加入到系統的" +"受信任的根憑證存放區。" #: dlls/cryptui/cryptui.rc:34 msgid "This certificate could not be validated to a trusted root certificate." -msgstr "這個憑證無法被驗證為信賴的根憑證。" +msgstr "這個憑證無法被驗證為信任的根憑證。" #: dlls/cryptui/cryptui.rc:35 msgid "This certificate's issuer could not be found." -msgstr "找不到這個憑證的發證者。" +msgstr "找不到這個憑證的簽發者。" #: dlls/cryptui/cryptui.rc:36 msgid "All the intended purposes of this certificate could not be verified." @@ -2610,15 +2591,15 @@ msgstr "這個憑證的所有預定目的都無法被驗證。" #: dlls/cryptui/cryptui.rc:37 msgid "This certificate is intended for the following purposes:" -msgstr "這個憑證是適用於下列目的：" +msgstr "這個憑證適用於下列目的:" #: dlls/cryptui/cryptui.rc:38 msgid "Issued to: " -msgstr "發證對象：" +msgstr "發證給:" #: dlls/cryptui/cryptui.rc:39 msgid "Issued by: " -msgstr "發證來源：" +msgstr "簽發者:" #: dlls/cryptui/cryptui.rc:40 msgid "Valid from " @@ -2630,7 +2611,7 @@ msgstr " 到 " #: dlls/cryptui/cryptui.rc:42 msgid "This certificate has an invalid signature." -msgstr "這個憑證的簽名無效。" +msgstr "這個憑證的簽章無效。" #: dlls/cryptui/cryptui.rc:43 msgid "This certificate has expired or is not yet valid." @@ -2638,11 +2619,11 @@ msgstr "這個憑證已過期或尚未生效。" #: dlls/cryptui/cryptui.rc:44 msgid "This certificate's validity period exceeds that of its issuer." -msgstr "這個憑證的有效期限超過它的發證者。" +msgstr "這個憑證的有效期限超過簽發者的有效期限。" #: dlls/cryptui/cryptui.rc:45 msgid "This certificate was revoked by its issuer." -msgstr "這個憑證已被它的發證者取消。" +msgstr "這個憑證已被其簽發者撤銷。" #: dlls/cryptui/cryptui.rc:46 msgid "This certificate is OK." @@ -2667,15 +2648,15 @@ msgstr "只有版本 1 欄位" #: dlls/cryptui/cryptui.rc:51 msgid "Extensions Only" -msgstr "只有進階屬性" +msgstr "只有延伸" #: dlls/cryptui/cryptui.rc:52 msgid "Critical Extensions Only" -msgstr "只有關鍵進階屬性" +msgstr "只有關鍵延伸" #: dlls/cryptui/cryptui.rc:53 msgid "Properties Only" -msgstr "只有屬性" +msgstr "只有內容" #: dlls/cryptui/cryptui.rc:55 msgid "Serial number" @@ -2724,11 +2705,11 @@ msgstr "描述" #: dlls/cryptui/cryptui.rc:66 msgid "Certificate Properties" -msgstr "憑證屬性" +msgstr "憑證內容" #: dlls/cryptui/cryptui.rc:67 msgid "Please enter an OID in the form 1.2.3.4" -msgstr "請以 1.2.3.4 的形式輸入 OID" +msgstr "請以 1.2.3.4 的格式輸入 OID" #: dlls/cryptui/cryptui.rc:68 msgid "The OID you entered already exists." @@ -2736,13 +2717,13 @@ msgstr "您輸入的 OID 已經存在。" #: dlls/cryptui/cryptui.rc:70 msgid "Please select a certificate store." -msgstr "請選取憑證儲存處。" +msgstr "請選取憑證存放區。" #: dlls/cryptui/cryptui.rc:72 msgid "" "The file contains objects that do not match the given criteria. Please " "select another file." -msgstr "檔案含有不匹配給定準則的物件。請選取另一個檔案。" +msgstr "檔案含有不符合指定條件的物件。請選取另一個檔案。" #: dlls/cryptui/cryptui.rc:73 msgid "File to Import" @@ -2754,13 +2735,13 @@ msgstr "指定您要匯入的檔案。" #: dlls/cryptui/cryptui.rc:75 dlls/cryptui/cryptui.rc:98 msgid "Certificate Store" -msgstr "憑證儲存處" +msgstr "憑證存放區" #: dlls/cryptui/cryptui.rc:76 msgid "" "Certificate stores are collections of certificates, certificate revocation " "lists, and certificate trust lists." -msgstr "憑證儲存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。" +msgstr "憑證存放區收藏了憑證、憑證撤銷清單以及憑證信任清單。" #: dlls/cryptui/cryptui.rc:77 msgid "X.509 Certificate (*.cer; *.crt)" @@ -2776,7 +2757,7 @@ msgstr "憑證撤銷清單 (*.crl)" #: dlls/cryptui/cryptui.rc:80 dlls/cryptui/cryptui.rc:159 msgid "Certificate Trust List (*.stl)" -msgstr "憑證信賴清單 (*.stl)" +msgstr "憑證信任清單 (*.stl)" #: dlls/cryptui/cryptui.rc:82 msgid "CMS/PKCS #7 Messages (*.spc; *.p7b)" @@ -2800,11 +2781,11 @@ msgstr "由程式所決定" #: dlls/cryptui/cryptui.rc:88 msgid "Please select a store" -msgstr "請選取儲存處" +msgstr "請選取存放區" #: dlls/cryptui/cryptui.rc:89 msgid "Certificate Store Selected" -msgstr "憑證儲存處已選" +msgstr "已選取憑證存放區" #: dlls/cryptui/cryptui.rc:90 msgid "Automatically determined by the program" @@ -2832,7 +2813,7 @@ msgstr "個人資訊交換" #: dlls/cryptui/cryptui.rc:99 msgid "The import was successful." -msgstr "已成功匯入。" +msgstr "匯入成功。" #: dlls/cryptui/cryptui.rc:100 msgid "The import failed." @@ -2848,15 +2829,15 @@ msgstr "<進階目的>" #: dlls/cryptui/cryptui.rc:104 msgid "Issued To" -msgstr "發證對象" +msgstr "發證給" #: dlls/cryptui/cryptui.rc:105 msgid "Issued By" -msgstr "發證來源" +msgstr "簽發者" #: dlls/cryptui/cryptui.rc:106 dlls/wininet/wininet.rc:36 msgid "Expiration Date" -msgstr "過期日期" +msgstr "到期日期" #: dlls/cryptui/cryptui.rc:107 msgid "Friendly Name" @@ -2873,7 +2854,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您將不能再以這個憑證解密訊息，或用它簽署訊息。\n" -"確定要移除這個憑證？" +"確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:111 msgid "" @@ -2882,7 +2863,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "您將不能再以這些憑證解密訊息，或用它們簽署訊息。\n" -"確定要移除這些憑證？" +"確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:112 msgid "" @@ -2891,21 +2872,16 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您將不能再以這個憑證加密訊息，或驗證以它簽署的訊息。\n" -"確定要移除這個憑證？" +"確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" "Are you sure you want to remove these certificates?" msgstr "" "您將不能再以這些憑證加密訊息，或驗證以它們簽署的訊息。\n" -"確定要移除這些憑證？" +"確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:114 msgid "" @@ -2913,8 +2889,8 @@ msgid "" "trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"由這個憑證授權者所發的憑證將不再被信賴。\n" -"確定要移除這個憑證？" +"由這個憑證授權單位所發的憑證將不再被信任。\n" +"確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:115 msgid "" @@ -2922,8 +2898,8 @@ msgid "" "trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"由這些憑證授權者所發的憑證將不再被信賴。\n" -"確定要移除這些憑證？" +"由這些憑證授權單位所發的憑證將不再被信任。\n" +"確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:116 msgid "" @@ -2931,8 +2907,8 @@ msgid "" "certification authorities it issued, will no longer be trusted.\n" "Are you sure you want to remove this trusted root certificate?" msgstr "" -"由這個憑證授權者所發的憑證，或是任何由它發證的憑證授權者，將不再被信賴。\n" -"確定要移除這個信賴的根憑證？" +"由這個憑證授權單位所發的憑證或憑證授權單位將不再被信任。\n" +"確定要移除這個信任的根憑證?" #: dlls/cryptui/cryptui.rc:117 msgid "" @@ -2940,36 +2916,36 @@ msgid "" "certification authorities they issued, will no longer be trusted.\n" "Are you sure you want to remove these trusted root certificates?" msgstr "" -"由這些憑證授權者所發的憑證，或是任何由它們發證的憑證授權者，將不再被信賴。\n" -"確定要移除這些信賴的根憑證？" +"由這些憑證授權單位所發的憑證或憑證授權單位將不再被信任。\n" +"確定要移除這些信任的根憑證?" #: dlls/cryptui/cryptui.rc:118 msgid "" "Software signed by this publisher will no longer be trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"由這個發行者簽署的軟體將不再被信賴。\n" -"確定要移除這個憑證？" +"由這個發行者簽署的軟體將將不再被信任。\n" +"確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:119 msgid "" "Software signed by these publishers will no longer be trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"由這些發行者簽署的軟體將不再被信賴。\n" -"確定要移除這些憑證？" +"由這些發行者簽署的軟體將不再被信任。\n" +"確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:120 msgid "Are you sure you want to remove this certificate?" -msgstr "確定要移除這個憑證？" +msgstr "確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:121 msgid "Are you sure you want to remove these certificates?" -msgstr "確定要移除這些憑證？" +msgstr "確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:124 msgid "Ensures the identity of a remote computer" -msgstr "確保遠端電腦的身分" +msgstr "確認遠端電腦的身分" #: dlls/cryptui/cryptui.rc:125 msgid "Proves your identity to a remote computer" @@ -2980,8 +2956,8 @@ msgid "" "Ensures software came from software publisher\n" "Protects software from alteration after publication" msgstr "" -"請確認軟體是來自軟體發行者\n" -"保護軟體以避免發行之後的變更" +"確認軟體是來自軟體發行者\n" +"確保軟體在發行之後未被修改" #: dlls/cryptui/cryptui.rc:127 msgid "Protects e-mail messages" @@ -2997,15 +2973,15 @@ msgstr "允許以目前的時間簽署資料" #: dlls/cryptui/cryptui.rc:130 msgid "Allows you to digitally sign a certificate trust list" -msgstr "允許您數位簽署憑證信賴清單" +msgstr "允許您數位簽署憑證信任清單" #: dlls/cryptui/cryptui.rc:131 msgid "Allows data on disk to be encrypted" -msgstr "允許磁碟上的資料被加密" +msgstr "允許加密磁碟上的資料" #: dlls/cryptui/cryptui.rc:147 msgid "Private Key Archival" -msgstr "私鑰檔案的" +msgstr "私鑰檔案封存" #: dlls/cryptui/cryptui.rc:151 msgid "Export Format" @@ -3017,7 +2993,7 @@ msgstr "選擇將用來儲存內容的格式。" #: dlls/cryptui/cryptui.rc:153 msgid "Export Filename" -msgstr "匯出檔名" +msgstr "匯出檔案名稱" #: dlls/cryptui/cryptui.rc:154 msgid "Specify the name of the file in which the content will be saved." @@ -3025,7 +3001,7 @@ msgstr "指定將會儲存內容的檔案名稱。" #: dlls/cryptui/cryptui.rc:155 msgid "The specified file already exists. Do you want to replace it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "檔案已經存在。您要取代它嗎?" #: dlls/cryptui/cryptui.rc:156 msgid "DER-Encoded Binary X.509 (*.cer)" @@ -3057,7 +3033,7 @@ msgstr "匯出密鑰" #: dlls/cryptui/cryptui.rc:168 msgid "The export was successful." -msgstr "已成功匯出。" +msgstr "匯出成功。" #: dlls/cryptui/cryptui.rc:169 msgid "The export failed." @@ -3079,35 +3055,31 @@ msgstr "輸入密碼" #: dlls/cryptui/cryptui.rc:173 msgid "You may password-protect a private key." -msgstr "您可以以密碼保護私鑰。" +msgstr "您可以使用密碼來保護私鑰。" #: dlls/cryptui/cryptui.rc:174 msgid "The passwords do not match." -msgstr "密碼不匹配。" +msgstr "密碼不相符。" #: dlls/cryptui/cryptui.rc:175 msgid "Note: The private key for this certificate could not be opened." -msgstr "註記：用於這個憑證的私鑰無法開啟。" +msgstr "註記: 用於這個憑證的私鑰無法開啟。" #: dlls/cryptui/cryptui.rc:176 msgid "Note: The private key for this certificate is not exportable." -msgstr "註記：用於這個憑證的私鑰不可匯出。" +msgstr "註記: 用於這個憑證的私鑰不可匯出。" #: dlls/cryptui/cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "預定目的(&N)：" +msgstr "預定目的" #: dlls/cryptui/cryptui.rc:178 dlls/shell32/shell32.rc:150 msgid "Location" msgstr "位置" #: dlls/cryptui/cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "選取憑證儲存處" +msgstr "選取憑證" #: dlls/cryptui/cryptui.rc:181 programs/winefile/winefile.rc:101 #: programs/winhlp32/winhlp32.rc:110 programs/winhlp32/winhlp32.rc:85 @@ -3120,11 +3092,11 @@ msgstr "裝置設定" #: dlls/dinput/dinput.rc:39 msgid "Reset" -msgstr "重置" +msgstr "重設" #: dlls/dinput/dinput.rc:42 msgid "Player" -msgstr "玩家" +msgstr "播放器" #: dlls/dinput/dinput.rc:43 programs/winecfg/winecfg.rc:88 msgid "Device" @@ -3136,7 +3108,7 @@ msgstr "動作" #: dlls/dinput/dinput.rc:45 msgid "Mapping" -msgstr "映射" +msgstr "對應" #: dlls/dinput/dinput.rc:47 msgid "Show Assigned First" @@ -3188,7 +3160,7 @@ msgstr "阿拉伯語" #: dlls/gdi32/gdi32.rc:35 msgid "Baltic" -msgstr "波羅的海語" +msgstr "波羅的海語言" #: dlls/gdi32/gdi32.rc:36 msgid "Vietnamese" @@ -3204,19 +3176,19 @@ msgstr "日語" #: dlls/gdi32/gdi32.rc:39 msgid "CHINESE_GB2312" -msgstr "簡化字漢語" +msgstr "中文 (GB2312)" #: dlls/gdi32/gdi32.rc:40 msgid "Hangul" -msgstr "韓語諺文" +msgstr "韓語" #: dlls/gdi32/gdi32.rc:41 msgid "CHINESE_BIG5" -msgstr "傳統字漢語" +msgstr "中文 (BIG5)" #: dlls/gdi32/gdi32.rc:42 msgid "Hangul(Johab)" -msgstr "韓語諺文(組合型)" +msgstr "韓語 (Johab)" #: dlls/gdi32/gdi32.rc:43 msgid "Symbol" @@ -3237,7 +3209,7 @@ msgstr "照相機中的檔案" #: dlls/gphoto2.ds/gphoto2.rc:34 msgid "Import Selected" -msgstr "匯入選擇的檔案" +msgstr "匯入已選取檔案" #: dlls/gphoto2.ds/gphoto2.rc:35 msgid "Preview" @@ -3265,7 +3237,7 @@ msgstr "正在傳輸... 請稍候" #: dlls/gphoto2.ds/gphoto2.rc:51 msgid "Connecting to camera" -msgstr "連接照相機" +msgstr "正在連接照相機" #: dlls/gphoto2.ds/gphoto2.rc:55 msgid "Connecting to camera... Please Wait" @@ -3278,11 +3250,11 @@ msgstr "同步(&Y)" #: dlls/hhctrl.ocx/hhctrl.rc:60 dlls/hhctrl.ocx/hhctrl.rc:73 #: dlls/shdoclc/shdoclc.rc:41 programs/winhlp32/winhlp32.rc:89 msgid "&Back" -msgstr "返回(&B)" +msgstr "上一頁(&B)" #: dlls/hhctrl.ocx/hhctrl.rc:61 dlls/hhctrl.ocx/hhctrl.rc:74 msgid "&Forward" -msgstr "向前" +msgstr "下一頁(&F)" #: dlls/hhctrl.ocx/hhctrl.rc:62 msgctxt "table of contents" @@ -3314,10 +3286,8 @@ msgid "&View Source" msgstr "檢視原始碼(&V)" #: dlls/hhctrl.ocx/hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "屬性" +msgstr "內容(&T)" #: dlls/hhctrl.ocx/hhctrl.rc:87 dlls/shdoclc/shdoclc.rc:79 #: dlls/shdoclc/shdoclc.rc:93 dlls/shdoclc/shdoclc.rc:117 @@ -3388,7 +3358,7 @@ msgstr "重新整理" #: dlls/hhctrl.ocx/hhctrl.rc:46 dlls/ieframe/ieframe.rc:66 msgid "Back" -msgstr "返回" +msgstr "上一頁" #: dlls/hhctrl.ocx/hhctrl.rc:47 msgctxt "table of contents" @@ -3406,7 +3376,7 @@ msgstr "選項" #: dlls/hhctrl.ocx/hhctrl.rc:51 dlls/ieframe/ieframe.rc:67 msgid "Forward" -msgstr "向前" +msgstr "下一頁" #: dlls/iccvid/iccvid.rc:28 dlls/iccvid/iccvid.rc:29 msgid "Cinepak Video codec" @@ -3438,7 +3408,7 @@ msgstr "開啟(&O)..." #: dlls/ieframe/ieframe.rc:36 programs/notepad/notepad.rc:33 #: programs/wordpad/wordpad.rc:34 msgid "Save &as..." -msgstr "另存為(&A)..." +msgstr "另存新檔(&A)..." #: dlls/ieframe/ieframe.rc:38 msgid "Print &format..." @@ -3478,7 +3448,7 @@ msgstr "關於 Internet Explorer(&A)" #: dlls/ieframe/ieframe.rc:90 msgid "Open URL" -msgstr "開啟連結(&O)" +msgstr "開啟連結" #: dlls/ieframe/ieframe.rc:93 msgid "Specify the URL you wish to open in Internet Explorer" @@ -3486,7 +3456,7 @@ msgstr "指定您希望在 Internet Explorer 中開啟的網址" #: dlls/ieframe/ieframe.rc:94 msgid "Open:" -msgstr "開啟：" +msgstr "開啟:" #: dlls/ieframe/ieframe.rc:70 msgctxt "home page" @@ -3539,11 +3509,11 @@ msgstr "空白頁面(&B)" #: dlls/inetcpl.cpl/inetcpl.rc:56 msgid "Browsing history" -msgstr "瀏覽歷程" +msgstr "瀏覽歷程記錄" #: dlls/inetcpl.cpl/inetcpl.rc:57 msgid "You can delete cached pages, cookies and other data." -msgstr "您可以刪除網頁快取、訊餅和其他資料。" +msgstr "您可以刪除網頁快取、Cookie 以及其他資料。" #: dlls/inetcpl.cpl/inetcpl.rc:59 msgid "Delete &files..." @@ -3555,7 +3525,7 @@ msgstr "設定(&S)..." #: dlls/inetcpl.cpl/inetcpl.rc:68 msgid "Delete browsing history" -msgstr "刪除瀏覽歷程" +msgstr "刪除瀏覽歷程記錄" #: dlls/inetcpl.cpl/inetcpl.rc:71 msgid "" @@ -3571,7 +3541,7 @@ msgid "" "Files saved on your computer by websites, which store things like user " "preferences and login information." msgstr "" -"訊餅\n" +"Cookies\n" "由網站儲存於您電腦的檔案，其存有諸如使用者偏好設定和登入資訊。" #: dlls/inetcpl.cpl/inetcpl.rc:75 @@ -3579,7 +3549,7 @@ msgid "" "History\n" "List of websites you have accessed." msgstr "" -"歷程\n" +"歷程記錄\n" "您曾存取過的網站清單。" #: dlls/inetcpl.cpl/inetcpl.rc:77 @@ -3606,7 +3576,7 @@ msgstr "刪除" msgid "" "Certificates are used for your personal identification and to identify " "certificate authorities and publishers." -msgstr "憑證是做為您的個人識別，以及識別憑證授權機構和發行者。" +msgstr "憑證是用於您的個人識別，以及識別憑證授權單位和發行者。" #: dlls/inetcpl.cpl/inetcpl.rc:114 msgid "Certificates..." @@ -3617,46 +3587,36 @@ msgid "Publishers..." msgstr "發行者..." #: dlls/inetcpl.cpl/inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "區域網路連線" +msgstr "連線" #: dlls/inetcpl.cpl/inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Wine 設定" +msgstr "自動設定" #: dlls/inetcpl.cpl/inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "使用 Web Proxy Auto-Discovery (WPAD)" #: dlls/inetcpl.cpl/inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "使用 Proxy Auto-Config (PAC) 指令碼" #: dlls/inetcpl.cpl/inetcpl.rc:128 dlls/inetcpl.cpl/inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "位址" +msgstr "位址:" #: dlls/inetcpl.cpl/inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "本機伺服器(&L)" +msgstr "代理伺服器" #: dlls/inetcpl.cpl/inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "使用代理伺服器" #: dlls/inetcpl.cpl/inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "無連接埠" +msgstr "連接埠:" #: dlls/inetcpl.cpl/inetcpl.rc:31 msgid "Internet Settings" @@ -3668,7 +3628,7 @@ msgstr "設定 Wine 網際網路瀏覽器和相關的設定。" #: dlls/inetcpl.cpl/inetcpl.rc:33 msgid "Security settings for zone: " -msgstr "區域的安全設定：" +msgstr "此區域的安全設定:" #: dlls/inetcpl.cpl/inetcpl.rc:34 msgid "Custom" @@ -3680,7 +3640,7 @@ msgstr "非常低" #: dlls/inetcpl.cpl/inetcpl.rc:36 dlls/wininet/wininet.rc:42 msgid "Low" -msgstr "慢" +msgstr "低" #: dlls/inetcpl.cpl/inetcpl.rc:37 msgid "Medium" @@ -3688,7 +3648,7 @@ msgstr "中" #: dlls/inetcpl.cpl/inetcpl.rc:38 msgid "Increased" -msgstr "已增加" +msgstr "稍高" #: dlls/inetcpl.cpl/inetcpl.rc:39 dlls/wininet/wininet.rc:41 msgid "High" @@ -3703,30 +3663,24 @@ msgid "&Disable" 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)" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "編輯覆載設定" +msgstr "覆寫(&O)" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" -msgstr "已連線" +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" @@ -3736,7 +3690,7 @@ msgstr "已停用" msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." -msgstr "停用或啟用裝置之後，已連線的搖桿將無法更新，直到您重新啟動這個小程式。" +msgstr "停用或啟用裝置之後，已連接的搖桿將無法更新，直到您重新啟動這個程式。" #: dlls/joy.cpl/joy.rc:55 msgid "Test Joystick" @@ -3759,8 +3713,8 @@ msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" -"請按下控制器中的任何按鈕以啟用所選的效果。效果的方向可以利用控制器的軸向來變" -"更。" +"請按下控制器中的任何按鈕以啟用所選的效果。" +"效果的方向可以利用控制器的軸向來變更。" #: dlls/joy.cpl/joy.rc:31 msgid "Game Controllers" @@ -3768,7 +3722,7 @@ msgstr "遊戲控制器" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "測試和設定遊戲控制器。" #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3783,10 +3737,8 @@ msgid "Subscript out of range" msgstr "註標超出範圍" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "無紙；" +msgstr "堆疊空間不足" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3802,7 +3754,7 @@ msgstr "物件不支援這個屬性或方法" #: dlls/jscript/jscript.rc:35 dlls/vbscript/vbscript.rc:50 msgid "Object doesn't support this action" -msgstr "物件不支援此動作" +msgstr "物件不支援這個動作" #: dlls/jscript/jscript.rc:36 msgid "Argument not optional" @@ -3814,27 +3766,23 @@ msgstr "語法錯誤" #: dlls/jscript/jscript.rc:38 msgid "Expected ';'" -msgstr "預期為 ;" +msgstr "預期為 ';'" #: dlls/jscript/jscript.rc:39 msgid "Expected '('" -msgstr "預期為 (" +msgstr "預期為 '('" #: dlls/jscript/jscript.rc:40 msgid "Expected ')'" -msgstr "預期為 )" +msgstr "預期為 ')'" #: dlls/jscript/jscript.rc:41 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "主體金鑰識別碼" +msgstr "預期為識別碼" #: dlls/jscript/jscript.rc:42 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "預期為 ;" +msgstr "預期為 '='" #: dlls/jscript/jscript.rc:43 msgid "Invalid character" @@ -3846,15 +3794,15 @@ msgstr "未終結的字串常數" #: dlls/jscript/jscript.rc:45 msgid "'return' statement outside of function" -msgstr "return 敘述位於函式之外" +msgstr "'return' 敘述位於函式之外" #: dlls/jscript/jscript.rc:46 msgid "Can't have 'break' outside of loop" -msgstr "在迴圈之外不可有 break" +msgstr "在迴圈之外不可有 'break'" #: dlls/jscript/jscript.rc:47 msgid "Can't have 'continue' outside of loop" -msgstr "在迴圈之外不可有 continue" +msgstr "在迴圈之外不可有 'continue'" #: dlls/jscript/jscript.rc:48 msgid "Label redefined" @@ -3865,38 +3813,32 @@ msgid "Label not found" msgstr "找不到標貼" #: dlls/jscript/jscript.rc:50 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "預期為 ;" +msgstr "預期為 '@end'" #: dlls/jscript/jscript.rc:51 msgid "Conditional compilation is turned off" -msgstr "條件編譯已被關閉" +msgstr "條件編譯已關閉" #: dlls/jscript/jscript.rc:52 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "預期為 ;" +msgstr "預期為 '@'" #: dlls/jscript/jscript.rc:80 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript 編譯錯誤" #: dlls/jscript/jscript.rc:81 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript 執行期錯誤" #: dlls/jscript/jscript.rc:82 dlls/vbscript/vbscript.rc:64 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "未知錯誤" +msgstr "不明執行期錯誤" #: dlls/jscript/jscript.rc:55 msgid "Number expected" -msgstr "預期為編號" +msgstr "預期為數字" #: dlls/jscript/jscript.rc:53 msgid "Function expected" @@ -3904,7 +3846,7 @@ msgstr "預期為函式" #: dlls/jscript/jscript.rc:54 msgid "'[object]' is not a date object" -msgstr "[object] 並非日期物件" +msgstr "'[object]' 並非日期物件" #: dlls/jscript/jscript.rc:56 msgid "Object expected" @@ -3916,11 +3858,11 @@ msgstr "不合法的指派" #: dlls/jscript/jscript.rc:58 msgid "'|' is undefined" -msgstr "| 未定義" +msgstr "'|' 未定義" #: dlls/jscript/jscript.rc:59 msgid "Boolean object expected" -msgstr "預期為布林物件" +msgstr "預期為布林值物件" #: dlls/jscript/jscript.rc:60 msgid "Cannot delete '|'" @@ -3935,16 +3877,12 @@ msgid "JScript object expected" msgstr "預期為 JScript 物件" #: dlls/jscript/jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "預期為陣列物件" +msgstr "預期為列舉器物件" #: dlls/jscript/jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "預期為布林物件" +msgstr "預期為正規表示式" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" @@ -3952,7 +3890,7 @@ msgstr "正規表示式語法發生錯誤" #: dlls/jscript/jscript.rc:66 msgid "Exception thrown and not caught" -msgstr "" +msgstr "發生異常且未被捕捉" #: dlls/jscript/jscript.rc:68 msgid "URI to be encoded contains invalid characters" @@ -3982,33 +3920,31 @@ msgstr "預期為陣列物件" msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" -msgstr "" +msgstr "無法在這個物件更改屬性描述符中的 'writable' 屬性為 'true'" #: 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 '|'" -msgstr "" +msgstr "無法重新定義不可設定的屬性 '|'" #: dlls/jscript/jscript.rc:76 msgid "Cannot modify non-writable property '|'" -msgstr "" +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" -msgstr "" +msgstr "屬性不可同時有存取子和值" #: include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Wine 核心 DLL" #: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32 #: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137 @@ -4041,7 +3977,7 @@ msgstr "存取被拒。\n" #: dlls/kernel32/winerror.mc:58 msgid "Invalid handle.\n" -msgstr "無效的控柄。\n" +msgstr "無效的控制代碼。\n" #: dlls/kernel32/winerror.mc:63 msgid "Memory trashed.\n" @@ -4057,11 +3993,11 @@ msgstr "無效的區塊。\n" #: dlls/kernel32/winerror.mc:78 msgid "Bad environment.\n" -msgstr "不當的環境。\n" +msgstr "不良的環境。\n" #: dlls/kernel32/winerror.mc:83 msgid "Bad format.\n" -msgstr "不當的格式。\n" +msgstr "錯誤的格式。\n" #: dlls/kernel32/winerror.mc:88 msgid "Invalid access.\n" @@ -4081,7 +4017,7 @@ msgstr "無效的儲存裝置。\n" #: dlls/kernel32/winerror.mc:108 msgid "Can't delete current directory.\n" -msgstr "無法刪除現行目錄。\n" +msgstr "無法刪除目前的目錄。\n" #: dlls/kernel32/winerror.mc:113 msgid "Not same device.\n" @@ -4089,15 +4025,15 @@ msgstr "並非相同裝置。\n" #: dlls/kernel32/winerror.mc:118 msgid "No more files.\n" -msgstr "沒有檔案了。\n" +msgstr "沒有更多檔案。\n" #: dlls/kernel32/winerror.mc:123 msgid "Write protected.\n" -msgstr "防止寫入的。\n" +msgstr "已設定寫入保護。\n" #: dlls/kernel32/winerror.mc:128 msgid "Bad unit.\n" -msgstr "不當的單位。\n" +msgstr "錯誤的單位。\n" #: dlls/kernel32/winerror.mc:133 msgid "Not ready.\n" @@ -4105,7 +4041,7 @@ msgstr "未就緒。\n" #: dlls/kernel32/winerror.mc:138 msgid "Bad command.\n" -msgstr "不當的命令。\n" +msgstr "錯誤的命令。\n" #: dlls/kernel32/winerror.mc:143 msgid "CRC error.\n" @@ -4113,7 +4049,7 @@ msgstr "循環冗餘檢查錯誤。\n" #: dlls/kernel32/winerror.mc:148 msgid "Bad length.\n" -msgstr "不當長度。\n" +msgstr "長度錯誤。\n" #: dlls/kernel32/winerror.mc:153 dlls/kernel32/winerror.mc:528 msgid "Seek error.\n" @@ -4181,7 +4117,7 @@ msgstr "重複的網路名稱。\n" #: dlls/kernel32/winerror.mc:233 msgid "Bad network path.\n" -msgstr "不當的網路路徑。\n" +msgstr "錯誤的網路路徑。\n" #: dlls/kernel32/winerror.mc:238 msgid "Network busy.\n" @@ -4197,11 +4133,11 @@ msgstr "太多命令。\n" #: dlls/kernel32/winerror.mc:253 msgid "Adapter hardware error.\n" -msgstr "調適器硬體錯誤。\n" +msgstr "介面卡硬體錯誤。\n" #: dlls/kernel32/winerror.mc:258 msgid "Bad network response.\n" -msgstr "不當的網路回應。\n" +msgstr "不良的網路回應。\n" #: dlls/kernel32/winerror.mc:263 msgid "Unexpected network error.\n" @@ -4209,7 +4145,7 @@ msgstr "未預期的網路錯誤。\n" #: dlls/kernel32/winerror.mc:268 msgid "Bad remote adapter.\n" -msgstr "不當的遠端調適器。\n" +msgstr "不良的遠端介面卡。\n" #: dlls/kernel32/winerror.mc:273 msgid "Print queue full.\n" @@ -4233,11 +4169,11 @@ msgstr "存取網路被拒絕。\n" #: dlls/kernel32/winerror.mc:298 msgid "Bad device type.\n" -msgstr "不當的裝置類型。\n" +msgstr "錯誤的裝置類型。\n" #: dlls/kernel32/winerror.mc:303 msgid "Bad network name.\n" -msgstr "不當的網路名稱。\n" +msgstr "錯誤的網路名稱。\n" #: dlls/kernel32/winerror.mc:308 msgid "Too many network names.\n" @@ -4245,7 +4181,7 @@ msgstr "太多網路名稱。\n" #: dlls/kernel32/winerror.mc:313 msgid "Too many network sessions.\n" -msgstr "太多網路執行期間。\n" +msgstr "太多網路工作階段。\n" #: dlls/kernel32/winerror.mc:318 msgid "Sharing paused.\n" @@ -4293,23 +4229,23 @@ msgstr "網路寫入錯誤。\n" #: dlls/kernel32/winerror.mc:373 msgid "No process slots.\n" -msgstr "沒有行程插槽。\n" +msgstr "沒有線程插槽。\n" #: dlls/kernel32/winerror.mc:378 msgid "Too many semaphores.\n" -msgstr "太多號誌。\n" +msgstr "太多旗號。\n" #: dlls/kernel32/winerror.mc:383 msgid "Exclusive semaphore already owned.\n" -msgstr "已擁有互斥號誌。\n" +msgstr "已擁有專屬旗號。\n" #: dlls/kernel32/winerror.mc:388 msgid "Semaphore is set.\n" -msgstr "已設定號誌。\n" +msgstr "已設定旗號。\n" #: dlls/kernel32/winerror.mc:393 msgid "Too many semaphore requests.\n" -msgstr "太多號誌要求。\n" +msgstr "太多旗號要求。\n" #: dlls/kernel32/winerror.mc:398 msgid "Invalid at interrupt time.\n" @@ -4317,11 +4253,11 @@ msgstr "於插斷時間無效。\n" #: dlls/kernel32/winerror.mc:403 msgid "Semaphore owner died.\n" -msgstr "號誌擁有者已死。\n" +msgstr "旗號擁有者已終止。\n" #: dlls/kernel32/winerror.mc:408 msgid "Semaphore user limit.\n" -msgstr "號誌使用者限制。\n" +msgstr "旗號使用者限制。\n" #: dlls/kernel32/winerror.mc:413 msgid "Insert disk for drive %1.\n" @@ -4329,7 +4265,7 @@ msgstr "插入磁碟於儲存裝置 %1。\n" #: dlls/kernel32/winerror.mc:418 msgid "Drive locked.\n" -msgstr "已鎖定儲存裝置。\n" +msgstr "儲存裝置已鎖定。\n" #: dlls/kernel32/winerror.mc:423 msgid "Broken pipe.\n" @@ -4345,11 +4281,11 @@ msgstr "緩衝區溢位。\n" #: dlls/kernel32/winerror.mc:443 msgid "No more search handles.\n" -msgstr "沒有搜尋控柄了。\n" +msgstr "沒有更多搜尋控制代碼。\n" #: dlls/kernel32/winerror.mc:448 msgid "Invalid target handle.\n" -msgstr "無效的目標控柄。\n" +msgstr "無效的目標控制代碼。\n" #: dlls/kernel32/winerror.mc:453 msgid "Invalid IOCTL.\n" @@ -4369,7 +4305,7 @@ msgstr "呼叫尚未實作。\n" #: dlls/kernel32/winerror.mc:473 msgid "Semaphore timeout.\n" -msgstr "號誌逾時。\n" +msgstr "旗號逾時。\n" #: dlls/kernel32/winerror.mc:478 msgid "Insufficient buffer.\n" @@ -4385,7 +4321,7 @@ msgstr "無效的層級。\n" #: dlls/kernel32/winerror.mc:493 msgid "No volume label.\n" -msgstr "沒有卷冊標貼。\n" +msgstr "沒有磁碟區標籤。\n" #: dlls/kernel32/winerror.mc:498 msgid "Module not found.\n" @@ -4405,7 +4341,7 @@ msgstr "子行程還未完成。\n" #: dlls/kernel32/winerror.mc:518 msgid "Invalid use of direct access handle.\n" -msgstr "直接存取控柄的使用無效。\n" +msgstr "直接存取控制代碼的使用無效。\n" #: dlls/kernel32/winerror.mc:523 msgid "Negative seek.\n" @@ -4433,19 +4369,19 @@ msgstr "儲存裝置未被 SUBST。\n" #: dlls/kernel32/winerror.mc:558 msgid "Attempt to JOIN onto a JOINed drive.\n" -msgstr "試圖 JOIN 到已被 JOIN 的儲存裝置。\n" +msgstr "嘗試 JOIN 到已被 JOIN 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:563 msgid "Attempt to SUBST onto a SUBSTed drive.\n" -msgstr "試圖 SUBST 到已被 SUBST 的儲存裝置。\n" +msgstr "嘗試 SUBST 到已被 SUBST 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:568 msgid "Attempt to JOIN to a SUBSTed drive.\n" -msgstr "試圖 JOIN 到已被 SUBST 的儲存裝置。\n" +msgstr "嘗試 JOIN 到已被 SUBST 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:573 msgid "Attempt to SUBST to a JOINed drive.\n" -msgstr "試圖 SUBST 到已被 JOIN 的儲存裝置。\n" +msgstr "嘗試 SUBST 到已被 JOIN 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:578 msgid "Drive is busy.\n" @@ -4489,7 +4425,7 @@ msgstr "用於 DosMuxSemWait 的事件計數不正確。\n" #: dlls/kernel32/winerror.mc:628 msgid "Too many waiters for DosMuxSemWait.\n" -msgstr "太多 DosMuxSemWait 的等待者。\n" +msgstr "太多 DosMuxSemWait 的等待項。\n" #: dlls/kernel32/winerror.mc:633 msgid "DosSemMuxWait list invalid.\n" @@ -4497,11 +4433,11 @@ msgstr "DosSemMuxWait 清單無效。\n" #: dlls/kernel32/winerror.mc:638 msgid "Volume label too long.\n" -msgstr "卷冊標貼太長。\n" +msgstr "磁碟區標籤太長。\n" #: dlls/kernel32/winerror.mc:643 msgid "Too many TCBs.\n" -msgstr "太多 TCBs。\n" +msgstr "太多 TCB。\n" #: dlls/kernel32/winerror.mc:648 msgid "Signal refused.\n" @@ -4517,11 +4453,11 @@ msgstr "無法鎖定資料段。\n" #: dlls/kernel32/winerror.mc:663 msgid "Bad thread ID address.\n" -msgstr "不當的執行緒識別號位址。\n" +msgstr "錯誤的執行緒識別碼位址。\n" #: dlls/kernel32/winerror.mc:668 msgid "Bad arguments to DosExecPgm.\n" -msgstr "不當的 DosExecPgm 引數。\n" +msgstr "錯誤的 DosExecPgm 引數。\n" #: dlls/kernel32/winerror.mc:673 msgid "Path is invalid.\n" @@ -4569,7 +4505,7 @@ msgstr "無效的旗標號碼。\n" #: dlls/kernel32/winerror.mc:728 msgid "Semaphore name not found.\n" -msgstr "找不到號誌名稱。\n" +msgstr "找不到旗號名稱。\n" #: dlls/kernel32/winerror.mc:733 msgid "Invalid starting code segment for %1.\n" @@ -4593,7 +4529,7 @@ msgstr "EXE %1 被標記為無效。\n" #: dlls/kernel32/winerror.mc:758 msgid "Bad EXE format for %1.\n" -msgstr "%1 的不當 EXE 格式。\n" +msgstr "%1 是錯誤的 EXE 格式。\n" #: dlls/kernel32/winerror.mc:763 msgid "Iterated data exceeds 64k in %1.\n" @@ -4673,19 +4609,19 @@ msgstr "不允許巢狀 LoadModule 呼叫。\n" #: dlls/kernel32/winerror.mc:858 msgid "Machine type mismatch.\n" -msgstr "機器型態不匹配。\n" +msgstr "機器類型不相符。\n" #: dlls/kernel32/winerror.mc:863 msgid "Bad pipe.\n" -msgstr "不當的管線。\n" +msgstr "錯誤的管線。\n" #: dlls/kernel32/winerror.mc:868 msgid "Pipe busy.\n" -msgstr "管線忙碌。\n" +msgstr "管線忙碌中。\n" #: dlls/kernel32/winerror.mc:873 msgid "Pipe closed.\n" -msgstr "管線關閉。\n" +msgstr "管線已關閉。\n" #: dlls/kernel32/winerror.mc:878 msgid "Pipe not connected.\n" @@ -4693,11 +4629,11 @@ msgstr "管線未連接。\n" #: dlls/kernel32/winerror.mc:883 msgid "More data available.\n" -msgstr "更多資料可用。\n" +msgstr "有更多可用資料。\n" #: dlls/kernel32/winerror.mc:888 msgid "Session canceled.\n" -msgstr "已取消工作階段。\n" +msgstr "工作階段已取消。\n" #: dlls/kernel32/winerror.mc:893 msgid "Invalid extended attribute name.\n" @@ -4733,7 +4669,7 @@ msgstr "進階屬性表格已滿。\n" #: dlls/kernel32/winerror.mc:933 msgid "Invalid extended attribute handle.\n" -msgstr "無效的進階屬性控柄。\n" +msgstr "無效的進階屬性控制代碼。\n" #: dlls/kernel32/winerror.mc:938 msgid "Extended attributes not supported.\n" @@ -4745,7 +4681,7 @@ msgstr "Mutex 非由呼叫者所擁有。\n" #: dlls/kernel32/winerror.mc:948 msgid "Too many posts to semaphore.\n" -msgstr "號誌太多貼文。\n" +msgstr "旗號太多貼文。\n" #: dlls/kernel32/winerror.mc:953 msgid "Read/WriteProcessMemory partially completed.\n" @@ -4753,7 +4689,7 @@ msgstr "讀取/寫入行程記憶體已部分完成。\n" #: dlls/kernel32/winerror.mc:958 msgid "The oplock wasn't granted.\n" -msgstr "未被授與 oplock。\n" +msgstr "未授權 oplock。\n" #: dlls/kernel32/winerror.mc:963 msgid "Invalid oplock message received.\n" @@ -4821,7 +4757,7 @@ msgstr "無效的旗標。\n" #: dlls/kernel32/winerror.mc:1043 msgid "Unrecognized volume.\n" -msgstr "無法辨識的卷冊。\n" +msgstr "無法辨識的磁碟區。\n" #: dlls/kernel32/winerror.mc:1048 msgid "File invalid.\n" @@ -4833,7 +4769,7 @@ msgstr "無法全螢幕運行。\n" #: dlls/kernel32/winerror.mc:1058 msgid "Nonexistent token.\n" -msgstr "不存在的字組。\n" +msgstr "不存在的權杖。\n" #: dlls/kernel32/winerror.mc:1063 msgid "Registry corrupt.\n" @@ -4885,7 +4821,7 @@ msgstr "註冊表索引鍵有子項。\n" #: dlls/kernel32/winerror.mc:1123 msgid "Subkey must be volatile.\n" -msgstr "子項必須是易變的。\n" +msgstr "子項必須是可變的。\n" #: dlls/kernel32/winerror.mc:1128 msgid "Notify change request in progress.\n" @@ -4937,7 +4873,7 @@ msgstr "服務無法接受控制訊息。\n" #: dlls/kernel32/winerror.mc:1188 msgid "Service not active.\n" -msgstr "服務現未啟用。\n" +msgstr "服務尚未啟用。\n" #: dlls/kernel32/winerror.mc:1193 msgid "Service controller connect failed.\n" @@ -4985,7 +4921,7 @@ msgstr "服務已存在。\n" #: dlls/kernel32/winerror.mc:1248 msgid "System running last-known-good config.\n" -msgstr "系統執行最後已知正常的組配。\n" +msgstr "系統執行最近已知正常的組配。\n" #: dlls/kernel32/winerror.mc:1253 msgid "Service dependency deleted.\n" @@ -4993,11 +4929,11 @@ msgstr "服務相依性已刪除。\n" #: dlls/kernel32/winerror.mc:1258 msgid "Boot already accepted as last-good config.\n" -msgstr "開機已被接受為最後正常的組配。\n" +msgstr "開機已接受為上次正常的組配。\n" #: dlls/kernel32/winerror.mc:1263 msgid "Service not started since last boot.\n" -msgstr "服務自從最後一次開機即無法啟動。\n" +msgstr "服務自上次開機之後尚未啟動。\n" #: dlls/kernel32/winerror.mc:1268 msgid "Duplicate service name.\n" @@ -5013,11 +4949,11 @@ msgstr "無法偵測到驅動程式的失敗。\n" #: dlls/kernel32/winerror.mc:1283 msgid "Process abort cannot be detected.\n" -msgstr "無法偵測到行程中止。\n" +msgstr "無法偵測到處理程序中止。\n" #: dlls/kernel32/winerror.mc:1288 msgid "No recovery program for service.\n" -msgstr "沒有復原程式用於服務。\n" +msgstr "服務沒有復原程式。\n" #: dlls/kernel32/winerror.mc:1293 msgid "Service not implemented by exe.\n" @@ -5053,7 +4989,7 @@ msgstr "無效的區塊長度。\n" #: dlls/kernel32/winerror.mc:1333 msgid "Device not partitioned.\n" -msgstr "裝置未設分割區。\n" +msgstr "裝置未設定分割區。\n" #: dlls/kernel32/winerror.mc:1338 msgid "Unable to lock media.\n" @@ -5080,8 +5016,6 @@ msgid "No Unicode translation.\n" msgstr "沒有萬國碼轉譯。\n" #: dlls/kernel32/winerror.mc:1368 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "動態連結函式庫初始失敗。\n" @@ -5115,7 +5049,7 @@ msgstr "序列 I/O 計數器逾時。\n" #: dlls/kernel32/winerror.mc:1408 msgid "Floppy ID address mark not found.\n" -msgstr "找不到軟碟識別號位址標記。\n" +msgstr "找不到軟碟識別碼位址標記。\n" #: dlls/kernel32/winerror.mc:1413 msgid "Floppy reports wrong cylinder.\n" @@ -5123,7 +5057,7 @@ msgstr "軟碟回報錯誤的磁柱。\n" #: dlls/kernel32/winerror.mc:1418 msgid "Unknown floppy error.\n" -msgstr "未知的軟碟錯誤。\n" +msgstr "不明的軟碟錯誤。\n" #: dlls/kernel32/winerror.mc:1423 msgid "Floppy registers inconsistent.\n" @@ -5167,7 +5101,7 @@ msgstr "設定電源狀態失敗。\n" #: dlls/kernel32/winerror.mc:1473 msgid "Too many links.\n" -msgstr "太多鏈結。\n" +msgstr "太多連結。\n" #: dlls/kernel32/winerror.mc:1478 msgid "Newer Windows version needed.\n" @@ -5203,7 +5137,7 @@ msgstr "找不到 DLL 檔。\n" #: dlls/kernel32/winerror.mc:1518 msgid "Out of user handles.\n" -msgstr "超出使用者控柄。\n" +msgstr "超出使用者控制代碼。\n" #: dlls/kernel32/winerror.mc:1523 msgid "Message can only be used in synchronous calls.\n" @@ -5231,7 +5165,7 @@ msgstr "裝置需要重新初始化。\n" #: dlls/kernel32/winerror.mc:1553 msgid "The device requires cleaning.\n" -msgstr "裝置需要清潔。\n" +msgstr "裝置需要清理。\n" #: dlls/kernel32/winerror.mc:1558 msgid "The device door is open.\n" @@ -5259,11 +5193,11 @@ msgstr "找不到點。\n" #: dlls/kernel32/winerror.mc:1588 msgid "No running tracking service.\n" -msgstr "沒在執行追蹤服務。\n" +msgstr "沒有執行中的追蹤服務。\n" #: dlls/kernel32/winerror.mc:1593 msgid "No such volume ID.\n" -msgstr "沒有此類卷冊識別號。\n" +msgstr "沒有此類磁碟區識別碼。\n" #: dlls/kernel32/winerror.mc:1598 msgid "Unable to remove the file to be replaced.\n" @@ -5283,11 +5217,11 @@ msgstr "正在刪除日誌。\n" #: dlls/kernel32/winerror.mc:1618 msgid "The journal is not active.\n" -msgstr "日誌現未啟用。\n" +msgstr "日誌尚未啟用。\n" #: dlls/kernel32/winerror.mc:1623 msgid "Potential matching file found.\n" -msgstr "找到可能的匹配檔案。\n" +msgstr "找到可能的相符檔案。\n" #: dlls/kernel32/winerror.mc:1628 msgid "The journal entry was deleted.\n" @@ -5299,7 +5233,7 @@ msgstr "無效的裝置名稱。\n" #: dlls/kernel32/winerror.mc:1638 msgid "Connection unavailable.\n" -msgstr "連接不得使用。\n" +msgstr "連接無法使用。\n" #: dlls/kernel32/winerror.mc:1643 msgid "Device already remembered.\n" @@ -5307,7 +5241,7 @@ msgstr "裝置已被記住。\n" #: dlls/kernel32/winerror.mc:1648 msgid "No network or bad path.\n" -msgstr "沒有網路或不當的路徑。\n" +msgstr "沒有網路或錯誤的路徑。\n" #: dlls/kernel32/winerror.mc:1653 msgid "Invalid network provider name.\n" @@ -5315,11 +5249,11 @@ msgstr "無效的網路提供者名稱。\n" #: dlls/kernel32/winerror.mc:1658 msgid "Cannot open network connection profile.\n" -msgstr "無法開啟網路連線側寫檔。\n" +msgstr "無法開啟網路連線設定檔。\n" #: dlls/kernel32/winerror.mc:1663 msgid "Corrupt network connection profile.\n" -msgstr "損壞的網路連線側寫檔。\n" +msgstr "損壞的網路連線設定檔。\n" #: dlls/kernel32/winerror.mc:1668 msgid "Not a container.\n" @@ -5327,7 +5261,7 @@ msgstr "不是一個容器。\n" #: dlls/kernel32/winerror.mc:1673 msgid "Extended error.\n" -msgstr "進階錯誤。\n" +msgstr "延伸錯誤。\n" #: dlls/kernel32/winerror.mc:1678 msgid "Invalid group name.\n" @@ -5367,11 +5301,11 @@ msgstr "無效的訊息目的地。\n" #: dlls/kernel32/winerror.mc:1728 msgid "Session credential conflict.\n" -msgstr "作業階段憑據發生衝突。\n" +msgstr "工作階段憑據發生衝突。\n" #: dlls/kernel32/winerror.mc:1733 msgid "Remote session limit exceeded.\n" -msgstr "已超出遠端作業階段限制。\n" +msgstr "已超出遠端工作階段限制。\n" #: dlls/kernel32/winerror.mc:1738 msgid "Duplicate domain or workgroup name.\n" @@ -5395,7 +5329,7 @@ msgstr "連線被拒。\n" #: dlls/kernel32/winerror.mc:1763 msgid "Connection gracefully closed.\n" -msgstr "已平順關閉連接。\n" +msgstr "已順利關閉連線。\n" #: dlls/kernel32/winerror.mc:1768 msgid "Address already associated with transport endpoint.\n" @@ -5411,23 +5345,23 @@ msgstr "連線無效。\n" #: dlls/kernel32/winerror.mc:1783 msgid "Connection is active.\n" -msgstr "連接現正使用。\n" +msgstr "連線現正使用。\n" #: dlls/kernel32/winerror.mc:1788 msgid "Network unreachable.\n" -msgstr "無法連線網路。\n" +msgstr "網路無法連線。\n" #: dlls/kernel32/winerror.mc:1793 msgid "Host unreachable.\n" -msgstr "無法連線主機。\n" +msgstr "主機無法連線。\n" #: dlls/kernel32/winerror.mc:1798 msgid "Protocol unreachable.\n" -msgstr "無法連線協定。\n" +msgstr "協定無法連線。\n" #: dlls/kernel32/winerror.mc:1803 msgid "Port unreachable.\n" -msgstr "無法連線通訊埠。\n" +msgstr "通訊埠無法連線。\n" #: dlls/kernel32/winerror.mc:1808 msgid "Request aborted.\n" @@ -5435,7 +5369,7 @@ msgstr "已放棄要求。\n" #: dlls/kernel32/winerror.mc:1813 msgid "Connection aborted.\n" -msgstr "已放棄連接。\n" +msgstr "已放棄連線。\n" #: dlls/kernel32/winerror.mc:1818 msgid "Please retry operation.\n" @@ -5471,7 +5405,7 @@ msgstr "使用者未被認證。\n" #: dlls/kernel32/winerror.mc:1858 msgid "User not logged on.\n" -msgstr "使用者未被記錄。\n" +msgstr "使用者未登入。\n" #: dlls/kernel32/winerror.mc:1863 msgid "Continue work in progress.\n" @@ -5503,7 +5437,7 @@ msgstr "即使沒有變更任何東西時也進行作業。\n" #: dlls/kernel32/winerror.mc:1898 msgid "The user profile is invalid.\n" -msgstr "使用者側寫檔無效。\n" +msgstr "使用者設定檔無效。\n" #: dlls/kernel32/winerror.mc:1903 msgid "Not supported on Small Business Server.\n" @@ -5515,7 +5449,7 @@ msgstr "並非所有權限都被指派。\n" #: dlls/kernel32/winerror.mc:1913 msgid "Some security IDs not mapped.\n" -msgstr "某些安全識別號未對應。\n" +msgstr "某些安全識別碼未對應。\n" #: dlls/kernel32/winerror.mc:1918 msgid "No quotas for account.\n" @@ -5547,7 +5481,7 @@ msgstr "無效的主要群組。\n" #: dlls/kernel32/winerror.mc:1953 msgid "No impersonation token.\n" -msgstr "沒有假冒字組。\n" +msgstr "沒有模擬權杖。\n" #: dlls/kernel32/winerror.mc:1958 msgid "Can't disable mandatory group.\n" @@ -5555,11 +5489,11 @@ msgstr "無法停用必要群組。\n" #: dlls/kernel32/winerror.mc:1963 msgid "No logon servers available.\n" -msgstr "沒有可用的登錄伺服器。\n" +msgstr "沒有可用的登入伺服器。\n" #: dlls/kernel32/winerror.mc:1968 msgid "No such logon session.\n" -msgstr "沒有此類登錄作業階段。\n" +msgstr "沒有此類登入工作階段。\n" #: dlls/kernel32/winerror.mc:1973 msgid "No such privilege.\n" @@ -5623,7 +5557,7 @@ msgstr "帳號限制。\n" #: dlls/kernel32/winerror.mc:2048 msgid "Invalid logon hours.\n" -msgstr "無效的登錄時數。\n" +msgstr "無效的登入時數。\n" #: dlls/kernel32/winerror.mc:2053 msgid "Invalid workstation.\n" @@ -5639,7 +5573,7 @@ msgstr "帳號已停用。\n" #: dlls/kernel32/winerror.mc:2068 msgid "No security ID mapped.\n" -msgstr "沒有對應的安全識別號。\n" +msgstr "沒有對應的安全識別碼。\n" #: dlls/kernel32/winerror.mc:2073 msgid "Too many LUIDs requested.\n" @@ -5667,7 +5601,7 @@ msgstr "無效的安全描述元。\n" #: dlls/kernel32/winerror.mc:2103 msgid "Bad inherited ACL.\n" -msgstr "不當繼承的 ACL。\n" +msgstr "錯誤繼承的 ACL。\n" #: dlls/kernel32/winerror.mc:2108 msgid "Server disabled.\n" @@ -5679,7 +5613,7 @@ msgstr "伺服器未停用。\n" #: dlls/kernel32/winerror.mc:2118 msgid "Invalid ID authority.\n" -msgstr "無效的識別號授權。\n" +msgstr "無效的識別碼授權。\n" #: dlls/kernel32/winerror.mc:2123 msgid "Allotted space exceeded.\n" @@ -5691,19 +5625,19 @@ msgstr "無效的群組屬性。\n" #: dlls/kernel32/winerror.mc:2133 msgid "Bad impersonation level.\n" -msgstr "不當的假冒等級。\n" +msgstr "錯誤的模擬等級。\n" #: dlls/kernel32/winerror.mc:2138 msgid "Can't open anonymous security token.\n" -msgstr "無法開啟匿名安全性代表字組。\n" +msgstr "無法開啟匿名的安全權杖。\n" #: dlls/kernel32/winerror.mc:2143 msgid "Bad validation class.\n" -msgstr "不當的驗證類別。\n" +msgstr "錯誤的驗證類別。\n" #: dlls/kernel32/winerror.mc:2148 msgid "Bad token type.\n" -msgstr "不當的字組型態。\n" +msgstr "錯誤的權杖類型。\n" #: dlls/kernel32/winerror.mc:2153 msgid "No security on object.\n" @@ -5751,15 +5685,15 @@ msgstr "通用存取類型未對應。\n" #: dlls/kernel32/winerror.mc:2208 msgid "Bad descriptor format.\n" -msgstr "不當的描述元格式。\n" +msgstr "錯誤的描述元格式。\n" #: dlls/kernel32/winerror.mc:2213 msgid "Not a logon process.\n" -msgstr "不是個登錄行程。\n" +msgstr "不是登入工作階段。\n" #: dlls/kernel32/winerror.mc:2218 msgid "Logon session ID exists.\n" -msgstr "登錄期間識別碼已存在。\n" +msgstr "登入工作階段識別碼已存在。\n" #: dlls/kernel32/winerror.mc:2223 msgid "Unknown authentication package.\n" @@ -5767,19 +5701,19 @@ msgstr "不明認證套件。\n" #: dlls/kernel32/winerror.mc:2228 msgid "Bad logon session state.\n" -msgstr "不當的登錄作業階段狀態。\n" +msgstr "錯誤的登入工作階段狀態。\n" #: dlls/kernel32/winerror.mc:2233 msgid "Logon session ID collision.\n" -msgstr "登錄期間識別碼產生碰撞。\n" +msgstr "登入工作階段識別碼發生衝突。\n" #: dlls/kernel32/winerror.mc:2238 msgid "Invalid logon type.\n" -msgstr "無效的登錄型態。\n" +msgstr "無效的登入類型。\n" #: dlls/kernel32/winerror.mc:2243 msgid "Cannot impersonate.\n" -msgstr "無法假冒。\n" +msgstr "無法模擬。\n" #: dlls/kernel32/winerror.mc:2248 msgid "Invalid transaction state.\n" @@ -5807,7 +5741,7 @@ msgstr "其為使用者的主要群組。\n" #: dlls/kernel32/winerror.mc:2278 msgid "Token already in use.\n" -msgstr "字組已使用中。\n" +msgstr "權杖已在使用中。\n" #: dlls/kernel32/winerror.mc:2283 msgid "No such local group.\n" @@ -5827,7 +5761,7 @@ msgstr "本地群組已存在。\n" #: dlls/kernel32/winerror.mc:2303 dlls/kernel32/winerror.mc:2328 msgid "Logon type not granted.\n" -msgstr "登錄型態未授與。\n" +msgstr "登錄類型未授與。\n" #: dlls/kernel32/winerror.mc:2308 msgid "Too many secrets.\n" @@ -5843,7 +5777,7 @@ msgstr "內部安全資料庫錯誤。\n" #: dlls/kernel32/winerror.mc:2323 msgid "Too many context IDs.\n" -msgstr "太多文脈識別號。\n" +msgstr "太多內容識別碼。\n" #: dlls/kernel32/winerror.mc:2333 msgid "Cross-encrypted NT password required.\n" @@ -5867,7 +5801,7 @@ msgstr "必須輸入交叉加密過的本機密碼。\n" #: dlls/kernel32/winerror.mc:2358 msgid "No inheritable components.\n" -msgstr "沒有可繼承的成分。\n" +msgstr "沒有可繼承的元件。\n" #: dlls/kernel32/winerror.mc:2363 msgid "File or directory corrupt.\n" @@ -5879,7 +5813,7 @@ msgstr "磁碟已損壞。\n" #: dlls/kernel32/winerror.mc:2373 msgid "No user session key.\n" -msgstr "沒有使用者作業階段金鑰。\n" +msgstr "沒有使用者工作階段金鑰。\n" #: dlls/kernel32/winerror.mc:2378 msgid "License quota exceeded.\n" @@ -5895,31 +5829,31 @@ msgstr "相互認證失敗。\n" #: dlls/kernel32/winerror.mc:2393 msgid "Time skew between client and server.\n" -msgstr "客戶端與伺服端的時間偏斜。\n" +msgstr "用戶端與伺服器的時間存在偏移。\n" #: dlls/kernel32/winerror.mc:2398 msgid "Invalid window handle.\n" -msgstr "無效的視窗控柄。\n" +msgstr "無效的視窗控制代碼。\n" #: dlls/kernel32/winerror.mc:2403 msgid "Invalid menu handle.\n" -msgstr "無效的選單控柄。\n" +msgstr "無效的選單控制代碼。\n" #: dlls/kernel32/winerror.mc:2408 msgid "Invalid cursor handle.\n" -msgstr "無效的游標控柄。\n" +msgstr "無效的游標控制代碼。\n" #: dlls/kernel32/winerror.mc:2413 msgid "Invalid accelerator table handle.\n" -msgstr "無效的加速功能表格控柄。\n" +msgstr "無效的加速功能表格控制代碼。\n" #: dlls/kernel32/winerror.mc:2418 msgid "Invalid hook handle.\n" -msgstr "無效的攔截控柄。\n" +msgstr "無效的勾點控制代碼。\n" #: dlls/kernel32/winerror.mc:2423 msgid "Invalid DWP handle.\n" -msgstr "無效的 DWP 控柄。\n" +msgstr "無效的 DWP 控制代碼。\n" #: dlls/kernel32/winerror.mc:2428 msgid "Can't create top-level child window.\n" @@ -5935,7 +5869,7 @@ msgstr "視窗由另外的執行緒所擁有。\n" #: dlls/kernel32/winerror.mc:2443 msgid "Hotkey already registered.\n" -msgstr "熱鍵已被註冊。\n" +msgstr "快捷鍵已被註冊。\n" #: dlls/kernel32/winerror.mc:2448 msgid "Class already exists.\n" @@ -5955,7 +5889,7 @@ msgstr "無效的索引。\n" #: dlls/kernel32/winerror.mc:2468 msgid "Invalid icon handle.\n" -msgstr "無效的圖示控柄。\n" +msgstr "無效的圖示控制代碼。\n" #: dlls/kernel32/winerror.mc:2473 msgid "Private dialog index.\n" @@ -5963,11 +5897,11 @@ msgstr "私人的對話框索引。\n" #: dlls/kernel32/winerror.mc:2478 msgid "List box ID not found.\n" -msgstr "找不到清單方塊識別號。\n" +msgstr "找不到清單方塊識別碼。\n" #: dlls/kernel32/winerror.mc:2483 msgid "No wildcard characters.\n" -msgstr "沒有萬用字元字元。\n" +msgstr "沒有萬用字元。\n" #: dlls/kernel32/winerror.mc:2488 msgid "Clipboard not open.\n" @@ -5975,7 +5909,7 @@ msgstr "未開啟剪貼簿。\n" #: dlls/kernel32/winerror.mc:2493 msgid "Hotkey not registered.\n" -msgstr "快速鍵未註冊。\n" +msgstr "快捷鍵未註冊。\n" #: dlls/kernel32/winerror.mc:2498 msgid "Not a dialog window.\n" @@ -5983,7 +5917,7 @@ msgstr "不是個對話框視窗。\n" #: dlls/kernel32/winerror.mc:2503 msgid "Control ID not found.\n" -msgstr "找不到控制識別號。\n" +msgstr "找不到控制識別碼。\n" #: dlls/kernel32/winerror.mc:2508 msgid "Invalid combo box message.\n" @@ -6003,7 +5937,7 @@ msgstr "找不到 DC。\n" #: dlls/kernel32/winerror.mc:2528 msgid "Invalid hook filter.\n" -msgstr "無效的攔截篩選器。\n" +msgstr "無效的勾點篩選器。\n" #: dlls/kernel32/winerror.mc:2533 msgid "Invalid filter procedure.\n" @@ -6011,19 +5945,19 @@ msgstr "無效的篩選器程序。\n" #: dlls/kernel32/winerror.mc:2538 msgid "Hook procedure needs module handle.\n" -msgstr "攔截程序需要模組控柄。\n" +msgstr "勾點程序需要模組控制代碼。\n" #: dlls/kernel32/winerror.mc:2543 msgid "Global-only hook procedure.\n" -msgstr "僅限全域的攔截程序。\n" +msgstr "只限全域的勾點程序。\n" #: dlls/kernel32/winerror.mc:2548 msgid "Journal hook already set.\n" -msgstr "已經設定日誌攔截。\n" +msgstr "已經設定日誌勾點。\n" #: dlls/kernel32/winerror.mc:2553 msgid "Hook procedure not installed.\n" -msgstr "尚未安裝攔截程序。\n" +msgstr "尚未安裝勾點程序。\n" #: dlls/kernel32/winerror.mc:2558 msgid "Invalid list box message.\n" @@ -6039,7 +5973,7 @@ msgstr "這個清單方塊沒有定位停駐點。\n" #: dlls/kernel32/winerror.mc:2573 msgid "Can't destroy object owned by another thread.\n" -msgstr "無法銷毀由另外執行緒所擁有的物件。\n" +msgstr "無法銷毀由其他執行緒所擁有的物件。\n" #: dlls/kernel32/winerror.mc:2578 msgid "Child window menus not allowed.\n" @@ -6063,7 +5997,7 @@ msgstr "螢幕已鎖定。\n" #: dlls/kernel32/winerror.mc:2603 msgid "Window handles have different parents.\n" -msgstr "視窗控柄有不同的上層。\n" +msgstr "視窗控制代碼有不同的父系。\n" #: dlls/kernel32/winerror.mc:2608 msgid "Not a child window.\n" @@ -6075,7 +6009,7 @@ msgstr "數字格式無效。\n" #: dlls/kernel32/winerror.mc:2618 msgid "Invalid thread ID.\n" -msgstr "無效的執行緒識別號。\n" +msgstr "無效的執行緒識別碼。\n" #: dlls/kernel32/winerror.mc:2623 msgid "Not an MDI child window.\n" @@ -6107,7 +6041,7 @@ msgstr "沒有非置換頁的系統資源。\n" #: dlls/kernel32/winerror.mc:2658 msgid "No paged system resources.\n" -msgstr "非置換頁的系統資源。\n" +msgstr "沒有置換頁的系統資源。\n" #: dlls/kernel32/winerror.mc:2663 msgid "No working set quota.\n" @@ -6127,11 +6061,11 @@ msgstr "找不到選單項目。\n" #: dlls/kernel32/winerror.mc:2683 msgid "Invalid keyboard handle.\n" -msgstr "無效的鍵盤控柄。\n" +msgstr "無效的鍵盤控制代碼。\n" #: dlls/kernel32/winerror.mc:2688 msgid "Hook type not allowed.\n" -msgstr "不允許攔截型態。\n" +msgstr "不允許的勾點類型。\n" #: dlls/kernel32/winerror.mc:2693 msgid "Interactive window station required.\n" @@ -6143,7 +6077,7 @@ msgstr "逾時。\n" #: dlls/kernel32/winerror.mc:2703 msgid "Invalid monitor handle.\n" -msgstr "無效的監視器控柄。\n" +msgstr "無效的監視器控制代碼。\n" #: dlls/kernel32/winerror.mc:2708 msgid "Event log file corrupt.\n" @@ -6171,11 +6105,11 @@ msgstr "使用者已放棄安裝。\n" #: dlls/kernel32/winerror.mc:2738 msgid "Installation failure.\n" -msgstr "安裝已失敗。\n" +msgstr "安裝失敗。\n" #: dlls/kernel32/winerror.mc:2743 msgid "Installation suspended.\n" -msgstr "安裝已懸置。\n" +msgstr "安裝暫停。\n" #: dlls/kernel32/winerror.mc:2748 msgid "Unknown product.\n" @@ -6183,19 +6117,19 @@ msgstr "不明產品。\n" #: dlls/kernel32/winerror.mc:2753 msgid "Unknown feature.\n" -msgstr "不明特徵。\n" +msgstr "不明功能。\n" #: dlls/kernel32/winerror.mc:2758 msgid "Unknown component.\n" -msgstr "未知的元件。\n" +msgstr "不明元件。\n" #: dlls/kernel32/winerror.mc:2763 msgid "Unknown property.\n" -msgstr "未知的屬性。\n" +msgstr "不明屬性。\n" #: dlls/kernel32/winerror.mc:2768 msgid "Invalid handle state.\n" -msgstr "無效的控柄狀態。\n" +msgstr "無效的控制代碼狀態。\n" #: dlls/kernel32/winerror.mc:2773 msgid "Bad configuration.\n" @@ -6251,7 +6185,7 @@ msgstr "開啟安裝記錄檔時失敗。\n" #: dlls/kernel32/winerror.mc:2838 msgid "Installation language not supported.\n" -msgstr "不受支援的安裝語言。\n" +msgstr "不支援的安裝語言。\n" #: dlls/kernel32/winerror.mc:2843 msgid "Installation transform failed to apply.\n" @@ -6275,11 +6209,11 @@ msgstr "無效的表格。\n" #: dlls/kernel32/winerror.mc:2868 msgid "Data type mismatch.\n" -msgstr "資料類型不匹配。\n" +msgstr "資料類型不相符。\n" #: dlls/kernel32/winerror.mc:2873 dlls/kernel32/winerror.mc:3083 msgid "Unsupported type.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的類型。\n" #: dlls/kernel32/winerror.mc:2878 msgid "Creation failed.\n" @@ -6291,7 +6225,7 @@ msgstr "無法寫入暫存資料夾。\n" #: dlls/kernel32/winerror.mc:2888 msgid "Installation platform not supported.\n" -msgstr "不受支援的安裝平臺。\n" +msgstr "不支援的安裝平臺。\n" #: dlls/kernel32/winerror.mc:2893 msgid "Installer not used.\n" @@ -6307,7 +6241,7 @@ msgstr "無效的更新套件。\n" #: dlls/kernel32/winerror.mc:2908 msgid "Unsupported patch package.\n" -msgstr "不受支援的修補程式套件。\n" +msgstr "不支援的修補程式套件。\n" #: dlls/kernel32/winerror.mc:2913 msgid "Another version is installed.\n" @@ -6351,7 +6285,7 @@ msgstr "無效的字串 UUID。\n" #: dlls/kernel32/winerror.mc:2963 msgid "Invalid endpoint format.\n" -msgstr "無效的終點格式。\n" +msgstr "無效的端點格式。\n" #: dlls/kernel32/winerror.mc:2968 msgid "Invalid network address.\n" @@ -6359,7 +6293,7 @@ msgstr "無效的網路位址。\n" #: dlls/kernel32/winerror.mc:2973 msgid "No endpoint found.\n" -msgstr "找不到任何終點。\n" +msgstr "找不到任何端點。\n" #: dlls/kernel32/winerror.mc:2978 msgid "Invalid timeout value.\n" @@ -6391,11 +6325,11 @@ msgstr "RPC 伺服器未傾聽。\n" #: dlls/kernel32/winerror.mc:3013 msgid "Unknown manager type.\n" -msgstr "不明管理員型態。\n" +msgstr "不明管理員類型。\n" #: dlls/kernel32/winerror.mc:3018 msgid "Unknown interface.\n" -msgstr "未知的介面。\n" +msgstr "不明的介面。\n" #: dlls/kernel32/winerror.mc:3023 msgid "No bindings.\n" @@ -6407,7 +6341,7 @@ msgstr "沒有協定序列。\n" #: dlls/kernel32/winerror.mc:3033 msgid "Can't create endpoint.\n" -msgstr "無法建立終點。\n" +msgstr "無法建立端點。\n" #: dlls/kernel32/winerror.mc:3038 msgid "Out of resources.\n" @@ -6415,7 +6349,7 @@ msgstr "資源不足。\n" #: dlls/kernel32/winerror.mc:3043 msgid "RPC server unavailable.\n" -msgstr "RPC 伺服器不得使用。\n" +msgstr "RPC 伺服器不可用。\n" #: dlls/kernel32/winerror.mc:3048 msgid "RPC server too busy.\n" @@ -6427,7 +6361,7 @@ msgstr "無效的網路選項。\n" #: dlls/kernel32/winerror.mc:3058 msgid "No RPC call active.\n" -msgstr "沒有現用的 RPC 呼叫。\n" +msgstr "沒有可用的 RPC 呼叫。\n" #: dlls/kernel32/winerror.mc:3063 msgid "RPC call failed.\n" @@ -6443,7 +6377,7 @@ msgstr "RPC 協定發生錯誤。\n" #: dlls/kernel32/winerror.mc:3078 msgid "Unsupported transfer syntax.\n" -msgstr "不受支援的轉送語法。\n" +msgstr "不支援的轉送語法。\n" #: dlls/kernel32/winerror.mc:3088 msgid "Invalid tag.\n" @@ -6463,7 +6397,7 @@ msgstr "無效的名稱語法。\n" #: dlls/kernel32/winerror.mc:3108 msgid "Unsupported name syntax.\n" -msgstr "不受支援的名稱語法。\n" +msgstr "不支援的名稱語法。\n" #: dlls/kernel32/winerror.mc:3113 msgid "No network address.\n" @@ -6471,7 +6405,7 @@ msgstr "沒有網路位址。\n" #: dlls/kernel32/winerror.mc:3118 msgid "Duplicate endpoint.\n" -msgstr "重複的終點。\n" +msgstr "重複的端點。\n" #: dlls/kernel32/winerror.mc:3123 msgid "Unknown authentication type.\n" @@ -6479,7 +6413,7 @@ msgstr "不明認證類型。\n" #: dlls/kernel32/winerror.mc:3128 msgid "Maximum calls too low.\n" -msgstr "太低的呼叫數最大值。\n" +msgstr "呼叫數的最大值太低。\n" #: dlls/kernel32/winerror.mc:3133 msgid "String too long.\n" @@ -6523,7 +6457,7 @@ msgstr "無法進行作業。\n" #: dlls/kernel32/winerror.mc:3183 msgid "Endpoints not registered.\n" -msgstr "終點未註冊。\n" +msgstr "端點未註冊。\n" #: dlls/kernel32/winerror.mc:3188 msgid "Nothing to export.\n" @@ -6543,7 +6477,7 @@ msgstr "已無更多成員。\n" #: dlls/kernel32/winerror.mc:3208 msgid "Not all objects unexported.\n" -msgstr "並非所有物件被取消匯出。\n" +msgstr "並非所有物件未被匯出。\n" #: dlls/kernel32/winerror.mc:3213 msgid "Interface not found.\n" @@ -6559,7 +6493,7 @@ msgstr "找不到條目。\n" #: dlls/kernel32/winerror.mc:3228 msgid "Name service unavailable.\n" -msgstr "名稱服務不得使用。\n" +msgstr "名稱服務不可用。\n" #: dlls/kernel32/winerror.mc:3233 msgid "Invalid network address family.\n" @@ -6571,7 +6505,7 @@ msgstr "操作不受支援。\n" #: dlls/kernel32/winerror.mc:3243 msgid "No security context available.\n" -msgstr "沒有可用安全文脈。\n" +msgstr "沒有可用的安全內容。\n" #: dlls/kernel32/winerror.mc:3248 msgid "RPCInternal error.\n" @@ -6611,23 +6545,23 @@ msgstr "字元翻譯表格檔案太小。\n" #: dlls/kernel32/winerror.mc:3293 msgid "Null context handle.\n" -msgstr "空值文脈控柄。\n" +msgstr "內容控制代碼為空值。\n" #: dlls/kernel32/winerror.mc:3298 msgid "Context handle damaged.\n" -msgstr "文脈控柄受損害。\n" +msgstr "內容控制代碼已損壞。\n" #: dlls/kernel32/winerror.mc:3303 msgid "Binding handle mismatch.\n" -msgstr "繫結控柄不匹配。\n" +msgstr "繫結控制代碼不相符。\n" #: dlls/kernel32/winerror.mc:3308 msgid "Cannot get call handle.\n" -msgstr "無法提取呼叫控柄。\n" +msgstr "無法提取呼叫控制代碼。\n" #: dlls/kernel32/winerror.mc:3313 msgid "Null reference pointer.\n" -msgstr "空值參考指標。\n" +msgstr "參考指標為空值。\n" #: dlls/kernel32/winerror.mc:3318 msgid "Enumeration value out of range.\n" @@ -6639,7 +6573,7 @@ msgstr "位元組數量太小。\n" #: dlls/kernel32/winerror.mc:3328 msgid "Bad stub data.\n" -msgstr "不當的殘餘資料。\n" +msgstr "損壞的虛設常式資料。\n" #: dlls/kernel32/winerror.mc:3333 msgid "Invalid user buffer.\n" @@ -6667,15 +6601,15 @@ msgstr "信賴的關聯性失敗。\n" #: dlls/kernel32/winerror.mc:3363 msgid "Trust logon failure.\n" -msgstr "信賴登錄失敗。\n" +msgstr "信賴登入失敗。\n" #: dlls/kernel32/winerror.mc:3368 msgid "RPC call already in progress.\n" -msgstr "RPC 呼叫已正進行。\n" +msgstr "RPC 呼叫已在進行。\n" #: dlls/kernel32/winerror.mc:3373 msgid "NETLOGON is not started.\n" -msgstr "NETLOGON 未被啟始。\n" +msgstr "NETLOGON 未被啟動。\n" #: dlls/kernel32/winerror.mc:3378 msgid "Account expired.\n" @@ -6683,7 +6617,7 @@ msgstr "帳號已過期。\n" #: dlls/kernel32/winerror.mc:3383 msgid "Redirector has open handles.\n" -msgstr "重導器已開啟控柄。\n" +msgstr "重導器已開啟控制代碼。\n" #: dlls/kernel32/winerror.mc:3388 msgid "Printer driver already installed.\n" @@ -6695,7 +6629,7 @@ msgstr "不明通訊埠。\n" #: dlls/kernel32/winerror.mc:3398 msgid "Unknown printer driver.\n" -msgstr "未知的印表機驅動程式。\n" +msgstr "不明印表機驅動程式。\n" #: dlls/kernel32/winerror.mc:3403 msgid "Unknown print processor.\n" @@ -6735,15 +6669,15 @@ msgstr "已無更多繫結。\n" #: dlls/kernel32/winerror.mc:3448 msgid "Can't log on with inter-domain trust account.\n" -msgstr "無法以網域間信賴帳號登錄。\n" +msgstr "無法以網域間信任帳號登入。\n" #: dlls/kernel32/winerror.mc:3453 msgid "Can't log on with workstation trust account.\n" -msgstr "無法以工作站信賴帳號登錄。\n" +msgstr "無法以工作站信任帳號登入。\n" #: dlls/kernel32/winerror.mc:3458 msgid "Can't log on with server trust account.\n" -msgstr "無法以伺服器信賴帳號登錄。\n" +msgstr "無法以伺服器信任帳號登入。\n" #: dlls/kernel32/winerror.mc:3463 msgid "Domain trust information inconsistent.\n" @@ -6751,7 +6685,7 @@ msgstr "網域信賴資訊不一致。\n" #: dlls/kernel32/winerror.mc:3468 msgid "Server has open handles.\n" -msgstr "伺服器已開啟控柄。\n" +msgstr "伺服器已開啟控制代碼。\n" #: dlls/kernel32/winerror.mc:3473 msgid "Resource data not found.\n" @@ -6791,7 +6725,7 @@ msgstr "RPC 指令失敗。\n" #: dlls/kernel32/winerror.mc:3518 msgid "Unsupported authorization level.\n" -msgstr "不受支援的授權等級。\n" +msgstr "不支援的授權等級。\n" #: dlls/kernel32/winerror.mc:3523 msgid "No principal name registered.\n" @@ -6815,7 +6749,7 @@ msgstr "執行緒未取消。\n" #: dlls/kernel32/winerror.mc:3548 msgid "Invalid handle operation.\n" -msgstr "無效的控柄作業。\n" +msgstr "無效的控制代碼作業。\n" #: dlls/kernel32/winerror.mc:3553 msgid "Wrong serializing package version.\n" @@ -6843,7 +6777,7 @@ msgstr "找不到群組成員。\n" #: dlls/kernel32/winerror.mc:3583 msgid "Can't create endpoint mapper DB.\n" -msgstr "無法建立終點映射器資料庫。\n" +msgstr "無法建立端點對應器資料庫。\n" #: dlls/kernel32/winerror.mc:3588 msgid "Invalid object.\n" @@ -6863,7 +6797,7 @@ msgstr "無效的表單大小。\n" #: dlls/kernel32/winerror.mc:3608 msgid "Already awaiting printer handle.\n" -msgstr "已經在等待印表機控柄。\n" +msgstr "已經在等待印表機控制代碼。\n" #: dlls/kernel32/winerror.mc:3613 msgid "Printer deleted.\n" @@ -6903,7 +6837,7 @@ msgstr "不完整的 RPC 發送。\n" #: dlls/kernel32/winerror.mc:3658 msgid "Invalid asynchronous RPC handle.\n" -msgstr "無效的非同步 RPC 控柄。\n" +msgstr "無效的非同步 RPC 控制代碼。\n" #: dlls/kernel32/winerror.mc:3663 msgid "Invalid asynchronous RPC call.\n" @@ -6935,7 +6869,7 @@ msgstr "無法解析檔名。\n" #: dlls/kernel32/winerror.mc:3698 msgid "RPC entry type mismatch.\n" -msgstr "RPC 條目型態不匹配。\n" +msgstr "RPC 條目類型不匹配。\n" #: dlls/kernel32/winerror.mc:3703 msgid "Not all objects could be exported.\n" @@ -6947,15 +6881,15 @@ msgstr "無法匯出介面。\n" #: dlls/kernel32/winerror.mc:3713 msgid "The profile could not be added.\n" -msgstr "無法加入側寫檔。\n" +msgstr "無法加入設定檔。\n" #: dlls/kernel32/winerror.mc:3718 msgid "The profile element could not be added.\n" -msgstr "無法加入側寫檔元件。\n" +msgstr "無法加入設定檔元件。\n" #: dlls/kernel32/winerror.mc:3723 msgid "The profile element could not be removed.\n" -msgstr "無法移除側寫檔元件。\n" +msgstr "無法移除設定檔元件。\n" #: dlls/kernel32/winerror.mc:3728 msgid "The group element could not be added.\n" @@ -6970,57 +6904,41 @@ msgid "The username could not be found.\n" msgstr "無法找到使用者名稱。\n" #: dlls/kernel32/winerror.mc:3743 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "站臺不存在。\n" +msgstr "這個網路連線不存在。\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "連線被拒。\n" +msgstr "連線被同儕節點重設。\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "未實作" +msgstr "未實作。\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "RPC 呼叫失敗。\n" +msgstr "呼叫失敗。\n" #: dlls/kernel32/winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "在檔案 %2 中找不到訊息 0x%1。\n" +msgstr "無法在檔案中找到簽章。\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "無效的層級。\n" +msgstr "無效的呼叫。\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Help not available." msgid "Resource is not currently available.\n" -msgstr "沒有可用的說明資訊。" +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 msgid "Normal" -msgstr "中" +msgstr "標準" #: dlls/localspl/localspl.rc:37 #, fuzzy -- 2.33.0.windows.2

1 0

[PATCH] winebus.sys: get inotify working on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

FreeBSD requires linking to the inotify library, and including limits.h. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/winebus.sys/Makefile.in | 2 ++ dlls/winebus.sys/bus_udev.c | 1 + 2 files changed, 3 insertions(+)

2 1

[PATCH 8/8] wrc: use sysctl instead of /proc/curproc/file on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- tools/wrc/wrc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)

1 0

[PATCH 7/8] wmc: use sysctl instead of /proc/curproc/file on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- tools/wmc/wmc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)

1 0

[PATCH 6/8] winegcc: use sysctl instead of /proc/curproc/file on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- tools/winegcc/winegcc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)

1 0

[PATCH 5/8] widl: use sysctl instead of /proc/curproc/file on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- tools/widl/widl.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)

1 0

[PATCH 4/8] libs/wine: use sysctl instead of /proc/curproc/file on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- libs/wine/config.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)

1 0

[PATCH 3/8] ntdll: use sysctl instead of /proc/curproc/file on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ntdll/unix/loader.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)

1 0

[PATCH 2/8] loader: use sysctl instead of /proc/curproc/file on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- loader/main.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)

1 0

[PATCH 1/8] server: use sysctl instead of /proc/curproc/file on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- server/unicode.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)

1 0

[PATCH 0/8] use sysctl instead of /proc/curproc/file on FreeBSD
by Damjan Jovanovic 23 Oct '21

23 Oct '21

/proc isn't even mounted by default on FreeBSD, causing Wine to crash, yet everything it provides is always available through sysctl(3) and/or libprocstat(3). This patchset changes Wine to use sysctl() calls instead of /proc/curproc/file, and gets Wine working with /proc unmounted. Damjan Jovanovic (8): server: use sysctl instead of /proc/curproc/file on FreeBSD loader: use sysctl instead of /proc/curproc/file on FreeBSD ntdll: use sysctl instead of /proc/curproc/file on FreeBSD libs/wine: use sysctl instead of /proc/curproc/file on FreeBSD widl: use sysctl instead of /proc/curproc/file on FreeBSD winegcc: use sysctl instead of /proc/curproc/file on FreeBSD wmc: use sysctl instead of /proc/curproc/file on FreeBSD wrc: use sysctl instead of /proc/curproc/file on FreeBSD dlls/ntdll/unix/loader.c | 14 +++++++++++++- libs/wine/config.c | 16 ++++++++++++++-- loader/main.c | 15 ++++++++++++--- server/unicode.c | 16 +++++++++++++++- tools/widl/widl.c | 12 +++++++++++- tools/winegcc/winegcc.c | 12 +++++++++++- tools/wmc/wmc.c | 12 +++++++++++- tools/wrc/wrc.c | 12 +++++++++++- 8 files changed, 98 insertions(+), 11 deletions(-) -- 2.32.0

1 0

[PATCH] libs/mpg123: Fix compilation with clang.
by Dmitry Timoshkov 23 Oct '21

23 Oct '21

clang -c -o libs/mpg123/src/compat/compat.cross.o ../wine.src/libs/mpg123/src/compat/compat.c -Ilibs/mpg123 \ -I../wine.src/libs/mpg123 -Iinclude -I../wine.src/include -I../wine.src/include/msvcrt \ -I../wine.src/libs/mpg123/src -I../wine.src/libs/mpg123/src/compat \ -I../wine.src/libs/mpg123/src/libmpg123 -DOPT_GENERIC_DITHER -DREAL_IS_FLOAT -DNO_CATCHSIGNAL \ -D_UCRT -D__WINE_PE_BUILD -target x86_64-windows -fno-strict-aliasing -Wno-pragma-pack -Wno-format \ -mcx16 -gdwarf-2 -gstrict-dwarf -g -O2 In file included from ../wine.src/libs/mpg123/src/compat/compat.c:15: ../wine.src/libs/mpg123/src/compat/compat.h:74:10: fatal error: 'strings.h' file not found ^~~~~~~~~~~ 1 error generated. make: *** [Makefile:216382: libs/mpg123/src/compat/compat.cross.o] Error 1 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- libs/mpg123/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/mpg123/config.h b/libs/mpg123/config.h index 77986b2a513..c0ad79f0ebf 100644 --- a/libs/mpg123/config.h +++ b/libs/mpg123/config.h @@ -219,7 +219,7 @@ #define HAVE_STRERROR 1 /* Define to 1 if you have the <strings.h> header file. */ -#define HAVE_STRINGS_H 1 +/* #undef HAVE_STRINGS_H 1 */ /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 -- 2.33.1

2 1

Fwd: [PATCH 1/2] Add xinputuap.dll
by Yusuf Khan 23 Oct '21

23 Oct '21

---------- Forwarded message --------- From: Yusuf Khan <yusisamerican(a)gmail.com> Date: Fri, Oct 22, 2021 at 4:01 PM Subject: Re: [PATCH 1/2] Add xinputuap.dll To: Alex Henrie <alexhenrie24(a)gmail.com> On Fri, Oct 22, 2021 at 3:52 PM Yusuf Khan <yusisamerican(a)gmail.com> wrote: > > Hi Alex! > > I have added the changes you have suggested. I do not know what names > of the applications were since I have an awful memory. When I checked > my custom build of wine I saw in my notes document that an app was not > booting without this DLL, it was dated 10/12/21 which was quite recent > so it probably wouldn't break any modern functionality. I just sent a > patch file to this mailing list. > > -Yusuf Khan > > On Thu, Oct 21, 2021 at 9:11 PM Alex Henrie <alexhenrie24(a)gmail.com> wrote: > > > > Hello Yusuf, and thank you for your interest in contributing to Wine! > > > > You should add the new DLL to configure.ac instead of configure. Run > > `autoconf` to copy the changes from configure.ac to configure, but > > only commit the changes to configure.ac to Git, not the changes to > > configure. Send it all as one patch and only attach one patch to each > > email that you send to the wine-devel mailing list. > > > > What are the names of the applications that require this DLL? > > > > -Alex

1 0

[PATCH] mpg123: Don't try to include strings.h
by Martin Storsjö 23 Oct '21

23 Oct '21

Wine doesn't provide this header. When building with mingw tools, it ends up including the header from the mingw toolchain's headers. When building with Clang in MSVC mode, it fails to include the header altogether. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- libs/mpg123/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/mpg123/config.h b/libs/mpg123/config.h index 77986b2a513..ba3e217ee0d 100644 --- a/libs/mpg123/config.h +++ b/libs/mpg123/config.h @@ -219,7 +219,7 @@ #define HAVE_STRERROR 1 /* Define to 1 if you have the <strings.h> header file. */ -#define HAVE_STRINGS_H 1 +/* #undef HAVE_STRINGS_H */ /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 -- 2.25.1

1 0

[PATCH 1/2] Add xinputuap.dll
by Yusuf Khan 22 Oct '21

22 Oct '21

2 2

Wine staging 6.20 release
by Alistair Leslie-Hughes 22 Oct '21

22 Oct '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.20 (557 patches are applied to wine vanilla) Notes * The mfplat-streaming patchset is currently disabled, so some games will not work with release. * All the dinput patches are also disabled as these should be fixed upstream by the new HID backend. Please file bug reports if a feature is not working as expected. Upstreamed (Either directly from staging or fixed with a similar patch). * dinput: Recalculated Axis after deadzone change. * dinput: Load users Joystick mappings. * dinput: Allow reconnecting to disconnected joysticks. * imm32: Automatically initialize COM on window activation. * imm32: Only generate 'WM_IME_SETCONTEXT' message if window has focus Added: * None Updated: * eventfd_synchronization * ntdll-NtAlertThreadByThreadId Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] strmbase: Send EC_COMPLETE on Run for unconnected renderers
by Andrew Eikum 22 Oct '21

22 Oct '21

Tests written by Zebediah Figura. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/evr/tests/evr.c | 104 ++++++++++++++++++++++++++++++ dlls/qedit/tests/nullrenderer.c | 104 ++++++++++++++++++++++++++++++ dlls/quartz/tests/videorenderer.c | 67 +++++++++++++++++++ dlls/quartz/tests/vmr9.c | 67 +++++++++++++++++++ dlls/strmbase/renderer.c | 2 +- 5 files changed, 343 insertions(+), 1 deletion(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 01edda7bc9b..4f2bfc5b986 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -84,6 +84,15 @@ static IBaseFilter *create_evr(void) return filter; } +static IFilterGraph2 *create_graph(void) +{ + IFilterGraph2 *ret; + HRESULT hr; + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&ret); + ok(hr == S_OK, "Failed to create FilterGraph: %#x\n", hr); + return ret; +} + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -2763,6 +2772,100 @@ static void test_MFIsFormatYUV(void) } } +static unsigned int check_event_code(IMediaEvent *eventsrc, DWORD timeout, LONG expected_code, LONG_PTR expected1, LONG_PTR expected2) +{ + LONG_PTR param1, param2; + unsigned int ret = 0; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, timeout)) == S_OK) + { + if (code == expected_code) + { + ok(param1 == expected1, "Got param1 %#lx.\n", param1); + ok(param2 == expected2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + timeout = 0; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static inline unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) +{ + return check_event_code(eventsrc, timeout, EC_COMPLETE, S_OK, 0); +} + +static void test_unconnected_eos(void) +{ + IBaseFilter *filter = create_evr(); + IFilterGraph2 *graph = create_graph(); + IMediaControl *control; + IMediaEvent *eventsrc; + unsigned int ret; + HRESULT hr; + ULONG ref; + + hr = IFilterGraph2_AddFilter(graph, filter, L"renderer"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + IMediaControl_Release(control); + IMediaEvent_Release(eventsrc); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(evr) { CoInitialize(NULL); @@ -2788,6 +2891,7 @@ START_TEST(evr) test_mixer_zorder(); test_mixer_samples(); test_MFIsFormatYUV(); + test_unconnected_eos(); CoUninitialize(); } diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index 1800f4dad4c..59e346fe5bf 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -32,6 +32,15 @@ static IBaseFilter *create_null_renderer(void) return filter; } +static IFilterGraph2 *create_graph(void) +{ + IFilterGraph2 *ret; + HRESULT hr; + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&ret); + ok(hr == S_OK, "Failed to create FilterGraph: %#x\n", hr); + return ret; +} + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -900,6 +909,100 @@ static void test_connect_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static unsigned int check_event_code(IMediaEvent *eventsrc, DWORD timeout, LONG expected_code, LONG_PTR expected1, LONG_PTR expected2) +{ + LONG_PTR param1, param2; + unsigned int ret = 0; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, timeout)) == S_OK) + { + if (code == expected_code) + { + ok(param1 == expected1, "Got param1 %#lx.\n", param1); + ok(param2 == expected2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + timeout = 0; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static inline unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) +{ + return check_event_code(eventsrc, timeout, EC_COMPLETE, S_OK, 0); +} + +static void test_unconnected_eos(void) +{ + IBaseFilter *filter = create_null_renderer(); + IFilterGraph2 *graph = create_graph(); + IMediaControl *control; + IMediaEvent *eventsrc; + unsigned int ret; + HRESULT hr; + ULONG ref; + + hr = IFilterGraph2_AddFilter(graph, filter, L"renderer"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + IMediaControl_Release(control); + IMediaEvent_Release(eventsrc); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -924,6 +1027,7 @@ START_TEST(nullrenderer) test_media_types(); test_enum_media_types(); test_connect_pin(); + test_unconnected_eos(); CoUninitialize(); } diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 8d0003cf12e..5625971426b 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2865,6 +2865,72 @@ static void test_basic_video(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_unconnected_eos(void) +{ + IBaseFilter *filter = create_video_renderer(); + IFilterGraph2 *graph = create_graph(); + IMediaControl *control; + IMediaEvent *eventsrc; + unsigned int ret; + HRESULT hr; + ULONG ref; + + hr = IFilterGraph2_AddFilter(graph, filter, L"renderer"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + IMediaControl_Release(control); + IMediaEvent_Release(eventsrc); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(videorenderer) { CoInitialize(NULL); @@ -2881,6 +2947,7 @@ START_TEST(videorenderer) test_overlay(); test_video_window(); test_basic_video(); + test_unconnected_eos(); CoUninitialize(); } diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 154b6a6b99e..bb8b91eaeef 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -4170,6 +4170,72 @@ static void test_mixing_prefs(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_unconnected_eos(void) +{ + IBaseFilter *filter = create_vmr9(0); + IFilterGraph2 *graph = create_graph(); + IMediaControl *control; + IMediaEvent *eventsrc; + unsigned int ret; + HRESULT hr; + ULONG ref; + + hr = IFilterGraph2_AddFilter(graph, filter, L"renderer"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + IMediaControl_Release(control); + IMediaEvent_Release(eventsrc); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -4205,6 +4271,7 @@ START_TEST(vmr9) test_basic_video(); test_windowless_size(); test_mixing_prefs(); + test_unconnected_eos(); CoUninitialize(); } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index a879917b169..da257555a19 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -252,7 +252,7 @@ static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TI if (filter->sink.pin.peer && filter->ops->renderer_start_stream) filter->ops->renderer_start_stream(filter); - if (filter->eos && graph + if ((filter->eos || !filter->sink.pin.peer) && graph && SUCCEEDED(IFilterGraph_QueryInterface(graph, &IID_IMediaEventSink, (void **)&event_sink))) { -- 2.33.1

2 1

[PATCH] gdi32: Fixed obj_map_cmp special cases.
by Francisco Casas 22 Oct '21

22 Oct '21

>From 6e1444a2d4a7585e199f3e8cc01844362e6358c7 Mon Sep 17 00:00:00 2001 From: Francisco Casas <franciscojacb(a)gmail.com> Date: Fri, 22 Oct 2021 14:21:30 -0300 Subject: [PATCH] gdi32: Fixed obj_map_cmp special cases. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixed obj_map_cmp when the difference between key and entry is too large and the resulting integer overflows. e.g. The subtraction: 0x000000000A0A009F - 0xFFFFFFFF9910019E doesn't result in -1 as it should (even when using the highwords 0A0A009F - 9910019E). Also, by suggestion of Zebediah Figura, pointers are now cast to (UINT_PTR) instead of using HandleToLong(·), to avoid a theoretical chance of collision by only using the highwords. Signed-off-by: Francisco Casas <franciscojacb(a)gmail.com> --- dlls/gdi32/objects.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 4b390aa0160..c92a83bdebc 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -178,7 +178,11 @@ DWORD WINAPI GetObjectType( HGDIOBJ handle ) static int obj_map_cmp( const void *key, const struct wine_rb_entry *entry ) { struct obj_map_entry *obj_entry = WINE_RB_ENTRY_VALUE( entry, struct obj_map_entry, entry ); - return HandleToLong( key ) - HandleToLong( obj_entry->obj ); + UINT_PTR a = (UINT_PTR)(key); + UINT_PTR b = (UINT_PTR)(obj_entry->obj); + if(a>b) return 1; + if(a<b) return -1; + return 0; }; struct wine_rb_tree obj_map = { obj_map_cmp }; -- 2.25.1

1 0

[PATCH] Fixed obj_map_cmp when the difference between key and entry
by Francisco Casas 22 Oct '21

22 Oct '21

>From 2034bd429c5ab345d480c7faeb8ee2185d3449e4 Mon Sep 17 00:00:00 2001 From: Francisco Casas <franciscojacb(a)gmail.com> Date: Fri, 22 Oct 2021 11:09:44 -0300 Subject: [PATCH] Fixed obj_map_cmp when the difference between key and entry is too large. e.g. The substraction: 000000000A0A009F - FFFFFFFF9910019E doesn't result in -1 as it should. Signed-off-by: Francisco Casas <franciscojacb(a)gmail.com> --- dlls/gdi32/objects.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 4b390aa0160..3eebaef31cc 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -178,7 +178,11 @@ DWORD WINAPI GetObjectType( HGDIOBJ handle ) static int obj_map_cmp( const void *key, const struct wine_rb_entry *entry ) { struct obj_map_entry *obj_entry = WINE_RB_ENTRY_VALUE( entry, struct obj_map_entry, entry ); - return HandleToLong( key ) - HandleToLong( obj_entry->obj ); + LONG32 a = HandleToLong( key ); + LONG32 b = HandleToLong( obj_entry->obj ); + if(a>b) return 1; + if(a<b) return -1; + return 0; }; struct wine_rb_tree obj_map = { obj_map_cmp }; -- 2.25.1

2 1

[PATCH v2] wininet: Support option INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT for http requests.
by Hans Leidekker 22 Oct '21

22 Oct '21

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v2: PCERT_CHAIN_CONTEXT -> PCCERT_CHAIN_CONTEXT. Set last error before testing it. Improve patch subject. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wininet/http.c | 13 +++++++++++++ dlls/wininet/tests/http.c | 15 +++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c9c4a060aac..1ca97cf3eb0 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2321,6 +2321,19 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *(ULONG*)buffer = hdr->ErrorMask; *size = sizeof(ULONG); + return ERROR_SUCCESS; + case INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT: + TRACE("INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT\n"); + + if (*size < sizeof(PCCERT_CHAIN_CONTEXT)) + return ERROR_INSUFFICIENT_BUFFER; + + if (!req->server->cert_chain) + return ERROR_INTERNET_INCORRECT_HANDLE_STATE; + + *(PCCERT_CHAIN_CONTEXT *)buffer = CertDuplicateCertificateChain(req->server->cert_chain); + *size = sizeof(PCCERT_CHAIN_CONTEXT); + return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index d1d7e678853..3b8f16a9fb2 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6855,6 +6855,7 @@ static void test_secure_connection(void) INTERNET_CERTIFICATE_INFOW *certificate_structW = NULL; char certstr1[512], certstr2[512]; BOOL ret; + PCCERT_CHAIN_CONTEXT chain; ses = InternetOpenA("Gizmo5", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); @@ -6886,6 +6887,13 @@ static void test_secure_connection(void) test_cert_struct(req, &test_winehq_org_cert); + size = sizeof(chain); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT, &chain, &size); + ok(ret || GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE /* < IE8 */, + "InternetQueryOption failed: %u\n", GetLastError()); + if (ret) CertFreeCertificateChain(chain); + /* Querying the same option through InternetQueryOptionW still results in * ANSI strings being returned. */ @@ -7825,6 +7833,7 @@ static void test_cert_string(void) char actual[512]; DWORD size; BOOL res; + PCCERT_CHAIN_CONTEXT chain; ses = InternetOpenA( "winetest", 0, NULL, NULL, 0 ); ok( ses != NULL, "InternetOpenA failed\n" ); @@ -7845,6 +7854,12 @@ static void test_cert_string(void) ok( size == 0, "unexpected size: %u\n", size ); ok( actual[0] == 0x55, "unexpected byte: %02x\n", actual[0] ); + size = sizeof(chain); + SetLastError(0xdeadbeef); + res = InternetQueryOptionA(req, INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT, &chain, &size); + ok(!res && (GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_STATE), + "InternetQueryOption failed: %u\n", GetLastError()); + InternetCloseHandle( req ); InternetCloseHandle( con ); InternetCloseHandle( ses ); -- 2.30.2

3 2

[PATCH] Fixed obj_map_cmp when the difference between key and entry is too large.
by Francisco Casas 22 Oct '21

22 Oct '21

>From 2034bd429c5ab345d480c7faeb8ee2185d3449e4 Mon Sep 17 00:00:00 2001 From: Francisco Casas <franciscojacb(a)gmail.com> Date: Fri, 22 Oct 2021 11:09:44 -0300 Subject: [PATCH] Fixed obj_map_cmp when the difference between key and entry is too large. e.g. The substraction: 000000000A0A009F - FFFFFFFF9910019E doesn't result in -1 as it should. --- dlls/gdi32/objects.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 4b390aa0160..3eebaef31cc 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -178,7 +178,11 @@ DWORD WINAPI GetObjectType( HGDIOBJ handle ) static int obj_map_cmp( const void *key, const struct wine_rb_entry *entry ) { struct obj_map_entry *obj_entry = WINE_RB_ENTRY_VALUE( entry, struct obj_map_entry, entry ); - return HandleToLong( key ) - HandleToLong( obj_entry->obj ); + LONG32 a = HandleToLong( key ); + LONG32 b = HandleToLong( obj_entry->obj ); + if(a>b) return 1; + if(a<b) return -1; + return 0; }; struct wine_rb_tree obj_map = { obj_map_cmp }; -- 2.25.1

2 1

[PATCH 1/5] ntdll: Factor out capture_stack_back_trace() function.
by Paul Gofman 22 Oct '21

22 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/signal_i386.c | 22 ++++++++++++++++------ dlls/ntdll/signal_x86_64.c | 35 +++++++++++++++++++++++------------ 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 14971032ce6..0245aa602a1 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -481,17 +481,15 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, /************************************************************************* - * RtlCaptureStackBackTrace (NTDLL.@) + * capture_stack_back_trace */ -USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +static USHORT capture_stack_back_trace( CONTEXT *context, ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) { - CONTEXT context; - ULONG i; ULONG *frame; + ULONG i; - RtlCaptureContext( &context ); if (hash) *hash = 0; - frame = (ULONG *)context.Ebp; + frame = (ULONG *)context->Ebp; while (skip--) { @@ -510,6 +508,18 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, } +/************************************************************************* + * RtlCaptureStackBackTrace (NTDLL.@) + */ +USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +{ + CONTEXT context; + + RtlCaptureContext( &context ); + return capture_stack_back_trace( &context, skip, count, buffer, hash ); +} + + /*********************************************************************** * signal_start_thread */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ef32eba68b7..dbf622392b7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1490,27 +1490,23 @@ static inline ULONG hash_pointers( void **ptrs, ULONG count ) /************************************************************************* - * RtlCaptureStackBackTrace (NTDLL.@) + * capture_stack_back_trace */ -USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +static USHORT capture_stack_back_trace( CONTEXT *context, ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) { - UNWIND_HISTORY_TABLE table; DISPATCHER_CONTEXT dispatch; - CONTEXT context; + UNWIND_HISTORY_TABLE table; + USHORT num_entries = 0; NTSTATUS status; ULONG i; - USHORT num_entries = 0; - TRACE( "(%u, %u, %p, %p)\n", skip, count, buffer, hash ); - - RtlCaptureContext( &context ); dispatch.TargetIp = 0; - dispatch.ContextRecord = &context; + dispatch.ContextRecord = context; dispatch.HistoryTable = &table; if (hash) *hash = 0; for (i = 0; i < skip + count; i++) { - status = virtual_unwind( UNW_FLAG_NHANDLER, &dispatch, &context ); + status = virtual_unwind( UNW_FLAG_NHANDLER, &dispatch, context ); if (status != STATUS_SUCCESS) return i; if (!dispatch.EstablisherFrame) break; @@ -1524,9 +1520,9 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, break; } - if (context.Rsp == (ULONG64)NtCurrentTeb()->Tib.StackBase) break; + if (context->Rsp == (ULONG64)NtCurrentTeb()->Tib.StackBase) break; - if (i >= skip) buffer[num_entries++] = (void *)context.Rip; + if (i >= skip) buffer[num_entries++] = (void *)context->Rip; } if (hash && num_entries > 0) *hash = hash_pointers( buffer, num_entries ); TRACE( "captured %hu frames\n", num_entries ); @@ -1534,6 +1530,21 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, } +/************************************************************************* + * RtlCaptureStackBackTrace (NTDLL.@) + */ +USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +{ + CONTEXT context; + + TRACE( "(%u, %u, %p, %p)\n", skip, count, buffer, hash ); + + RtlCaptureContext( &context ); + + return capture_stack_back_trace( &context, skip, count, buffer, hash ); +} + + /*********************************************************************** * signal_start_thread */ -- 2.31.1

2 7

[v2 PATCH 1/5] msxml3/tests: Add some processing instruction tests.
by Nikolay Sivov 22 Oct '21

22 Oct '21

From: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/tests/domdoc.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9e9789ebd9a..d98a87f6d9c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8594,6 +8594,31 @@ static void test_createProcessingInstruction(void) hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"windows-1252\" dummy=\"value\""), &pi); todo_wine ok(hr == XML_E_UNEXPECTED_ATTRIBUTE, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, NULL, _bstr_("version=\"1.0\" encoding=\"UTF-8\""), &pi); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), NULL, &pi); +todo_wine + ok(hr == XML_E_XMLDECLSYNTAX, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=UTF-8"), &pi); +todo_wine + ok(hr == XML_E_MISSINGQUOTE, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding='UTF-8\""), &pi); +todo_wine + ok(hr == XML_E_BADCHARINSTRING, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"UTF-8"), &pi); +todo_wine + ok(hr == XML_E_BADCHARINSTRING, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding='UTF-8'"), &pi); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMProcessingInstruction_QueryInterface(pi, &IID_IXMLDOMNode, (void **)&node); + node_map = NULL; + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMNode_get_attributes(node, &node_map); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + if (node_map) IXMLDOMNamedNodeMap_Release(node_map); + IXMLDOMNode_Release(node); + IXMLDOMProcessingInstruction_Release(pi); /* test for BSTR handling, pass broken BSTR */ memcpy(&buff[2], L"test", 5 * sizeof(WCHAR)); -- 2.33.0

1 4

[PATCH 1/3] dinput: Cleanup mouse device enumeration and creation.
by Rémi Bernon 22 Oct '21

22 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/mouse.c | 134 +++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 83 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 1b91fa12189..4e353dba200 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -76,120 +76,88 @@ static inline SysMouseImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W return CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), SysMouseImpl, base); } -static void fill_mouse_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD version) { - DWORD dwSize; - DIDEVICEINSTANCEW ddi; - - dwSize = lpddi->dwSize; - - TRACE("%d %p\n", dwSize, lpddi); - - memset(lpddi, 0, dwSize); - memset(&ddi, 0, sizeof(ddi)); - - ddi.dwSize = dwSize; - ddi.guidInstance = GUID_SysMouse;/* DInput's GUID */ - ddi.guidProduct = GUID_SysMouse; - if (version >= 0x0800) - ddi.dwDevType = DI8DEVTYPE_MOUSE | (DI8DEVTYPEMOUSE_TRADITIONAL << 8); - else - ddi.dwDevType = DIDEVTYPE_MOUSE | (DIDEVTYPEMOUSE_TRADITIONAL << 8); - MultiByteToWideChar(CP_ACP, 0, "Mouse", -1, ddi.tszInstanceName, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, "Wine Mouse", -1, ddi.tszProductName, MAX_PATH); - - memcpy(lpddi, &ddi, (dwSize < sizeof(ddi) ? dwSize : sizeof(ddi))); -} - -static HRESULT mousedev_enum_device(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) +static HRESULT mouse_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version, int index ) { - if (id != 0) - return E_FAIL; - - if (dwFlags & DIEDFL_FORCEFEEDBACK) - return S_FALSE; - - if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_MOUSE) && (version < 0x0800)) || - (((dwDevType == DI8DEVCLASS_POINTER) || (dwDevType == DI8DEVTYPE_MOUSE)) && (version >= 0x0800))) { - TRACE("Enumerating the mouse device\n"); - - fill_mouse_dideviceinstanceW(lpddi, version); - - return S_OK; - } - - return S_FALSE; + DWORD size; + + TRACE( "type %#x, flags %#x, instance %p, version %#04x, index %d\n", type, flags, instance, version, index ); + + if (index != 0) return DIERR_GENERIC; + if (flags & DIEDFL_FORCEFEEDBACK) return DI_NOEFFECT; + if (version < 0x0800 && type != 0 && type != DIDEVTYPE_MOUSE) return DI_NOEFFECT; + if (version >= 0x0800 && type != DI8DEVCLASS_ALL && type != DI8DEVCLASS_POINTER && type != DI8DEVTYPE_MOUSE) + return DI_NOEFFECT; + + if (instance->dwSize != sizeof(DIDEVICEINSTANCEW) && + instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W)) + return DIERR_INVALIDPARAM; + + size = instance->dwSize; + memset( instance, 0, size ); + instance->dwSize = size; + instance->guidInstance = GUID_SysMouse; + instance->guidProduct = GUID_SysMouse; + if (version >= 0x0800) instance->dwDevType = DI8DEVTYPE_MOUSE | (DI8DEVTYPEMOUSE_TRADITIONAL << 8); + else instance->dwDevType = DIDEVTYPE_MOUSE | (DIDEVTYPEMOUSE_TRADITIONAL << 8); + MultiByteToWideChar( CP_ACP, 0, "Mouse", -1, instance->tszInstanceName, MAX_PATH ); + MultiByteToWideChar( CP_ACP, 0, "Wine Mouse", -1, instance->tszProductName, MAX_PATH ); + + return DI_OK; } -static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseImpl **out ) +static HRESULT mouse_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) { - SysMouseImpl* newDevice; - WCHAR buffer[20]; + SysMouseImpl *impl; HKEY hkey, appkey; + WCHAR buffer[20]; HRESULT hr; + TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); + + *out = NULL; + if (!IsEqualGUID( &GUID_SysMouse, guid )) return DIERR_DEVICENOTREG; + if (FAILED(hr = direct_input_device_alloc( sizeof(SysMouseImpl), &SysMouseWvt, &mouse_internal_vtbl, - rguid, dinput, (void **)&newDevice ))) + guid, dinput, (void **)&impl ))) return hr; - newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysMouseImpl*->base.crit"); + impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysMouseImpl*->base.crit"); - fill_mouse_dideviceinstanceW( &newDevice->base.instance, newDevice->base.dinput->dwVersion ); - newDevice->base.caps.dwDevType = newDevice->base.instance.dwDevType; - newDevice->base.caps.dwFirmwareRevision = 100; - newDevice->base.caps.dwHardwareRevision = 100; - newDevice->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; + mouse_enum_device( 0, 0, &impl->base.instance, dinput->dwVersion, 0 ); + impl->base.caps.dwDevType = impl->base.instance.dwDevType; + impl->base.caps.dwFirmwareRevision = 100; + impl->base.caps.dwHardwareRevision = 100; + impl->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; get_app_key(&hkey, &appkey); if (!get_config_key( hkey, appkey, L"MouseWarpOverride", buffer, sizeof(buffer) )) { - if (!wcsnicmp( buffer, L"disable", -1 )) newDevice->warp_override = WARP_DISABLE; - else if (!wcsnicmp( buffer, L"force", -1 )) newDevice->warp_override = WARP_FORCE_ON; + if (!wcsnicmp( buffer, L"disable", -1 )) impl->warp_override = WARP_DISABLE; + else if (!wcsnicmp( buffer, L"force", -1 )) impl->warp_override = WARP_FORCE_ON; } if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); - if (FAILED(hr = direct_input_device_init( &newDevice->base.IDirectInputDevice8W_iface ))) + if (FAILED(hr = direct_input_device_init( &impl->base.IDirectInputDevice8W_iface ))) { - IDirectInputDevice_Release( &newDevice->base.IDirectInputDevice8W_iface ); + IDirectInputDevice_Release( &impl->base.IDirectInputDevice8W_iface ); return hr; } if (dinput->dwVersion >= 0x0800) { - newDevice->base.use_raw_input = TRUE; - newDevice->base.raw_device.usUsagePage = 1; /* HID generic device page */ - newDevice->base.raw_device.usUsage = 2; /* HID generic mouse */ + impl->base.use_raw_input = TRUE; + impl->base.raw_device.usUsagePage = 1; /* HID generic device page */ + impl->base.raw_device.usUsage = 2; /* HID generic mouse */ } - *out = newDevice; + *out = &impl->base.IDirectInputDevice8W_iface; return DI_OK; } -static HRESULT mousedev_create_device( IDirectInputImpl *dinput, REFGUID rguid, IDirectInputDevice8W **out ) -{ - TRACE( "%p %s %p\n", dinput, debugstr_guid( rguid ), out ); - *out = NULL; - - if (IsEqualGUID(&GUID_SysMouse, rguid)) /* Wine Mouse */ - { - SysMouseImpl *This; - HRESULT hr; - - if (FAILED(hr = alloc_device( rguid, dinput, &This ))) return hr; - - TRACE( "Created a Mouse device (%p)\n", This ); - - *out = &This->base.IDirectInputDevice8W_iface; - return DI_OK; - } - - return DIERR_DEVICENOTREG; -} - const struct dinput_device mouse_device = { "Wine mouse driver", - mousedev_enum_device, - mousedev_create_device + mouse_enum_device, + mouse_create_device }; /****************************************************************************** -- 2.33.0

1 2

[v3 PATCH] msxml3/saxreader: Handle null url in parseURL().
by Nikolay Sivov 22 Oct '21

22 Oct '21

From: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51267 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/saxreader.c | 14 +++++++------- dlls/msxml3/tests/saxreader.c | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index c610ffcaccb..8c202bddccd 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2728,23 +2728,23 @@ static HRESULT internal_onDataAvailable(void *obj, char *ptr, DWORD len) return internal_parseBuffer(This, ptr, len, FALSE); } -static HRESULT internal_parseURL( - saxreader* This, - const WCHAR *url, - BOOL vbInterface) +static HRESULT internal_parseURL(saxreader *reader, const WCHAR *url, BOOL vbInterface) { IMoniker *mon; bsc_t *bsc; HRESULT hr; - TRACE("(%p)->(%s)\n", This, debugstr_w(url)); + TRACE("%p, %s.\n", reader, debugstr_w(url)); + + if (!url && reader->version < MSXML4) + return E_INVALIDARG; hr = create_moniker_from_url(url, &mon); if(FAILED(hr)) return hr; - if(vbInterface) hr = bind_url(mon, internal_vbonDataAvailable, This, &bsc); - else hr = bind_url(mon, internal_onDataAvailable, This, &bsc); + if(vbInterface) hr = bind_url(mon, internal_vbonDataAvailable, reader, &bsc); + else hr = bind_url(mon, internal_onDataAvailable, reader, &bsc); IMoniker_Release(mon); if(FAILED(hr)) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ad093af6a12..20c5e07443b 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2325,6 +2325,22 @@ static void test_saxreader(void) WriteFile(file, testXML, sizeof(testXML)-1, &written, NULL); CloseHandle(file); + /* crashes on newer versions */ + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader30)) + { + IVBSAXXMLReader *vb_reader; + + hr = ISAXXMLReader_parseURL(reader, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = ISAXXMLReader_QueryInterface(reader, &IID_IVBSAXXMLReader, (void **)&vb_reader); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IVBSAXXMLReader_parseURL(vb_reader, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IVBSAXXMLReader_Release(vb_reader); + } + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) || IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) test_seq = content_handler_test1_alternate; -- 2.33.0

1 0

[PATCH 1/2] mfplat: Consider MF_BYTESTREAM_ORIGIN_NAME when looking for bytestream handler.
by Nikolay Sivov 22 Oct '21

22 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7fd713261fc..5bd19190ed5 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5946,9 +5946,9 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA { static const char streamhandlerspath[] = "Software\\Microsoft\\Windows Media Foundation\\ByteStreamHandlers"; static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; + WCHAR *mimeW = NULL, *urlW = NULL; IMFAttributes *attributes; const WCHAR *url_ext; - WCHAR *mimeW = NULL; HRESULT hr = E_FAIL; unsigned int i, j; UINT32 length; @@ -5959,6 +5959,11 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA if (SUCCEEDED(IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes))) { IMFAttributes_GetAllocatedString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, &mimeW, &length); + if (!url) + { + IMFAttributes_GetAllocatedString(attributes, &MF_BYTESTREAM_ORIGIN_NAME, &urlW, &length); + url = urlW; + } IMFAttributes_Release(attributes); } @@ -5967,7 +5972,7 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA if (!url_ext && !mimeW) { - CoTaskMemFree(mimeW); + CoTaskMemFree(urlW); return MF_E_UNSUPPORTED_BYTESTREAM_TYPE; } @@ -5991,7 +5996,11 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA LeaveCriticalSection(&local_handlers_section); if (*handler) + { + CoTaskMemFree(mimeW); + CoTaskMemFree(urlW); return hr; + } } for (i = 0, hr = E_FAIL; i < ARRAY_SIZE(hkey_roots); ++i) @@ -6030,6 +6039,7 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA } CoTaskMemFree(mimeW); + CoTaskMemFree(urlW); return hr; } -- 2.33.0

2 2

[PATCH 1/2] mfplay: Do not clear media item when playback ends.
by Nikolay Sivov 22 Oct '21

22 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index f7832598ae6..42b40b99ea1 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1860,21 +1860,6 @@ static void media_player_create_forward_event(struct media_player *player, HRESU LeaveCriticalSection(&player->cs); } -static void media_player_create_playback_ended_event(struct media_player *player, HRESULT event_status, - struct media_event **event) -{ - EnterCriticalSection(&player->cs); - - if (SUCCEEDED(media_event_create(player, MFP_EVENT_TYPE_PLAYBACK_ENDED, event_status, player->item, event))) - { - if (player->item) - IMFPMediaItem_Release(player->item); - player->item = NULL; - } - - LeaveCriticalSection(&player->cs); -} - static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { @@ -1936,7 +1921,7 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba if (SUCCEEDED(IMFMediaEvent_GetUINT32(session_event, &MF_EVENT_TOPOLOGY_STATUS, &status)) && status == MF_TOPOSTATUS_ENDED) { - media_player_create_playback_ended_event(player, event_status, &event); + media_event_create(player, MFP_EVENT_TYPE_PLAYBACK_ENDED, event_status, player->item, &event); } break; -- 2.33.0

1 1

[PATCH 0/1] Cross-compiling 32-bit macOS from 64-bit-only macOS.
by Brendan Shanks 22 Oct '21

22 Oct '21

Something I've been working on lately is cross-compiling Wine for 32-bit Mac from newer 64-bit-only macOS versions (10.15 and newer). This should be especially useful for anyone packaging Wine for macOS. The first part needed is a toolchain. Apple's last official toolchain to support targeting i386 is Xcode 9.4.1 and the 10.13 SDK, but this is unable to run on any OS newer than 10.14. To fix this, I've created a hack that allows the Xcode 9.4.1 toolchain to be used on newer OSes: <https://github.com/mrpippy/XcodeNueve> With the toolchain working, building i386 with it is now a cross-compile. Apple does not prefix the commands with the host triplet though (i.e. 'i386-apple-darwin'), which Wine seems to expect for cross-compiling. Specifically, configure adds "-b <host triplet>" to TARGETFLAGS, causing winebuild to search for commands like ld and nm prefixed with that host triplet, which fails. This is a patch which only sets that TARGETFLAGS when the host triplet appears in $CC. I'm open to a different approach to fixing this though. Here's the command I use to configure, assuming the modified Xcode 9.4.1 is at /Applications/Xcode9.app: DEVELOPER_DIR="/Applications/Xcode9.app" \ SDKROOT="/Applications/Xcode9.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk" \ ../configure --host=i386-apple-darwin \ --with-wine-tools=<path to wine64 build> --with-wine64=<path to wine64 build> \ CC="clang -arch i386" TARGETFLAGS="-m32" Make also needs to be run with DEVELOPER_DIR and SDKROOT set. And this also works on Apple Silicon, just run with 'arch -x86_64' Brendan Shanks (1): configure: Only set TARGETFLAGS when cross-compiling with host-prefixed tools. configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.30.1 (Apple Git-130)

3 8

Re: TestBot job 100579 results: [PATCH v2 resend] msxml3: Null check url in parseURL.
by Jefferson Carpenter 21 Oct '21

21 Oct '21

On 10/21/2021 12:45 PM, Marvin wrote: > debiant2 failed 1 > > You can also see the results at: > https://testbot.winehq.org/JobDetails.pl?Key=100579 > Looks like this failure occurred in domdoc, and was unrelated to this patch.

1 0

[PATCH 1/2] quartz: Use the performance counter for the system clock.
by Zebediah Figura 21 Oct '21

21 Oct '21

Native probably uses timeGetTime() as a source. That doesn't actually match the performance counter on Windows, but it does on Wine, and accessing the counter directly is slightly more efficient anyway. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51684 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- I remember testing before and finding that the system clock had a 15ms granularity, like the tick count, but that doesn't seem to hold on testing again. Possibly it was true for Windows XP and nothing else (or possibly I just messed up)... dlls/quartz/systemclock.c | 14 ++++++++++++-- dlls/quartz/tests/Makefile.in | 2 +- dlls/quartz/tests/systemclock.c | 9 +-------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index cebe4846f04..56ad217c76a 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -44,6 +44,7 @@ struct system_clock BOOL thread_created, thread_stopped; HANDLE thread; + LARGE_INTEGER frequency; REFERENCE_TIME last_time; CRITICAL_SECTION cs; CONDITION_VARIABLE cv; @@ -51,6 +52,14 @@ struct system_clock struct list sinks; }; +static REFERENCE_TIME get_current_time(const struct system_clock *clock) +{ + LARGE_INTEGER time; + + QueryPerformanceCounter(&time); + return (time.QuadPart * 1000) / clock->frequency.QuadPart * 10000; +} + static inline struct system_clock *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct system_clock, IUnknown_inner); @@ -145,7 +154,7 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) EnterCriticalSection(&clock->cs); - current_time = GetTickCount64() * 10000; + current_time = get_current_time(clock); LIST_FOR_EACH_ENTRY_SAFE(sink, cursor, &clock->sinks, struct advise_sink, entry) { @@ -240,7 +249,7 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_ return E_POINTER; } - ret = GetTickCount64() * 10000; + ret = get_current_time(clock); EnterCriticalSection(&clock->cs); @@ -336,6 +345,7 @@ HRESULT system_clock_create(IUnknown *outer, IUnknown **out) list_init(&object->sinks); InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.cs"); + QueryPerformanceFrequency(&object->frequency); TRACE("Created system clock %p.\n", object); *out = &object->IUnknown_inner; diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index b4a372d4d3e..423abc78ef6 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = quartz.dll -IMPORTS = strmbase advapi32 d3d9 dsound msdmo msvfw32 ole32 oleaut32 user32 uuid +IMPORTS = strmbase advapi32 d3d9 dsound msdmo msvfw32 ole32 oleaut32 user32 uuid winmm C_SRCS = \ acmwrapper.c \ diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index be5472ed6e1..3b39d2aadb4 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -22,8 +22,6 @@ #include "dshow.h" #include "wine/test.h" -static ULONGLONG (WINAPI *pGetTickCount64)(void); - static IReferenceClock *create_system_clock(void) { IReferenceClock *clock = NULL; @@ -178,10 +176,7 @@ static void test_get_time(void) ok(time1 % 10000 == 0, "Expected no less than 1ms coarseness, but got time %s.\n", wine_dbgstr_longlong(time1)); - if (pGetTickCount64) - ticks = pGetTickCount64() * 10000; - else - ticks = (REFERENCE_TIME)GetTickCount() * 10000; + ticks = (REFERENCE_TIME)timeGetTime() * 10000; hr = IReferenceClock_GetTime(clock, &time2); ok(hr == (time2 == time1 ? S_FALSE : S_OK), "Got hr %#x.\n", hr); @@ -291,8 +286,6 @@ START_TEST(systemclock) { CoInitialize(NULL); - pGetTickCount64 = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "GetTickCount64"); - test_interfaces(); test_aggregation(); test_get_time(); -- 2.33.0

2 2

[PATCH] windows.devices.enumeration: Add stub dll.
by Gijs Vermeulen 21 Oct '21

21 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51884 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- configure.ac | 1 + dlls/windows.devices.enumeration/Makefile.in | 7 + dlls/windows.devices.enumeration/classes.idl | 23 +++ dlls/windows.devices.enumeration/main.c | 157 ++++++++++++++++++ .../windows.devices.enumeration.spec | 3 + include/Makefile.in | 1 + include/windows.devices.enumeration.idl | 55 ++++++ 7 files changed, 247 insertions(+) create mode 100644 dlls/windows.devices.enumeration/Makefile.in create mode 100644 dlls/windows.devices.enumeration/classes.idl create mode 100644 dlls/windows.devices.enumeration/main.c create mode 100644 dlls/windows.devices.enumeration/windows.devices.enumeration.spec create mode 100644 include/windows.devices.enumeration.idl diff --git a/configure.ac b/configure.ac index 3f1d50a4dfc..c897057a9df 100644 --- a/configure.ac +++ b/configure.ac @@ -3560,6 +3560,7 @@ WINE_CONFIG_MAKEFILE(dlls/win32u/tests) WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/windebug.dll16,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/windows.devices.enumeration) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input/tests) WINE_CONFIG_MAKEFILE(dlls/windows.globalization) diff --git a/dlls/windows.devices.enumeration/Makefile.in b/dlls/windows.devices.enumeration/Makefile.in new file mode 100644 index 00000000000..a2058b3d002 --- /dev/null +++ b/dlls/windows.devices.enumeration/Makefile.in @@ -0,0 +1,7 @@ +MODULE = windows.devices.enumeration.dll +IMPORTS = combase uuid + +C_SRCS = \ + main.c + +IDL_SRCS = classes.idl diff --git a/dlls/windows.devices.enumeration/classes.idl b/dlls/windows.devices.enumeration/classes.idl new file mode 100644 index 00000000000..8d13d9bbef7 --- /dev/null +++ b/dlls/windows.devices.enumeration/classes.idl @@ -0,0 +1,23 @@ +/* + * Runtime Classes for windows.devices.enumeration.dll + * + * Copyright 2021 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +#include "windows.devices.enumeration.idl" diff --git a/dlls/windows.devices.enumeration/main.c b/dlls/windows.devices.enumeration/main.c new file mode 100644 index 00000000000..a2a13861a88 --- /dev/null +++ b/dlls/windows.devices.enumeration/main.c @@ -0,0 +1,157 @@ +/* WinRT Windows.Devices.Enumeration implementation + * + * Copyright 2021 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "wine/debug.h" +#include "objbase.h" + +#include "initguid.h" +#include "activation.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Devices_Enumeration +#include "windows.devices.enumeration.h" + +WINE_DEFAULT_DEBUG_CHANNEL(enumeration); + +static const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +struct windows_devices_enumeration +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct windows_devices_enumeration *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct windows_devices_enumeration, IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_QueryInterface( + IActivationFactory *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IActivationFactory)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE windows_devices_enumeration_AddRef( + IActivationFactory *iface) +{ + struct windows_devices_enumeration *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE windows_devices_enumeration_Release( + IActivationFactory *iface) +{ + struct windows_devices_enumeration *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_GetIids( + IActivationFactory *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_GetRuntimeClassName( + IActivationFactory *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_GetTrustLevel( + IActivationFactory *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_devices_enumeration_ActivateInstance( + IActivationFactory *iface, IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl activation_factory_vtbl = +{ + windows_devices_enumeration_QueryInterface, + windows_devices_enumeration_AddRef, + windows_devices_enumeration_Release, + /* IInspectable methods */ + windows_devices_enumeration_GetIids, + windows_devices_enumeration_GetRuntimeClassName, + windows_devices_enumeration_GetTrustLevel, + /* IActivationFactory methods */ + windows_devices_enumeration_ActivateInstance, +}; + +static struct windows_devices_enumeration windows_devices_enumeration = +{ + {&activation_factory_vtbl}, + 1 +}; + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory); + *factory = &windows_devices_enumeration.IActivationFactory_iface; + IUnknown_AddRef(*factory); + return S_OK; +} diff --git a/dlls/windows.devices.enumeration/windows.devices.enumeration.spec b/dlls/windows.devices.enumeration/windows.devices.enumeration.spec new file mode 100644 index 00000000000..20a8bfa98ea --- /dev/null +++ b/dlls/windows.devices.enumeration/windows.devices.enumeration.spec @@ -0,0 +1,3 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetActivationFactory(ptr ptr) +@ stdcall -private DllGetClassObject(ptr ptr ptr) diff --git a/include/Makefile.in b/include/Makefile.in index a9a478e5433..71d1b497b6d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -767,6 +767,7 @@ SOURCES = \ windef.h \ windns.h \ windot11.h \ + windows.devices.enumeration.idl \ windows.foundation.collections.idl \ windows.foundation.idl \ windows.gaming.input.forcefeedback.idl \ diff --git a/include/windows.devices.enumeration.idl b/include/windows.devices.enumeration.idl new file mode 100644 index 00000000000..9aa2aaba441 --- /dev/null +++ b/include/windows.devices.enumeration.idl @@ -0,0 +1,55 @@ +/* + * Copyright 2021 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Devices { + namespace Enumeration { + interface IDeviceInformationStatics; + interface IDeviceInformationStatics2; + } + } +} + +namespace Windows { + namespace Devices { + namespace Enumeration { + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Devices.Enumeration.IDeviceInformationStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Devices.Enumeration.IDeviceInformationStatics2, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass DeviceInformation + { + [default] interface Windows.Devices.Enumeration.IDeviceInformation; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Devices.Enumeration.IDeviceInformation2; + } + } + } +} -- 2.33.1

1 0

[PATCH v2] po: Update Traditional Chinese translation.
by Chan Chilung 21 Oct '21

21 Oct '21

Signed-off-by: Chan Chilung <eason066(a)gmail.com> --- v2: Corrected accelerator key for translation of "dlls/aclui/aclui.rc:32:". po/zh_TW.po | 1081 +++++++++++++++++++++------------------------------ 1 file changed, 454 insertions(+), 627 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index a8312e8bcec..3bf580d6c79 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,9 +5,9 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-07-28 00:06+0800\n" -"Last-Translator: Wei-Lun Chao <bluebat(a)member.fsf.org>\n" -"Language-Team: Chinese (traditional) <zh-l10n(a)linux.org.tw>\n" +"PO-Revision-Date: 2021-10-20 21:30+0800\n" +"Last-Translator: Chan Chilung <eason066(a)gmail.com>\n" +"Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,30 +20,24 @@ 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 "Access denied.\n" msgid "Permissions for %1" -msgstr "存取被拒。\n" +msgstr "%1 的權限" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" -msgstr "安裝/移除" +msgstr "安裝/解除安裝" #: dlls/appwiz.cpl/appwiz.rc:61 msgid "" @@ -61,8 +55,8 @@ msgid "" "to modify its installed components, select it from the list and click Modify/" "Remove." msgstr "" -"下列軟體可以自動解除安裝。從清單中選取它並按下「新增/移除」，可以移除程式或" -"者調整已安裝元件。" +"下列軟體可以自動解除安裝。要移除程式或者調整已安裝元件，請從清單中選取程式" +"並按下「修改/移除」。" #: dlls/appwiz.cpl/appwiz.rc:67 msgid "&Support Information" @@ -123,11 +117,11 @@ msgstr "確定" #: dlls/appwiz.cpl/appwiz.rc:79 msgid "The following information can be used to get technical support for %s:" -msgstr "%s 技術支援資訊：" +msgstr "以下資訊可協助取得 %s 的技術支援：" #: dlls/appwiz.cpl/appwiz.rc:80 msgid "Publisher:" -msgstr "生產商：" +msgstr "發行者：" #: dlls/appwiz.cpl/appwiz.rc:81 programs/winefile/winefile.rc:165 msgid "Version:" @@ -175,7 +169,7 @@ msgstr "" "幫您下載並安裝 Gecko。\n" "\n" "備註：建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" -"Gecko\">https://wiki.winehq.org/Gecko</a>" +"Gecko\">https://wiki.winehq.org/Gecko</a>。" #: dlls/appwiz.cpl/appwiz.rc:109 dlls/appwiz.cpl/appwiz.rc:124 msgid "&Install" @@ -242,7 +236,7 @@ msgstr "" "並安裝它。\n" "\n" "備註：建議您使用發行版所附的套件。詳情請見 <a href=\"https://wiki.winehq.org/" -"Mono\">https://wiki.winehq.org/Mono</a>" +"Mono\">https://wiki.winehq.org/Mono</a>。" #: dlls/appwiz.cpl/appwiz.rc:31 msgid "Add/Remove Programs" @@ -263,7 +257,7 @@ msgstr "應用程式" msgid "" "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " "entry for this program from the registry?" -msgstr "無法執行移除程式 %s。您想將這個移除程式從註冊表中刪除嗎？" +msgstr "無法執行移除程式「%s」。您想將這個移除程式從註冊表中移除嗎？" #: dlls/appwiz.cpl/appwiz.rc:36 msgid "Not specified" @@ -277,7 +271,7 @@ msgstr "名稱" #: dlls/appwiz.cpl/appwiz.rc:39 msgid "Publisher" -msgstr "生產商" +msgstr "發行者" #: dlls/appwiz.cpl/appwiz.rc:40 dlls/cryptui/cryptui.rc:54 msgid "Version" @@ -331,7 +325,7 @@ msgstr "選項(&O)..." #: dlls/avifil32/avifil32.rc:49 msgid "&Interleave every" -msgstr "交錯(&I)" +msgstr "交錯(&I)：每隔" #: dlls/avifil32/avifil32.rc:51 dlls/msvfw32/msvfw32.rc:51 msgid "frames" @@ -363,7 +357,7 @@ msgstr "音訊" #: dlls/avifil32/avifil32.rc:36 msgid "Wine AVI-default-filehandler" -msgstr "Wine AVI-預設處理器" +msgstr "Wine AVI 預設處理器" #: dlls/avifil32/avifil32.rc:37 msgid "uncompressed" @@ -375,29 +369,27 @@ msgstr "正在取消..." #: dlls/browseui/browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "剩餘 %1!u! %2" #: dlls/browseui/browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "剩餘 %1!u! %2 %3!u! %4" #: dlls/browseui/browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "秒(&S)" +msgstr "秒" #: dlls/browseui/browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "分" #: dlls/browseui/browseui.rc:33 msgid "hours" -msgstr "" +msgstr "小時" #: dlls/comctl32/comctl32.rc:68 programs/winefile/winefile.rc:156 msgid "Properties for %s" -msgstr "屬性 %s" +msgstr "%s 的內容" #: dlls/comctl32/comctl32.rc:73 dlls/comdlg32/comdlg32.rc:265 msgid "&Apply" @@ -438,7 +430,7 @@ msgstr "關閉(&C)" #: dlls/comctl32/comctl32.rc:101 msgid "R&eset" -msgstr "重置(&e)" +msgstr "重置(&E)" #: dlls/comctl32/comctl32.rc:102 dlls/comdlg32/comdlg32.rc:173 #: dlls/comdlg32/comdlg32.rc:195 dlls/comdlg32/comdlg32.rc:266 @@ -458,7 +450,7 @@ msgstr "重置(&e)" #: programs/winemine/winemine.rc:53 programs/winhlp32/winhlp32.rc:57 #: programs/wordpad/wordpad.rc:102 msgid "&Help" -msgstr "求助(&H)" +msgstr "說明(&H)" #: dlls/comctl32/comctl32.rc:103 msgid "Move &Up" @@ -508,16 +500,12 @@ msgid "&Retry" msgstr "重試(&R)" #: dlls/comctl32/comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "隱藏分頁(&T)" +msgstr "隱藏詳細資訊" #: dlls/comctl32/comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "詳細資料" +msgstr "顯示詳細資訊" #: dlls/comctl32/comctl32.rc:31 dlls/cryptui/cryptui.rc:235 #: programs/regedit/regedit.rc:286 programs/taskmgr/taskmgr.rc:434 @@ -641,7 +629,7 @@ msgstr "[無]" #: dlls/comdlg32/comdlg32.rc:231 msgid "Specific &Printer" -msgstr "特定的印表機(&P)" +msgstr "指定的印表機(&P)" #: dlls/comdlg32/comdlg32.rc:236 dlls/comdlg32/comdlg32.rc:419 #: dlls/comdlg32/comdlg32.rc:443 dlls/wineps.drv/wineps.rc:34 @@ -701,7 +689,7 @@ msgstr "底線(&U)" #: dlls/comdlg32/comdlg32.rc:270 programs/winecfg/winecfg.rc:290 msgid "&Color:" -msgstr "配色(&C)：" +msgstr "色彩(&C)：" #: dlls/comdlg32/comdlg32.rc:273 msgid "Sample" @@ -721,11 +709,11 @@ msgstr "基本色彩(&B)：" #: dlls/comdlg32/comdlg32.rc:287 msgid "&Custom Colors:" -msgstr "自定色彩(&C)：" +msgstr "自訂色彩(&C)：" #: dlls/comdlg32/comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|純色(&O)" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" @@ -755,18 +743,16 @@ msgstr "亮度(&L)：" #: dlls/comdlg32/comdlg32.rc:310 msgid "&Add to Custom Colors" -msgstr "新增自定色彩(&A)" +msgstr "新增自訂色彩(&A)" #: dlls/comdlg32/comdlg32.rc:311 msgid "&Define Custom Colors >>" -msgstr "定義自定色彩(&D) >>" +msgstr "定義自訂色彩(&D) >>" #: dlls/comdlg32/comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "否(&N)" +msgstr "&o" #: dlls/comdlg32/comdlg32.rc:318 programs/regedit/regedit.rc:275 #: programs/regedit/regedit.rc:285 @@ -822,7 +808,7 @@ msgstr "取代全部(&A)" #: dlls/shell32/shell32.rc:108 programs/clock/clock.rc:31 #: programs/conhost/conhost.rc:34 msgid "&Properties" -msgstr "屬性(&P)" +msgstr "內容(&P)" #: dlls/comdlg32/comdlg32.rc:364 msgid "Print to fi&le" @@ -961,7 +947,7 @@ msgstr "找不到檔案" #: dlls/comdlg32/comdlg32.rc:34 msgid "Please verify that the correct file name was given" -msgstr "請檢查是否給予正確的檔案名稱。" +msgstr "請檢查是否給予正確的檔案名稱" #: dlls/comdlg32/comdlg32.rc:35 msgid "" @@ -977,23 +963,23 @@ msgid "" "Do you want to replace it?" msgstr "" "檔案已經存在。\n" -"要取代嗎？" +"您要取代它嗎？" #: dlls/comdlg32/comdlg32.rc:37 msgid "Invalid character(s) in path" -msgstr "檔案名稱中存在無效的字元" +msgstr "路徑中存在無效的字元" #: dlls/comdlg32/comdlg32.rc:38 msgid "" "A filename cannot contain any of the following characters:\n" " / : < > |" msgstr "" -"檔案名中不能包含任何一下字元:\n" +"檔案名稱中不能包含以下任何一個字元：\n" " / : < > |" #: dlls/comdlg32/comdlg32.rc:39 msgid "Path does not exist" -msgstr "資料夾不存在" +msgstr "路徑不存在" #: dlls/comdlg32/comdlg32.rc:40 msgid "File does not exist" @@ -1001,7 +987,7 @@ msgstr "檔案不存在" #: dlls/comdlg32/comdlg32.rc:41 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "已選項目包含非資料夾對象" #: dlls/comdlg32/comdlg32.rc:46 msgid "Up One Level" @@ -1118,15 +1104,15 @@ msgstr "" #: dlls/comdlg32/comdlg32.rc:61 msgid "The 'from' entry cannot exceed the 'to' entry." -msgstr "起始值不能大於終點值。" +msgstr "「從」項的值不能大於「到」項的值。" #: dlls/comdlg32/comdlg32.rc:63 msgid "" "Margins overlap or fall outside Paper boundaries.\n" "Please reenter margins." msgstr "" -"邊緣空白重疊或落於邊界外，\n" -"請重新輸入邊緣空白。" +"頁面邊距重疊或落於邊界外，\n" +"請重新輸入頁面邊距。" #: dlls/comdlg32/comdlg32.rc:65 msgid "The 'Number of copies' field cannot be empty." @@ -1137,8 +1123,8 @@ msgid "" "This large number of copies is not supported by your printer.\n" "Please enter a value between 1 and %d." msgstr "" -"您的印表機不支持這麼大的份數。\n" -"請輸入一個 1 和 %d 之間的數。" +"您的印表機不支援列印這麼大的份數。\n" +"請輸入一個 1 和 %d 之間的數值。" #: dlls/comdlg32/comdlg32.rc:68 msgid "A printer error occurred." @@ -1169,12 +1155,12 @@ msgid "" "Before you can perform printer-related tasks such as page setup or printing " "a document, you need to install a printer. Please install one and retry." msgstr "" -"在使用與印表機有關功能(版面設定, 列印檔案)之前, 您必須先安裝印表機。請安裝一" -"個印表機後再試。" +"您必須先安裝印表機才能使用與印表機有關的功能（如：版面設定、列印檔案）。" +"請安裝印表機後再試一次。" #: dlls/comdlg32/comdlg32.rc:142 msgid "Select a font size between %1!d! and %2!d! points." -msgstr "選取介於 %1!d! 和 %2!d! 點的字型尺寸。" +msgstr "選取介於 %1!d! 和 %2!d! 點的字型大小。" #: dlls/comdlg32/comdlg32.rc:143 dlls/ieframe/ieframe.rc:35 msgid "&Save" @@ -1193,14 +1179,12 @@ msgid "Open File" msgstr "開啟檔案" #: dlls/comdlg32/comdlg32.rc:148 -#, fuzzy -#| msgid "New Folder" msgid "Select Folder" -msgstr "新資料夾" +msgstr "選擇資料夾" #: dlls/comdlg32/comdlg32.rc:149 msgid "Font size has to be a number." -msgstr "" +msgstr "字型大小必須是數字。" #: dlls/comdlg32/comdlg32.rc:84 programs/oleview/oleview.rc:98 msgid "Ready" @@ -1260,7 +1244,7 @@ msgstr "不可用；" #: dlls/comdlg32/comdlg32.rc:98 msgid "Waiting; " -msgstr "等待；" +msgstr "正在等待；" #: dlls/comdlg32/comdlg32.rc:99 msgid "Processing; " @@ -1288,7 +1272,7 @@ msgstr "頁處理記憶體超支；" #: dlls/comdlg32/comdlg32.rc:105 msgid "Interrupted by user; " -msgstr "已被使用者中斷；" +msgstr "被使用者中斷；" #: dlls/comdlg32/comdlg32.rc:106 msgid "Out of memory; " @@ -1296,7 +1280,7 @@ msgstr "記憶體不足；" #: dlls/comdlg32/comdlg32.rc:107 msgid "The printer door is open; " -msgstr "印表機蓋是打開的；" +msgstr "印表機蓋已打開；" #: dlls/comdlg32/comdlg32.rc:108 msgid "Print server unknown; " @@ -1316,11 +1300,11 @@ msgstr "有 %d 個文件正在等待列印" #: dlls/comdlg32/comdlg32.rc:80 msgid "Margins [inches]" -msgstr "邊緣空白 [英寸]" +msgstr "頁面邊距 [英寸]" #: dlls/comdlg32/comdlg32.rc:81 msgid "Margins [mm]" -msgstr "邊緣空白 [毫米]" +msgstr "頁面邊距 [毫米]" #: dlls/comdlg32/comdlg32.rc:82 dlls/sane.ds/sane.rc:33 msgctxt "unit: millimeters" @@ -1369,8 +1353,7 @@ msgid "" msgstr "" "開啟大寫鎖定可能導致您輸入錯誤的密碼。\n" "\n" -"請在輸入密碼前按下 Caps Lock 鍵，解除\n" -"大寫鎖定。" +"您可以按下 Caps Lock 鍵以解除大寫鎖定，然後再輸入密碼。" #: dlls/credui/credui.rc:34 msgid "Caps Lock is On" @@ -1378,7 +1361,7 @@ msgstr "大寫鎖定已開啟" #: dlls/crypt32/crypt32.rc:30 msgid "Authority Key Identifier" -msgstr "授權金鑰識別碼" +msgstr "授權金鑰識別號" #: dlls/crypt32/crypt32.rc:31 msgid "Key Attributes" @@ -1410,7 +1393,7 @@ msgstr "憑證策略" #: dlls/crypt32/crypt32.rc:38 msgid "Subject Key Identifier" -msgstr "主體金鑰識別碼" +msgstr "主體金鑰識別號" #: dlls/crypt32/crypt32.rc:39 msgid "CRL Reason Code" @@ -1446,7 +1429,7 @@ msgstr "電子郵件地址" #: dlls/crypt32/crypt32.rc:47 msgid "Unstructured Name" -msgstr "無結構的名稱" +msgstr "非結構化名稱" #: dlls/crypt32/crypt32.rc:48 msgid "Content Type" @@ -1462,15 +1445,15 @@ msgstr "簽署時間" #: dlls/crypt32/crypt32.rc:51 msgid "Counter Sign" -msgstr "計數器符號" +msgstr "副署" #: dlls/crypt32/crypt32.rc:52 msgid "Challenge Password" -msgstr "挑戰密碼" +msgstr "要求密碼" #: dlls/crypt32/crypt32.rc:53 msgid "Unstructured Address" -msgstr "無結構的位址" +msgstr "非結構化位址" #: dlls/crypt32/crypt32.rc:54 msgid "S/MIME Capabilities" @@ -1478,7 +1461,7 @@ msgstr "S/MIME 能力" #: dlls/crypt32/crypt32.rc:55 msgid "Prefer Signed Data" -msgstr "偏好已簽署資料" +msgstr "已簽署資料優先" #: dlls/crypt32/crypt32.rc:56 dlls/cryptdlg/cryptdlg.rc:34 msgctxt "Certification Practice Statement" @@ -1527,7 +1510,7 @@ msgstr "Netscape CA 廢止網址" #: dlls/crypt32/crypt32.rc:67 msgid "Netscape Cert Renewal URL" -msgstr "Netscape 憑證重申網址" +msgstr "Netscape 憑證續約網址" #: dlls/crypt32/crypt32.rc:68 msgid "Netscape CA Policy URL" @@ -1615,7 +1598,7 @@ msgstr "Windows 產品更新" #: dlls/crypt32/crypt32.rc:89 msgid "Enrollment Name Value Pair" -msgstr "註冊名稱值對" +msgstr "註冊名稱值配對" #: dlls/crypt32/crypt32.rc:90 msgid "OS Version" @@ -1627,7 +1610,7 @@ msgstr "註冊 CSP" #: dlls/crypt32/crypt32.rc:92 msgid "CRL Number" -msgstr "CRL 數字" +msgstr "CRL 號碼" #: dlls/crypt32/crypt32.rc:93 msgid "Delta CRL Indicator" @@ -1635,7 +1618,7 @@ msgstr "Delta CRL 指示器" #: dlls/crypt32/crypt32.rc:94 msgid "Issuing Distribution Point" -msgstr "議題發布點" +msgstr "發證發布點" #: dlls/crypt32/crypt32.rc:95 msgid "Freshest CRL" @@ -1751,7 +1734,7 @@ msgstr "虛設簽署人" #: dlls/crypt32/crypt32.rc:123 msgid "Encrypted Private Key" -msgstr "加密的私鑰" +msgstr "已加密的私鑰" #: dlls/crypt32/crypt32.rc:124 msgid "Published CRL Locations" @@ -1767,11 +1750,11 @@ msgstr "異動作業識別號" #: dlls/crypt32/crypt32.rc:127 msgid "Sender Nonce" -msgstr "當前傳送者" +msgstr "發送者的一次性隨機數" #: dlls/crypt32/crypt32.rc:128 msgid "Recipient Nonce" -msgstr "當前收件者" +msgstr "收件者的一次性隨機數" #: dlls/crypt32/crypt32.rc:129 msgid "Reg Info" @@ -1807,7 +1790,7 @@ msgstr "私鑰使用週期" #: dlls/crypt32/crypt32.rc:137 msgid "Client Information" -msgstr "客戶端資訊" +msgstr "用戶端資訊" #: dlls/crypt32/crypt32.rc:138 msgid "Server Authentication" @@ -1815,7 +1798,7 @@ msgstr "伺服器認證" #: dlls/crypt32/crypt32.rc:139 msgid "Client Authentication" -msgstr "客戶端認證" +msgstr "用戶端認證" #: dlls/crypt32/crypt32.rc:140 msgid "Code Signing" @@ -1843,7 +1826,7 @@ msgstr "IP 安全終端系統" #: dlls/crypt32/crypt32.rc:146 msgid "IP security tunnel termination" -msgstr "IP 安全遂道終端" +msgstr "IP 安全隧道終端" #: dlls/crypt32/crypt32.rc:147 msgid "IP security user" @@ -1923,7 +1906,7 @@ msgstr "憑證請求代理程式" #: dlls/crypt32/crypt32.rc:166 dlls/cryptui/cryptui.rc:141 msgid "Lifetime Signing" -msgstr "生命期簽署" +msgstr "永久簽署" #: dlls/crypt32/crypt32.rc:167 msgid "All issuance policies" @@ -2050,7 +2033,7 @@ msgstr "不明存取方法" #: dlls/crypt32/crypt32.rc:205 msgid "Alternative Name" -msgstr "另類名稱" +msgstr "其他名稱" #: dlls/crypt32/crypt32.rc:206 msgid "CRL Distribution Point" @@ -2094,11 +2077,11 @@ msgstr "已取代" #: dlls/crypt32/crypt32.rc:216 msgid "Operation Ceased" -msgstr "作業終了" +msgstr "作業已停止" #: dlls/crypt32/crypt32.rc:217 msgid "Certificate Hold" -msgstr "憑證暫停" +msgstr "持有的憑證" #: dlls/crypt32/crypt32.rc:218 msgid "Financial Information=" @@ -2110,11 +2093,11 @@ msgstr "可用" #: dlls/crypt32/crypt32.rc:220 msgid "Not Available" -msgstr "無法使用" +msgstr "不可用" #: dlls/crypt32/crypt32.rc:221 msgid "Meets Criteria=" -msgstr "會面準則=" +msgstr "符合準則=" #: dlls/crypt32/crypt32.rc:222 dlls/cryptui/cryptui.rc:166 #: dlls/oleaut32/oleaut32.rc:32 dlls/wininet/wininet.rc:94 @@ -2138,7 +2121,7 @@ msgstr "不可否認性" #: dlls/crypt32/crypt32.rc:226 msgid "Key Encipherment" -msgstr "金鑰編密" +msgstr "金鑰加密" #: dlls/crypt32/crypt32.rc:227 msgid "Data Encipherment" @@ -2162,15 +2145,15 @@ msgstr "CRL 簽署" #: dlls/crypt32/crypt32.rc:232 msgid "Encipher Only" -msgstr "只譯為密文" +msgstr "僅加密者" #: dlls/crypt32/crypt32.rc:233 msgid "Decipher Only" -msgstr "只解開密文" +msgstr "僅解密者" #: dlls/crypt32/crypt32.rc:234 msgid "SSL Client Authentication" -msgstr "SSL 客戶端認證" +msgstr "SSL 用戶端認證" #: dlls/crypt32/crypt32.rc:235 msgid "SSL Server Authentication" @@ -2202,7 +2185,7 @@ msgstr "憑證策略" #: dlls/cryptdlg/cryptdlg.rc:31 msgid "Policy Identifier: " -msgstr "策略識別碼：" +msgstr "策略識別號：" #: dlls/cryptdlg/cryptdlg.rc:32 msgid "Policy Qualifier Info" @@ -2252,7 +2235,7 @@ msgstr "顯示(&S)：" #: dlls/cryptui/cryptui.rc:210 msgid "&Edit Properties..." -msgstr "編輯屬性(&E)..." +msgstr "編輯內容(&E)..." #: dlls/cryptui/cryptui.rc:211 msgid "&Copy to File..." @@ -2305,20 +2288,20 @@ msgstr "停用這個憑證的全部目的(&I)" #: dlls/cryptui/cryptui.rc:253 msgid "Enable &only the following purposes for this certificate:" -msgstr "只有啟用這個憑證的下列目的(&O)：" +msgstr "只啟用這個憑證的下列目的(&O)：" #: dlls/cryptui/cryptui.rc:258 msgid "Add &Purpose..." -msgstr "加入目的(&P)..." +msgstr "新增目的(&P)..." #: dlls/cryptui/cryptui.rc:262 msgid "Add Purpose" -msgstr "加入目的" +msgstr "新增目的" #: dlls/cryptui/cryptui.rc:265 msgid "" "Add the object identifier (OID) for the certificate purpose you wish to add:" -msgstr "加入您所希望的憑證目的物件識別符號 (OID)：" +msgstr "新增您希望加入的憑證目的的物件識別號 (OID)：" #: dlls/cryptui/cryptui.rc:273 dlls/cryptui/cryptui.rc:69 msgid "Select Certificate Store" @@ -2330,7 +2313,7 @@ msgstr "選取您要使用的憑證儲存處：" #: dlls/cryptui/cryptui.rc:279 msgid "&Show physical stores" -msgstr "顯示實體儲存(&S)" +msgstr "顯示實體儲存裝置(&S)" #: dlls/cryptui/cryptui.rc:285 dlls/cryptui/cryptui.rc:296 #: dlls/cryptui/cryptui.rc:313 dlls/cryptui/cryptui.rc:327 @@ -2356,10 +2339,10 @@ msgid "" msgstr "" "這個精靈協助您從檔案匯入憑證、憑證撤銷清單以及憑證信賴清單到憑證儲存處。\n" "\n" -"憑證可用於識別您或您正在通訊的電腦。它也可以用於認證以及對訊息簽署。憑證儲" -"存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" +"憑證可用於識別您或您用以通訊的電腦。它也可以用於認證以及簽署訊息。" +"憑證儲存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" "\n" -"要繼續，請按下一步。" +"請按下一步繼續。" #: dlls/cryptui/cryptui.rc:299 dlls/cryptui/cryptui.rc:435 msgid "&File name:" @@ -2402,7 +2385,7 @@ msgstr "自動選取憑證儲存處(&A)" #: dlls/cryptui/cryptui.rc:320 msgid "&Place all certificates in the following store:" -msgstr "將所有憑證放置於下列儲存(&P)：" +msgstr "將所有憑證放置於下列儲存處(&P)：" #: dlls/cryptui/cryptui.rc:330 msgid "Completing the Certificate Import Wizard" @@ -2410,7 +2393,7 @@ msgstr "正在完成憑證匯入精靈" #: dlls/cryptui/cryptui.rc:332 msgid "You have successfully completed the Certificate Import Wizard." -msgstr "您已經成功地完成憑證匯入精靈。" +msgstr "您已經成功完成憑證匯入精靈。" #: dlls/cryptui/cryptui.rc:334 dlls/cryptui/cryptui.rc:448 msgid "You have specified the following settings:" @@ -2462,7 +2445,7 @@ msgstr "憑證目的" #: dlls/cryptui/cryptui.rc:364 msgid "" "Select one or more purposes to be listed when Advanced Purposes is selected." -msgstr "當進階目的已選時選取一或多個要列出的目的。" +msgstr "選取一個或多個在進階目的已選取時要列出的目的。" #: dlls/cryptui/cryptui.rc:366 msgid "&Certificate purposes:" @@ -2493,10 +2476,10 @@ msgid "" msgstr "" "這個精靈協助您從憑證儲存處匯出憑證、憑證撤銷清單以及憑證信賴清單到檔案。\n" "\n" -"憑證可用於識別您或您用以通訊的電腦。它也可以被用於認證以及簽署訊息。憑證儲存" -"處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" +"憑證可用於識別您或您用以通訊的電腦。它也可以用於認證以及簽署訊息。" +"憑證儲存處收藏了憑證、憑證撤銷清單以及憑證信賴清單。\n" "\n" -"要繼續請按下一步。" +"請按下一步繼續。" #: dlls/cryptui/cryptui.rc:389 msgid "" @@ -2510,11 +2493,11 @@ msgstr "您要匯出私鑰嗎？" #: dlls/cryptui/cryptui.rc:391 msgid "&Yes, export the private key" -msgstr "是(&Y)，匯出私鑰。" +msgstr "是，匯出私鑰(&Y)" #: dlls/cryptui/cryptui.rc:393 msgid "N&o, do not export the private key" -msgstr "否(&N)，不要匯出私鑰。" +msgstr "否，不要匯出私鑰(&O)" #: dlls/cryptui/cryptui.rc:404 msgid "&Confirm password:" @@ -2562,19 +2545,15 @@ msgstr "正在完成憑證匯出精靈" #: dlls/cryptui/cryptui.rc:446 msgid "You have successfully completed the Certificate Export Wizard." -msgstr "您已經成功地完成憑證匯出精靈" +msgstr "您已經成功完成憑證匯出精靈。" #: dlls/cryptui/cryptui.rc:456 dlls/cryptui/cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "選取憑證儲存處" +msgstr "選取憑證" #: dlls/cryptui/cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "選取您要使用的憑證儲存處：" +msgstr "選取您要使用的憑證" #: dlls/cryptui/cryptui.rc:30 dlls/cryptui/cryptui.rc:93 msgid "Certificate" @@ -2594,7 +2573,7 @@ msgstr "這個憑證的簽名無效。憑證也許已被改變或已損壞。" msgid "" "This root certificate is not trusted. To trust it, add it to your system's " "trusted root certificate store." -msgstr "這個根憑證未被信賴。要信賴它，就將它加入您系統的信賴根憑證儲存處。" +msgstr "這個根憑證未被信賴。要信賴它，就要將它加入到系統的信賴根憑證儲存處。" #: dlls/cryptui/cryptui.rc:34 msgid "This certificate could not be validated to a trusted root certificate." @@ -2614,11 +2593,11 @@ msgstr "這個憑證是適用於下列目的：" #: dlls/cryptui/cryptui.rc:38 msgid "Issued to: " -msgstr "發證對象：" +msgstr "發證予：" #: dlls/cryptui/cryptui.rc:39 msgid "Issued by: " -msgstr "發證來源：" +msgstr "發證者：" #: dlls/cryptui/cryptui.rc:40 msgid "Valid from " @@ -2638,7 +2617,7 @@ msgstr "這個憑證已過期或尚未生效。" #: dlls/cryptui/cryptui.rc:44 msgid "This certificate's validity period exceeds that of its issuer." -msgstr "這個憑證的有效期限超過它的發證者。" +msgstr "這個憑證的有效期限超過發證者的有效期限。" #: dlls/cryptui/cryptui.rc:45 msgid "This certificate was revoked by its issuer." @@ -2663,19 +2642,19 @@ msgstr "<所有>" #: dlls/cryptui/cryptui.rc:50 msgid "Version 1 Fields Only" -msgstr "只有版本 1 欄位" +msgstr "僅版本 1 欄位" #: dlls/cryptui/cryptui.rc:51 msgid "Extensions Only" -msgstr "只有進階屬性" +msgstr "僅進階屬性" #: dlls/cryptui/cryptui.rc:52 msgid "Critical Extensions Only" -msgstr "只有關鍵進階屬性" +msgstr "僅重要進階屬性" #: dlls/cryptui/cryptui.rc:53 msgid "Properties Only" -msgstr "只有屬性" +msgstr "僅屬性" #: dlls/cryptui/cryptui.rc:55 msgid "Serial number" @@ -2703,7 +2682,7 @@ msgstr "公鑰" #: dlls/cryptui/cryptui.rc:61 msgid "%1 (%2!d! bits)" -msgstr "%1 (%2!d! 位元)" +msgstr "%1（%2!d! 位元）" #: dlls/cryptui/cryptui.rc:62 msgid "SHA1 hash" @@ -2711,7 +2690,7 @@ msgstr "SHA1 雜湊" #: dlls/cryptui/cryptui.rc:63 msgid "Enhanced key usage (property)" -msgstr "進階金鑰用法 (內容)" +msgstr "進階金鑰用法（內容）" #: dlls/cryptui/cryptui.rc:64 msgid "Friendly name" @@ -2724,11 +2703,11 @@ msgstr "描述" #: dlls/cryptui/cryptui.rc:66 msgid "Certificate Properties" -msgstr "憑證屬性" +msgstr "憑證內容" #: dlls/cryptui/cryptui.rc:67 msgid "Please enter an OID in the form 1.2.3.4" -msgstr "請以 1.2.3.4 的形式輸入 OID" +msgstr "請以 1.2.3.4 的格式輸入 OID" #: dlls/cryptui/cryptui.rc:68 msgid "The OID you entered already exists." @@ -2742,7 +2721,7 @@ msgstr "請選取憑證儲存處。" msgid "" "The file contains objects that do not match the given criteria. Please " "select another file." -msgstr "檔案含有不匹配給定準則的物件。請選取另一個檔案。" +msgstr "檔案含有不符合給定準則的物件。請選取另一個檔案。" #: dlls/cryptui/cryptui.rc:73 msgid "File to Import" @@ -2804,7 +2783,7 @@ msgstr "請選取儲存處" #: dlls/cryptui/cryptui.rc:89 msgid "Certificate Store Selected" -msgstr "憑證儲存處已選" +msgstr "已選取憑證儲存處" #: dlls/cryptui/cryptui.rc:90 msgid "Automatically determined by the program" @@ -2832,7 +2811,7 @@ msgstr "個人資訊交換" #: dlls/cryptui/cryptui.rc:99 msgid "The import was successful." -msgstr "已成功匯入。" +msgstr "匯入成功。" #: dlls/cryptui/cryptui.rc:100 msgid "The import failed." @@ -2848,11 +2827,11 @@ msgstr "<進階目的>" #: dlls/cryptui/cryptui.rc:104 msgid "Issued To" -msgstr "發證對象" +msgstr "發證予" #: dlls/cryptui/cryptui.rc:105 msgid "Issued By" -msgstr "發證來源" +msgstr "發證者" #: dlls/cryptui/cryptui.rc:106 dlls/wininet/wininet.rc:36 msgid "Expiration Date" @@ -2894,11 +2873,6 @@ msgstr "" "確定要移除這個憑證？" #: dlls/cryptui/cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" @@ -2913,7 +2887,7 @@ msgid "" "trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"由這個憑證授權者所發的憑證將不再被信賴。\n" +"將不再信賴由這個憑證授權者所發的憑證。\n" "確定要移除這個憑證？" #: dlls/cryptui/cryptui.rc:115 @@ -2922,7 +2896,7 @@ msgid "" "trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"由這些憑證授權者所發的憑證將不再被信賴。\n" +"將不再信賴由這些憑證授權者所發的憑證。\n" "確定要移除這些憑證？" #: dlls/cryptui/cryptui.rc:116 @@ -2931,7 +2905,7 @@ msgid "" "certification authorities it issued, will no longer be trusted.\n" "Are you sure you want to remove this trusted root certificate?" msgstr "" -"由這個憑證授權者所發的憑證，或是任何由它發證的憑證授權者，將不再被信賴。\n" +"將不再信賴由這個憑證授權者所發的憑證或憑證授權者。\n" "確定要移除這個信賴的根憑證？" #: dlls/cryptui/cryptui.rc:117 @@ -2940,7 +2914,7 @@ msgid "" "certification authorities they issued, will no longer be trusted.\n" "Are you sure you want to remove these trusted root certificates?" msgstr "" -"由這些憑證授權者所發的憑證，或是任何由它們發證的憑證授權者，將不再被信賴。\n" +"將不再信賴由這些憑證授權者所發的憑證或憑證授權者。\n" "確定要移除這些信賴的根憑證？" #: dlls/cryptui/cryptui.rc:118 @@ -2948,7 +2922,7 @@ msgid "" "Software signed by this publisher will no longer be trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"由這個發行者簽署的軟體將不再被信賴。\n" +"將不再信賴由這個發行者簽署的軟體。\n" "確定要移除這個憑證？" #: dlls/cryptui/cryptui.rc:119 @@ -2956,7 +2930,7 @@ msgid "" "Software signed by these publishers will no longer be trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"由這些發行者簽署的軟體將不再被信賴。\n" +"將不再信賴由這些發行者簽署的軟體。\n" "確定要移除這些憑證？" #: dlls/cryptui/cryptui.rc:120 @@ -2969,7 +2943,7 @@ msgstr "確定要移除這些憑證？" #: dlls/cryptui/cryptui.rc:124 msgid "Ensures the identity of a remote computer" -msgstr "確保遠端電腦的身分" +msgstr "確認遠端電腦的身分" #: dlls/cryptui/cryptui.rc:125 msgid "Proves your identity to a remote computer" @@ -2980,8 +2954,8 @@ msgid "" "Ensures software came from software publisher\n" "Protects software from alteration after publication" msgstr "" -"請確認軟體是來自軟體發行者\n" -"保護軟體以避免發行之後的變更" +"確認軟體是來自軟體發行者\n" +"確保軟體在發行之後未被修改" #: dlls/cryptui/cryptui.rc:127 msgid "Protects e-mail messages" @@ -3001,11 +2975,11 @@ msgstr "允許您數位簽署憑證信賴清單" #: dlls/cryptui/cryptui.rc:131 msgid "Allows data on disk to be encrypted" -msgstr "允許磁碟上的資料被加密" +msgstr "允許加密磁碟上的資料" #: dlls/cryptui/cryptui.rc:147 msgid "Private Key Archival" -msgstr "私鑰檔案的" +msgstr "私鑰檔案封存" #: dlls/cryptui/cryptui.rc:151 msgid "Export Format" @@ -3017,7 +2991,7 @@ msgstr "選擇將用來儲存內容的格式。" #: dlls/cryptui/cryptui.rc:153 msgid "Export Filename" -msgstr "匯出檔名" +msgstr "匯出檔案名稱" #: dlls/cryptui/cryptui.rc:154 msgid "Specify the name of the file in which the content will be saved." @@ -3025,7 +2999,7 @@ msgstr "指定將會儲存內容的檔案名稱。" #: dlls/cryptui/cryptui.rc:155 msgid "The specified file already exists. Do you want to replace it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "檔案已經存在。您要取代它嗎？" #: dlls/cryptui/cryptui.rc:156 msgid "DER-Encoded Binary X.509 (*.cer)" @@ -3057,7 +3031,7 @@ msgstr "匯出密鑰" #: dlls/cryptui/cryptui.rc:168 msgid "The export was successful." -msgstr "已成功匯出。" +msgstr "匯出成功。" #: dlls/cryptui/cryptui.rc:169 msgid "The export failed." @@ -3079,11 +3053,11 @@ msgstr "輸入密碼" #: dlls/cryptui/cryptui.rc:173 msgid "You may password-protect a private key." -msgstr "您可以以密碼保護私鑰。" +msgstr "您可以使用密碼來保護私鑰。" #: dlls/cryptui/cryptui.rc:174 msgid "The passwords do not match." -msgstr "密碼不匹配。" +msgstr "密碼不相符。" #: dlls/cryptui/cryptui.rc:175 msgid "Note: The private key for this certificate could not be opened." @@ -3094,20 +3068,16 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "註記：用於這個憑證的私鑰不可匯出。" #: dlls/cryptui/cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "預定目的(&N)：" +msgstr "預定目的" #: dlls/cryptui/cryptui.rc:178 dlls/shell32/shell32.rc:150 msgid "Location" msgstr "位置" #: dlls/cryptui/cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "選取憑證儲存處" +msgstr "選取憑證" #: dlls/cryptui/cryptui.rc:181 programs/winefile/winefile.rc:101 #: programs/winhlp32/winhlp32.rc:110 programs/winhlp32/winhlp32.rc:85 @@ -3120,11 +3090,11 @@ msgstr "裝置設定" #: dlls/dinput/dinput.rc:39 msgid "Reset" -msgstr "重置" +msgstr "重設" #: dlls/dinput/dinput.rc:42 msgid "Player" -msgstr "玩家" +msgstr "播放器" #: dlls/dinput/dinput.rc:43 programs/winecfg/winecfg.rc:88 msgid "Device" @@ -3168,55 +3138,55 @@ msgstr "中歐語言" #: dlls/gdi32/gdi32.rc:30 msgid "Cyrillic" -msgstr "斯拉夫語" +msgstr "斯拉夫文" #: dlls/gdi32/gdi32.rc:31 msgid "Greek" -msgstr "希臘語" +msgstr "希臘文" #: dlls/gdi32/gdi32.rc:32 msgid "Turkish" -msgstr "土耳其語" +msgstr "土耳其文" #: dlls/gdi32/gdi32.rc:33 msgid "Hebrew" -msgstr "希伯來語" +msgstr "希伯來文" #: dlls/gdi32/gdi32.rc:34 msgid "Arabic" -msgstr "阿拉伯語" +msgstr "阿拉伯文" #: dlls/gdi32/gdi32.rc:35 msgid "Baltic" -msgstr "波羅的海語" +msgstr "波羅的海語言" #: dlls/gdi32/gdi32.rc:36 msgid "Vietnamese" -msgstr "越南語" +msgstr "越南文" #: dlls/gdi32/gdi32.rc:37 msgid "Thai" -msgstr "泰語" +msgstr "泰文" #: dlls/gdi32/gdi32.rc:38 msgid "Japanese" -msgstr "日語" +msgstr "日文" #: dlls/gdi32/gdi32.rc:39 msgid "CHINESE_GB2312" -msgstr "簡化字漢語" +msgstr "中文（GB2312）" #: dlls/gdi32/gdi32.rc:40 msgid "Hangul" -msgstr "韓語諺文" +msgstr "韓文" #: dlls/gdi32/gdi32.rc:41 msgid "CHINESE_BIG5" -msgstr "傳統字漢語" +msgstr "中文（BIG5）" #: dlls/gdi32/gdi32.rc:42 msgid "Hangul(Johab)" -msgstr "韓語諺文(組合型)" +msgstr "韓文（Johab）" #: dlls/gdi32/gdi32.rc:43 msgid "Symbol" @@ -3237,7 +3207,7 @@ msgstr "照相機中的檔案" #: dlls/gphoto2.ds/gphoto2.rc:34 msgid "Import Selected" -msgstr "匯入選擇的檔案" +msgstr "匯入已選取檔案" #: dlls/gphoto2.ds/gphoto2.rc:35 msgid "Preview" @@ -3265,7 +3235,7 @@ msgstr "正在傳輸... 請稍候" #: dlls/gphoto2.ds/gphoto2.rc:51 msgid "Connecting to camera" -msgstr "連接照相機" +msgstr "正在連接照相機" #: dlls/gphoto2.ds/gphoto2.rc:55 msgid "Connecting to camera... Please Wait" @@ -3278,11 +3248,11 @@ msgstr "同步(&Y)" #: dlls/hhctrl.ocx/hhctrl.rc:60 dlls/hhctrl.ocx/hhctrl.rc:73 #: dlls/shdoclc/shdoclc.rc:41 programs/winhlp32/winhlp32.rc:89 msgid "&Back" -msgstr "返回(&B)" +msgstr "上一頁(&B)" #: dlls/hhctrl.ocx/hhctrl.rc:61 dlls/hhctrl.ocx/hhctrl.rc:74 msgid "&Forward" -msgstr "向前" +msgstr "下一頁(&F)" #: dlls/hhctrl.ocx/hhctrl.rc:62 msgctxt "table of contents" @@ -3314,10 +3284,8 @@ msgid "&View Source" msgstr "檢視原始碼(&V)" #: dlls/hhctrl.ocx/hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "屬性" +msgstr "內容(&T)" #: dlls/hhctrl.ocx/hhctrl.rc:87 dlls/shdoclc/shdoclc.rc:79 #: dlls/shdoclc/shdoclc.rc:93 dlls/shdoclc/shdoclc.rc:117 @@ -3388,7 +3356,7 @@ msgstr "重新整理" #: dlls/hhctrl.ocx/hhctrl.rc:46 dlls/ieframe/ieframe.rc:66 msgid "Back" -msgstr "返回" +msgstr "上一頁" #: dlls/hhctrl.ocx/hhctrl.rc:47 msgctxt "table of contents" @@ -3406,7 +3374,7 @@ msgstr "選項" #: dlls/hhctrl.ocx/hhctrl.rc:51 dlls/ieframe/ieframe.rc:67 msgid "Forward" -msgstr "向前" +msgstr "下一頁" #: dlls/iccvid/iccvid.rc:28 dlls/iccvid/iccvid.rc:29 msgid "Cinepak Video codec" @@ -3438,7 +3406,7 @@ msgstr "開啟(&O)..." #: dlls/ieframe/ieframe.rc:36 programs/notepad/notepad.rc:33 #: programs/wordpad/wordpad.rc:34 msgid "Save &as..." -msgstr "另存為(&A)..." +msgstr "另存新檔(&A)..." #: dlls/ieframe/ieframe.rc:38 msgid "Print &format..." @@ -3478,7 +3446,7 @@ msgstr "關於 Internet Explorer(&A)" #: dlls/ieframe/ieframe.rc:90 msgid "Open URL" -msgstr "開啟連結(&O)" +msgstr "開啟連結" #: dlls/ieframe/ieframe.rc:93 msgid "Specify the URL you wish to open in Internet Explorer" @@ -3539,11 +3507,11 @@ msgstr "空白頁面(&B)" #: dlls/inetcpl.cpl/inetcpl.rc:56 msgid "Browsing history" -msgstr "瀏覽歷程" +msgstr "瀏覽歷史" #: dlls/inetcpl.cpl/inetcpl.rc:57 msgid "You can delete cached pages, cookies and other data." -msgstr "您可以刪除網頁快取、訊餅和其他資料。" +msgstr "您可以刪除網頁快取、Cookie 和其他資料。" #: dlls/inetcpl.cpl/inetcpl.rc:59 msgid "Delete &files..." @@ -3555,7 +3523,7 @@ msgstr "設定(&S)..." #: dlls/inetcpl.cpl/inetcpl.rc:68 msgid "Delete browsing history" -msgstr "刪除瀏覽歷程" +msgstr "刪除瀏覽歷史" #: dlls/inetcpl.cpl/inetcpl.rc:71 msgid "" @@ -3571,7 +3539,7 @@ msgid "" "Files saved on your computer by websites, which store things like user " "preferences and login information." msgstr "" -"訊餅\n" +"Cookies\n" "由網站儲存於您電腦的檔案，其存有諸如使用者偏好設定和登入資訊。" #: dlls/inetcpl.cpl/inetcpl.rc:75 @@ -3579,7 +3547,7 @@ msgid "" "History\n" "List of websites you have accessed." msgstr "" -"歷程\n" +"歷史\n" "您曾存取過的網站清單。" #: dlls/inetcpl.cpl/inetcpl.rc:77 @@ -3617,16 +3585,12 @@ msgid "Publishers..." msgstr "發行者..." #: dlls/inetcpl.cpl/inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "區域網路連線" +msgstr "連線" #: dlls/inetcpl.cpl/inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Wine 設定" +msgstr "自動設定" #: dlls/inetcpl.cpl/inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" @@ -3637,26 +3601,20 @@ msgid "Use Proxy Auto-Config (PAC) script" msgstr "" #: dlls/inetcpl.cpl/inetcpl.rc:128 dlls/inetcpl.cpl/inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "位址" +msgstr "位址：" #: dlls/inetcpl.cpl/inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "本機伺服器(&L)" +msgstr "代理伺服器" #: dlls/inetcpl.cpl/inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "使用代理伺服器" #: dlls/inetcpl.cpl/inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "無連接埠" +msgstr "連接埠：" #: dlls/inetcpl.cpl/inetcpl.rc:31 msgid "Internet Settings" @@ -3668,7 +3626,7 @@ msgstr "設定 Wine 網際網路瀏覽器和相關的設定。" #: dlls/inetcpl.cpl/inetcpl.rc:33 msgid "Security settings for zone: " -msgstr "區域的安全設定：" +msgstr "此區域的安全設定：" #: dlls/inetcpl.cpl/inetcpl.rc:34 msgid "Custom" @@ -3680,7 +3638,7 @@ msgstr "非常低" #: dlls/inetcpl.cpl/inetcpl.rc:36 dlls/wininet/wininet.rc:42 msgid "Low" -msgstr "慢" +msgstr "低" #: dlls/inetcpl.cpl/inetcpl.rc:37 msgid "Medium" @@ -3688,7 +3646,7 @@ msgstr "中" #: dlls/inetcpl.cpl/inetcpl.rc:38 msgid "Increased" -msgstr "已增加" +msgstr "稍高" #: dlls/inetcpl.cpl/inetcpl.rc:39 dlls/wininet/wininet.rc:41 msgid "High" @@ -3703,30 +3661,24 @@ msgid "&Disable" 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)" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "編輯覆載設定" +msgstr "覆寫(&O)" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" -msgstr "已連線" +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" @@ -3736,7 +3688,7 @@ msgstr "已停用" msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." -msgstr "停用或啟用裝置之後，已連線的搖桿將無法更新，直到您重新啟動這個小程式。" +msgstr "停用或啟用裝置之後，已連接的搖桿將無法更新，直到您重新啟動這個程式。" #: dlls/joy.cpl/joy.rc:55 msgid "Test Joystick" @@ -3759,8 +3711,8 @@ msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" -"請按下控制器中的任何按鈕以啟用所選的效果。效果的方向可以利用控制器的軸向來變" -"更。" +"請按下控制器中的任何按鈕以啟用所選的效果。" +"效果的方向可以利用控制器的軸向來變更。" #: dlls/joy.cpl/joy.rc:31 msgid "Game Controllers" @@ -3768,7 +3720,7 @@ msgstr "遊戲控制器" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "測試和設定遊戲控制器。" #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3783,10 +3735,8 @@ msgid "Subscript out of range" msgstr "註標超出範圍" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "無紙；" +msgstr "堆疊空間不足" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3802,7 +3752,7 @@ msgstr "物件不支援這個屬性或方法" #: dlls/jscript/jscript.rc:35 dlls/vbscript/vbscript.rc:50 msgid "Object doesn't support this action" -msgstr "物件不支援此動作" +msgstr "物件不支援這個動作" #: dlls/jscript/jscript.rc:36 msgid "Argument not optional" @@ -3814,27 +3764,23 @@ msgstr "語法錯誤" #: dlls/jscript/jscript.rc:38 msgid "Expected ';'" -msgstr "預期為 ;" +msgstr "預期為 ';'" #: dlls/jscript/jscript.rc:39 msgid "Expected '('" -msgstr "預期為 (" +msgstr "預期為 '('" #: dlls/jscript/jscript.rc:40 msgid "Expected ')'" -msgstr "預期為 )" +msgstr "預期為 ')'" #: dlls/jscript/jscript.rc:41 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "主體金鑰識別碼" +msgstr "預期為識別號" #: dlls/jscript/jscript.rc:42 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "預期為 ;" +msgstr "預期為 '='" #: dlls/jscript/jscript.rc:43 msgid "Invalid character" @@ -3846,15 +3792,15 @@ msgstr "未終結的字串常數" #: dlls/jscript/jscript.rc:45 msgid "'return' statement outside of function" -msgstr "return 敘述位於函式之外" +msgstr "'return' 敘述位於函式之外" #: dlls/jscript/jscript.rc:46 msgid "Can't have 'break' outside of loop" -msgstr "在迴圈之外不可有 break" +msgstr "在迴圈之外不可有 'break'" #: dlls/jscript/jscript.rc:47 msgid "Can't have 'continue' outside of loop" -msgstr "在迴圈之外不可有 continue" +msgstr "在迴圈之外不可有 'continue'" #: dlls/jscript/jscript.rc:48 msgid "Label redefined" @@ -3865,38 +3811,32 @@ msgid "Label not found" msgstr "找不到標貼" #: dlls/jscript/jscript.rc:50 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "預期為 ;" +msgstr "預期為 '@end'" #: dlls/jscript/jscript.rc:51 msgid "Conditional compilation is turned off" -msgstr "條件編譯已被關閉" +msgstr "條件編譯已關閉" #: dlls/jscript/jscript.rc:52 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "預期為 ;" +msgstr "預期為 '@'" #: dlls/jscript/jscript.rc:80 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript 編譯錯誤" #: dlls/jscript/jscript.rc:81 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript 執行期錯誤" #: dlls/jscript/jscript.rc:82 dlls/vbscript/vbscript.rc:64 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "未知錯誤" +msgstr "不明執行期錯誤" #: dlls/jscript/jscript.rc:55 msgid "Number expected" -msgstr "預期為編號" +msgstr "預期為數字" #: dlls/jscript/jscript.rc:53 msgid "Function expected" @@ -3904,7 +3844,7 @@ msgstr "預期為函式" #: dlls/jscript/jscript.rc:54 msgid "'[object]' is not a date object" -msgstr "[object] 並非日期物件" +msgstr "'[object]' 並非日期物件" #: dlls/jscript/jscript.rc:56 msgid "Object expected" @@ -3916,11 +3856,11 @@ msgstr "不合法的指派" #: dlls/jscript/jscript.rc:58 msgid "'|' is undefined" -msgstr "| 未定義" +msgstr "'|' 未定義" #: dlls/jscript/jscript.rc:59 msgid "Boolean object expected" -msgstr "預期為布林物件" +msgstr "預期為布林值物件" #: dlls/jscript/jscript.rc:60 msgid "Cannot delete '|'" @@ -3935,16 +3875,12 @@ msgid "JScript object expected" msgstr "預期為 JScript 物件" #: dlls/jscript/jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "預期為陣列物件" +msgstr "預期為列舉器物件" #: dlls/jscript/jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "預期為布林物件" +msgstr "預期為正規表示式" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" @@ -3952,7 +3888,7 @@ msgstr "正規表示式語法發生錯誤" #: dlls/jscript/jscript.rc:66 msgid "Exception thrown and not caught" -msgstr "" +msgstr "發生異常且未被捕捉" #: dlls/jscript/jscript.rc:68 msgid "URI to be encoded contains invalid characters" @@ -3982,25 +3918,23 @@ msgstr "預期為陣列物件" msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" -msgstr "" +msgstr "無法在這個物件更改屬性描述符中的 'writable' 屬性為 'true'" #: 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 '|'" -msgstr "" +msgstr "無法重新定義不可設定的屬性 '|'" #: dlls/jscript/jscript.rc:76 msgid "Cannot modify non-writable property '|'" -msgstr "" +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" @@ -4008,7 +3942,7 @@ msgstr "" #: include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Wine 核心 DLL" #: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32 #: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137 @@ -4081,7 +4015,7 @@ msgstr "無效的儲存裝置。\n" #: dlls/kernel32/winerror.mc:108 msgid "Can't delete current directory.\n" -msgstr "無法刪除現行目錄。\n" +msgstr "無法刪除目前的目錄。\n" #: dlls/kernel32/winerror.mc:113 msgid "Not same device.\n" @@ -4093,7 +4027,7 @@ msgstr "沒有檔案了。\n" #: dlls/kernel32/winerror.mc:123 msgid "Write protected.\n" -msgstr "防止寫入的。\n" +msgstr "已設定寫入保護。\n" #: dlls/kernel32/winerror.mc:128 msgid "Bad unit.\n" @@ -4245,7 +4179,7 @@ msgstr "太多網路名稱。\n" #: dlls/kernel32/winerror.mc:313 msgid "Too many network sessions.\n" -msgstr "太多網路執行期間。\n" +msgstr "太多網路工作階段。\n" #: dlls/kernel32/winerror.mc:318 msgid "Sharing paused.\n" @@ -4293,7 +4227,7 @@ msgstr "網路寫入錯誤。\n" #: dlls/kernel32/winerror.mc:373 msgid "No process slots.\n" -msgstr "沒有行程插槽。\n" +msgstr "沒有線程插槽。\n" #: dlls/kernel32/winerror.mc:378 msgid "Too many semaphores.\n" @@ -4301,7 +4235,7 @@ msgstr "太多號誌。\n" #: dlls/kernel32/winerror.mc:383 msgid "Exclusive semaphore already owned.\n" -msgstr "已擁有互斥號誌。\n" +msgstr "已擁有專屬號誌。\n" #: dlls/kernel32/winerror.mc:388 msgid "Semaphore is set.\n" @@ -4317,7 +4251,7 @@ msgstr "於插斷時間無效。\n" #: dlls/kernel32/winerror.mc:403 msgid "Semaphore owner died.\n" -msgstr "號誌擁有者已死。\n" +msgstr "號誌擁有者已終止。\n" #: dlls/kernel32/winerror.mc:408 msgid "Semaphore user limit.\n" @@ -4329,7 +4263,7 @@ msgstr "插入磁碟於儲存裝置 %1。\n" #: dlls/kernel32/winerror.mc:418 msgid "Drive locked.\n" -msgstr "已鎖定儲存裝置。\n" +msgstr "儲存裝置已鎖定。\n" #: dlls/kernel32/winerror.mc:423 msgid "Broken pipe.\n" @@ -4385,7 +4319,7 @@ msgstr "無效的層級。\n" #: dlls/kernel32/winerror.mc:493 msgid "No volume label.\n" -msgstr "沒有卷冊標貼。\n" +msgstr "沒有磁碟區代號。\n" #: dlls/kernel32/winerror.mc:498 msgid "Module not found.\n" @@ -4433,19 +4367,19 @@ msgstr "儲存裝置未被 SUBST。\n" #: dlls/kernel32/winerror.mc:558 msgid "Attempt to JOIN onto a JOINed drive.\n" -msgstr "試圖 JOIN 到已被 JOIN 的儲存裝置。\n" +msgstr "嘗試 JOIN 到已被 JOIN 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:563 msgid "Attempt to SUBST onto a SUBSTed drive.\n" -msgstr "試圖 SUBST 到已被 SUBST 的儲存裝置。\n" +msgstr "嘗試 SUBST 到已被 SUBST 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:568 msgid "Attempt to JOIN to a SUBSTed drive.\n" -msgstr "試圖 JOIN 到已被 SUBST 的儲存裝置。\n" +msgstr "嘗試 JOIN 到已被 SUBST 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:573 msgid "Attempt to SUBST to a JOINed drive.\n" -msgstr "試圖 SUBST 到已被 JOIN 的儲存裝置。\n" +msgstr "嘗試 SUBST 到已被 JOIN 的儲存裝置。\n" #: dlls/kernel32/winerror.mc:578 msgid "Drive is busy.\n" @@ -4489,7 +4423,7 @@ msgstr "用於 DosMuxSemWait 的事件計數不正確。\n" #: dlls/kernel32/winerror.mc:628 msgid "Too many waiters for DosMuxSemWait.\n" -msgstr "太多 DosMuxSemWait 的等待者。\n" +msgstr "太多 DosMuxSemWait 的等待項。\n" #: dlls/kernel32/winerror.mc:633 msgid "DosSemMuxWait list invalid.\n" @@ -4497,7 +4431,7 @@ msgstr "DosSemMuxWait 清單無效。\n" #: dlls/kernel32/winerror.mc:638 msgid "Volume label too long.\n" -msgstr "卷冊標貼太長。\n" +msgstr "磁碟區代號太長。\n" #: dlls/kernel32/winerror.mc:643 msgid "Too many TCBs.\n" @@ -4673,7 +4607,7 @@ msgstr "不允許巢狀 LoadModule 呼叫。\n" #: dlls/kernel32/winerror.mc:858 msgid "Machine type mismatch.\n" -msgstr "機器型態不匹配。\n" +msgstr "機器類型不相符。\n" #: dlls/kernel32/winerror.mc:863 msgid "Bad pipe.\n" @@ -4681,11 +4615,11 @@ msgstr "不當的管線。\n" #: dlls/kernel32/winerror.mc:868 msgid "Pipe busy.\n" -msgstr "管線忙碌。\n" +msgstr "管線忙碌中。\n" #: dlls/kernel32/winerror.mc:873 msgid "Pipe closed.\n" -msgstr "管線關閉。\n" +msgstr "管線已關閉。\n" #: dlls/kernel32/winerror.mc:878 msgid "Pipe not connected.\n" @@ -4693,11 +4627,11 @@ msgstr "管線未連接。\n" #: dlls/kernel32/winerror.mc:883 msgid "More data available.\n" -msgstr "更多資料可用。\n" +msgstr "有更多可用資料。\n" #: dlls/kernel32/winerror.mc:888 msgid "Session canceled.\n" -msgstr "已取消工作階段。\n" +msgstr "工作階段已取消。\n" #: dlls/kernel32/winerror.mc:893 msgid "Invalid extended attribute name.\n" @@ -4753,7 +4687,7 @@ msgstr "讀取/寫入行程記憶體已部分完成。\n" #: dlls/kernel32/winerror.mc:958 msgid "The oplock wasn't granted.\n" -msgstr "未被授與 oplock。\n" +msgstr "未授權 oplock。\n" #: dlls/kernel32/winerror.mc:963 msgid "Invalid oplock message received.\n" @@ -4821,7 +4755,7 @@ msgstr "無效的旗標。\n" #: dlls/kernel32/winerror.mc:1043 msgid "Unrecognized volume.\n" -msgstr "無法辨識的卷冊。\n" +msgstr "無法辨識的磁碟區。\n" #: dlls/kernel32/winerror.mc:1048 msgid "File invalid.\n" @@ -4833,7 +4767,7 @@ msgstr "無法全螢幕運行。\n" #: dlls/kernel32/winerror.mc:1058 msgid "Nonexistent token.\n" -msgstr "不存在的字組。\n" +msgstr "不存在的權杖。\n" #: dlls/kernel32/winerror.mc:1063 msgid "Registry corrupt.\n" @@ -4885,7 +4819,7 @@ msgstr "註冊表索引鍵有子項。\n" #: dlls/kernel32/winerror.mc:1123 msgid "Subkey must be volatile.\n" -msgstr "子項必須是易變的。\n" +msgstr "子項必須是可變的。\n" #: dlls/kernel32/winerror.mc:1128 msgid "Notify change request in progress.\n" @@ -4937,7 +4871,7 @@ msgstr "服務無法接受控制訊息。\n" #: dlls/kernel32/winerror.mc:1188 msgid "Service not active.\n" -msgstr "服務現未啟用。\n" +msgstr "服務尚未啟用。\n" #: dlls/kernel32/winerror.mc:1193 msgid "Service controller connect failed.\n" @@ -4985,7 +4919,7 @@ msgstr "服務已存在。\n" #: dlls/kernel32/winerror.mc:1248 msgid "System running last-known-good config.\n" -msgstr "系統執行最後已知正常的組配。\n" +msgstr "系統執行最近已知正常的組配。\n" #: dlls/kernel32/winerror.mc:1253 msgid "Service dependency deleted.\n" @@ -4993,7 +4927,7 @@ msgstr "服務相依性已刪除。\n" #: dlls/kernel32/winerror.mc:1258 msgid "Boot already accepted as last-good config.\n" -msgstr "開機已被接受為最後正常的組配。\n" +msgstr "開機已接受為最近正常的組配。\n" #: dlls/kernel32/winerror.mc:1263 msgid "Service not started since last boot.\n" @@ -5017,7 +4951,7 @@ msgstr "無法偵測到行程中止。\n" #: dlls/kernel32/winerror.mc:1288 msgid "No recovery program for service.\n" -msgstr "沒有復原程式用於服務。\n" +msgstr "服務沒有復原程式。\n" #: dlls/kernel32/winerror.mc:1293 msgid "Service not implemented by exe.\n" @@ -5080,8 +5014,6 @@ msgid "No Unicode translation.\n" msgstr "沒有萬國碼轉譯。\n" #: dlls/kernel32/winerror.mc:1368 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "動態連結函式庫初始失敗。\n" @@ -5123,7 +5055,7 @@ msgstr "軟碟回報錯誤的磁柱。\n" #: dlls/kernel32/winerror.mc:1418 msgid "Unknown floppy error.\n" -msgstr "未知的軟碟錯誤。\n" +msgstr "不明的軟碟錯誤。\n" #: dlls/kernel32/winerror.mc:1423 msgid "Floppy registers inconsistent.\n" @@ -5167,7 +5099,7 @@ msgstr "設定電源狀態失敗。\n" #: dlls/kernel32/winerror.mc:1473 msgid "Too many links.\n" -msgstr "太多鏈結。\n" +msgstr "太多連結。\n" #: dlls/kernel32/winerror.mc:1478 msgid "Newer Windows version needed.\n" @@ -5231,7 +5163,7 @@ msgstr "裝置需要重新初始化。\n" #: dlls/kernel32/winerror.mc:1553 msgid "The device requires cleaning.\n" -msgstr "裝置需要清潔。\n" +msgstr "裝置需要清理。\n" #: dlls/kernel32/winerror.mc:1558 msgid "The device door is open.\n" @@ -5259,11 +5191,11 @@ msgstr "找不到點。\n" #: dlls/kernel32/winerror.mc:1588 msgid "No running tracking service.\n" -msgstr "沒在執行追蹤服務。\n" +msgstr "沒有執行中的追蹤服務。\n" #: dlls/kernel32/winerror.mc:1593 msgid "No such volume ID.\n" -msgstr "沒有此類卷冊識別號。\n" +msgstr "沒有此類磁碟區識別號。\n" #: dlls/kernel32/winerror.mc:1598 msgid "Unable to remove the file to be replaced.\n" @@ -5283,11 +5215,11 @@ msgstr "正在刪除日誌。\n" #: dlls/kernel32/winerror.mc:1618 msgid "The journal is not active.\n" -msgstr "日誌現未啟用。\n" +msgstr "日誌尚未啟用。\n" #: dlls/kernel32/winerror.mc:1623 msgid "Potential matching file found.\n" -msgstr "找到可能的匹配檔案。\n" +msgstr "找到可能的相符檔案。\n" #: dlls/kernel32/winerror.mc:1628 msgid "The journal entry was deleted.\n" @@ -5299,7 +5231,7 @@ msgstr "無效的裝置名稱。\n" #: dlls/kernel32/winerror.mc:1638 msgid "Connection unavailable.\n" -msgstr "連接不得使用。\n" +msgstr "連接無法使用。\n" #: dlls/kernel32/winerror.mc:1643 msgid "Device already remembered.\n" @@ -5315,11 +5247,11 @@ msgstr "無效的網路提供者名稱。\n" #: dlls/kernel32/winerror.mc:1658 msgid "Cannot open network connection profile.\n" -msgstr "無法開啟網路連線側寫檔。\n" +msgstr "無法開啟網路連線配置檔案。\n" #: dlls/kernel32/winerror.mc:1663 msgid "Corrupt network connection profile.\n" -msgstr "損壞的網路連線側寫檔。\n" +msgstr "損壞的網路連線配置檔案。\n" #: dlls/kernel32/winerror.mc:1668 msgid "Not a container.\n" @@ -5327,7 +5259,7 @@ msgstr "不是一個容器。\n" #: dlls/kernel32/winerror.mc:1673 msgid "Extended error.\n" -msgstr "進階錯誤。\n" +msgstr "延伸錯誤。\n" #: dlls/kernel32/winerror.mc:1678 msgid "Invalid group name.\n" @@ -5367,11 +5299,11 @@ msgstr "無效的訊息目的地。\n" #: dlls/kernel32/winerror.mc:1728 msgid "Session credential conflict.\n" -msgstr "作業階段憑據發生衝突。\n" +msgstr "工作階段憑據發生衝突。\n" #: dlls/kernel32/winerror.mc:1733 msgid "Remote session limit exceeded.\n" -msgstr "已超出遠端作業階段限制。\n" +msgstr "已超出遠端工作階段限制。\n" #: dlls/kernel32/winerror.mc:1738 msgid "Duplicate domain or workgroup name.\n" @@ -5395,7 +5327,7 @@ msgstr "連線被拒。\n" #: dlls/kernel32/winerror.mc:1763 msgid "Connection gracefully closed.\n" -msgstr "已平順關閉連接。\n" +msgstr "已順利關閉連線。\n" #: dlls/kernel32/winerror.mc:1768 msgid "Address already associated with transport endpoint.\n" @@ -5411,23 +5343,23 @@ msgstr "連線無效。\n" #: dlls/kernel32/winerror.mc:1783 msgid "Connection is active.\n" -msgstr "連接現正使用。\n" +msgstr "連線現正使用。\n" #: dlls/kernel32/winerror.mc:1788 msgid "Network unreachable.\n" -msgstr "無法連線網路。\n" +msgstr "網路無法連線。\n" #: dlls/kernel32/winerror.mc:1793 msgid "Host unreachable.\n" -msgstr "無法連線主機。\n" +msgstr "主機無法連線。\n" #: dlls/kernel32/winerror.mc:1798 msgid "Protocol unreachable.\n" -msgstr "無法連線協定。\n" +msgstr "協定無法連線。\n" #: dlls/kernel32/winerror.mc:1803 msgid "Port unreachable.\n" -msgstr "無法連線通訊埠。\n" +msgstr "通訊埠無法連線。\n" #: dlls/kernel32/winerror.mc:1808 msgid "Request aborted.\n" @@ -5435,7 +5367,7 @@ msgstr "已放棄要求。\n" #: dlls/kernel32/winerror.mc:1813 msgid "Connection aborted.\n" -msgstr "已放棄連接。\n" +msgstr "已放棄連線。\n" #: dlls/kernel32/winerror.mc:1818 msgid "Please retry operation.\n" @@ -5471,7 +5403,7 @@ msgstr "使用者未被認證。\n" #: dlls/kernel32/winerror.mc:1858 msgid "User not logged on.\n" -msgstr "使用者未被記錄。\n" +msgstr "使用者未登入。\n" #: dlls/kernel32/winerror.mc:1863 msgid "Continue work in progress.\n" @@ -5503,7 +5435,7 @@ msgstr "即使沒有變更任何東西時也進行作業。\n" #: dlls/kernel32/winerror.mc:1898 msgid "The user profile is invalid.\n" -msgstr "使用者側寫檔無效。\n" +msgstr "使用者配置檔案無效。\n" #: dlls/kernel32/winerror.mc:1903 msgid "Not supported on Small Business Server.\n" @@ -5547,7 +5479,7 @@ msgstr "無效的主要群組。\n" #: dlls/kernel32/winerror.mc:1953 msgid "No impersonation token.\n" -msgstr "沒有假冒字組。\n" +msgstr "沒有模擬權杖。\n" #: dlls/kernel32/winerror.mc:1958 msgid "Can't disable mandatory group.\n" @@ -5555,11 +5487,11 @@ msgstr "無法停用必要群組。\n" #: dlls/kernel32/winerror.mc:1963 msgid "No logon servers available.\n" -msgstr "沒有可用的登錄伺服器。\n" +msgstr "沒有可用的登入伺服器。\n" #: dlls/kernel32/winerror.mc:1968 msgid "No such logon session.\n" -msgstr "沒有此類登錄作業階段。\n" +msgstr "沒有此類登入工作階段。\n" #: dlls/kernel32/winerror.mc:1973 msgid "No such privilege.\n" @@ -5623,7 +5555,7 @@ msgstr "帳號限制。\n" #: dlls/kernel32/winerror.mc:2048 msgid "Invalid logon hours.\n" -msgstr "無效的登錄時數。\n" +msgstr "無效的登入時數。\n" #: dlls/kernel32/winerror.mc:2053 msgid "Invalid workstation.\n" @@ -5691,11 +5623,11 @@ msgstr "無效的群組屬性。\n" #: dlls/kernel32/winerror.mc:2133 msgid "Bad impersonation level.\n" -msgstr "不當的假冒等級。\n" +msgstr "不當的模擬等級。\n" #: dlls/kernel32/winerror.mc:2138 msgid "Can't open anonymous security token.\n" -msgstr "無法開啟匿名安全性代表字組。\n" +msgstr "無法開啟匿名的安全權杖。\n" #: dlls/kernel32/winerror.mc:2143 msgid "Bad validation class.\n" @@ -5703,7 +5635,7 @@ msgstr "不當的驗證類別。\n" #: dlls/kernel32/winerror.mc:2148 msgid "Bad token type.\n" -msgstr "不當的字組型態。\n" +msgstr "不當的權杖類型。\n" #: dlls/kernel32/winerror.mc:2153 msgid "No security on object.\n" @@ -5755,11 +5687,11 @@ msgstr "不當的描述元格式。\n" #: dlls/kernel32/winerror.mc:2213 msgid "Not a logon process.\n" -msgstr "不是個登錄行程。\n" +msgstr "不是登入工作階段。\n" #: dlls/kernel32/winerror.mc:2218 msgid "Logon session ID exists.\n" -msgstr "登錄期間識別碼已存在。\n" +msgstr "登入工作階段識別號已存在。\n" #: dlls/kernel32/winerror.mc:2223 msgid "Unknown authentication package.\n" @@ -5767,19 +5699,19 @@ msgstr "不明認證套件。\n" #: dlls/kernel32/winerror.mc:2228 msgid "Bad logon session state.\n" -msgstr "不當的登錄作業階段狀態。\n" +msgstr "不當的登入工作階段狀態。\n" #: dlls/kernel32/winerror.mc:2233 msgid "Logon session ID collision.\n" -msgstr "登錄期間識別碼產生碰撞。\n" +msgstr "登入工作階段識別號發生衝突。\n" #: dlls/kernel32/winerror.mc:2238 msgid "Invalid logon type.\n" -msgstr "無效的登錄型態。\n" +msgstr "無效的登入類型。\n" #: dlls/kernel32/winerror.mc:2243 msgid "Cannot impersonate.\n" -msgstr "無法假冒。\n" +msgstr "無法模擬。\n" #: dlls/kernel32/winerror.mc:2248 msgid "Invalid transaction state.\n" @@ -5807,7 +5739,7 @@ msgstr "其為使用者的主要群組。\n" #: dlls/kernel32/winerror.mc:2278 msgid "Token already in use.\n" -msgstr "字組已使用中。\n" +msgstr "權杖已在使用中。\n" #: dlls/kernel32/winerror.mc:2283 msgid "No such local group.\n" @@ -5827,7 +5759,7 @@ msgstr "本地群組已存在。\n" #: dlls/kernel32/winerror.mc:2303 dlls/kernel32/winerror.mc:2328 msgid "Logon type not granted.\n" -msgstr "登錄型態未授與。\n" +msgstr "登錄類型未授與。\n" #: dlls/kernel32/winerror.mc:2308 msgid "Too many secrets.\n" @@ -5843,7 +5775,7 @@ msgstr "內部安全資料庫錯誤。\n" #: dlls/kernel32/winerror.mc:2323 msgid "Too many context IDs.\n" -msgstr "太多文脈識別號。\n" +msgstr "太多內容識別號。\n" #: dlls/kernel32/winerror.mc:2333 msgid "Cross-encrypted NT password required.\n" @@ -5879,7 +5811,7 @@ msgstr "磁碟已損壞。\n" #: dlls/kernel32/winerror.mc:2373 msgid "No user session key.\n" -msgstr "沒有使用者作業階段金鑰。\n" +msgstr "沒有使用者工作階段金鑰。\n" #: dlls/kernel32/winerror.mc:2378 msgid "License quota exceeded.\n" @@ -5895,7 +5827,7 @@ msgstr "相互認證失敗。\n" #: dlls/kernel32/winerror.mc:2393 msgid "Time skew between client and server.\n" -msgstr "客戶端與伺服端的時間偏斜。\n" +msgstr "用戶端與伺服器的時間存在偏移。\n" #: dlls/kernel32/winerror.mc:2398 msgid "Invalid window handle.\n" @@ -5935,7 +5867,7 @@ msgstr "視窗由另外的執行緒所擁有。\n" #: dlls/kernel32/winerror.mc:2443 msgid "Hotkey already registered.\n" -msgstr "熱鍵已被註冊。\n" +msgstr "快捷鍵已被註冊。\n" #: dlls/kernel32/winerror.mc:2448 msgid "Class already exists.\n" @@ -5967,7 +5899,7 @@ msgstr "找不到清單方塊識別號。\n" #: dlls/kernel32/winerror.mc:2483 msgid "No wildcard characters.\n" -msgstr "沒有萬用字元字元。\n" +msgstr "沒有萬用字元。\n" #: dlls/kernel32/winerror.mc:2488 msgid "Clipboard not open.\n" @@ -5975,7 +5907,7 @@ msgstr "未開啟剪貼簿。\n" #: dlls/kernel32/winerror.mc:2493 msgid "Hotkey not registered.\n" -msgstr "快速鍵未註冊。\n" +msgstr "快捷鍵未註冊。\n" #: dlls/kernel32/winerror.mc:2498 msgid "Not a dialog window.\n" @@ -6039,7 +5971,7 @@ msgstr "這個清單方塊沒有定位停駐點。\n" #: dlls/kernel32/winerror.mc:2573 msgid "Can't destroy object owned by another thread.\n" -msgstr "無法銷毀由另外執行緒所擁有的物件。\n" +msgstr "無法銷毀由其他執行緒所擁有的物件。\n" #: dlls/kernel32/winerror.mc:2578 msgid "Child window menus not allowed.\n" @@ -6107,7 +6039,7 @@ msgstr "沒有非置換頁的系統資源。\n" #: dlls/kernel32/winerror.mc:2658 msgid "No paged system resources.\n" -msgstr "非置換頁的系統資源。\n" +msgstr "沒有置換頁的系統資源。\n" #: dlls/kernel32/winerror.mc:2663 msgid "No working set quota.\n" @@ -6131,7 +6063,7 @@ msgstr "無效的鍵盤控柄。\n" #: dlls/kernel32/winerror.mc:2688 msgid "Hook type not allowed.\n" -msgstr "不允許攔截型態。\n" +msgstr "不允許的攔截類型。\n" #: dlls/kernel32/winerror.mc:2693 msgid "Interactive window station required.\n" @@ -6171,11 +6103,11 @@ msgstr "使用者已放棄安裝。\n" #: dlls/kernel32/winerror.mc:2738 msgid "Installation failure.\n" -msgstr "安裝已失敗。\n" +msgstr "安裝失敗。\n" #: dlls/kernel32/winerror.mc:2743 msgid "Installation suspended.\n" -msgstr "安裝已懸置。\n" +msgstr "安裝擱置。\n" #: dlls/kernel32/winerror.mc:2748 msgid "Unknown product.\n" @@ -6183,15 +6115,15 @@ msgstr "不明產品。\n" #: dlls/kernel32/winerror.mc:2753 msgid "Unknown feature.\n" -msgstr "不明特徵。\n" +msgstr "不明功能。\n" #: dlls/kernel32/winerror.mc:2758 msgid "Unknown component.\n" -msgstr "未知的元件。\n" +msgstr "不明元件。\n" #: dlls/kernel32/winerror.mc:2763 msgid "Unknown property.\n" -msgstr "未知的屬性。\n" +msgstr "不明屬性。\n" #: dlls/kernel32/winerror.mc:2768 msgid "Invalid handle state.\n" @@ -6251,7 +6183,7 @@ msgstr "開啟安裝記錄檔時失敗。\n" #: dlls/kernel32/winerror.mc:2838 msgid "Installation language not supported.\n" -msgstr "不受支援的安裝語言。\n" +msgstr "不支援的安裝語言。\n" #: dlls/kernel32/winerror.mc:2843 msgid "Installation transform failed to apply.\n" @@ -6275,11 +6207,11 @@ msgstr "無效的表格。\n" #: dlls/kernel32/winerror.mc:2868 msgid "Data type mismatch.\n" -msgstr "資料類型不匹配。\n" +msgstr "資料類型不相符。\n" #: dlls/kernel32/winerror.mc:2873 dlls/kernel32/winerror.mc:3083 msgid "Unsupported type.\n" -msgstr "不受支援的型態。\n" +msgstr "不支援的類型。\n" #: dlls/kernel32/winerror.mc:2878 msgid "Creation failed.\n" @@ -6291,7 +6223,7 @@ msgstr "無法寫入暫存資料夾。\n" #: dlls/kernel32/winerror.mc:2888 msgid "Installation platform not supported.\n" -msgstr "不受支援的安裝平臺。\n" +msgstr "不支援的安裝平臺。\n" #: dlls/kernel32/winerror.mc:2893 msgid "Installer not used.\n" @@ -6307,7 +6239,7 @@ msgstr "無效的更新套件。\n" #: dlls/kernel32/winerror.mc:2908 msgid "Unsupported patch package.\n" -msgstr "不受支援的修補程式套件。\n" +msgstr "不支援的修補程式套件。\n" #: dlls/kernel32/winerror.mc:2913 msgid "Another version is installed.\n" @@ -6391,7 +6323,7 @@ msgstr "RPC 伺服器未傾聽。\n" #: dlls/kernel32/winerror.mc:3013 msgid "Unknown manager type.\n" -msgstr "不明管理員型態。\n" +msgstr "不明管理員類型。\n" #: dlls/kernel32/winerror.mc:3018 msgid "Unknown interface.\n" @@ -6415,7 +6347,7 @@ msgstr "資源不足。\n" #: dlls/kernel32/winerror.mc:3043 msgid "RPC server unavailable.\n" -msgstr "RPC 伺服器不得使用。\n" +msgstr "RPC 伺服器不可用。\n" #: dlls/kernel32/winerror.mc:3048 msgid "RPC server too busy.\n" @@ -6427,7 +6359,7 @@ msgstr "無效的網路選項。\n" #: dlls/kernel32/winerror.mc:3058 msgid "No RPC call active.\n" -msgstr "沒有現用的 RPC 呼叫。\n" +msgstr "沒有可用的 RPC 呼叫。\n" #: dlls/kernel32/winerror.mc:3063 msgid "RPC call failed.\n" @@ -6443,7 +6375,7 @@ msgstr "RPC 協定發生錯誤。\n" #: dlls/kernel32/winerror.mc:3078 msgid "Unsupported transfer syntax.\n" -msgstr "不受支援的轉送語法。\n" +msgstr "不支援的轉送語法。\n" #: dlls/kernel32/winerror.mc:3088 msgid "Invalid tag.\n" @@ -6463,7 +6395,7 @@ msgstr "無效的名稱語法。\n" #: dlls/kernel32/winerror.mc:3108 msgid "Unsupported name syntax.\n" -msgstr "不受支援的名稱語法。\n" +msgstr "不支援的名稱語法。\n" #: dlls/kernel32/winerror.mc:3113 msgid "No network address.\n" @@ -6479,7 +6411,7 @@ msgstr "不明認證類型。\n" #: dlls/kernel32/winerror.mc:3128 msgid "Maximum calls too low.\n" -msgstr "太低的呼叫數最大值。\n" +msgstr "呼叫數的最大值太低。\n" #: dlls/kernel32/winerror.mc:3133 msgid "String too long.\n" @@ -6543,7 +6475,7 @@ msgstr "已無更多成員。\n" #: dlls/kernel32/winerror.mc:3208 msgid "Not all objects unexported.\n" -msgstr "並非所有物件被取消匯出。\n" +msgstr "並非所有物件未被匯出。\n" #: dlls/kernel32/winerror.mc:3213 msgid "Interface not found.\n" @@ -6559,7 +6491,7 @@ msgstr "找不到條目。\n" #: dlls/kernel32/winerror.mc:3228 msgid "Name service unavailable.\n" -msgstr "名稱服務不得使用。\n" +msgstr "名稱服務不可用。\n" #: dlls/kernel32/winerror.mc:3233 msgid "Invalid network address family.\n" @@ -6571,7 +6503,7 @@ msgstr "操作不受支援。\n" #: dlls/kernel32/winerror.mc:3243 msgid "No security context available.\n" -msgstr "沒有可用安全文脈。\n" +msgstr "沒有可用的安全內容。\n" #: dlls/kernel32/winerror.mc:3248 msgid "RPCInternal error.\n" @@ -6611,15 +6543,15 @@ msgstr "字元翻譯表格檔案太小。\n" #: dlls/kernel32/winerror.mc:3293 msgid "Null context handle.\n" -msgstr "空值文脈控柄。\n" +msgstr "內容控柄為空值。\n" #: dlls/kernel32/winerror.mc:3298 msgid "Context handle damaged.\n" -msgstr "文脈控柄受損害。\n" +msgstr "內容控柄已損壞。\n" #: dlls/kernel32/winerror.mc:3303 msgid "Binding handle mismatch.\n" -msgstr "繫結控柄不匹配。\n" +msgstr "繫結控柄不相符。\n" #: dlls/kernel32/winerror.mc:3308 msgid "Cannot get call handle.\n" @@ -6627,7 +6559,7 @@ msgstr "無法提取呼叫控柄。\n" #: dlls/kernel32/winerror.mc:3313 msgid "Null reference pointer.\n" -msgstr "空值參考指標。\n" +msgstr "參考指標為空值。\n" #: dlls/kernel32/winerror.mc:3318 msgid "Enumeration value out of range.\n" @@ -6667,15 +6599,15 @@ msgstr "信賴的關聯性失敗。\n" #: dlls/kernel32/winerror.mc:3363 msgid "Trust logon failure.\n" -msgstr "信賴登錄失敗。\n" +msgstr "信賴登入失敗。\n" #: dlls/kernel32/winerror.mc:3368 msgid "RPC call already in progress.\n" -msgstr "RPC 呼叫已正進行。\n" +msgstr "RPC 呼叫已在進行。\n" #: dlls/kernel32/winerror.mc:3373 msgid "NETLOGON is not started.\n" -msgstr "NETLOGON 未被啟始。\n" +msgstr "NETLOGON 未被啟動。\n" #: dlls/kernel32/winerror.mc:3378 msgid "Account expired.\n" @@ -6695,7 +6627,7 @@ msgstr "不明通訊埠。\n" #: dlls/kernel32/winerror.mc:3398 msgid "Unknown printer driver.\n" -msgstr "未知的印表機驅動程式。\n" +msgstr "不明印表機驅動程式。\n" #: dlls/kernel32/winerror.mc:3403 msgid "Unknown print processor.\n" @@ -6735,15 +6667,15 @@ msgstr "已無更多繫結。\n" #: dlls/kernel32/winerror.mc:3448 msgid "Can't log on with inter-domain trust account.\n" -msgstr "無法以網域間信賴帳號登錄。\n" +msgstr "無法以網域間信賴帳號登入。\n" #: dlls/kernel32/winerror.mc:3453 msgid "Can't log on with workstation trust account.\n" -msgstr "無法以工作站信賴帳號登錄。\n" +msgstr "無法以工作站信賴帳號登入。\n" #: dlls/kernel32/winerror.mc:3458 msgid "Can't log on with server trust account.\n" -msgstr "無法以伺服器信賴帳號登錄。\n" +msgstr "無法以伺服器信賴帳號登入。\n" #: dlls/kernel32/winerror.mc:3463 msgid "Domain trust information inconsistent.\n" @@ -6791,7 +6723,7 @@ msgstr "RPC 指令失敗。\n" #: dlls/kernel32/winerror.mc:3518 msgid "Unsupported authorization level.\n" -msgstr "不受支援的授權等級。\n" +msgstr "不支援的授權等級。\n" #: dlls/kernel32/winerror.mc:3523 msgid "No principal name registered.\n" @@ -6935,7 +6867,7 @@ msgstr "無法解析檔名。\n" #: dlls/kernel32/winerror.mc:3698 msgid "RPC entry type mismatch.\n" -msgstr "RPC 條目型態不匹配。\n" +msgstr "RPC 條目類型不匹配。\n" #: dlls/kernel32/winerror.mc:3703 msgid "Not all objects could be exported.\n" @@ -6947,15 +6879,15 @@ msgstr "無法匯出介面。\n" #: dlls/kernel32/winerror.mc:3713 msgid "The profile could not be added.\n" -msgstr "無法加入側寫檔。\n" +msgstr "無法加入配置檔案。\n" #: dlls/kernel32/winerror.mc:3718 msgid "The profile element could not be added.\n" -msgstr "無法加入側寫檔元件。\n" +msgstr "無法加入配置檔案元件。\n" #: dlls/kernel32/winerror.mc:3723 msgid "The profile element could not be removed.\n" -msgstr "無法移除側寫檔元件。\n" +msgstr "無法移除配置檔案元件。\n" #: dlls/kernel32/winerror.mc:3728 msgid "The group element could not be added.\n" @@ -6970,610 +6902,505 @@ msgid "The username could not be found.\n" msgstr "無法找到使用者名稱。\n" #: dlls/kernel32/winerror.mc:3743 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "站臺不存在。\n" +msgstr "這個網路連線不存在。\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "連線被拒。\n" +msgstr "連線被同儕節點重設。\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "未實作" +msgstr "未實作。\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "RPC 呼叫失敗。\n" +msgstr "呼叫失敗。\n" #: dlls/kernel32/winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "在檔案 %2 中找不到訊息 0x%1。\n" +msgstr "無法在檔案中找到簽名。\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "無效的層級。\n" +msgstr "無效的呼叫。\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Help not available." msgid "Resource is not currently available.\n" -msgstr "沒有可用的說明資訊。" +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 msgid "Normal" -msgstr "中" +msgstr "標準" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" -msgstr "代號" +msgstr "Letter" #: dlls/localspl/localspl.rc:38 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Small" -msgstr "代號" +msgstr "Letter Small" #: dlls/localspl/localspl.rc:39 -#, fuzzy -#| msgid "&Table" msgid "Tabloid" -msgstr "表格(&T)" +msgstr "Tabloid" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "Ledger" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "Legal" #: 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 Small" #: 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 "Note" #: 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 "美國標準 Fanfold" #: dlls/localspl/localspl.rc:76 msgid "German Std Fanfold" -msgstr "" +msgstr "德國標準 Fanfold" #: dlls/localspl/localspl.rc:77 msgid "German Legal Fanfold" -msgstr "" +msgstr "德國法定 Fanfold" #: 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 "信封 Invite" #: dlls/localspl/localspl.rc:84 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Extra" -msgstr "代號" +msgstr "Letter Extra" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" -msgstr "" +msgstr "Legal Extra" #: dlls/localspl/localspl.rc:86 msgid "Tabloid Extra" -msgstr "" +msgstr "Tabloid Extra" #: dlls/localspl/localspl.rc:87 -#, fuzzy -#| msgid "E&xtras" msgid "A4 Extra" -msgstr "其他(&X)" +msgstr "A4 Extra" #: dlls/localspl/localspl.rc:88 msgid "Letter Transverse" -msgstr "" +msgstr "Letter Transverse" #: dlls/localspl/localspl.rc:89 msgid "A4 Transverse" -msgstr "" +msgstr "A4 Transverse" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" -msgstr "" +msgstr "Letter Extra Transverse" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "Super A" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "Super B" #: dlls/localspl/localspl.rc:93 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Plus" -msgstr "代號" +msgstr "Letter Plus" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "A4 Plus" #: dlls/localspl/localspl.rc:95 msgid "A5 Transverse" -msgstr "" +msgstr "A5 Transverse" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" -msgstr "" +msgstr "B5 (JIS) Transverse" #: dlls/localspl/localspl.rc:97 -#, fuzzy -#| msgid "E&xtras" msgid "A3 Extra" -msgstr "其他(&X)" +msgstr "A3 Extra" #: dlls/localspl/localspl.rc:98 -#, fuzzy -#| msgid "E&xtras" msgid "A5 Extra" -msgstr "其他(&X)" +msgstr "A5 Extra" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "B5 (ISO) Extra" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "A" +msgstr "A2" #: dlls/localspl/localspl.rc:101 msgid "A3 Transverse" -msgstr "" +msgstr "A3 Transverse" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" -msgstr "" +msgstr "A3 Extra Transverse" #: 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 "日本角形信封 #2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "日本角形信封 #3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "日本長形信封 #3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "日本長形信封 #4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "Letter 橫向" #: 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 "日本角形信封 #2 橫向" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "日本角形信封 #3 橫向" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "日本長形信封 #3 橫向" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "日本長形信封 #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 "日本洋形信封 #4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "日本洋形信封 #4 橫向" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "中國 16K" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "中國 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 "中國信封 #1" #: dlls/localspl/localspl.rc:131 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "PKCS 7 封套" +msgstr "中國信封 #2" #: dlls/localspl/localspl.rc:132 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "PKCS 7 封套" +msgstr "中國信封 #3" #: dlls/localspl/localspl.rc:133 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "PKCS 7 封套" +msgstr "中國信封 #4" #: dlls/localspl/localspl.rc:134 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "PKCS 7 封套" +msgstr "中國信封 #5" #: dlls/localspl/localspl.rc:135 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "PKCS 7 封套" +msgstr "中國信封 #6" #: dlls/localspl/localspl.rc:136 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "PKCS 7 封套" +msgstr "中國信封 #7" #: dlls/localspl/localspl.rc:137 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "PKCS 7 封套" +msgstr "中國信封 #8" #: dlls/localspl/localspl.rc:138 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "PKCS 7 封套" +msgstr "中國信封 #9" #: dlls/localspl/localspl.rc:139 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "PKCS 7 封套" +msgstr "中國信封 #10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "中國 16K 橫向" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "中國 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 "中國信封 #1 橫向" #: dlls/localspl/localspl.rc:144 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #2 橫向" #: dlls/localspl/localspl.rc:145 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #3 橫向" #: dlls/localspl/localspl.rc:146 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #4 橫向" #: dlls/localspl/localspl.rc:147 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #5 橫向" #: dlls/localspl/localspl.rc:148 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #6 橫向" #: dlls/localspl/localspl.rc:149 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #7 橫向" #: dlls/localspl/localspl.rc:150 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #8 橫向" #: dlls/localspl/localspl.rc:151 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #9 橫向" #: dlls/localspl/localspl.rc:152 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "PKCS 7 封套" +msgstr "中國信封 #10 橫向" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7590,7 +7417,7 @@ msgstr "新增本機連接埠" #: dlls/localui/localui.rc:42 msgid "&Enter the port name to add:" -msgstr "輸入要新增的本機連接埠名稱(&E):" +msgstr "輸入要新增的本機連接埠名稱(&E)：" #: dlls/localui/localui.rc:51 msgid "Configure LPT Port" @@ -7598,15 +7425,15 @@ msgstr "設定並列埠" #: dlls/localui/localui.rc:54 msgid "Timeout (seconds)" -msgstr "超時(秒)" +msgstr "超時（秒）" #: dlls/localui/localui.rc:55 msgid "&Transmission Retry:" -msgstr "重試傳送(&T):" +msgstr "重試傳送(&T)：" #: dlls/localui/localui.rc:32 msgid "'%s' is not a valid port name" -msgstr "%s 不是有效的連接埠名稱" +msgstr "「%s」不是有效的連接埠名稱" #: dlls/localui/localui.rc:33 msgid "Port %s already exists" @@ -7626,7 +7453,7 @@ msgstr "傳送郵件" #: dlls/mferror/mferror.mc:249 dlls/mferror/mferror.mc:256 msgid "Begin request has already been made.\n" -msgstr "" +msgstr "已建立開始要求。\n" #: dlls/mferror/mferror.mc:599 #, fuzzy -- 2.33.0.windows.2

2 5

[PATCH] dinput: Set high DIK bit for extended scancodes.
by Rémi Bernon 21 Oct '21

21 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51910 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/keyboard.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index fb6cf33b911..fd8e9e8fd12 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -80,7 +80,8 @@ static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType, DWORD vers break; } } - return scanCode; + if (scanCode & 0x100) scanCode |= 0x80; + return (BYTE)scanCode; } int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam ) @@ -89,6 +90,7 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa BYTE new_diks, subtype = GET_DIDEVICE_SUBTYPE( This->base.instance.dwDevType ); int dik_code, ret = This->base.dwCoopLevel & DISCL_EXCLUSIVE; KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam; + DWORD scan_code; if (wparam != WM_KEYDOWN && wparam != WM_KEYUP && wparam != WM_SYSKEYDOWN && wparam != WM_SYSKEYUP) @@ -105,9 +107,9 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa case VK_NUMLOCK : dik_code = DIK_NUMLOCK; break; case VK_SUBTRACT: dik_code = DIK_SUBTRACT; break; default: - dik_code = map_dik_code( hook->scanCode & 0xff, hook->vkCode, subtype, - This->base.dinput->dwVersion ); - if (hook->flags & LLKHF_EXTENDED) dik_code |= 0x80; + scan_code = hook->scanCode & 0xff; + if (hook->flags & LLKHF_EXTENDED) scan_code |= 0x100; + dik_code = map_dik_code( scan_code, hook->vkCode, subtype, This->base.dinput->dwVersion ); } new_diks = hook->flags & LLKHF_UP ? 0 : 0x80; -- 2.33.0

1 0

[PATCH vkd3d v2] vkd3d-shader/hlsl: Return the shape of the left operand when appropriate.
by Giovanni Mascellani 21 Oct '21

21 Oct '21

The assumption about the size of matrices is not correct: it is legitimate to compose a matrix 2x2 with a vector of length 4, in which case it appears that the result has the shape of the first (leftmost) operand. Even for matrices 1xN or Nx1, the result is not always a vector: in general it has the shape of the first operand again. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index bfe2bbb9..c42e372e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -971,18 +971,7 @@ static bool expr_common_shape(struct hlsl_ctx *ctx, struct hlsl_type *t1, struct } else { - /* Two vectors or a vector and a matrix (matrix must be 1xn or nx1) */ - unsigned int max_dim_1, max_dim_2; - - max_dim_1 = max(t1->dimx, t1->dimy); - max_dim_2 = max(t2->dimx, t2->dimy); - if (t1->dimx * t1->dimy == t2->dimx * t2->dimy) - { - *type = HLSL_CLASS_VECTOR; - *dimx = max(t1->dimx, t2->dimx); - *dimy = 1; - } - else if (max_dim_1 <= max_dim_2) + if (t1->dimx * t1->dimy <= t2->dimx * t2->dimy) { *type = t1->type; *dimx = t1->dimx; -- 2.33.0

4 5

[PATCH vkd3d 1/6] vkd3d-shader/hlsl: Introduce a helper for getting numeric types.
by Giovanni Mascellani 21 Oct '21

21 Oct '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 4 ++-- libs/vkd3d-shader/hlsl.h | 28 ++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl.y | 28 ++++++++++++---------------- 3 files changed, 42 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 9bce6beb..421aaf27 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -560,7 +560,7 @@ struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned i if (!(c = hlsl_alloc(ctx, sizeof(*c)))) return NULL; - init_node(&c->node, HLSL_IR_CONSTANT, ctx->builtin_types.scalar[HLSL_TYPE_UINT], loc); + init_node(&c->node, HLSL_IR_CONSTANT, get_scalar_type(ctx, HLSL_TYPE_UINT), loc); c->value[0].u = n; return c; } @@ -650,7 +650,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned if (!(swizzle = hlsl_alloc(ctx, sizeof(*swizzle)))) return NULL; init_node(&swizzle->node, HLSL_IR_SWIZZLE, - ctx->builtin_types.vector[val->data_type->base_type][components - 1], *loc); + get_vector_type(ctx, val->data_type->base_type, components), *loc); hlsl_src_from_node(&swizzle->val, val); swizzle->swizzle = s; return swizzle; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index e401971e..2e6b1bf7 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -629,6 +629,34 @@ static inline void hlsl_release_string_buffer(struct hlsl_ctx *ctx, struct vkd3d vkd3d_string_buffer_release(&ctx->string_buffers, buffer); } +static inline struct hlsl_type *get_scalar_type(const struct hlsl_ctx *ctx, enum hlsl_base_type base_type) +{ + return ctx->builtin_types.scalar[base_type]; +} + +static inline struct hlsl_type *get_vector_type(const struct hlsl_ctx *ctx, enum hlsl_base_type base_type, + unsigned int dimx) +{ + return ctx->builtin_types.vector[base_type][dimx - 1]; +} + +static inline struct hlsl_type *get_matrix_type(const struct hlsl_ctx *ctx, enum hlsl_base_type base_type, + unsigned int dimx, unsigned int dimy) +{ + return ctx->builtin_types.matrix[base_type][dimx - 1][dimy - 1]; +} + +static inline struct hlsl_type *get_numeric_type(const struct hlsl_ctx *ctx, enum hlsl_type_class type, + enum hlsl_base_type base_type, unsigned int dimx, unsigned int dimy) +{ + if (type == HLSL_CLASS_SCALAR) + return get_scalar_type(ctx, base_type); + else if (type == HLSL_CLASS_VECTOR) + return get_vector_type(ctx, base_type, dimx); + else + return get_matrix_type(ctx, base_type, dimx, dimy); +} + const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op); const char *debug_hlsl_type(struct hlsl_ctx *ctx, const struct hlsl_type *type); const char *debug_hlsl_writemask(unsigned int writemask); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ae19cd1a..addb9c59 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1021,11 +1021,7 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type } } - if (type == HLSL_CLASS_SCALAR) - return ctx->builtin_types.scalar[base]; - if (type == HLSL_CLASS_VECTOR) - return ctx->builtin_types.vector[base][dimx - 1]; - return ctx->builtin_types.matrix[base][dimx - 1][dimy - 1]; + return get_numeric_type(ctx, type, base, dimx, dimy); } static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, enum hlsl_ir_expr_op op, @@ -1761,7 +1757,7 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type } if (!(arg = add_implicit_conversion(ctx, params->instrs, arg, - ctx->builtin_types.vector[type->base_type][width - 1], &arg->loc))) + get_vector_type(ctx, type->base_type, width), &arg->loc))) continue; if (!(store = hlsl_new_store(ctx, var, NULL, arg, @@ -1816,9 +1812,9 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl if (params->args_count >= 2) FIXME("Ignoring index and/or offset parameter(s).\n"); - /* -1 for zero-indexing; +1 for the mipmap level */ + /* +1 for the mipmap level */ if (!(coords = add_implicit_conversion(ctx, instrs, params->args[0], - ctx->builtin_types.vector[HLSL_TYPE_INT][sampler_dim - 1 + 1], loc))) + get_vector_type(ctx, HLSL_TYPE_INT, sampler_dim + 1), loc))) return false; if (!(load = hlsl_new_resource_load(ctx, object_type->e.resource_format, HLSL_RESOURCE_LOAD, @@ -2500,7 +2496,7 @@ type: YYABORT; } - $$ = ctx->builtin_types.vector[$3->base_type][$5 - 1]; + $$ = get_vector_type(ctx, $3->base_type, $5); } | KW_MATRIX '<' type ',' C_INTEGER ',' C_INTEGER '>' { @@ -2528,7 +2524,7 @@ type: YYABORT; } - $$ = ctx->builtin_types.matrix[$3->base_type][$7 - 1][$5 - 1]; + $$ = get_matrix_type(ctx, $3->base_type, $7, $5); } | KW_VOID { @@ -2560,7 +2556,7 @@ type: } | texture_type { - $$ = hlsl_new_texture_type(ctx, $1, ctx->builtin_types.vector[HLSL_TYPE_FLOAT][4 - 1]); + $$ = hlsl_new_texture_type(ctx, $1, get_vector_type(ctx, HLSL_TYPE_FLOAT, 4)); } | texture_type '<' type '>' { @@ -2971,7 +2967,7 @@ primary_expr: if (!(c = hlsl_alloc(ctx, sizeof(*c)))) YYABORT; - init_node(&c->node, HLSL_IR_CONSTANT, ctx->builtin_types.scalar[HLSL_TYPE_FLOAT], @1); + init_node(&c->node, HLSL_IR_CONSTANT, get_scalar_type(ctx, HLSL_TYPE_FLOAT), @1); c->value[0].f = $1; if (!($$ = make_list(ctx, &c->node))) YYABORT; @@ -2982,7 +2978,7 @@ primary_expr: if (!(c = hlsl_alloc(ctx, sizeof(*c)))) YYABORT; - init_node(&c->node, HLSL_IR_CONSTANT, ctx->builtin_types.scalar[HLSL_TYPE_INT], @1); + init_node(&c->node, HLSL_IR_CONSTANT, get_scalar_type(ctx, HLSL_TYPE_INT), @1); c->value[0].i = $1; if (!($$ = make_list(ctx, &c->node))) YYABORT; @@ -2993,7 +2989,7 @@ primary_expr: if (!(c = hlsl_alloc(ctx, sizeof(*c)))) YYABORT; - init_node(&c->node, HLSL_IR_CONSTANT, ctx->builtin_types.scalar[HLSL_TYPE_BOOL], @1); + init_node(&c->node, HLSL_IR_CONSTANT, get_scalar_type(ctx, HLSL_TYPE_BOOL), @1); c->value[0].b = $1; if (!($$ = make_list(ctx, &c->node))) YYABORT; @@ -3030,7 +3026,7 @@ primary_expr: struct hlsl_ir_var *var; if (!(var = hlsl_new_synthetic_var(ctx, "<state-block-expr>", - ctx->builtin_types.scalar[HLSL_TYPE_INT], @1))) + get_scalar_type(ctx, HLSL_TYPE_INT), @1))) YYABORT; if (!(load = hlsl_new_var_load(ctx, var, @1))) YYABORT; @@ -3116,7 +3112,7 @@ postfix_expr: YYABORT; } - if (!(cast = hlsl_new_cast(ctx, index, ctx->builtin_types.scalar[HLSL_TYPE_UINT], &index->loc))) + if (!(cast = hlsl_new_cast(ctx, index, get_scalar_type(ctx, HLSL_TYPE_UINT), &index->loc))) { destroy_instr_list($1); YYABORT; -- 2.33.0

3 16

[PATCH v2 1/2] include: Update struct _LDR_DDAG_NODE definition.
by Paul Gofman 21 Oct '21

21 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- include/winternl.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index f1272518dbb..097dea4601a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3284,18 +3284,13 @@ typedef struct _LDR_DDAG_NODE LIST_ENTRY Modules; LDR_SERVICE_TAG_RECORD *ServiceTagList; ULONG LoadCount; - ULONG ReferenceCount; - ULONG DependencyCount; - union - { - LDRP_CSLIST Dependencies; - SINGLE_LIST_ENTRY RemovalLink; - }; + ULONG LoadWhileUnloadingCount; + ULONG LowestLink; + LDRP_CSLIST Dependencies; LDRP_CSLIST IncomingDependencies; LDR_DDAG_STATE State; SINGLE_LIST_ENTRY CondenseLink; ULONG PreorderNumber; - ULONG LowestLink; } LDR_DDAG_NODE, *PLDR_DDAG_NODE; typedef enum _LDR_DLL_LOAD_REASON -- 2.31.1

1 1

[PATCH 1/2] include: Update struct _LDR_DDAG_NODE definition.
by Paul Gofman 21 Oct '21

21 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- include/winternl.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index f1272518dbb..097dea4601a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3284,18 +3284,13 @@ typedef struct _LDR_DDAG_NODE LIST_ENTRY Modules; LDR_SERVICE_TAG_RECORD *ServiceTagList; ULONG LoadCount; - ULONG ReferenceCount; - ULONG DependencyCount; - union - { - LDRP_CSLIST Dependencies; - SINGLE_LIST_ENTRY RemovalLink; - }; + ULONG LoadWhileUnloadingCount; + ULONG LowestLink; + LDRP_CSLIST Dependencies; LDRP_CSLIST IncomingDependencies; LDR_DDAG_STATE State; SINGLE_LIST_ENTRY CondenseLink; ULONG PreorderNumber; - ULONG LowestLink; } LDR_DDAG_NODE, *PLDR_DDAG_NODE; typedef enum _LDR_DLL_LOAD_REASON -- 2.31.1

2 2

[PATCH v2 resend] msxml3: Null check url in parseURL.
by Jefferson Carpenter 21 Oct '21

21 Oct '21

Considered adding IVBSAXXMLReader_parseURL to test_saxreader() instead of adding the function test_vb_saxreader() but ran into two problems: 1) ISAXXMLReader sometimes cannot be queried for IVBSAXXMLReader and 2) the EXPECT_REF lines in contentHandler_putDocumentLocator would need to be incremented to account for the additional reference.

1 0

[PATCH v2] msxml3: Null check url in parseURL.
by Jefferson Carpenter 21 Oct '21

21 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51267 Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> --- Considered adding IVBSAXXMLReader_parseURL to test_saxreader() instead of adding the function test_vb_saxreader() but ran into two problems: 1) ISAXXMLReader sometimes cannot be queried for IVBSAXXMLReader and 2) the EXPECT_REF lines in contentHandler_putDocumentLocator would need to be incremented to account for the additional reference. --- dlls/msxml3/saxreader.c | 2 ++ dlls/msxml3/tests/saxreader.c | 36 +++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index c610ffcaccb..eadf8e0c631 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2739,6 +2739,8 @@ static HRESULT internal_parseURL( TRACE("(%p)->(%s)\n", This, debugstr_w(url)); + if (!url) return E_INVALIDARG; + hr = create_moniker_from_url(url, &mon); if(FAILED(hr)) return hr; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ad093af6a12..7fda64f9776 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2325,6 +2325,13 @@ static void test_saxreader(void) WriteFile(file, testXML, sizeof(testXML)-1, &written, NULL); CloseHandle(file); + /* crashes on new versions */ + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader30)) { + hr = ISAXXMLReader_parseURL(reader, NULL); + EXPECT_HR(hr, E_INVALIDARG); + } + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) || IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) test_seq = content_handler_test1_alternate; @@ -2561,6 +2568,34 @@ static void test_saxreader(void) free_bstrs(); } +static void test_vb_saxreader(void) +{ + const struct msxmlsupported_data_t *table = reader_support_data; + HRESULT hr; + IVBSAXXMLReader *reader = NULL; + + while (table->clsid) + { + if (!is_clsid_supported(table->clsid, reader_support_data)) + { + table++; + continue; + } + + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IVBSAXXMLReader, (void**)&reader); + EXPECT_HR(hr, S_OK); + + /* crashes on new versions */ + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader30)) { + hr = IVBSAXXMLReader_parseURL(reader, NULL); + EXPECT_HR(hr, E_INVALIDARG); + } + + table++; + } +} + struct saxreader_props_test_t { const char *prop_name; @@ -6019,6 +6054,7 @@ START_TEST(saxreader) get_class_support_data(reader_support_data, &IID_ISAXXMLReader); test_saxreader(); + test_vb_saxreader(); test_saxreader_properties(); test_saxreader_features(); test_saxreader_encoding(); -- 2.26.2

2 1

[PATCH 1/5] winegstreamer: Translate GST_AUDIO_CHANNEL_POSITION_MONO to SPEAKER_FRONT_CENTER.
by Zebediah Figura 21 Oct '21

21 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wg_parser.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 0c23ae6d351..c3c9051a174 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -159,7 +159,10 @@ static uint32_t wg_channel_position_from_gst(GstAudioChannelPosition position) SPEAKER_TOP_BACK_CENTER, }; - if (position < ARRAY_SIZE(position_map)) + if (position == GST_AUDIO_CHANNEL_POSITION_MONO) + return SPEAKER_FRONT_CENTER; + + if (position >= 0 && position < ARRAY_SIZE(position_map)) return position_map[position]; return 0; } -- 2.33.0

2 5

[PATCH] xslt: Build with LIBXSLT_STATIC, fix building with clang in MSVC mode
by Martin Storsjö 21 Oct '21

21 Oct '21

This avoids unnecessarily embedding dllexport directives in all the object files. This also fixes building with clang in MSVC mode, as the MSVC definition of XSLTPUBVAR in xsltexports.h is lacking 'extern' when doing dllexport. (This probably used to work before compilers defaulted to -fcommon.) This fixes duplicate symbols like these: lld-link: error: duplicate symbol: xsltGenericError >>> defined at ../src/libs/xslt/libxslt/xsltutils.h:140 >>> libxslt.cross.a(documents.cross.o) >>> defined at ../src/libs/xslt/libxslt/xsltutils.h:140 >>> libxslt.cross.a(extensions.cross.o) Signed-off-by: Martin Storsjö <martin(a)martin.st> --- configure.ac | 2 +- libs/xslt/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 3f1d50a4dfc..62af43220ce 100644 --- a/configure.ac +++ b/configure.ac @@ -1060,7 +1060,7 @@ WINE_EXTLIB_FLAGS(LCMS2, lcms2, lcms2, "-I\$(top_srcdir)/libs/lcms2/include") WINE_EXTLIB_FLAGS(PNG, png, "png \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/png") WINE_EXTLIB_FLAGS(TIFF, tiff, tiff, "-I\$(top_srcdir)/libs/tiff/libtiff") WINE_EXTLIB_FLAGS(XML2, libxml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") -WINE_EXTLIB_FLAGS(XSLT, libxslt, xslt, "-I\$(top_srcdir)/libs/xslt") +WINE_EXTLIB_FLAGS(XSLT, libxslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO") dnl **** Check for pthread **** diff --git a/libs/xslt/Makefile.in b/libs/xslt/Makefile.in index 3550010ce31..b620710c5af 100644 --- a/libs/xslt/Makefile.in +++ b/libs/xslt/Makefile.in @@ -1,5 +1,5 @@ EXTLIB = libxslt.a -EXTRAINCL = $(XML2_PE_CFLAGS) +EXTRAINCL = $(XML2_PE_CFLAGS) $(XSLT_PE_CFLAGS) C_SRCS = \ libxslt/attributes.c \ -- 2.25.1

1 0

[PATCH v2] winebus.sys: Map SDL joystick axes the same way as UDEV evdev.
by Rémi Bernon 21 Oct '21

21 Oct '21

And increase the arbitrary absolute axis count limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40658 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 217916 v2: Only resending this single patch to fix relative_usages index which should be 2 * i, as SDL balls are two axes combined together. In any case, SDL linux backend may only ever report one ball at the moment. dlls/winebus.sys/bus_sdl.c | 64 +++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 403c4821f24..fe3a960649c 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -227,33 +227,47 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) { - static const USAGE joystick_usages[] = + static const USAGE_AND_PAGE absolute_usages[] = { - HID_USAGE_GENERIC_X, - HID_USAGE_GENERIC_Y, - HID_USAGE_GENERIC_Z, - HID_USAGE_GENERIC_RX, - HID_USAGE_GENERIC_RY, - HID_USAGE_GENERIC_RZ, - HID_USAGE_GENERIC_SLIDER, - HID_USAGE_GENERIC_DIAL, - HID_USAGE_GENERIC_WHEEL + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_THROTTLE}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_RUDDER}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_ACCELERATOR}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_BRAKE}, + }; + static const USAGE_AND_PAGE relative_usages[] = + { + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_SLIDER}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, }; struct sdl_device *impl = impl_from_unix_device(iface); int i, button_count, axis_count, ball_count, hat_count; axis_count = pSDL_JoystickNumAxes(impl->sdl_joystick); - if (axis_count > 6) + if (axis_count > ARRAY_SIZE(absolute_usages)) { - FIXME("Clamping joystick to 6 axis\n"); - axis_count = 6; + FIXME("More than %zu absolute axes found, ignoring.\n", ARRAY_SIZE(absolute_usages)); + axis_count = ARRAY_SIZE(absolute_usages); } ball_count = pSDL_JoystickNumBalls(impl->sdl_joystick); - if (axis_count + ball_count * 2 > ARRAY_SIZE(joystick_usages)) + if (ball_count > ARRAY_SIZE(relative_usages) / 2) { - FIXME("Capping ball + axis at 9\n"); - ball_count = (ARRAY_SIZE(joystick_usages) - axis_count) / 2; + FIXME("More than %zu relative axes found, ignoring.\n", ARRAY_SIZE(relative_usages)); + ball_count = ARRAY_SIZE(relative_usages) / 2; } hat_count = pSDL_JoystickNumHats(impl->sdl_joystick); @@ -265,13 +279,19 @@ static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) if (!hid_device_begin_input_report(iface)) return STATUS_NO_MEMORY; - if (axis_count && !hid_device_add_axes(iface, axis_count, HID_USAGE_PAGE_GENERIC, - joystick_usages, FALSE, -32768, 32767)) - return STATUS_NO_MEMORY; + for (i = 0; i < axis_count; i++) + { + if (!hid_device_add_axes(iface, 1, absolute_usages[i].UsagePage, + &absolute_usages[i].Usage, FALSE, -32768, 32767)) + return STATUS_NO_MEMORY; + } - if (ball_count && !hid_device_add_axes(iface, ball_count * 2, HID_USAGE_PAGE_GENERIC, - &joystick_usages[axis_count], TRUE, INT32_MIN, INT32_MAX)) - return STATUS_NO_MEMORY; + for (i = 0; i < ball_count; i++) + { + if (!hid_device_add_axes(iface, 2, relative_usages[2 * i].UsagePage, + &relative_usages[2 * i].Usage, TRUE, INT32_MIN, INT32_MAX)) + return STATUS_NO_MEMORY; + } if (hat_count && !hid_device_add_hatswitch(iface, hat_count)) return STATUS_NO_MEMORY; -- 2.33.0

1 0

[PATCH 1/4] winebus.sys: Prefer USAGE_AND_PAGE over BYTE arrays.
by Rémi Bernon 21 Oct '21

21 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40658 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 133 +++++++++++++++++------------------- 1 file changed, 63 insertions(+), 70 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index c7125520c33..f0651a8e529 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -141,15 +141,63 @@ static inline struct hidraw_device *hidraw_impl_from_unix_device(struct unix_dev #ifdef HAS_PROPER_INPUT_HEADER -#define HID_REL_MAX (REL_MISC+1) -#define HID_ABS_MAX (ABS_VOLUME+1) +static const USAGE_AND_PAGE absolute_usages[] = +{ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, /* ABS_X */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, /* ABS_Y */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, /* ABS_Z */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, /* ABS_RX */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, /* ABS_RY */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, /* ABS_RZ */ + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_THROTTLE}, /* ABS_THROTTLE */ + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_RUDDER}, /* ABS_RUDDER */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, /* ABS_WHEEL */ + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_ACCELERATOR}, /* ABS_GAS */ + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_BRAKE}, /* ABS_BRAKE */ + {0}, + {0}, + {0}, + {0}, + {0}, + {0}, /* ABS_HAT0X */ + {0}, /* ABS_HAT0Y */ + {0}, /* ABS_HAT1X */ + {0}, /* ABS_HAT1Y */ + {0}, /* ABS_HAT2X */ + {0}, /* ABS_HAT2Y */ + {0}, /* ABS_HAT3X */ + {0}, /* ABS_HAT3Y */ + {.UsagePage = HID_USAGE_PAGE_DIGITIZER, .Usage = HID_USAGE_DIGITIZER_TIP_PRESSURE}, /* ABS_PRESSURE */ + {0}, /* ABS_DISTANCE */ + {.UsagePage = HID_USAGE_PAGE_DIGITIZER, .Usage = HID_USAGE_DIGITIZER_X_TILT}, /* ABS_TILT_X */ + {.UsagePage = HID_USAGE_PAGE_DIGITIZER, .Usage = HID_USAGE_DIGITIZER_Y_TILT}, /* ABS_TILT_Y */ + {0}, /* ABS_TOOL_WIDTH */ + {0}, + {0}, + {0}, + {.UsagePage = HID_USAGE_PAGE_CONSUMER, .Usage = HID_USAGE_CONSUMER_VOLUME}, /* ABS_VOLUME */ +}; + +static const USAGE_AND_PAGE relative_usages[] = +{ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, /* REL_X */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, /* REL_Y */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, /* REL_Z */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, /* REL_RX */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, /* REL_RY */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, /* REL_RZ */ + {0}, /* REL_HWHEEL */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, /* REL_DIAL */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, /* REL_WHEEL */ + {0}, /* REL_MISC */ +}; struct lnxev_device { struct base_device base; - BYTE abs_map[HID_ABS_MAX]; - BYTE rel_map[HID_REL_MAX]; + BYTE abs_map[ARRAY_SIZE(absolute_usages)]; + BYTE rel_map[ARRAY_SIZE(relative_usages)]; BYTE hat_map[8]; BYTE button_map[KEY_MAX]; @@ -459,58 +507,6 @@ static struct base_device *find_device_from_syspath(const char *path) return NULL; } -static const BYTE ABS_TO_HID_MAP[][2] = { - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_X}, /*ABS_X*/ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Y}, /*ABS_Y*/ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Z}, /*ABS_Z*/ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RX}, /*ABS_RX*/ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RY}, /*ABS_RY*/ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RZ}, /*ABS_RZ*/ - {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_THROTTLE}, /*ABS_THROTTLE*/ - {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_RUDDER}, /*ABS_RUDDER*/ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /*ABS_WHEEL*/ - {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_ACCELERATOR}, /*ABS_GAS*/ - {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_BRAKE}, /*ABS_BRAKE*/ - {0,0}, - {0,0}, - {0,0}, - {0,0}, - {0,0}, - {0,0}, /*ABS_HAT0X*/ - {0,0}, /*ABS_HAT0Y*/ - {0,0}, /*ABS_HAT1X*/ - {0,0}, /*ABS_HAT1Y*/ - {0,0}, /*ABS_HAT2X*/ - {0,0}, /*ABS_HAT2Y*/ - {0,0}, /*ABS_HAT3X*/ - {0,0}, /*ABS_HAT3Y*/ - {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_TIP_PRESSURE}, /*ABS_PRESSURE*/ - {0, 0}, /*ABS_DISTANCE*/ - {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_X_TILT}, /*ABS_TILT_X*/ - {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_Y_TILT}, /*ABS_TILT_Y*/ - {0, 0}, /*ABS_TOOL_WIDTH*/ - {0, 0}, - {0, 0}, - {0, 0}, - {HID_USAGE_PAGE_CONSUMER, HID_USAGE_CONSUMER_VOLUME} /*ABS_VOLUME*/ -}; -C_ASSERT(ARRAY_SIZE(ABS_TO_HID_MAP) == HID_ABS_MAX); -#define TOP_ABS_PAGE (HID_USAGE_PAGE_DIGITIZER+1) - -static const BYTE REL_TO_HID_MAP[][2] = { - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_X}, /* REL_X */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Y}, /* REL_Y */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Z}, /* REL_Z */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RX}, /* REL_RX */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RY}, /* REL_RY */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RZ}, /* REL_RZ */ - {0, 0}, /* REL_HWHEEL */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_DIAL}, /* REL_DIAL */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /* REL_WHEEL */ - {0, 0} /* REL_MISC */ -}; -#define TOP_REL_PAGE (HID_USAGE_PAGE_CONSUMER+1) - #define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) static const BYTE* what_am_I(struct udev_device *dev) @@ -584,17 +580,17 @@ static INT count_abs_axis(int device_fd) return 0; } - for (i = 0; i < HID_ABS_MAX; i++) + for (i = 0; i < ARRAY_SIZE(absolute_usages); i++) if (test_bit(absbits, i) && - (ABS_TO_HID_MAP[i][1] >= HID_USAGE_GENERIC_X && - ABS_TO_HID_MAP[i][1] <= HID_USAGE_GENERIC_WHEEL)) + (absolute_usages[i].Usage >= HID_USAGE_GENERIC_X && + absolute_usages[i].Usage <= HID_USAGE_GENERIC_WHEEL)) abs_count++; return abs_count; } static NTSTATUS build_report_descriptor(struct unix_device *iface, struct udev_device *dev) { - struct input_absinfo abs_info[HID_ABS_MAX]; + struct input_absinfo abs_info[ARRAY_SIZE(absolute_usages)]; BYTE absbits[(ABS_MAX+7)/8]; BYTE relbits[(REL_MAX+7)/8]; BYTE ffbits[(FF_MAX+7)/8]; @@ -629,14 +625,12 @@ static NTSTATUS build_report_descriptor(struct unix_device *iface, struct udev_d return STATUS_NO_MEMORY; abs_count = 0; - for (i = 0; i < HID_ABS_MAX; i++) + for (i = 0; i < ARRAY_SIZE(absolute_usages); i++) { + usage = absolute_usages[i]; if (!test_bit(absbits, i)) continue; ioctl(impl->base.device_fd, EVIOCGABS(i), abs_info + i); - - if (!(usage.UsagePage = ABS_TO_HID_MAP[i][0])) continue; - if (!(usage.Usage = ABS_TO_HID_MAP[i][1])) continue; - + if (!usage.UsagePage || !usage.Usage) continue; if (!hid_device_add_axes(iface, 1, usage.UsagePage, &usage.Usage, FALSE, LE_DWORD(abs_info[i].minimum), LE_DWORD(abs_info[i].maximum))) return STATUS_NO_MEMORY; @@ -645,12 +639,11 @@ static NTSTATUS build_report_descriptor(struct unix_device *iface, struct udev_d } rel_count = 0; - for (i = 0; i < HID_REL_MAX; i++) + for (i = 0; i < ARRAY_SIZE(relative_usages); i++) { + usage = relative_usages[i]; if (!test_bit(relbits, i)) continue; - if (!(usage.UsagePage = REL_TO_HID_MAP[i][0])) continue; - if (!(usage.Usage = REL_TO_HID_MAP[i][1])) continue; - + if (!usage.UsagePage || !usage.Usage) continue; if (!hid_device_add_axes(iface, 1, usage.UsagePage, &usage.Usage, TRUE, INT32_MIN, INT32_MAX)) return STATUS_NO_MEMORY; @@ -719,7 +712,7 @@ static NTSTATUS build_report_descriptor(struct unix_device *iface, struct udev_d return STATUS_NO_MEMORY; /* Initialize axis in the report */ - for (i = 0; i < HID_ABS_MAX; i++) + for (i = 0; i < ARRAY_SIZE(absolute_usages); i++) { if (!test_bit(absbits, i)) continue; if (i < ABS_HAT0X || i > ABS_HAT3Y) -- 2.33.0

1 3

[PATCH 1/6] dinput: Replace stub EnumEffects with generic implementation.
by Rémi Bernon 21 Oct '21

21 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 73 ++++++++++++++++++++++++++++++++++---- dlls/dinput/joystick_hid.c | 73 +------------------------------------- 2 files changed, 67 insertions(+), 79 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 8858bfa26bb..e5713f4713d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1661,14 +1661,73 @@ HRESULT WINAPI IDirectInputDevice2WImpl_CreateEffect(LPDIRECTINPUTDEVICE8W iface return DIERR_UNSUPPORTED; } -HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( - LPDIRECTINPUTDEVICE8W iface, - LPDIENUMEFFECTSCALLBACKW lpCallback, - LPVOID lpvRef, - DWORD dwFlags) +HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, + void *context, DWORD type ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("(%p)->(%p,%p,0x%08x): stub!\n", This, lpCallback, lpvRef, dwFlags); + DIEFFECTINFOW info = {.dwSize = sizeof(info)}; + HRESULT hr; + + TRACE( "iface %p, callback %p, context %p, type %#x.\n", iface, callback, context, type ); + + if (!callback) return DIERR_INVALIDPARAM; + + type = DIEFT_GETTYPE( type ); + + if (type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_ConstantForce ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_RAMPFORCE) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_RampForce ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_PERIODIC) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Square ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Sine ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Triangle ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothUp ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothDown ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_CONDITION) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Spring ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Damper ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Inertia ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Friction ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } return DI_OK; } diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 766e022ebe0..91b6020d1f1 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -838,77 +838,6 @@ failed: return hr; } -static HRESULT WINAPI hid_joystick_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, - void *context, DWORD type ) -{ - DIEFFECTINFOW info = {.dwSize = sizeof(info)}; - HRESULT hr; - - TRACE( "iface %p, callback %p, context %p, type %#x.\n", iface, callback, context, type ); - - if (!callback) return DIERR_INVALIDPARAM; - - type = DIEFT_GETTYPE( type ); - - if (type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_ConstantForce ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - if (type == DIEFT_ALL || type == DIEFT_RAMPFORCE) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_RampForce ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - if (type == DIEFT_ALL || type == DIEFT_PERIODIC) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Square ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Sine ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Triangle ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothUp ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothDown ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - if (type == DIEFT_ALL || type == DIEFT_CONDITION) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Spring ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Damper ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Inertia ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Friction ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - return DI_OK; -} - static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, const GUID *guid ) { @@ -1155,7 +1084,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = IDirectInputDevice2WImpl_Initialize, /*** IDirectInputDevice2 methods ***/ hid_joystick_CreateEffect, - hid_joystick_EnumEffects, + IDirectInputDevice2WImpl_EnumEffects, hid_joystick_GetEffectInfo, hid_joystick_GetForceFeedbackState, hid_joystick_SendForceFeedbackCommand, -- 2.33.0

1 5

[PATCH] po: Update German translation.
by Julian Rüger 21 Oct '21

21 Oct '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH v2] msxml3/tests: Test VBSAXXMLReader.
by Jefferson Carpenter 21 Oct '21

21 Oct '21

Removed vb_reader_support_data. Looped through reader_support_data, but incremented a flag through SAXObjectType and VB_SAXObjectType while incrementing the table. thanks, Jefferson

2 4

[PATCH] include: Add MFVideoAlphaBitmapFlags in evr9.idl
by Biswapriyo Nath 21 Oct '21

21 Oct '21

2 2

[PATCH 1/3] winegstreamer: Move the IWMPacketSize2 implementation to the wm_reader object.
by Zebediah Figura 21 Oct '21

21 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/wm_asyncreader.c | 68 ----------------------------- dlls/winegstreamer/wm_reader.c | 67 ++++++++++++++++++++++++++++ dlls/wmvcore/tests/wmvcore.c | 4 +- 4 files changed, 70 insertions(+), 70 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 6dc0ad3e291..519be33dadd 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -117,6 +117,7 @@ struct wm_reader { IWMHeaderInfo3 IWMHeaderInfo3_iface; IWMLanguageList IWMLanguageList_iface; + IWMPacketSize2 IWMPacketSize2_iface; IWMProfile3 IWMProfile3_iface; LONG refcount; diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index a36718ef453..d2891730bfb 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -33,7 +33,6 @@ struct async_reader IWMReaderTimecode IWMReaderTimecode_iface; IWMReaderPlaylistBurn IWMReaderPlaylistBurn_iface; IReferenceClock IReferenceClock_iface; - IWMPacketSize2 IWMPacketSize2_iface; }; static struct async_reader *impl_from_IWMReader(IWMReader *iface) @@ -1322,68 +1321,6 @@ static const IReferenceClockVtbl ReferenceClockVtbl = refclock_Unadvise }; -static struct async_reader *impl_from_IWMPacketSize2(IWMPacketSize2 *iface) -{ - return CONTAINING_RECORD(iface, struct async_reader, IWMPacketSize2_iface); -} - -static HRESULT WINAPI packetsize_QueryInterface(IWMPacketSize2 *iface, REFIID riid, void **ppv) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI packetsize_AddRef(IWMPacketSize2 *iface) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI packetsize_Release(IWMPacketSize2 *iface) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI packetsize_GetMaxPacketSize(IWMPacketSize2 *iface, DWORD *size) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %p\n", This, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI packetsize_SetMaxPacketSize(IWMPacketSize2 *iface, DWORD size) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %d\n", This, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI packetsize_GetMinPacketSize(IWMPacketSize2 *iface, DWORD *size) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %p\n", This, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI packetsize_SetMinPacketSize(IWMPacketSize2 *iface, DWORD size) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %d\n", This, size); - return E_NOTIMPL; -} - -static const IWMPacketSize2Vtbl WMPacketSize2Vtbl = -{ - packetsize_QueryInterface, - packetsize_AddRef, - packetsize_Release, - packetsize_GetMaxPacketSize, - packetsize_SetMaxPacketSize, - packetsize_GetMinPacketSize, - packetsize_SetMinPacketSize -}; - static struct async_reader *impl_from_wm_reader(struct wm_reader *iface) { return CONTAINING_RECORD(iface, struct async_reader, reader); @@ -1398,10 +1335,6 @@ static void *async_reader_query_interface(struct wm_reader *iface, REFIID iid) if (IsEqualIID(iid, &IID_IReferenceClock)) return &reader->IReferenceClock_iface; - if (IsEqualIID(iid, &IID_IWMPacketSize) - || IsEqualIID(iid, &IID_IWMPacketSize2)) - return &reader->IWMPacketSize2_iface; - if (IsEqualIID(iid, &IID_IWMReader)) return &reader->IWMReader_iface; @@ -1462,7 +1395,6 @@ HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader) wm_reader_init(&object->reader, &async_reader_ops); object->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl; - object->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl; object->IWMReader_iface.lpVtbl = &WMReaderVtbl; object->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; object->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index b72ff98cd18..edf8f227308 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -41,6 +41,11 @@ static HRESULT WINAPI profile_QueryInterface(IWMProfile3 *iface, REFIID iid, voi { *out = &reader->IWMLanguageList_iface; } + else if (IsEqualIID(iid, &IID_IWMPacketSize) + || IsEqualIID(iid, &IID_IWMPacketSize2)) + { + *out = &reader->IWMPacketSize2_iface; + } else if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IWMProfile) || IsEqualIID(iid, &IID_IWMProfile2) @@ -572,10 +577,72 @@ static const IWMLanguageListVtbl language_list_vtbl = language_list_AddLanguageByRFC1766String, }; +static struct wm_reader *impl_from_IWMPacketSize2(IWMPacketSize2 *iface) +{ + return CONTAINING_RECORD(iface, struct wm_reader, IWMPacketSize2_iface); +} + +static HRESULT WINAPI packet_size_QueryInterface(IWMPacketSize2 *iface, REFIID iid, void **out) +{ + struct wm_reader *reader = impl_from_IWMPacketSize2(iface); + + return IWMProfile3_QueryInterface(&reader->IWMProfile3_iface, iid, out); +} + +static ULONG WINAPI packet_size_AddRef(IWMPacketSize2 *iface) +{ + struct wm_reader *reader = impl_from_IWMPacketSize2(iface); + + return IWMProfile3_AddRef(&reader->IWMProfile3_iface); +} + +static ULONG WINAPI packet_size_Release(IWMPacketSize2 *iface) +{ + struct wm_reader *reader = impl_from_IWMPacketSize2(iface); + + return IWMProfile3_Release(&reader->IWMProfile3_iface); +} + +static HRESULT WINAPI packet_size_GetMaxPacketSize(IWMPacketSize2 *iface, DWORD *size) +{ + FIXME("iface %p, size %p, stub!\n", iface, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packet_size_SetMaxPacketSize(IWMPacketSize2 *iface, DWORD size) +{ + FIXME("iface %p, size %u, stub!\n", iface, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packet_size_GetMinPacketSize(IWMPacketSize2 *iface, DWORD *size) +{ + FIXME("iface %p, size %p, stub!\n", iface, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packet_size_SetMinPacketSize(IWMPacketSize2 *iface, DWORD size) +{ + FIXME("iface %p, size %u, stub!\n", iface, size); + return E_NOTIMPL; +} + +static const IWMPacketSize2Vtbl packet_size_vtbl = +{ + packet_size_QueryInterface, + packet_size_AddRef, + packet_size_Release, + packet_size_GetMaxPacketSize, + packet_size_SetMaxPacketSize, + packet_size_GetMinPacketSize, + packet_size_SetMinPacketSize, +}; + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl; reader->IWMLanguageList_iface.lpVtbl = &language_list_vtbl; + reader->IWMPacketSize2_iface.lpVtbl = &packet_size_vtbl; reader->IWMProfile3_iface.lpVtbl = &profile_vtbl; reader->refcount = 1; reader->ops = ops; diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 9f9c5ed393f..0662c035617 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -148,8 +148,8 @@ static void test_wmsyncreader_interfaces(void) check_interface(reader, &IID_IWMHeaderInfo2, TRUE); check_interface(reader, &IID_IWMHeaderInfo3, TRUE); check_interface(reader, &IID_IWMLanguageList, TRUE); - todo_wine check_interface(reader, &IID_IWMPacketSize, TRUE); - todo_wine check_interface(reader, &IID_IWMPacketSize2, TRUE); + check_interface(reader, &IID_IWMPacketSize, TRUE); + check_interface(reader, &IID_IWMPacketSize2, TRUE); check_interface(reader, &IID_IWMProfile, TRUE); check_interface(reader, &IID_IWMProfile2, TRUE); check_interface(reader, &IID_IWMProfile3, TRUE); -- 2.33.0

1 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel