July 2012 - Wine-commits - list.winehq.org

Gustavo Henrique Milaré : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 468647f1843431c1f520802dfb275e6b28ce02db URL: http://source.winehq.org/git/wine.git/?a=commit;h=468647f1843431c1f520802df… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Sun Jul 22 16:30:05 2012 -0300 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 122 ++++++++++------------------------------------------------- 1 files changed, 20 insertions(+), 102 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index d8ea3f1..111653a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-02-29 21:39-0300\n" +"PO-Revision-Date: 2012-07-22 16:28-0300\n" "Last-Translator: Gustavo Henrique Milaré <gugamilare(a)gmail.com>\n" "Language-Team: none\n" "Language: Portuguese (Brazil)\n" @@ -30,11 +30,6 @@ msgid "&Install..." msgstr "&Instalar..." #: appwiz.rc:62 -#, fuzzy -#| msgid "" -#| "The following software can be automatically removed. To remove a program " -#| "or to modify its installed components, select it from the list and click " -#| "Change/Remove." msgid "" "The following software can be automatically removed. To remove a program or " "to modify its installed components, select it from the list and click Modify/" @@ -163,21 +158,10 @@ msgid "Cancel" msgstr "Cancelar" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Instalador Wine Gecko" +msgstr "Instalador Wine Mono" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -186,13 +170,13 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"O Wine não pôde encontrar o pacote Gecko que é necessário para aplicativos " -"com HTML embutido funcionarem corretamente. O Wine pode automaticamente " -"efetuar o download e instalá-lo para você.\n" +"O Wine não pôde encontrar o pacote Mono que é necessário para aplicativos ." +"NET funcionarem corretamente. O Wine pode automaticamente efetuar o download " +"e instalá-lo para você.\n" "\n" "Nota: é recomendável usar os pacotes da sua distribuição em vez disso. Veja " -"<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -"para mais detalhes." +"<a href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> para " +"mais detalhes." #: appwiz.rc:28 msgid "Add/Remove Programs" @@ -2226,14 +2210,10 @@ msgstr "" "lista de revogação de certificados ou lista de certificados confiáveis:" #: cryptui.rc:296 -#, fuzzy -#| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" msgstr "Padrão de Sintaxe de Mensagem Criptográfica/Mensagens PKCS #7 (.p7b)" #: cryptui.rc:298 -#, fuzzy -#| msgid "Personal Information Exchange/PKCS #12 (.pfx, .p12)" msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" msgstr "Troca de Informações Pessoais/PKCS #12 (.pfx, .p12)" @@ -2379,20 +2359,14 @@ msgid "Select the format you want to use:" msgstr "Selecione o formato que deseja utilizar:" #: cryptui.rc:405 -#, fuzzy -#| msgid "&DER-encoded X.509 (.cer)" msgid "&DER-encoded X.509 (*.cer)" msgstr "&DER-codificado X.509 (.cer)" #: cryptui.rc:407 -#, fuzzy -#| msgid "Ba&se64-encoded X.509 (.cer):" msgid "Ba&se64-encoded X.509 (*.cer):" msgstr "Ba&se64-codificado X.509 (.cer):" #: cryptui.rc:409 -#, fuzzy -#| msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" msgstr "Padrão de Sintaxe de Mensagem &Criptográfica/PKCS #7 Mensagem (.p7b)" @@ -2401,8 +2375,6 @@ msgid "&Include all certificates in the certification path if possible" msgstr "&Incluir todos os certificados no caminho do certificado se possível" #: cryptui.rc:413 -#, fuzzy -#| msgid "&Personal Information Exchange/PKCS #12 (.pfx)" msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" msgstr "Troca de Informações &Pessoais/PKCS #12 (.pfx)" @@ -3472,22 +3444,16 @@ msgid "&Disable" msgstr "&Desativar" #: joy.rc:37 -#, fuzzy -#| msgid "&enable" msgid "&Enable" -msgstr "&habilitar" +msgstr "&Habilitar" #: joy.rc:38 -#, fuzzy -#| msgid "Disconnected" msgid "Connected" -msgstr "Desconectado" +msgstr "Conectado" #: joy.rc:40 -#, fuzzy -#| msgid "&Disable" msgid "Disabled" -msgstr "&Desativar" +msgstr "Desativado" #: joy.rc:46 msgid "Test Joystick" @@ -3502,10 +3468,8 @@ msgid "Test Force Feedback" msgstr "" #: joy.rc:63 -#, fuzzy -#| msgid "Available formats" msgid "Available Effects" -msgstr "Formatos Disponíveis" +msgstr "Efeitos Disponíveis" #: joy.rc:65 msgid "" @@ -3514,10 +3478,8 @@ msgid "" msgstr "" #: joy.rc:28 -#, fuzzy -#| msgid "Create Control" msgid "Game Controllers" -msgstr "Criar controle" +msgstr "Controles de Jogos" #: jscript.rc:25 msgid "Error converting object to primitive type" @@ -3568,10 +3530,8 @@ msgid "Expected ')'" msgstr "')' esperado" #: jscript.rc:37 -#, fuzzy -#| msgid "Invalid parameter.\n" msgid "Invalid character" -msgstr "Parâmetro inválido.\n" +msgstr "Caractere inválido" #: jscript.rc:38 msgid "Unterminated string constant" @@ -3650,16 +3610,12 @@ msgid "URI to be decoded is incorrect" msgstr "URI a ser codificado está incorreto" #: jscript.rc:57 -#, fuzzy -#| msgid "Enumeration value out of range.\n" msgid "Number of fraction digits is out of range" -msgstr "Valor de enumeração fora dos limites.\n" +msgstr "Número de dígitos fracionários fora do limite" #: jscript.rc:58 -#, fuzzy -#| msgid "Subscript out of range" msgid "Precision is out of range" -msgstr "Subscript fora de alcance" +msgstr "Precisão fora do limite" #: jscript.rc:59 msgid "Array length must be a finite positive integer" @@ -6765,37 +6721,6 @@ msgid "insert disk %s" msgstr "insira disco %s" #: msi.rc:30 -#, fuzzy -#| msgid "" -#| "Windows Installer %s\n" -#| "\n" -#| "Usage:\n" -#| "msiexec command {required parameter} [optional parameter]\n" -#| "\n" -#| "Install a product:\n" -#| "\t/i {package|product_code} [property]\n" -#| "\t/package {package|product_code} [property]\n" -#| "\t/a package [property]\n" -#| "Repair an installation:\n" -#| "\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" -#| "Uninstall a product:\n" -#| "\t/uninstall {package|product_code} [property]\n" -#| "\t/x {package|product_code} [property]\n" -#| "Advertise a product:\n" -#| "\t/j[u|m] package [/t transform] [/g languageid]\n" -#| "Apply a patch:\n" -#| "\t/p patch_package [property]\n" -#| "\t/p patch_package /a package [property]\n" -#| "Log and UI Modifiers for above commands:\n" -#| "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -#| "\t/q{|n|b|r|f|n+|b+|b-}\n" -#| "Register MSI Service:\n" -#| "\t/y\n" -#| "Unregister MSI Service:\n" -#| "\t/z\n" -#| "Display this help:\n" -#| "\t/help\n" -#| "\t/?\n" msgid "" "Windows Installer %s\n" "\n" @@ -6846,7 +6771,7 @@ msgstr "" "Aplicar um patch:\n" "\t/p pacotedepatch [propriedade]\n" "\t/p pacotedepatch /a pacote [propriedade]\n" -"Modificadores Log e UI para os comandos acima:\n" +"Modificadores de log e interface de usuário para os comandos acima:\n" "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" "\t/q{|n|b|r|f|n+|b+|b-}\n" "Registrar Serviço MSI:\n" @@ -12893,9 +12818,8 @@ msgid "Select an executable file" msgstr "Selecione um arquivo executável" #: winecfg.rc:66 -#, fuzzy msgid "Autodetect" -msgstr "Auto &Detectar" +msgstr "Auto detectar" #: winecfg.rc:67 msgid "Local hard disk" @@ -13778,22 +13702,16 @@ msgid "Help topics: " msgstr "Tópicos de ajuda: " #: wmic.rc:25 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "Error: Command line not supported\n" -msgstr "Erro: Parâmetros da linha de comandos inválidos\n" +msgstr "Erro: Parâmetros da linha de comandos não suportados\n" #: wmic.rc:26 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Error: Alias not found\n" -msgstr "Propriedade não encontrada.\n" +msgstr "Erro: alias não encontrado\n" #: wmic.rc:27 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "Error: Invalid query\n" -msgstr "Erro: Nome de chave inválido\n" +msgstr "Erro: Consulta inválida\n" #: wordpad.rc:28 msgid "&New...\tCtrl+N"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 33e87241896775d793687f8f2d7f767100cb11cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e87241896775d793687f8f2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 23 07:35:19 2012 +0200 po: Update French translation. --- po/fr.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index 72723d2..86107a6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-06-22 07:46+0100\n" +"PO-Revision-Date: 2012-07-23 07:34+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -3479,16 +3479,16 @@ msgid "Test Force Feedback" msgstr "Tester le retour de force" #: joy.rc:63 -#, fuzzy -#| msgid "Available formats" msgid "Available Effects" -msgstr "Formats disponibles" +msgstr "Effets disponibles" #: joy.rc:65 msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" +"Appuyez sur un bouton du contrôleur pour activer l'effet choisi. La " +"direction de l'effet peut être modifiée en utilisant l'axe du contrôleur." #: joy.rc:28 msgid "Game Controllers"

