January 2012 - Wine-commits

Austin English : iphlpapi: Sync spec file to Windows 7.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: dc80d2d6c240b3605c0e756417c49641a3d42bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc80d2d6c240b3605c0e75641… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 24 16:01:30 2012 -0800 iphlpapi: Sync spec file to Windows 7. --- dlls/iphlpapi/iphlpapi.spec | 173 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 171 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc80d2d6c240b3605c0e7…

1 0

Austin English : iphlpapi: Add a stub for GetTcpTable2:.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: a52f88096ff1b526f91a45ccae9128a32a36c464 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52f88096ff1b526f91a45cca… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 24 16:02:50 2012 -0800 iphlpapi: Add a stub for GetTcpTable2:. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 3247992..a6662c3 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -138,7 +138,7 @@ @ stdcall GetTcpStatistics( ptr ) @ stub GetTcpStatsFromStack @ stdcall GetTcpTable( ptr ptr long ) -#@ stub GetTcpTable2 +@ stdcall GetTcpTable2( ptr ptr long ) @ stub GetTcpTableFromStack #@ stub GetTeredoPort #@ stub GetUdp6Table diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d43f644..ea759ae 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2276,3 +2276,12 @@ DWORD WINAPI PfCreateInterface(DWORD dwName, PFFORWARD_ACTION inAction, PFFORWAR FIXME("(%d %d %d %x %x %p) stub\n", dwName, inAction, outAction, bUseLog, bMustBeUnique, ppInterface); return ERROR_CALL_NOT_IMPLEMENTED; } + +/****************************************************************** + * GetTcpTable2 (IPHLPAPI.@) + */ +ULONG WINAPI GetTcpTable2(PMIB_TCPTABLE2 table, PULONG size, BOOL order) +{ + FIXME("pTcpTable2 %p, pdwSize %p, bOrder %d: stub\n", table, size, order); + return ERROR_NOT_SUPPORTED; +}

1 0