1 0

Wei-Lun Chao : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 00c5cdd894dfae69d986050a8bf1fe0d2173a353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c5cdd894dfae69d986050a8… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Sat Jul 14 01:17:36 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 92 ++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 51 insertions(+), 41 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 4173ef1..9506b41 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -11439,7 +11439,7 @@ msgstr "暫停(&P)" #: taskmgr.rc:68 taskmgr.rc:256 msgid "&Select Columns..." -msgstr "選擇欄位(&S)..." +msgstr "選擇欄(&S)…" #: taskmgr.rc:69 taskmgr.rc:258 msgid "&CPU History" @@ -11986,47 +11986,47 @@ msgstr "取消工作管理員隱藏狀態" #: taskmgr.rc:230 msgid "Removes the process from the system" -msgstr "將行程從系統中移除" +msgstr "將進程從系統中移除" #: taskmgr.rc:232 msgid "Removes this process and all descendants from the system" -msgstr "將行程及其附屬行程從系統中移除" +msgstr "將進程及其附屬進程從系統中移除" #: taskmgr.rc:233 msgid "Attaches the debugger to this process" -msgstr "將除錯器接到本行程" +msgstr "將除錯器接到本進程" #: taskmgr.rc:235 msgid "Controls which processors the process will be allowed to run on" -msgstr "控制各行程使用那個處理器" +msgstr "控制各進程使用那個處理器" #: taskmgr.rc:237 msgid "Sets process to the REALTIME priority class" -msgstr "將行程設為即時優先等級" +msgstr "將進程設為即時優先等級" #: taskmgr.rc:238 msgid "Sets process to the HIGH priority class" -msgstr "將行程設為高優先級" +msgstr "將進程設為高優先級" #: taskmgr.rc:240 msgid "Sets process to the ABOVE NORMAL priority class" -msgstr "將行程設為中等以上優先級" +msgstr "將進程設為中等以上優先級" #: taskmgr.rc:242 msgid "Sets process to the NORMAL priority class" -msgstr "將行程設為中等優先級" +msgstr "將進程設為中等優先級" #: taskmgr.rc:244 msgid "Sets process to the BELOW NORMAL priority class" -msgstr "將行程設為中等以下優先級" +msgstr "將進程設為中等以下優先級" #: taskmgr.rc:245 msgid "Sets process to the LOW priority class" -msgstr "將行程設為低優先級" +msgstr "將進程設為低優先級" #: taskmgr.rc:247 msgid "Controls Debug Channels" -msgstr "" +msgstr "控制項除錯頻道" #: taskmgr.rc:264 msgid "Performance" @@ -12038,7 +12038,7 @@ msgstr "CPU 使用率: %3d%%" #: taskmgr.rc:266 msgid "Processes: %d" -msgstr "處理程序：%d" +msgstr "進程：%d" #: taskmgr.rc:267 msgid "Mem Usage: %1!u!kB / %2!u!kB" @@ -12050,11 +12050,11 @@ msgstr "影像名稱" #: taskmgr.rc:273 msgid "PID" -msgstr "" +msgstr "PID" #: taskmgr.rc:274 msgid "CPU" -msgstr "" +msgstr "CPU" #: taskmgr.rc:275 msgid "CPU Time" @@ -12094,19 +12094,19 @@ msgstr "PF 差異" #: taskmgr.rc:286 msgid "VM Size" -msgstr "VM 大小" +msgstr "虛擬機器大小" #: taskmgr.rc:287 msgid "Paged Pool" -msgstr "分頁池" +msgstr "置換頁池" #: taskmgr.rc:288 msgid "NP Pool" -msgstr "" +msgstr "非置換頁池" #: taskmgr.rc:289 msgid "Base Pri" -msgstr "" +msgstr "基底優先權" #: taskmgr.rc:301 msgid "Task Manager Warning" @@ -12118,10 +12118,13 @@ msgid "" "cause undesired results including system instability. Are you\n" "sure you want to change the priority class?" msgstr "" +"警告：變更這個進程的優先權類別也許會\n" +"造成預料之外的結果像是系統的不穩定。\n" +"您確定要變更優先權類別嗎？" #: taskmgr.rc:305 msgid "Unable to Change Priority" -msgstr "" +msgstr "無法變更優先權" #: taskmgr.rc:310 msgid "" @@ -12131,32 +12134,39 @@ msgid "" "data before it is terminated. Are you sure you want to\n" "terminate the process?" msgstr "" +"警告：終止進程可以造成 undesired\n" +"結果包含失真的資料和系統 instability。\n" +"進程將無法被給定的 chance 到儲存它的狀態或\n" +"資料之前它被終止。確定要\n" +"終止進程？" #: taskmgr.rc:311 msgid "Unable to Terminate Process" -msgstr "" +msgstr "無法終止進程" #: taskmgr.rc:313 msgid "" "WARNING: Debugging this process may result in loss of data.\n" "Are you sure you wish to attach the debugger?" msgstr "" +"警告：對這個進程偵錯也許會導致資料失真。\n" +"您確定希望要附加除錯程式？" #: taskmgr.rc:314 msgid "Unable to Debug Process" -msgstr "" +msgstr "無法對進程進行除錯" #: taskmgr.rc:315 msgid "The process must have affinity with at least one processor" -msgstr "" +msgstr "進程必須有具備至少一個處理器的近似者" #: taskmgr.rc:316 msgid "Invalid Option" -msgstr "" +msgstr "無效的選項" #: taskmgr.rc:317 msgid "Unable to Access or Set Process Affinity" -msgstr "" +msgstr "無法存取或設定進程近似者" #: taskmgr.rc:322 msgid "System Idle Process" @@ -12185,7 +12195,7 @@ msgid "" "Do you want to remove the uninstall entry from the registry?" msgstr "" "移除指令執行失敗「%s」, 可能是找不到可執行程式。\n" -"您要將這項移除指令從登錄檔中刪除嗎？" +"您要將這項移除指令從註冊表中刪除嗎？" #: view.rc:33 msgid "&Pan" @@ -12222,9 +12232,9 @@ msgid "" "\n" "If you terminate the process you may lose all unsaved data." msgstr "" -"正在模擬關機，但此程序沒有反應。\n" +"正在模擬關機，但此程式沒有反應。\n" "\n" -"如果您中斷程式，可能會遺失尚未儲存的資料。" +"如果您中斷進程，可能會遺失尚未儲存的資料。" #: wineboot.rc:39 msgid "Wine" @@ -12232,7 +12242,7 @@ msgstr "Wine" #: wineboot.rc:43 msgid "The Wine configuration in %s is being updated, please wait..." -msgstr "正在更新 %s 的 Wine 設定，請稍候..." +msgstr "正在更新 %s 的 Wine 設定，請稍候…" #: winecfg.rc:132 msgid "" @@ -12242,7 +12252,7 @@ msgid "" "option) any later version." msgstr "" "這個程式是自由軟體；您可以遵照自由軟體基金會所制定的 GNU LGPL 2.1 版或者更新" -"版本的許可條款來修改和重新散佈這個程式。" +"版本的許可條款來修改和重新散布這個程式。" #: winecfg.rc:134 msgid "Windows registration information" @@ -12271,7 +12281,7 @@ msgstr "" #: winecfg.rc:150 msgid "&Add application..." -msgstr "新增程式設定(&A)..." +msgstr "新增程式設定(&A)…" #: winecfg.rc:151 msgid "&Remove application" @@ -12311,7 +12321,7 @@ msgstr "螢幕解析度" #: winecfg.rc:175 msgid "This is a sample text using 10 point Tahoma" -msgstr "" +msgstr "這是使用 10 點 Tahoma 字型的範例文字" #: winecfg.rc:182 msgid "DLL overrides" @@ -12340,7 +12350,7 @@ msgstr "已有的函式庫覆載(&O)：" #: winecfg.rc:190 msgid "&Edit..." -msgstr "編輯(&E)..." +msgstr "編輯(&E)…" #: winecfg.rc:196 msgid "Edit Override" @@ -12378,11 +12388,11 @@ msgstr "儲存裝置對應" msgid "" "Failed to connect to the mount manager, the drive configuration cannot be " "edited." -msgstr "" +msgstr "連線到掛載管理員時失敗，無法編輯磁碟組態。" #: winecfg.rc:227 msgid "&Add..." -msgstr "加入(&A)..." +msgstr "加入(&A)…" #: winecfg.rc:229 msgid "Auto&detect" @@ -12402,7 +12412,7 @@ msgstr "裝置(&V)：" #: winecfg.rc:242 msgid "Bro&wse..." -msgstr "瀏覽(&W)..." +msgstr "瀏覽(&W)…" #: winecfg.rc:244 msgid "&Label:" @@ -12450,11 +12460,11 @@ msgstr "外觀" #: winecfg.rc:275 msgid "&Theme:" -msgstr "佈景主題(&T)：" +msgstr "布景主題(&T)：" #: winecfg.rc:277 msgid "&Install theme..." -msgstr "安裝佈景主題(&I)..." +msgstr "安裝布景主題(&I)…" #: winecfg.rc:282 msgid "It&em:" @@ -12490,7 +12500,7 @@ msgstr "隱藏進階選項(&A)" #: winecfg.rc:36 msgid "(No Theme)" -msgstr "(無佈景主題)" +msgstr "(無布景主題)" #: winecfg.rc:37 msgid "Graphics" @@ -12514,11 +12524,11 @@ msgstr "Wine 設定" #: winecfg.rc:43 msgid "Theme files (*.msstyles; *.theme)" -msgstr "佈景主題檔案 (*.msstyles；*.theme)" +msgstr "布景主題檔案 (*.msstyles; *.theme)" #: winecfg.rc:44 msgid "Select a theme file" -msgstr "選擇一個佈景主題檔案" +msgstr "選擇一個布景主題檔案" #: winecfg.rc:45 msgid "Folder"

1 0

Wei-Lun Chao : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 06ddb6f383b17b0ee6e6f277a32352198474cfa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ddb6f383b17b0ee6e6f277a… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Sat Jul 14 01:20:20 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 62 ++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 40 insertions(+), 22 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 9506b41..29084ac 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -12596,7 +12596,7 @@ msgstr "預設組態" #: winecfg.rc:59 msgid "Wine Programs (*.exe; *.exe.so)" -msgstr "Wine 程式 (*.exe；*.exe.so)" +msgstr "Wine 程式 (*.exe; *.exe.so)" #: winecfg.rc:60 msgid "Use global settings" @@ -12607,9 +12607,8 @@ msgid "Select an executable file" msgstr "選擇一個可執行檔" #: winecfg.rc:66 -#, fuzzy msgid "Autodetect" -msgstr "自動偵測(&D)" +msgstr "自動偵測" #: winecfg.rc:67 msgid "Local hard disk" @@ -12779,7 +12778,7 @@ msgstr "按鈕替換背景" #: winecfg.rc:117 msgid "Hot Tracked Item" -msgstr "" +msgstr "熱門軌段的項目" #: winecfg.rc:118 msgid "Active Title Bar Gradient" @@ -12947,7 +12946,7 @@ msgstr "螢幕緩衝區大小必須大於或等於視窗緩衝區" #: wineconsole.rc:34 msgid "Each character is %1!u! pixels wide and %2!u! pixels high" -msgstr "每個字都是 %1!u! 個像素寬，%2!u! 個像素高" +msgstr "每個字元都是 %1!u! 個像素寬，%2!u! 個像素高" #: wineconsole.rc:35 msgid "This is a test" @@ -12955,25 +12954,27 @@ msgstr "這是一段測試訊息" #: wineconsole.rc:41 msgid "wineconsole: Couldn't parse event id\n" -msgstr "" +msgstr "wineconsole：無法剖析事件識別號\n" #: wineconsole.rc:42 msgid "wineconsole: Invalid backend\n" -msgstr "" +msgstr "wineconsole：無效的後端程式\n" #: wineconsole.rc:43 msgid "wineconsole: Unrecognized command line option\n" -msgstr "" +msgstr "wineconsole：無法辨識的命令列選項\n" #: wineconsole.rc:44 msgid "Starts a program in a Wine console\n" -msgstr "" +msgstr "在 Wine 主控臺中啟始一個程式\n" #: wineconsole.rc:45 msgid "" "wineconsole: Starting program %s failed.\n" "The command is invalid.\n" msgstr "" +"wineconsole：啟始程式 %s 時失敗。\n" +"命令無效。\n" #: wineconsole.rc:47 msgid "" @@ -12983,6 +12984,11 @@ msgid "" "\n" "Options:\n" msgstr "" +"\n" +"用法：\n" +" wineconsole [選項] <命令>\n" +"\n" +"選項：\n" #: wineconsole.rc:49 msgid "" @@ -12991,10 +12997,12 @@ msgid "" " try to setup the current terminal as a Wine " "console.\n" msgstr "" +" --backend={user|curses} 選擇 user 將衍生新的視窗，curses 將\n" +" 試著設定目前的終端機做為 Wine 主控臺。\n" #: wineconsole.rc:50 msgid " <command> The Wine program to launch in the console.\n" -msgstr "" +msgstr " <命令> 要在主控臺中啟動的 Wine 程式。\n" #: wineconsole.rc:51 msgid "" @@ -13004,6 +13012,11 @@ msgid "" "Starts the Wine command prompt in a Wine console.\n" "\n" msgstr "" +"\n" +"範例：\n" +" wineconsole cmd\n" +"在 Wine 主控臺中啟始 Wine 指令提示符號。\n" +"\n" #: winedbg.rc:46 msgid "Program Error" @@ -13013,7 +13026,7 @@ msgstr "程式錯誤" msgid "" "The program %s has encountered a serious problem and needs to close. We are " "sorry for the inconvenience." -msgstr "" +msgstr "程式 %s 遇到了嚴重的問題而需要關閉。我們對於造成的不便感到抱歉。" #: winedbg.rc:55 msgid "" @@ -13021,6 +13034,8 @@ msgid "" "may want to check the <a href=\"http://appdb.winehq.org\">Application " "Database</a> for tips about running this application." msgstr "" +"這個可能是由 Wine 中的程式問題或缺失所造成。您可能要檢查<a href=\"http://" +"appdb.winehq.org\">應用程式資料庫</a>以獲得關於執行這個應用程式的祕訣。" #: winedbg.rc:58 msgid "Show &Details" @@ -13037,26 +13052,29 @@ msgid "" "button, then <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" +"如果這個問題在 Windows 之下不會出現且未曾被報告，您可以使用「另存新檔」按鈕" +"將詳細的資訊儲存到檔案，然後<a href=\"http://wiki.winehq.org/Bugs\">發送錯誤" +"報告</a>並附加該檔案到報告中。" #: winedbg.rc:35 msgid "Wine program crash" -msgstr "" +msgstr "Wine 程式當機" #: winedbg.rc:36 msgid "Internal errors - invalid parameters received" -msgstr "" +msgstr "內部錯誤 - 收到無效的參數" #: winedbg.rc:37 msgid "(unidentified)" -msgstr "" +msgstr "(未經識別的)" #: winedbg.rc:40 msgid "Saving failed" -msgstr "" +msgstr "儲存失敗" #: winedbg.rc:41 msgid "Loading detailed information, please wait..." -msgstr "" +msgstr "正在載入詳細資訊，請稍待…" #: winefile.rc:26 msgid "&Open\tEnter" @@ -13064,7 +13082,7 @@ msgstr "開啟(&O)\tEnter" #: winefile.rc:30 msgid "Re&name..." -msgstr "重新命名(&N)..." +msgstr "重新命名(&N)…" #: winefile.rc:31 msgid "Propert&ies\tAlt+Enter" @@ -13072,11 +13090,11 @@ msgstr "屬性(&I)\tAlt+Enter" #: winefile.rc:33 msgid "&Run..." -msgstr "執行(&R)..." +msgstr "執行(&R)…" #: winefile.rc:35 msgid "Cr&eate Directory..." -msgstr "建立目錄(&E)..." +msgstr "建立目錄(&E)…" #: winefile.rc:40 msgid "&Disk" @@ -13084,7 +13102,7 @@ msgstr "磁碟(&D)" #: winefile.rc:41 msgid "Connect &Network Drive..." -msgstr "連線至網路儲存裝置(&N)..." +msgstr "連線至網路儲存裝置(&N)…" #: winefile.rc:42 msgid "&Disconnect Network Drive" @@ -13116,7 +13134,7 @@ msgstr "按日期排列(&D)" #: winefile.rc:56 msgid "Filter by&..." -msgstr "" +msgstr "篩選依照…(&.)" #: winefile.rc:63 msgid "&Drivebar" @@ -13188,7 +13206,7 @@ msgstr "最後修改：" #: winefile.rc:168 msgid "Cop&yright:" -msgstr "" +msgstr "著作權(&Y)：" #: winefile.rc:170 msgid "Size:"