Austin English : kernel32: Add a stub for AddConsoleAliasA/W.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: 9a2c2ed5c2c515dc5a2077c0f0449843da83e2dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a2c2ed5c2c515dc5a2077c0f… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 24 16:11:52 2012 -0800 kernel32: Add a stub for AddConsoleAliasA/W. --- dlls/kernel32/console.c | 14 ++++++++++++++ dlls/kernel32/kernel32.spec | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 47e829e..6d429f0 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3201,3 +3201,17 @@ VOID WINAPI ExpungeConsoleCommandHistoryW(LPCWSTR unknown) FIXME(": (%s) stub!\n", debugstr_w(unknown)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); } + +BOOL WINAPI AddConsoleAliasA(LPSTR source, LPSTR target, LPSTR exename) +{ + FIXME(": (%s, %s, %s) stub!\n", debugstr_a(source), debugstr_a(target), debugstr_a(exename)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI AddConsoleAliasW(LPWSTR source, LPWSTR target, LPWSTR exename) +{ + FIXME(": (%s, %s, %s) stub!\n", debugstr_w(source), debugstr_w(target), debugstr_w(exename)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b1946ac..072cfa1 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -138,8 +138,8 @@ @ stdcall ActivateActCtx(ptr ptr) @ stdcall AddAtomA(str) @ stdcall AddAtomW(wstr) -@ stub AddConsoleAliasA -@ stub AddConsoleAliasW +@ stdcall AddConsoleAliasA(str str str) +@ stdcall AddConsoleAliasW(wstr wstr wstr) # @ stub AddLocalAlternateComputerNameA # @ stub AddLocalAlternateComputerNameW @ stdcall AddRefActCtx(ptr)

1 0

Austin English : imm32: Add a stub for ImmGetHotKey.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: 58e4febe4d2441040f4b78504a2f516d21a43b3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=58e4febe4d2441040f4b78504… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 24 19:32:05 2012 -0800 imm32: Add a stub for ImmGetHotKey. --- dlls/imm32/imm.c | 10 ++++++++++ dlls/imm32/imm32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index decdcae..7394101 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2845,3 +2845,13 @@ BOOL WINAPI ImmEnumInputContext(DWORD idThread, IMCENUMPROC lpfn, LPARAM lParam) FIXME("Stub\n"); return FALSE; } + +/*********************************************************************** + * ImmGetHotKey(IMM32.@) + */ + +BOOL WINAPI ImmGetHotKey(DWORD hotkey, UINT *modifiers, UINT *key, HKL hkl) +{ + FIXME("%x, %p, %p, %p: stub\n", hotkey, modifiers, key, hkl); + return FALSE; +} diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 03f64a5..37c46ab 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -39,7 +39,7 @@ @ stdcall ImmGetDescriptionW(long ptr long) @ stdcall ImmGetGuideLineA(long long ptr long) @ stdcall ImmGetGuideLineW(long long ptr long) -@ stub ImmGetHotKey +@ stdcall ImmGetHotKey(long ptr ptr ptr) @ stdcall ImmGetIMCCLockCount(long) @ stdcall ImmGetIMCCSize(long) @ stdcall ImmGetIMCLockCount(long)

1 0

Detlef Riekenberg : ieframe: Remove dead code.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: 1e1ad5ba2fb976ca84420aea6df77ecb189f650e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e1ad5ba2fb976ca84420aea6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jan 25 00:00:11 2012 +0100 ieframe: Remove dead code. --- dlls/ieframe/dochost.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 6eb27ec..5b0dd54 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -531,7 +531,6 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, FIXME("Unimplemented cmdid %d\n", nCmdID); return E_NOTIMPL; } - return S_OK; } if(IsEqualGUID(pguidCmdGroup, &CGID_DocHostCmdPriv)) {

1 0

Detlef Riekenberg : ieframe: Add missing return statements.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: 1cf886d7c951cd575e23d804ff6763826a43f71c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cf886d7c951cd575e23d804f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jan 25 00:00:12 2012 +0100 ieframe: Add missing return statements. --- dlls/ieframe/dochost.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 5b0dd54..547e253 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -589,9 +589,11 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, switch(nCmdID) { case CMDID_EXPLORER_UPDATEHISTORY: update_travellog(This); - break; + return S_OK; + default: FIXME("Unimplemented cmd %d of CGID_Explorer\n", nCmdID); + return E_NOTIMPL; } }

1 0

Detlef Riekenberg : ieframe: Use similar FIXME text.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: 39356260e73169fdaaf940089700877035d5931b URL: http://source.winehq.org/git/wine.git/?a=commit;h=39356260e73169fdaaf940089… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jan 25 00:00:13 2012 +0100 ieframe: Use similar FIXME text. --- dlls/ieframe/dochost.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 547e253..1b24dd2 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -592,12 +592,12 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, return S_OK; default: - FIXME("Unimplemented cmd %d of CGID_Explorer\n", nCmdID); + FIXME("Unimplemented cmdid %d of CGID_Explorer\n", nCmdID); return E_NOTIMPL; } } - FIXME("Unimplemented group %s\n", debugstr_guid(pguidCmdGroup)); + FIXME("Unimplemented cmdid %d of group %s\n", nCmdID, debugstr_guid(pguidCmdGroup)); return E_NOTIMPL; }

1 0

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

25 Jan '12

Module: wine Branch: master Commit: c12f87fbfa79368a18dc2884cac7bf008f34f83d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c12f87fbfa79368a18dc2884c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jan 25 13:01:05 2012 +0100 po: Update French translation. --- po/fr.po | 49 ++++++++++++++++++++++--------------------------- 1 files changed, 22 insertions(+), 27 deletions(-) diff --git a/po/fr.po b/po/fr.po index 68b8340..6d310a0 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7200,7 +7200,7 @@ msgid "" msgstr "" "Insère le contenu du presse-papiers dans votre document comme %s. Les " "données sont liées au fichier source afin que les modifications de celui-" -"cisoient répercutées dans votre document." +"ci soient répercutées dans votre document." #: oledlg.rc:38 msgid "" @@ -8977,7 +8977,6 @@ msgid "&Output File Name:" msgstr "&Fichier de sortie :" #: winspool.rc:28 -#, fuzzy msgid "The output file already exists. Click OK to overwrite." msgstr "Le fichier de sortie existe déjà. Cliquez sur OK pour l'écraser." @@ -10393,62 +10392,59 @@ msgid "Encoding:" msgstr "Codage :" #: notepad.rc:129 wordpad.rc:278 -#, fuzzy msgctxt "accelerator Select All" msgid "^A" -msgstr "T" +msgstr "^A" #: notepad.rc:130 wordpad.rc:280 msgctxt "accelerator Copy" msgid "^C" -msgstr "" +msgstr "^C" #: notepad.rc:131 regedit.rc:320 wordpad.rc:276 -#, fuzzy msgctxt "accelerator Find" msgid "^F" -msgstr "F" +msgstr "^F" #: notepad.rc:132 wordpad.rc:277 msgctxt "accelerator Replace" msgid "^H" -msgstr "" +msgstr "^H" #: notepad.rc:133 wordpad.rc:286 -#, fuzzy msgctxt "accelerator New" msgid "^N" -msgstr "N" +msgstr "^N" #: notepad.rc:134 wordpad.rc:287 msgctxt "accelerator Open" msgid "^O" -msgstr "" +msgstr "^O" #: notepad.rc:135 regedit.rc:321 wordpad.rc:289 msgctxt "accelerator Print" msgid "^P" -msgstr "" +msgstr "^P" #: notepad.rc:136 wordpad.rc:288 msgctxt "accelerator Save" msgid "^S" -msgstr "" +msgstr "^S" #: notepad.rc:137 msgctxt "accelerator Paste" msgid "^V" -msgstr "" +msgstr "^V" #: notepad.rc:138 wordpad.rc:279 msgctxt "accelerator Cut" msgid "^X" -msgstr "" +msgstr "^X" #: notepad.rc:139 wordpad.rc:281 msgctxt "accelerator Undo" msgid "^Z" -msgstr "" +msgstr "^Z" #: notepad.rc:66 msgid "Page &p" @@ -12506,7 +12502,7 @@ msgstr "&Droite" #: view.rc:51 msgctxt "accelerator Quit" msgid "^Q" -msgstr "" +msgstr "^Q" #: view.rc:46 msgid "Regular Metafile Viewer" @@ -13563,12 +13559,12 @@ msgstr "Informations de version" #: winefile.rc:201 winemine.rc:99 msgctxt "accelerator Exit" msgid "X" -msgstr "" +msgstr "X" #: winefile.rc:202 msgctxt "accelerator Fullscreen" msgid "^S" -msgstr "" +msgstr "^S" #: winefile.rc:93 msgid "Applying font settings" @@ -13996,38 +13992,37 @@ msgstr "Barres d'outils" #: 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 -#, fuzzy msgctxt "accelerator Redo" msgid "^Y" -msgstr "O" +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 (*.*)"

1 0

Francois Gouget : po: Fix some typography issues in the Japanese translation.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: 80119af8f9c9e33a92ce3a8f9ebf33309a13f08e URL: http://source.winehq.org/git/wine.git/?a=commit;h=80119af8f9c9e33a92ce3a8f9… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 25 02:18:19 2012 +0100 po: Fix some typography issues in the Japanese translation. --- po/ja.po | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/po/ja.po b/po/ja.po index 92ce031..413f872 100644 --- a/po/ja.po +++ b/po/ja.po @@ -2722,8 +2722,8 @@ msgid "" "trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"この認証局によって発行された証明書は信頼されなくなります。この証明書を削除し" -"ますか?" +"この認証局によって発行された証明書は信頼されなくなります。\n" +"この証明書を削除しますか?" #: cryptui.rc:112 msgid "" @@ -2731,8 +2731,8 @@ msgid "" "trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"これらの認証局によって発行された証明書は信頼されなくなります。これらの証明書" -"を削除しますか?" +"これらの認証局によって発行された証明書は信頼されなくなります。\n" +"これらの証明書を削除しますか?" #: cryptui.rc:113 msgid "" @@ -2758,16 +2758,16 @@ msgid "" "Software signed by this publisher will no longer be trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"この発行元により署名されたソフトウェアは信頼されなくなります。この証明書を削" -"除しますか?" +"この発行元により署名されたソフトウェアは信頼されなくなります。\n" +"この証明書を削除しますか?" #: cryptui.rc:116 msgid "" "Software signed by these publishers will no longer be trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"これらの発行元により署名されたソフトウェアは信頼されなくなります。これらの証" -"明書を削除しますか?" +"これらの発行元により署名されたソフトウェアは信頼されなくなります。\n" +"これらの証明書を削除しますか?" #: cryptui.rc:117 msgid "Are you sure you want to remove this certificate?" @@ -9285,7 +9285,7 @@ msgstr "CHDIR <ディレクトリ> は現在のデフォルトディレクト #: cmd.rc:43 msgid "CLS clears the console screen.\n" -msgstr "CLSはコンソール画面をクリアします\n" +msgstr "CLSはコンソール画面をクリアします。\n" #: cmd.rc:45 msgid "COPY <filename> copies a file.\n" @@ -10004,7 +10004,7 @@ msgstr "使い方: hostname\n" #: hostname.rc:28 msgid "Error: Invalid option '%c'.\n" -msgstr "エラー: 無効なオプション '%c'\n" +msgstr "エラー: 無効なオプション '%c'。\n" #: hostname.rc:29 msgid "" @@ -10089,7 +10089,7 @@ msgstr "" " -または-\n" "NET コマンド /HELP\n" "\n" -"コマンドは、HELP、START、STOP、USE のいずれかです\n" +"コマンドは、HELP、START、STOP、USE のいずれかです。\n" #: net.rc:28 msgid "" @@ -10298,7 +10298,7 @@ msgstr "フッタ(&F):" #: notepad.rc:104 msgid "Margins (millimeters)" -msgstr "マージン(mm):" +msgstr "マージン(mm)" #: notepad.rc:105 msgid "&Left:" @@ -10396,10 +10396,9 @@ msgid "" "\n" "Do you want to create a new file?" msgstr "" -"ファイル '%s'\n" -"は存在しません\n" +"ファイル '%s' は存在しません\n" "\n" -" 新しいファイルを作成しますか ?" +"新しいファイルを作成しますか?" #: notepad.rc:79 msgid "" @@ -10407,14 +10406,13 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"ファイル '%s'\n" -"は変更されています\n" +"ファイル '%s' は変更されています\n" "\n" -" 変更を保存しますか ?" +"変更を保存しますか?" #: notepad.rc:80 msgid "'%s' could not be found." -msgstr "'%s' は見つかりませんでした" +msgstr "'%s' は見つかりませんでした。" #: notepad.rc:82 msgid "Unicode (UTF-16)" @@ -10900,11 +10898,11 @@ msgstr "コマンドライン(&C):" #: progman.rc:171 msgid "&Working directory:" -msgstr "作業ディレクトリ(&W)" +msgstr "作業ディレクトリ(&W):" #: progman.rc:173 msgid "&Key combination:" -msgstr "キーの組み合わせ(&K)" +msgstr "キーの組み合わせ(&K):" #: progman.rc:176 progman.rc:212 msgid "&Minimize at launch"

1 0

Francois Gouget : po: Fix some typography issues in the Bulgarian translation.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: 28233992c3a498f07798e35152c89a3824a27c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28233992c3a498f07798e3515… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 25 02:20:59 2012 +0100 po: Fix some typography issues in the Bulgarian translation. --- po/bg.po | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/po/bg.po b/po/bg.po index c9c0411..64599af 100644 --- a/po/bg.po +++ b/po/bg.po @@ -2188,8 +2188,9 @@ msgid "&File name:" msgstr "&Файл" #: cryptui.rc:293 cryptui.rc:315 cryptui.rc:429 winecfg.rc:295 +#, fuzzy msgid "B&rowse..." -msgstr "Избор" +msgstr "Избор..." #: cryptui.rc:294 msgid "" @@ -10159,7 +10160,7 @@ msgid "" msgstr "" "Файлът '%s' не съществува.\n" "\n" -" Искате ли да създадете нов файл?" +"Искате ли да създадете нов файл?" #: notepad.rc:79 msgid "" @@ -10169,7 +10170,7 @@ msgid "" msgstr "" "Файлът '%s' е бил променен.\n" "\n" -" Искате ли да съхраните промените?" +"Искате ли да съхраните промените?" #: notepad.rc:80 msgid "'%s' could not be found." @@ -12218,7 +12219,7 @@ msgstr "&Добавяне на приложение..." #: winecfg.rc:151 msgid "&Remove application" -msgstr "Пре&махване на приложение..." +msgstr "Пре&махване на приложение" #: winecfg.rc:152 msgid "&Windows Version:" @@ -12286,7 +12287,7 @@ msgstr "Съществуващи замени:" #: winecfg.rc:190 msgid "&Edit..." -msgstr "&Редактирай" +msgstr "&Редактирай..." #: winecfg.rc:196 msgid "Edit Override" @@ -12339,7 +12340,7 @@ msgstr "&Добави..." #: winecfg.rc:229 msgid "Auto&detect" -msgstr "&Открий..." +msgstr "&Открий" #: winecfg.rc:232 msgid "&Path:"

1 0