1 0

Wei-Lun Chao : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: feea8e3b2ec1ca3a1850145949dc0b8ccb49b3c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feea8e3b2ec1ca3a185014594… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Sat Jul 14 01:29:21 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 140 +++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 84 insertions(+), 56 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 29084ac..48140e5 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -13235,7 +13235,7 @@ msgstr "版本資訊" #: winefile.rc:194 msgctxt "accelerator Fullscreen" msgid "S" -msgstr "" +msgstr "S" #: winefile.rc:87 msgid "Applying font settings" @@ -13243,7 +13243,7 @@ msgstr "字型設定套用中" #: winefile.rc:88 msgid "Error while selecting new font." -msgstr "" +msgstr "選取新字型時發生錯誤。" #: winefile.rc:93 msgid "Wine File Manager" @@ -13251,15 +13251,15 @@ msgstr "Wine 檔案管理員" #: winefile.rc:95 msgid "root fs" -msgstr "" +msgstr "根檔案系統" #: winefile.rc:96 msgid "unixfs" -msgstr "" +msgstr "unixfs" #: winefile.rc:98 msgid "Shell" -msgstr "" +msgstr "命令殼" #: winefile.rc:99 winhlp32.rc:107 winhlp32.rc:82 msgid "Not yet implemented" @@ -13267,38 +13267,38 @@ msgstr "尚未實作" #: winefile.rc:106 msgid "CDate" -msgstr "" +msgstr "CDate" #: winefile.rc:107 msgid "ADate" -msgstr "" +msgstr "ADate" #: winefile.rc:108 msgid "MDate" -msgstr "" +msgstr "MDate" #: winefile.rc:109 msgid "Index/Inode" -msgstr "" +msgstr "索引/Inode" #: winefile.rc:114 msgid "%1 of %2 free" -msgstr "" +msgstr "%2 中剩下 %1" #: winefile.rc:115 msgctxt "unit kilobyte" msgid "kB" -msgstr "" +msgstr "kB" #: winefile.rc:116 msgctxt "unit megabyte" msgid "MB" -msgstr "" +msgstr "MB" #: winefile.rc:117 msgctxt "unit gigabyte" msgid "GB" -msgstr "" +msgstr "GB" #: winemine.rc:34 msgid "&Game" @@ -13310,7 +13310,7 @@ msgstr "新遊戲(&N)\tF2" #: winemine.rc:37 msgid "Question &Marks" -msgstr "" +msgstr "問號(&M)" #: winemine.rc:39 msgid "&Beginner" @@ -13326,7 +13326,7 @@ msgstr "專家(&E)" #: winemine.rc:42 msgid "&Custom..." -msgstr "自訂(&C)..." +msgstr "自訂(&C)…" #: winemine.rc:44 msgid "&Fastest Times" @@ -13478,33 +13478,27 @@ msgstr "無法開啟檔案「%s」。您想要自己搜尋這個檔案嗎？" #: winhlp32.rc:90 msgid "Cannot find a richedit implementation... Aborting" -msgstr "找不到 richedit... 終止" +msgstr "找不到 richedit… 終止" #: winhlp32.rc:91 msgid "Help topics: " msgstr "說明主題：" #: wmic.rc:25 -#, fuzzy -#| msgid "Extended attributes not supported.\n" msgid "Error: Command line not supported\n" -msgstr "不支援延伸屬性。\n" +msgstr "錯誤：不支援命令列\n" #: wmic.rc:26 -#, fuzzy -#| msgid "Sector not found.\n" msgid "Error: Alias not found\n" -msgstr "找不到磁區。\n" +msgstr "錯誤：找不到別名\n" #: wmic.rc:27 -#, fuzzy -#| msgid "Invalid key.\n" msgid "Error: Invalid query\n" -msgstr "無效的機碼。\n" +msgstr "錯誤：無效的查詢\n" #: wordpad.rc:28 msgid "&New...\tCtrl+N" -msgstr "新增(&N)...\tCtrl+N" +msgstr "新增(&N)…\tCtrl+N" #: wordpad.rc:42 msgid "R&edo\tCtrl+Y" @@ -13568,7 +13562,7 @@ msgstr "插入(&I)" #: wordpad.rc:77 msgid "&Date and time..." -msgstr "日期時間(&D)..." +msgstr "日期時間(&D)…" #: wordpad.rc:79 msgid "F&ormat" @@ -13580,11 +13574,11 @@ msgstr "子彈點(&B)" #: wordpad.rc:83 wordpad.rc:106 msgid "&Paragraph..." -msgstr "段落(&P)..." +msgstr "段落(&P)…" #: wordpad.rc:84 msgid "&Tabs..." -msgstr "標籤(&T)..." +msgstr "標籤(&T)…" #: wordpad.rc:85 msgid "Backgroun&d" @@ -13636,7 +13630,7 @@ msgstr "右" #: wordpad.rc:229 msgid "First line" -msgstr "第一行" +msgstr "第一列" #: wordpad.rc:231 msgid "Alignment" @@ -13656,11 +13650,11 @@ msgstr "全部刪除(&L)" #: wordpad.rc:256 msgid "Line wrapping" -msgstr "自動換行" +msgstr "自動換列" #: wordpad.rc:257 msgid "&No line wrapping" -msgstr "關閉自動換行(&N)" +msgstr "關閉自動換列(&N)" #: wordpad.rc:258 msgid "Wrap text by the &window border" @@ -13677,37 +13671,37 @@ msgstr "工具列" #: wordpad.rc:273 msgctxt "accelerator Align Left" msgid "L" -msgstr "" +msgstr "L" #: wordpad.rc:274 msgctxt "accelerator Align Center" msgid "E" -msgstr "" +msgstr "E" #: wordpad.rc:275 msgctxt "accelerator Align Right" msgid "R" -msgstr "" +msgstr "R" #: wordpad.rc:282 msgctxt "accelerator Redo" msgid "Y" -msgstr "" +msgstr "Y" #: wordpad.rc:283 msgctxt "accelerator Bold" msgid "B" -msgstr "" +msgstr "B" #: wordpad.rc:284 msgctxt "accelerator Italic" msgid "I" -msgstr "" +msgstr "I" #: wordpad.rc:285 msgctxt "accelerator Underline" msgid "U" -msgstr "" +msgstr "U" #: wordpad.rc:136 msgid "All documents (*.*)" @@ -13719,15 +13713,15 @@ msgstr "純文字文件 (*.txt)" #: wordpad.rc:138 msgid "Unicode text document (*.txt)" -msgstr "統一碼文字文件 (*.txt)" +msgstr "萬國碼文字文件 (*.txt)" #: wordpad.rc:139 msgid "Rich text format (*.rtf)" -msgstr "RTF豐富格式 (*.rtf)" +msgstr "豐富文字格式 (*.rtf)" #: wordpad.rc:140 msgid "Rich text document" -msgstr "RTF豐富格式檔案" +msgstr "豐富文字格式檔案" #: wordpad.rc:141 msgid "Text document" @@ -13735,7 +13729,7 @@ msgstr "純文字文件" #: wordpad.rc:142 msgid "Unicode text document" -msgstr "統一碼文字文件" +msgstr "萬國碼文字文件" #: wordpad.rc:143 msgid "Printer files (*.prn)" @@ -13828,11 +13822,11 @@ msgstr "您已經選擇儲存為純文字格式, 這可能導致格式遺失。 #: wordpad.rc:187 msgid "Invalid number format." -msgstr "" +msgstr "無效的數字格式。" #: wordpad.rc:188 msgid "OLE storage documents are not supported." -msgstr "" +msgstr "OLE 儲存體文件未被支援。" #: wordpad.rc:189 msgid "Could not save the file." @@ -13856,19 +13850,19 @@ msgstr "列印功能尚未實作。" #: wordpad.rc:194 msgid "Cannot add more than 32 tab stops." -msgstr "" +msgstr "無法加入超過 32 個定位停駐點。" #: write.rc:27 msgid "Starting Wordpad failed" -msgstr "" +msgstr "啟動 Wordpad 時失敗" #: xcopy.rc:27 msgid "Invalid number of parameters - Use xcopy /? for help\n" -msgstr "" +msgstr "無效的參數數量 - 使用 xcopy /? 以獲得說明\n" #: xcopy.rc:28 msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "" +msgstr "無效的參數『%1』- 使用 xcopy /? 以獲得說明\n" #: xcopy.rc:29 msgid "Press <Enter> to begin copying\n" @@ -13876,7 +13870,7 @@ msgstr "請按 <Enter> 鍵開始複製\n" #: xcopy.rc:30 msgid "%1!d! file(s) would be copied\n" -msgstr "" +msgstr "%1!d! 個檔案將被複製\n" #: xcopy.rc:31 msgid "%1!d! file(s) copied\n" @@ -13888,32 +13882,35 @@ msgid "" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" +"『%1』是一個在目標上的\n" +"檔名或目錄？\n" +"(F - 檔案，D - 目錄)\n" #: xcopy.rc:35 msgid "%1? (Yes|No)\n" -msgstr "%1？ (是｜否)\n" +msgstr "%1？ (Yes|No)\n" #: xcopy.rc:36 msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "是否覆蓋 %1？ (是｜否｜全部皆是)\n" +msgstr "是否覆蓋 %1？ (Yes|No|All)\n" #: xcopy.rc:37 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "" +msgstr "將『%1』複製到『%2』時失敗並獲得 r/c %3!d!\n" #: xcopy.rc:39 msgid "Failed during reading of '%1'\n" -msgstr "" +msgstr "在讀取『%1』的期間發生了失敗\n" #: xcopy.rc:43 msgctxt "File key" msgid "F" -msgstr "" +msgstr "F" #: xcopy.rc:44 msgctxt "Directory key" msgid "D" -msgstr "" +msgstr "D" #: xcopy.rc:77 msgid "" @@ -13950,3 +13947,34 @@ msgid "" "\t\tthan source.\n" "\n" msgstr "" +"XCOPY - 將來源檔案或樹狀目錄複製到目的。\n" +"\n" +"語法：\n" +"XCOPY 來源 [目的] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" +"\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" +"\n" +"位置：\n" +"\n" +"[/I] 如果目的不存在且複製兩個或更多檔案時，\n" +"\t將目的假設為目錄。\n" +"[/S] 複製目錄和子目錄。\n" +"[/E] 複製目錄和子目錄，包含任何空目錄。\n" +"[/Q] 在複製期間不列出名稱，亦即安靜模式。\n" +"[/F] 在複製期間顯示完整的來源和目的名稱。\n" +"[/L] 模擬操作，顯示會被複製的名稱。\n" +"[/W] 在開始複製操作之前進行提示。\n" +"[/T] 建立空的目錄結構但是不複製檔案。\n" +"[/Y] 覆寫檔案時抑制提示。\n" +"[/-Y] 覆寫檔案時啟用提示。\n" +"[/P] 於複製每個來源檔案之前提示。\n" +"[/N] 使用簡稱複製。\n" +"[/U] 只複製已經存在目的中的檔案。\n" +"[/R] 覆寫任何唯讀檔案。\n" +"[/H] 複製時包括隱藏和系統檔案。\n" +"[/C] 即使在複製期間發生錯誤仍然繼續。\n" +"[/A] 只複製具有封存屬性的檔案。\n" +"[/M] 只複製具有封存屬性的檔案，\n" +"\t但會移除封存屬性。\n" +"[/D | /D:m-d-y] 複製新檔案或是於給定日期之後修改的檔案。\n" +"\t\t如果沒有給定日期，只有當目的比來源舊時才複製。\n" +"\n"

1 0

Matteo Bruni : d3dcompiler: Parse assignments.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 1a36da15afa711ff5eb9c4872f9d238bcd06ad10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a36da15afa711ff5eb9c4872… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 20 16:37:41 2012 +0200 d3dcompiler: Parse assignments. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 23 +++ dlls/d3dcompiler_43/hlsl.y | 5 +- dlls/d3dcompiler_43/utils.c | 217 +++++++++++++++++++++++++++++ 3 files changed, 244 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a36da15afa711ff5eb9c…

1 0

Jacek Caban : mshtml.idl: Added IXMLHttpRequest declaration.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 930065072a13a6fcebd96209867603c0fb5ae53c URL: http://source.winehq.org/git/wine.git/?a=commit;h=930065072a13a6fcebd962098… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 20 20:19:23 2012 +0200 mshtml.idl: Added IXMLHttpRequest declaration. --- include/mshtmdid.h | 22 ++++++++++++++++++ include/mshtml.idl | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index a062131..b43ead4 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1798,6 +1798,28 @@ /* IHTMLImgElement2 */ #define DISPID_IHTMLIMGELEMENT2_LONGDESC DISPID_IMG+19 +/* IHTMLXMLHttpRequest */ +#define DISPID_IHTMLXMLHTTPREQUEST_READYSTATE DISPID_XMLHTTPREQUEST+2 +#define DISPID_IHTMLXMLHTTPREQUEST_RESPONSEBODY DISPID_XMLHTTPREQUEST+3 +#define DISPID_IHTMLXMLHTTPREQUEST_RESPONSETEXT DISPID_XMLHTTPREQUEST+4 +#define DISPID_IHTMLXMLHTTPREQUEST_RESPONSEXML DISPID_XMLHTTPREQUEST+5 +#define DISPID_IHTMLXMLHTTPREQUEST_STATUS DISPID_XMLHTTPREQUEST+6 +#define DISPID_IHTMLXMLHTTPREQUEST_STATUSTEXT DISPID_XMLHTTPREQUEST+7 +#define DISPID_IHTMLXMLHTTPREQUEST_ONREADYSTATECHANGE DISPID_EVPROP_ONREADYSTATECHANGE +#define DISPID_IHTMLXMLHTTPREQUEST_ABORT DISPID_XMLHTTPREQUEST+9 +#define DISPID_IHTMLXMLHTTPREQUEST_OPEN DISPID_XMLHTTPREQUEST+10 +#define DISPID_IHTMLXMLHTTPREQUEST_SEND DISPID_XMLHTTPREQUEST+11 +#define DISPID_IHTMLXMLHTTPREQUEST_GETALLRESPONSEHEADERS DISPID_XMLHTTPREQUEST+12 +#define DISPID_IHTMLXMLHTTPREQUEST_GETRESPONSEHEADER DISPID_XMLHTTPREQUEST+13 +#define DISPID_IHTMLXMLHTTPREQUEST_SETREQUESTHEADER DISPID_XMLHTTPREQUEST+14 + +/* IHTMLXMLHttpRequest2 */ +#define DISPID_IHTMLXMLHTTPREQUEST2_TIMEOUT DISPID_XMLHTTPREQUEST+15 +#define DISPID_IHTMLXMLHTTPREQUEST2_ONTIMEOUT DISPID_EVPROP_TIMEOUT + +/* IHTMLXMLHttpRequestFactory */ +#define DISPID_IHTMLXMLHTTPREQUESTFACTORY_CREATE DISPID_VALUE + /* IOmHistory */ #define DISPID_IOMHISTORY_LENGTH DISPID_HISTORY #define DISPID_IOMHISTORY_BACK (DISPID_HISTORY+1) diff --git a/include/mshtml.idl b/include/mshtml.idl index d599eba..57f77e8 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -7802,6 +7802,68 @@ methods: } /***************************************************************************** + * IHTMLXMLHttpRequest interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051040a-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLXMLHttpRequest : IDispatch +{ + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_READYSTATE)] + HRESULT readyState([out, retval] long *p); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_RESPONSEBODY)] + HRESULT responseBody([out, retval] VARIANT *p); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_RESPONSETEXT)] + HRESULT responseText([out, retval] BSTR *p); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_RESPONSEXML)] + HRESULT responseXML([out, retval] IDispatch **p); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_STATUS)] + HRESULT status([out, retval] long *p); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_STATUSTEXT)] + HRESULT statusText([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLXMLHTTPREQUEST_ONREADYSTATECHANGE), displaybind, bindable] + HRESULT onreadystatechange([in] VARIANT v); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_ONREADYSTATECHANGE), displaybind, bindable] + HRESULT onreadystatechange([out, retval] VARIANT *p); + + [id(DISPID_IHTMLXMLHTTPREQUEST_ABORT)] HRESULT abort(); + + [id(DISPID_IHTMLXMLHTTPREQUEST_OPEN)] + HRESULT open( + [in] BSTR bstrMethod, + [in] BSTR bstrUrl, + [in] VARIANT varAsync, + [in, optional] VARIANT varUser, + [in, optional] VARIANT varPassword); + + [id(DISPID_IHTMLXMLHTTPREQUEST_SEND)] + HRESULT send([in, optional] VARIANT varBody); + + [id(DISPID_IHTMLXMLHTTPREQUEST_GETALLRESPONSEHEADERS)] + HRESULT getAllResponseHeaders([out, retval] BSTR *p); + + [id(DISPID_IHTMLXMLHTTPREQUEST_GETRESPONSEHEADER)] + HRESULT getResponseHeader( + [in] BSTR bstrHeader, + [out, retval] BSTR *p); + + [id(DISPID_IHTMLXMLHTTPREQUEST_SETREQUESTHEADER)] + HRESULT setRequestHeader( + [in] BSTR bstrHeader, + [in] BSTR bstrValue); +} + +/***************************************************************************** * IHTMLControlElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added more *XMLHttpRequest* declarations.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 84eb47531d8af046e8baac9f05d1c2e1ca73980c URL: http://source.winehq.org/git/wine.git/?a=commit;h=84eb47531d8af046e8baac9f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 20 20:19:37 2012 +0200 mshtml.idl: Added more *XMLHttpRequest* declarations. --- include/mshtmdid.h | 53 ++++++++++++++++++++++++- include/mshtml.idl | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+), 1 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index b43ead4..7484b7f 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -640,7 +640,49 @@ #define DISPID_EVPROP_ONHASHCHANGE (DISPID_EVENTS+109) #define DISPID_EVPROP_ONMESSAGE (DISPID_EVENTS+110) #define DISPID_EVPROP_ONDOMMUTATION (DISPID_EVENTS+111) -#define DISPID_EVPROPS_COUNT 112 +#define DISPID_EVPROP_TIMEOUT (DISPID_EVENTS+112) +#define DISPID_EVPROP_WHEEL (DISPID_EVENTS+113) +#define DISPID_EVPROP_SVGLOAD (DISPID_EVENTS+114) +#define DISPID_EVPROP_SVGUNLOAD (DISPID_EVENTS+115) +#define DISPID_EVPROP_SVGABORT (DISPID_EVENTS+116) +#define DISPID_EVPROP_SVGERROR (DISPID_EVENTS+117) +#define DISPID_EVPROP_SVGRESIZE (DISPID_EVENTS+118) +#define DISPID_EVPROP_SVGSCROLL (DISPID_EVENTS+119) +#define DISPID_EVPROP_SVGZOOM (DISPID_EVENTS+120) +#define DISPID_EVPROP_ONMSTHUMBNAILCLICK (DISPID_EVENTS+121) +#define DISPID_EVPROP_COMPOSITIONSTART (DISPID_EVENTS+122) +#define DISPID_EVPROP_COMPOSITIONUPDATE (DISPID_EVENTS+123) +#define DISPID_EVPROP_COMPOSITIONEND (DISPID_EVENTS+124) +#define DISPID_EVPROP_DOMATTRMODIFIED (DISPID_EVENTS+125) +#define DISPID_EVPROP_DOMCONTENTLOADED (DISPID_EVENTS+126) +#define DISPID_EVPROP_INPUT (DISPID_EVENTS+127) +#define DISPID_EVPROP_DOMCHARDATAMODIFIE (DISPID_EVENTS+128) +#define DISPID_EVPROP_TEXTINPUT (DISPID_EVENTS+129) +#define DISPID_EVPROP_ONMSSITEMODEJUMPLISTITEMREMOVED (DISPID_EVENTS+130) +#define DISPID_EVPROP_DOMNODEINSERTED (DISPID_EVENTS+131) +#define DISPID_EVPROP_DOMNODEREMOVED (DISPID_EVENTS+132) +#define DISPID_EVPROP_DOMSUBTREEMODIFIED (DISPID_EVENTS+133) +#define DISPID_EVPROP_CANPLAY (DISPID_EVENTS+134) +#define DISPID_EVPROP_CANPLAYTHROUGH (DISPID_EVENTS+135) +#define DISPID_EVPROP_DURATIONCHANGE (DISPID_EVENTS+136) +#define DISPID_EVPROP_EMPTIED (DISPID_EVENTS+137) +#define DISPID_EVPROP_ENDED (DISPID_EVENTS+138) +#define DISPID_EVPROP_LOADEDDATA (DISPID_EVENTS+139) +#define DISPID_EVPROP_LOADEDMETADATA (DISPID_EVENTS+140) +#define DISPID_EVPROP_LOADSTART (DISPID_EVENTS+141) +#define DISPID_EVPROP_PAUSE (DISPID_EVENTS+142) +#define DISPID_EVPROP_PLAY (DISPID_EVENTS+143) +#define DISPID_EVPROP_PLAYING (DISPID_EVENTS+144) +#define DISPID_EVPROP_PROGRESS (DISPID_EVENTS+145) +#define DISPID_EVPROP_RATECHANGE (DISPID_EVENTS+146) +#define DISPID_EVPROP_SEEKED (DISPID_EVENTS+147) +#define DISPID_EVPROP_SEEKING (DISPID_EVENTS+148) +#define DISPID_EVPROP_STALLED (DISPID_EVENTS+149) +#define DISPID_EVPROP_SUSPEND (DISPID_EVENTS+150) +#define DISPID_EVPROP_TIMEUPDATE (DISPID_EVENTS+151) +#define DISPID_EVPROP_VOLUMECHANGE (DISPID_EVENTS+152) +#define DISPID_EVPROP_WAITING (DISPID_EVENTS+153) +#define DISPID_EVPROPS_COUNT 154 #define DISPID_EVMETH_ONMOUSEOVER STDDISPID_XOBJ_ONMOUSEOVER #define DISPID_EVMETH_ONMOUSEOUT STDDISPID_XOBJ_ONMOUSEOUT @@ -1820,6 +1862,10 @@ /* IHTMLXMLHttpRequestFactory */ #define DISPID_IHTMLXMLHTTPREQUESTFACTORY_CREATE DISPID_VALUE +/* HTMLXMLHttpRequestEvents */ +#define DISPID_HTMLXMLHTTPREQUESTEVENTS_ONTIMEOUT DISPID_XMLHTTPREQUEST+16 +#define DISPID_HTMLXMLHTTPREQUESTEVENTS_ONREADYSTATECHANGE DISPID_XMLHTTPREQUEST+8 + /* IOmHistory */ #define DISPID_IOMHISTORY_LENGTH DISPID_HISTORY #define DISPID_IOMHISTORY_BACK (DISPID_HISTORY+1) @@ -2835,6 +2881,11 @@ #define DISPID_IHTMLSTORAGE_REMOVEITEM DISPID_DOMSTORAGE+5 #define DISPID_IHTMLSTORAGE_CLEAR DISPID_DOMSTORAGE+7 +/* IEventTarget */ +#define DISPID_IEVENTTARGET_ADDEVENTLISTENER DISPID_HTMLOBJECT+10 +#define DISPID_IEVENTTARGET_REMOVEEVENTLISTENER DISPID_HTMLOBJECT+11 +#define DISPID_IEVENTTARGET_DISPATCHEVENT DISPID_HTMLOBJECT+12 + /* IHTMLControlElement */ #define DISPID_IHTMLCONTROLELEMENT_TABINDEX STDPROPID_XOBJ_TABINDEX #define DISPID_IHTMLCONTROLELEMENT_FOCUS (DISPID_SITE+0) diff --git a/include/mshtml.idl b/include/mshtml.idl index 57f77e8..6dee9bf 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -7864,6 +7864,120 @@ interface IHTMLXMLHttpRequest : IDispatch } /***************************************************************************** + * IHTMLXMLHttpRequest2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510482-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLXMLHttpRequest2 : IDispatch +{ + [propput, id(DISPID_IHTMLXMLHTTPREQUEST2_TIMEOUT)] + HRESULT timeout([in] long v); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST2_TIMEOUT)] + HRESULT timeout([out, retval] long *p); + + [propput, id(DISPID_IHTMLXMLHTTPREQUEST2_ONTIMEOUT), displaybind, bindable] + HRESULT ontimeout([in] VARIANT v); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST2_ONTIMEOUT), displaybind, bindable] + HRESULT ontimeout([out, retval] VARIANT *p); +} + +/***************************************************************************** + * IHTMLXMLHttpRequestFactory interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051040c-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLXMLHttpRequestFactory : IDispatch +{ + [id(DISPID_IHTMLXMLHTTPREQUESTFACTORY_CREATE)] + HRESULT create([out, retval] IHTMLXMLHttpRequest **p); +} + +/***************************************************************************** + * DispHTMLXMLHttpRequest dispinterface + */ +[ + hidden, + uuid(3050f596-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLXMLHttpRequest +{ +properties: +methods: + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_READYSTATE)] + long readyState(); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_RESPONSEBODY)] + VARIANT responseBody(); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_RESPONSETEXT)] + BSTR responseText(); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_RESPONSEXML)] + IDispatch *responseXML(); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_STATUS)] + long status(); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_STATUSTEXT)] + BSTR statusText(); + + [propput, id(DISPID_IHTMLXMLHTTPREQUEST_ONREADYSTATECHANGE), displaybind, bindable] + void onreadystatechange(VARIANT v); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_ONREADYSTATECHANGE), displaybind, bindable] + VARIANT onreadystatechange(); + + [id(DISPID_IHTMLXMLHTTPREQUEST_ABORT)] + void abort(); + + [id(DISPID_IHTMLXMLHTTPREQUEST_OPEN)] + void open( + [in] BSTR bstrMethod, + [in] BSTR bstrUrl, + [in] VARIANT varAsync, + [in, optional] VARIANT varUser, + [in, optional] VARIANT varPassword); + + [id(DISPID_IHTMLXMLHTTPREQUEST_SEND)] + void send([in, optional] VARIANT varBody); + + [id(DISPID_IHTMLXMLHTTPREQUEST_GETALLRESPONSEHEADERS)] + BSTR getAllResponseHeaders(); + + [id(DISPID_IHTMLXMLHTTPREQUEST_GETRESPONSEHEADER)] + BSTR getResponseHeader([in] BSTR bstrHeader); + + [id(DISPID_IHTMLXMLHTTPREQUEST_SETREQUESTHEADER)] + void setRequestHeader( + [in] BSTR bstrHeader, + [in] BSTR bstrValue); + + [propput, id(DISPID_IHTMLXMLHTTPREQUEST2_TIMEOUT)] + void timeout(long v); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST2_TIMEOUT)] + long timeout(); + + [propput, id(DISPID_IHTMLXMLHTTPREQUEST2_ONTIMEOUT), displaybind, bindable] + void ontimeout(VARIANT v); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST2_ONTIMEOUT), displaybind, bindable] + VARIANT ontimeout(); + + WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL; +} + +/***************************************************************************** * IHTMLControlElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added IDOMEvent and IDOMEventTarget declarations.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 020a68e1350eaf7293718732c1c9203e460709c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=020a68e1350eaf7293718732c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 20 20:19:50 2012 +0200 mshtml.idl: Added IDOMEvent and IDOMEventTarget declarations. --- include/mshtmdid.h | 39 ++++++++++++++++++ include/mshtml.idl | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 7484b7f..10c1b85 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -108,6 +108,28 @@ #define DISPID_DOMSTORAGEITEM DISPID_NORMAL_FIRST #define DISPID_DOMSTORAGE DISPID_NORMAL_FIRST #define DISPID_DOMSTORAGELIST DISPID_NORMAL_FIRST +#define DISPID_RULESAPPLIED DISPID_NORMAL_FIRST +#define DISPID_RULESAPPLIED_COLLECTION DISPID_NORMAL_FIRST +#define DISPID_STYLESHEETRULESAPPLIED_COLLECTION DISPID_NORMAL_FIRST +#define DISPID_PROCESSINGINSTRUCTION DISPID_NORMAL_FIRST + +#define DISPID_DOMEVENT DISPID_NORMAL_FIRST +#define DISPID_DOMUIEVENT (DISPID_DOMEVENT+25) +#define DISPID_DOMMOUSEEVENT (DISPID_DOMUIEVENT+25) +#define DISPID_DOMMOUSEWHEELEVENT (DISPID_DOMMOUSEEVENT+25) +#define DISPID_DOMWHEELEVENT (DISPID_DOMMOUSEWHEELEVENT+25) +#define DISPID_DOMTEXTEVENT (DISPID_DOMWHEELEVENT+25) +#define DISPID_DOMKEYBOARDEVENT (DISPID_DOMTEXTEVENT+25) +#define DISPID_DOMCOMPOSITIONEVENT (DISPID_DOMKEYBOARDEVENT+25) +#define DISPID_DOMCUSTOMEVENT (DISPID_DOMCOMPOSITIONEVENT+25) +#define DISPID_DOMMUTATIONEVENT (DISPID_DOMCUSTOMEVENT+25) +#define DISPID_DOMFOCUSEVENT (DISPID_DOMMUTATIONEVENT+25) +#define DISPID_SVGZOOMEVENT (DISPID_DOMFOCUSEVENT+25) +#define DISPID_DOMSITEMODEEVENT (DISPID_SVGZOOMEVENT+25) +#define DISPID_DOMMESSAGEEVENT (DISPID_DOMSITEMODEEVENT+25) +#define DISPID_DOMSTORAGEEVENT (DISPID_DOMMESSAGEEVENT+25) +#define DISPID_DOMBEFOREUNLOADEVENT (DISPID_DOMSTORAGEEVENT+25) +#define DISPID_DOMDRAGEVENT (DISPID_DOMBEFOREUNLOADEVENT+25) #define DISPID_DOMIMPLEMENTATION DISPID_NORMAL_FIRST #define DISPID_DOCUMENTCOMPATIBLEINFO DISPID_NORMAL_FIRST @@ -2886,6 +2908,23 @@ #define DISPID_IEVENTTARGET_REMOVEEVENTLISTENER DISPID_HTMLOBJECT+11 #define DISPID_IEVENTTARGET_DISPATCHEVENT DISPID_HTMLOBJECT+12 +/* IDOMEvent */ +#define DISPID_IDOMEVENT_BUBBLES DISPID_DOMEVENT+1 +#define DISPID_IDOMEVENT_CANCELABLE DISPID_DOMEVENT+2 +#define DISPID_IDOMEVENT_CURRENTTARGET DISPID_DOMEVENT+3 +#define DISPID_IDOMEVENT_DEFAULTPREVENTED DISPID_DOMEVENT+4 +#define DISPID_IDOMEVENT_EVENTPHASE DISPID_DOMEVENT+5 +#define DISPID_IDOMEVENT_TARGET DISPID_DOMEVENT+6 +#define DISPID_IDOMEVENT_TIMESTAMP DISPID_DOMEVENT+7 +#define DISPID_IDOMEVENT_TYPE DISPID_DOMEVENT+8 +#define DISPID_IDOMEVENT_INITEVENT DISPID_DOMEVENT+9 +#define DISPID_IDOMEVENT_PREVENTDEFAULT DISPID_DOMEVENT+10 +#define DISPID_IDOMEVENT_STOPPROPAGATION DISPID_DOMEVENT+11 +#define DISPID_IDOMEVENT_STOPIMMEDIATEPROPAGATION DISPID_DOMEVENT+12 +#define DISPID_IDOMEVENT_ISTRUSTED DISPID_DOMEVENT+13 +#define DISPID_IDOMEVENT_CANCELBUBBLE DISPID_DOMEVENT+14 +#define DISPID_IDOMEVENT_SRCELEMENT DISPID_DOMEVENT+15 + /* IHTMLControlElement */ #define DISPID_IHTMLCONTROLELEMENT_TABINDEX STDPROPID_XOBJ_TABINDEX #define DISPID_IHTMLCONTROLELEMENT_FOCUS (DISPID_SITE+0) diff --git a/include/mshtml.idl b/include/mshtml.idl index 6dee9bf..19e0fa9 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -131,6 +131,7 @@ interface IHTMLElement2; interface IHTMLStyleSheetsCollection; interface IHTMLFrameBase; interface IHTMLStorage; +interface IDOMEvent; /***************************************************************************** * IHTMLFiltersCollection interface @@ -7975,6 +7976,22 @@ methods: VARIANT ontimeout(); WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL; + + + [id(DISPID_IEVENTTARGET_ADDEVENTLISTENER)] + void addEventListener( + [in] BSTR type, + [in] IDispatch *listener, + [in] VARIANT_BOOL useCapture); + + [id(DISPID_IEVENTTARGET_REMOVEEVENTLISTENER)] + void removeEventListener( + [in] BSTR type, + [in] IDispatch *listener, + [in] VARIANT_BOOL useCapture); + + [id(DISPID_IEVENTTARGET_DISPATCHEVENT)] + VARIANT_BOOL dispatchEvent([in] IDOMEvent *evt); } /***************************************************************************** @@ -17208,6 +17225,98 @@ interface IHTMLStorage : IDispatch } /***************************************************************************** + * IDOMEventTarget interface + */ +[ + odl, + oleautomation, + dual, + uuid(305104b9-98b5-11cf-bb82-00aa00bdce0b) +] +interface IEventTarget : IDispatch +{ + [id(DISPID_IEVENTTARGET_ADDEVENTLISTENER)] + HRESULT addEventListener( + [in] BSTR type, + [in] IDispatch *listener, + [in] VARIANT_BOOL useCapture); + + [id(DISPID_IEVENTTARGET_REMOVEEVENTLISTENER)] + HRESULT removeEventListener( + [in] BSTR type, + [in] IDispatch *listener, + [in] VARIANT_BOOL useCapture); + + [id(DISPID_IEVENTTARGET_DISPATCHEVENT)] + HRESULT dispatchEvent( + [in] IDOMEvent *evt, + [out, retval] VARIANT_BOOL *pfResult); +} + +/***************************************************************************** + * IDOMEvent interface + */ +[ + odl, + oleautomation, + dual, + uuid(305104ba-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDOMEvent : IDispatch +{ + [propget, id(DISPID_IDOMEVENT_BUBBLES)] + HRESULT bubbles([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IDOMEVENT_CANCELABLE)] + HRESULT cancelable([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IDOMEVENT_CURRENTTARGET)] + HRESULT currentTarget([out, retval] IEventTarget **p); + + [propget, id(DISPID_IDOMEVENT_DEFAULTPREVENTED)] + HRESULT defaultPrevented([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IDOMEVENT_EVENTPHASE)] + HRESULT eventPhase([out, retval] USHORT *p); + + [propget, id(DISPID_IDOMEVENT_TARGET)] + HRESULT target([out, retval] IEventTarget **p); + + [propget, id(DISPID_IDOMEVENT_TIMESTAMP)] + HRESULT timeStamp([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IDOMEVENT_TYPE)] + HRESULT type([out, retval] BSTR *p); + + [id(DISPID_IDOMEVENT_INITEVENT)] + HRESULT initEvent( + [in] BSTR eventType, + [in] VARIANT_BOOL canBubble, + [in] VARIANT_BOOL cancelable); + + [id(DISPID_IDOMEVENT_PREVENTDEFAULT)] + HRESULT preventDefault(); + + [id(DISPID_IDOMEVENT_STOPPROPAGATION)] + HRESULT stopPropagation(); + + [id(DISPID_IDOMEVENT_STOPIMMEDIATEPROPAGATION)] + HRESULT stopImmediatePropagation(); + + [propget, id(DISPID_IDOMEVENT_ISTRUSTED)] + HRESULT isTrusted([out, retval] VARIANT_BOOL *p); + + [propput, id(DISPID_IDOMEVENT_CANCELBUBBLE)] + HRESULT cancelBubble([in] VARIANT_BOOL v); + + [propget, id(DISPID_IDOMEVENT_CANCELBUBBLE)] + HRESULT cancelBubble([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IDOMEVENT_SRCELEMENT)] + HRESULT srcElement([out, retval] IHTMLElement **p); +} + +/***************************************************************************** * IMarkupContainer interface */ [

1 0

Jacek Caban : mshtml: Moved creating nsIFile to separated function.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 4870355aa240249c97ab222fcd21066ced7e18e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4870355aa240249c97ab222fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 20 12:35:47 2012 +0200 mshtml: Moved creating nsIFile to separated function. --- dlls/mshtml/nsembed.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 8ff7ad2..5ae78d5 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -79,6 +79,20 @@ static ATOM nscontainer_class; static WCHAR gecko_path[MAX_PATH]; static unsigned gecko_path_len; +static nsresult create_nsfile(const PRUnichar *path, nsIFile **ret) +{ + nsAString str; + nsresult nsres; + + nsAString_InitDepend(&str, path); + nsres = NS_NewLocalFile(&str, FALSE, ret); + nsAString_Finish(&str); + + if(NS_FAILED(nsres)) + WARN("NS_NewLocalFile failed: %08x\n", nsres); + return nsres; +} + static nsresult NSAPI nsDirectoryServiceProvider_QueryInterface(nsIDirectoryServiceProvider *iface, nsIIDRef riid, void **result) { @@ -113,7 +127,6 @@ static nsresult create_profile_directory(void) static const WCHAR wine_geckoW[] = {'\\','w','i','n','e','_','g','e','c','k','o',0}; WCHAR path[MAX_PATH + sizeof(wine_geckoW)/sizeof(WCHAR)]; - nsAString str; cpp_bool exists; nsresult nsres; HRESULT hres; @@ -125,13 +138,9 @@ static nsresult create_profile_directory(void) } strcatW(path, wine_geckoW); - nsAString_InitDepend(&str, path); - nsres = NS_NewLocalFile(&str, FALSE, &profile_directory); - nsAString_Finish(&str); - if(NS_FAILED(nsres)) { - ERR("NS_NewLocalFile failed: %08x\n", nsres); + nsres = create_nsfile(path, &profile_directory); + if(NS_FAILED(nsres)) return nsres; - } nsres = nsIFile_Exists(profile_directory, &exists); if(NS_FAILED(nsres)) { @@ -525,16 +534,12 @@ static void set_preferences(void) static BOOL init_xpcom(const PRUnichar *gre_path) { nsIComponentRegistrar *registrar = NULL; - nsAString path; nsIFile *gre_dir; WCHAR *ptr; nsresult nsres; - nsAString_InitDepend(&path, gre_path); - nsres = NS_NewLocalFile(&path, FALSE, &gre_dir); - nsAString_Finish(&path); + nsres = create_nsfile(gre_path, &gre_dir); if(NS_FAILED(nsres)) { - ERR("NS_NewLocalFile failed: %08x\n", nsres); FreeLibrary(xul_handle); return FALSE; }

1 0