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

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

18 Jul '12

Module: wine Branch: master Commit: 736efb6a268ab9cdda38cef209ecde2f122b146b URL: http://source.winehq.org/git/wine.git/?a=commit;h=736efb6a268ab9cdda38cef20… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Sat Jul 14 00:50:27 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 183 ++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 107 insertions(+), 76 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index c934aec..cbe2092 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6638,11 +6638,11 @@ msgstr "HTML 檔案" #: mshtml.rc:26 msgid "Downloading from %s..." -msgstr "從 %s 下載中..." +msgstr "從 %s 下載中…" #: mshtml.rc:25 msgid "Done" -msgstr "" +msgstr "已完成" #: msi.rc:27 msgid "" @@ -6690,6 +6690,35 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" +"Windows 安裝程式 %s\n" +"\n" +"用法：\n" +"msiexec 命令 {必要參數} [可選參數]\n" +"\n" +"安裝產品：\n" +"\t/i {套件|產品編號} [內容]\n" +"\t/package {套件|產品編號} [內容]\n" +"\t/a 套件 [內容]\n" +"修復安裝：\n" +"\t/f[p|o|e|d|c|a|u|m|s|v] {套件|產品編號}\n" +"解除安裝產品：\n" +"\t/uninstall {套件|產品編號} [內容]\n" +"\t/x {套件|產品編號} [內容]\n" +"通告產品：\n" +"\t/j[u|m] 套件 [/t 變換] [/g 語言識別號]\n" +"套用修補程式：\n" +"\t/p 修補套件 [內容]\n" +"\t/p 修補套件/a 套件 [內容]\n" +"用於以上命令的記錄檔和 UI 修飾鍵：\n" +"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] 日誌檔案\n" +"\t/q{|n|b|r|f|n+|b+|b-}\n" +"註冊 MSI 服務：\n" +"\t/y\n" +"移除註冊 MSI 服務：\n" +"\t/z\n" +"顯示這份說明：\n" +"\t/help\n" +"\t/?\n" #: msi.rc:57 msgid "enter which folder contains %s" @@ -6713,13 +6742,15 @@ msgstr "選擇包含 %s 的檔案夾" #: msrle32.rc:28 msgid "Wine MS-RLE video codec" -msgstr "" +msgstr "Wine MS-RLE 視訊編碼解碼器" #: msrle32.rc:29 msgid "" "Wine MS-RLE video codec\n" "Copyright 2002 by Michael Guennewig" msgstr "" +"Wine MS-RLE 視訊編碼解碼器\n" +"著作權 2002 Michael Guennewig" #: msvfw32.rc:30 msgid "Video Compression" @@ -6731,7 +6762,7 @@ msgstr "壓縮器(&C)：" #: msvfw32.rc:39 msgid "Con&figure..." -msgstr "組態(&F)..." +msgstr "組態(&F)…" #: msvfw32.rc:40 msgid "&About" @@ -6751,7 +6782,7 @@ msgstr "資料速率(&D)" #: msvfw32.rc:52 msgid "kB/s" -msgstr "" +msgstr "kB/s" #: msvfw32.rc:25 msgid "Full Frames (Uncompressed)" @@ -6759,11 +6790,11 @@ msgstr "全畫格(未壓縮)" #: msvidc32.rc:26 msgid "Wine Video 1 video codec" -msgstr "" +msgstr "Wine 視訊 1 視訊編碼解碼器" #: oleacc.rc:27 msgid "unknown object" -msgstr "" +msgstr "不明物件" #: oleacc.rc:28 msgid "title bar" @@ -6779,7 +6810,7 @@ msgstr "捲軸" #: oleacc.rc:31 msgid "grip" -msgstr "" +msgstr "握把" #: oleacc.rc:32 msgid "sound" @@ -6791,11 +6822,11 @@ msgstr "游標" #: oleacc.rc:34 msgid "caret" -msgstr "" +msgstr "插字符號" #: oleacc.rc:35 msgid "alert" -msgstr "" +msgstr "警示" #: oleacc.rc:36 msgid "window" @@ -6803,7 +6834,7 @@ msgstr "視窗" #: oleacc.rc:37 msgid "client" -msgstr "" +msgstr "客戶端" #: oleacc.rc:38 msgid "popup menu" @@ -6811,7 +6842,7 @@ msgstr "彈出式選單" #: oleacc.rc:39 msgid "menu item" -msgstr "" +msgstr "功能表項目" #: oleacc.rc:40 msgid "tool tip" @@ -6827,23 +6858,23 @@ msgstr "文件" #: oleacc.rc:43 msgid "pane" -msgstr "" +msgstr "窗格" #: oleacc.rc:44 msgid "chart" -msgstr "" +msgstr "圖表" #: oleacc.rc:45 msgid "dialog" -msgstr "" +msgstr "對話框" #: oleacc.rc:46 msgid "border" -msgstr "" +msgstr "邊框" #: oleacc.rc:47 msgid "grouping" -msgstr "" +msgstr "分組" #: oleacc.rc:48 msgid "separator" @@ -6863,15 +6894,15 @@ msgstr "表格" #: oleacc.rc:52 msgid "column header" -msgstr "" +msgstr "欄首" #: oleacc.rc:53 msgid "row header" -msgstr "" +msgstr "列首" #: oleacc.rc:54 msgid "column" -msgstr "行" +msgstr "欄" #: oleacc.rc:55 msgid "row" @@ -6879,51 +6910,51 @@ msgstr "列" #: oleacc.rc:56 msgid "cell" -msgstr "" +msgstr "儲存格" #: oleacc.rc:57 msgid "link" -msgstr "" +msgstr "鏈結" #: oleacc.rc:58 msgid "help balloon" -msgstr "" +msgstr "說明泡泡" #: oleacc.rc:59 msgid "character" -msgstr "" +msgstr "字元" #: oleacc.rc:60 msgid "list" -msgstr "" +msgstr "清單" #: oleacc.rc:61 msgid "list item" -msgstr "" +msgstr "清單項目" #: oleacc.rc:62 msgid "outline" -msgstr "" +msgstr "描邊" #: oleacc.rc:63 msgid "outline item" -msgstr "" +msgstr "描邊項目" #: oleacc.rc:64 msgid "page tab" -msgstr "" +msgstr "頁面頁標" #: oleacc.rc:65 msgid "property page" -msgstr "" +msgstr "內容頁面" #: oleacc.rc:66 msgid "indicator" -msgstr "" +msgstr "指示器" #: oleacc.rc:67 msgid "graphic" -msgstr "" +msgstr "圖形" #: oleacc.rc:68 msgid "static text" @@ -6935,47 +6966,47 @@ msgstr "文字" #: oleacc.rc:70 msgid "push button" -msgstr "" +msgstr "按鈕" #: oleacc.rc:71 msgid "check button" -msgstr "" +msgstr "檢查按鈕" #: oleacc.rc:72 msgid "radio button" -msgstr "" +msgstr "單選按鈕" #: oleacc.rc:73 msgid "combo box" -msgstr "" +msgstr "複合方塊" #: oleacc.rc:74 msgid "drop down" -msgstr "" +msgstr "下拉選單" #: oleacc.rc:75 msgid "progress bar" -msgstr "" +msgstr "進度條" #: oleacc.rc:76 msgid "dial" -msgstr "" +msgstr "撥號" #: oleacc.rc:77 msgid "hot key field" -msgstr "" +msgstr "快速鍵欄位" #: oleacc.rc:78 msgid "slider" -msgstr "" +msgstr "滑動軸" #: oleacc.rc:79 msgid "spin box" -msgstr "" +msgstr "數值調整框" #: oleacc.rc:80 msgid "diagram" -msgstr "" +msgstr "圖表" #: oleacc.rc:81 msgid "animation" @@ -6983,27 +7014,27 @@ msgstr "動畫" #: oleacc.rc:82 msgid "equation" -msgstr "" +msgstr "方程式" #: oleacc.rc:83 msgid "drop down button" -msgstr "" +msgstr "下拉按鈕" #: oleacc.rc:84 msgid "menu button" -msgstr "" +msgstr "選單按鈕" #: oleacc.rc:85 msgid "grid drop down button" -msgstr "" +msgstr "格線下拉按鈕" #: oleacc.rc:86 msgid "white space" -msgstr "" +msgstr "空白" #: oleacc.rc:87 msgid "page tab list" -msgstr "" +msgstr "頁面頁標清單" #: oleacc.rc:88 msgid "clock" @@ -7011,7 +7042,7 @@ msgstr "時鐘" #: oleacc.rc:89 msgid "split button" -msgstr "" +msgstr "分割按鈕" #: oleacc.rc:90 ipconfig.rc:33 msgid "IP address" @@ -7019,7 +7050,7 @@ msgstr "IP 位址" #: oleacc.rc:91 msgid "outline button" -msgstr "" +msgstr "描邊按鈕" #: oleaut32.rc:27 oleview.rc:144 msgid "True" @@ -7063,7 +7094,7 @@ msgstr "建立於檔案" #: oledlg.rc:65 msgid "&Add Control..." -msgstr "新增控制項(&A)..." +msgstr "新增控制項(&A)…" #: oledlg.rc:66 msgid "Display As Icon" @@ -7071,7 +7102,7 @@ msgstr "顯示為圖示" #: oledlg.rc:68 setupapi.rc:58 msgid "Browse..." -msgstr "瀏覽..." +msgstr "瀏覽…" #: oledlg.rc:69 msgid "File:" @@ -7104,7 +7135,7 @@ msgstr "顯示為圖示(&D)" #: oledlg.rc:92 msgid "Change &Icon..." -msgstr "變更圖示(&I)..." +msgstr "變更圖示(&I)…" #: oledlg.rc:25 msgid "Insert a new %s object into your document" @@ -7195,7 +7226,7 @@ msgstr "正在掃描" #: sane.rc:44 msgid "SCANNING... Please Wait" -msgstr "正在掃描... 請稍候" +msgstr "正在掃描… 請稍候" #: sane.rc:31 msgctxt "unit: pixels" @@ -7248,7 +7279,7 @@ msgstr "停止位元" #: setupapi.rc:36 msgid "Copying Files..." -msgstr "複製檔案..." +msgstr "複製檔案…" #: setupapi.rc:42 msgid "Destination:" @@ -7292,7 +7323,7 @@ msgstr "向前(&O)" #: shdoclc.rc:41 msgid "&Save Background As..." -msgstr "將背景存為(&S)..." +msgstr "將背景存為(&S)…" #: shdoclc.rc:42 msgid "Set As Back&ground" @@ -7316,7 +7347,7 @@ msgstr "建立捷徑(&T)" #: shdoclc.rc:50 shdoclc.rc:81 shdoclc.rc:134 shdoclc.rc:161 shdoclc.rc:185 msgid "Add to &Favorites..." -msgstr "新增至我的最愛(&F)..." +msgstr "新增至我的最愛(&F)…" #: shdoclc.rc:51 msgid "&View Source" @@ -7340,7 +7371,7 @@ msgstr "在新視窗開啟連結(&N)" #: shdoclc.rc:65 shdoclc.rc:126 shdoclc.rc:148 shdoclc.rc:172 msgid "Save Target &As..." -msgstr "另存目標(&A)..." +msgstr "另存目標(&A)…" #: shdoclc.rc:66 shdoclc.rc:127 shdoclc.rc:149 shdoclc.rc:173 msgid "&Print Target" @@ -7352,15 +7383,15 @@ msgstr "顯示圖片(&H)" #: shdoclc.rc:69 shdoclc.rc:176 msgid "&Save Picture As..." -msgstr "另存圖片(&S)..." +msgstr "另存圖片(&S)…" #: shdoclc.rc:70 msgid "&E-mail Picture..." -msgstr "電郵圖片(&E)..." +msgstr "電子郵件圖片(&E)…" #: shdoclc.rc:71 msgid "Pr&int Picture..." -msgstr "列印圖片(&I)..." +msgstr "列印圖片(&I)…" #: shdoclc.rc:72 msgid "&Go to My Pictures" @@ -7372,7 +7403,7 @@ msgstr "設為背景(&G)" #: shdoclc.rc:74 shdoclc.rc:154 shdoclc.rc:178 msgid "Set as &Desktop Item..." -msgstr "設為桌面項目(&D)..." +msgstr "設為桌面項目(&D)…" #: shdoclc.rc:76 shdoclc.rc:90 shdoclc.rc:114 shdoclc.rc:156 shdoclc.rc:180 #: user32.rc:57 wordpad.rc:101 @@ -7411,11 +7442,11 @@ msgstr "格(&C)" #: shdoclc.rc:103 msgid "&Row" -msgstr "行(&R)" +msgstr "列(&R)" #: shdoclc.rc:104 msgid "&Column" -msgstr "列(&O)" +msgstr "欄(&O)" #: shdoclc.rc:105 msgid "&Table" @@ -7447,7 +7478,7 @@ msgstr "剪下" #: shdoclc.rc:152 msgid "&Save Video As..." -msgstr "將視訊另存為(&S)..." +msgstr "將視訊另存為(&S)…" #: shdoclc.rc:163 shdoclc.rc:187 msgid "Play" @@ -7503,7 +7534,7 @@ msgstr "記憶體監控" #: shdoclc.rc:207 msgid "Performance Meters" -msgstr "" +msgstr "效能量尺" #: shdoclc.rc:208 msgid "Save HTML" @@ -7622,7 +7653,7 @@ msgstr "自動排列(&A)" #: shell32.rc:57 msgid "Line up Icons" -msgstr "" +msgstr "貼齊圖示" #: shell32.rc:62 msgid "Paste as Link" @@ -7651,7 +7682,7 @@ msgstr "回復(&R)" #: shell32.rc:83 msgid "&Erase" -msgstr "" +msgstr "清除(&E)" #: shell32.rc:95 msgid "E&xplore" @@ -7676,7 +7707,7 @@ msgstr "結束(&X)" #: shell32.rc:127 msgid "&About Control Panel" -msgstr "關於控制台(&A)" +msgstr "關於控制臺(&A)" #: shell32.rc:270 shell32.rc:285 msgid "Browse for Folder" @@ -7735,7 +7766,7 @@ msgstr "開啟(&O):" #: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234 #: winefile.rc:130 msgid "&Browse..." -msgstr "瀏覽(&B)..." +msgstr "瀏覽(&B)…" #: shell32.rc:135 shell32.rc:139 winefile.rc:105 msgid "Size" @@ -7771,7 +7802,7 @@ msgstr "群組" #: shell32.rc:145 msgid "Original location" -msgstr "" +msgstr "原來的位置" #: shell32.rc:146 msgid "Date deleted" @@ -7788,7 +7819,7 @@ msgstr "我的電腦" #: shell32.rc:156 msgid "Control Panel" -msgstr "Wine 控制台" +msgstr "Wine 控制臺" #: shell32.rc:163 msgid "Select" @@ -7853,7 +7884,7 @@ msgstr "樣板" #: shell32.rc:210 msgid "PrintHood" -msgstr "" +msgstr "印表套頁" #: shell32.rc:211 winhlp32.rc:45 msgid "History" @@ -7861,7 +7892,7 @@ msgstr "紀錄" #: shell32.rc:212 msgid "Program Files" -msgstr "" +msgstr "程式檔案" #: shell32.rc:214 msgid "My Pictures" @@ -7869,7 +7900,7 @@ msgstr "我的圖片" #: shell32.rc:215 msgid "Common Files" -msgstr "" +msgstr "共同檔案" #: shell32.rc:216 shell32.rc:147 shell32.rc:232 msgid "Documents"

1 0

Jacek Caban : winegecko: Added 1.7 release.
by Alexandre Julliard 18 Jul '12

18 Jul '12

Module: tools Branch: master Commit: 5f7b0d4644d2838993734d0cd7174130412361bf URL: http://source.winehq.org/git/tools.git/?a=commit;h=5f7b0d4644d2838993734d0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 18 12:48:32 2012 +0200 winegecko: Added 1.7 release. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index 20e7434..08262f3 100644 --- a/winegecko.php +++ b/winegecko.php @@ -66,7 +66,9 @@ $aFileSizes = array( '1.5-x86'=>15950848, '1.5-x86_64'=>16345088, '1.6-x86'=>16802816, - '1.6-x86_64'=>17251328 + '1.6-x86_64'=>17251328, + '1.7-x86'=>16995328, + '1.7-x86_64'=>17438720 ); // Exact size of the file:

1 0

André Hentschel : Wine 1.5.9 freigegeben
by Jeremy Newman 18 Jul '12

18 Jul '12

Module: website Branch: master Commit: ee3982da55bc29c8b7976865245182ae258d83d3 URL: http://source.winehq.org/git/website.git/?a=commit;h=ee3982da55bc29c8b79768… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 17 21:19:02 2012 +0200 Wine 1.5.9 freigegeben --- news/de/2012071701.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2012071701.xml b/news/de/2012071701.xml new file mode 100644 index 0000000..62c07fd --- /dev/null +++ b/news/de/2012071701.xml @@ -0,0 +1,17 @@ +<news> +<date>17. Juli 2012</date> +<title>Wine 1.5.9 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.9 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.9">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für GPOS Schrifttabellen in Uniscribe.</li> + <li>Unterstützung für XRandr 1.2 und 1.3.</li> + <li>Parser Verbesserungen für den HLSL Compiler.</li> + <li>Mehr Algorithmen für den Schlüsselaustausch unter Mac OS.</li> + <li>Relay tracing unter ARM.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.9.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.9
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: website Branch: master Commit: 4b47a1e778aa7aa0d699d5d9a2f512568488ee8a URL: http://source.winehq.org/git/website.git/?a=commit;h=4b47a1e778aa7aa0d699d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 20:52:24 2012 +0200 Wine release 1.5.9 --- news/en/2012071701.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2012071701.xml b/news/en/2012071701.xml new file mode 100644 index 0000000..b1912db --- /dev/null +++ b/news/en/2012071701.xml @@ -0,0 +1,17 @@ +<news> +<date>July 17, 2012</date> +<title>Wine 1.5.9 Released</title> +<body> + The Wine development release 1.5.9 is now available. + <a href="{$root}/announce/1.5.9">What's new</a> in this release: +<ul> + <li>Support for GPOS font tables in Uniscribe.</li> + <li>Support for XRandr 1.2 and 1.3.</li> + <li>Parser improvements for the HLSL compiler.</li> + <li>More key exchange algorithms supported on Mac OS.</li> + <li>Relay tracing on ARM.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.9.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.5.9.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: e7389d875d8204f51c48b12f59b6714ef94b845a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7389d875d8204f51c48b12f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 20:41:28 2012 +0200 Release 1.5.9. --- ANNOUNCE | 902 +++++++++++++++++++++++++++---------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 403 insertions(+), 519 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7389d875d8204f51c48b…

1 0

Tag wine-1.5.9 : Alexandre Julliard : Release 1.5.9
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: refs/tags/wine-1.5.9 Tag: 06dacaaa564f280bb82add7e6d82390feaa549b9 URL: http://source.winehq.org/git/wine.git/?a=tag;h=06dacaaa564f280bb82add7e6d82… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 20:41:30 2012 +0200 Release 1.5.9

1 0

Daniel Jelinski : comctl32/treeview: Fix NM_RCLICK behavior.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 602dea1e12c1c89d3fdf0499a079f488fe93cb85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=602dea1e12c1c89d3fdf0499a… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Jul 13 20:11:38 2012 +0200 comctl32/treeview: Fix NM_RCLICK behavior. --- dlls/comctl32/treeview.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 9e28ee2..e55c941 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4257,9 +4257,11 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) } else { - TREEVIEW_RButtonUp(infoPtr, &ht.pt); SetFocus(infoPtr->hwnd); - TREEVIEW_SendSimpleNotify(infoPtr, NM_RCLICK); + if(!TREEVIEW_SendSimpleNotify(infoPtr, NM_RCLICK)) + { + TREEVIEW_RButtonUp(infoPtr, &ht.pt); + } } return 0;

1 0

Daniel Jelinski : comctl32/treeview: Send WM_CONTEXTMENU everywhere, not just over items.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: c7212f8262a6aeac9856a1d22668bca0fc47dd14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7212f8262a6aeac9856a1d22… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Jul 13 20:42:33 2012 +0200 comctl32/treeview: Send WM_CONTEXTMENU everywhere, not just over items. --- dlls/comctl32/treeview.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index e55c941..88c1ff4 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4274,17 +4274,12 @@ TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt) ht.pt = *pPt; - TREEVIEW_HitTest(infoPtr, &ht); - - if (ht.hItem) - { - /* Change to screen coordinate for WM_CONTEXTMENU */ - ClientToScreen(infoPtr->hwnd, &ht.pt); + /* Change to screen coordinate for WM_CONTEXTMENU */ + ClientToScreen(infoPtr->hwnd, &ht.pt); - /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ - SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU, - (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); - } + /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ + SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU, + (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); return 0; }

1 0

Daniel Jelinski : comctl32/treeview: Inlined TREEVIEW_RButtonUp.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 5e86d843374333558d362fa9f5d379ac2e4e1d73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e86d843374333558d362fa9f… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Jul 13 20:47:45 2012 +0200 comctl32/treeview: Inlined TREEVIEW_RButtonUp. --- dlls/comctl32/treeview.c | 25 ++++++------------------- 1 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 88c1ff4..b784924 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -208,7 +208,6 @@ static VOID TREEVIEW_Invalidate(const TREEVIEW_INFO *, const TREEVIEW_ITEM *); static LRESULT TREEVIEW_DoSelectItem(TREEVIEW_INFO *, INT, HTREEITEM, INT); static VOID TREEVIEW_SetFirstVisible(TREEVIEW_INFO *, TREEVIEW_ITEM *, BOOL); static LRESULT TREEVIEW_EnsureVisible(TREEVIEW_INFO *, HTREEITEM, BOOL); -static LRESULT TREEVIEW_RButtonUp(const TREEVIEW_INFO *, const POINT *); static LRESULT TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel); static VOID TREEVIEW_UpdateScrollBars(TREEVIEW_INFO *infoPtr); static LRESULT TREEVIEW_HScroll(TREEVIEW_INFO *, WPARAM); @@ -4260,7 +4259,12 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) SetFocus(infoPtr->hwnd); if(!TREEVIEW_SendSimpleNotify(infoPtr, NM_RCLICK)) { - TREEVIEW_RButtonUp(infoPtr, &ht.pt); + /* Change to screen coordinate for WM_CONTEXTMENU */ + ClientToScreen(infoPtr->hwnd, &ht.pt); + + /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ + SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU, + (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); } } @@ -4268,23 +4272,6 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) } static LRESULT -TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt) -{ - TVHITTESTINFO ht; - - ht.pt = *pPt; - - /* Change to screen coordinate for WM_CONTEXTMENU */ - ClientToScreen(infoPtr->hwnd, &ht.pt); - - /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ - SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU, - (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); - return 0; -} - - -static LRESULT TREEVIEW_CreateDragImage(TREEVIEW_INFO *infoPtr, LPARAM lParam) { TREEVIEW_ITEM *dragItem = (HTREEITEM)lParam;

1 0

Daniel Jelinski : comctl32/treeview: Send WM_CONTEXTMENU only to parent window.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 067d528855940fd169366829736578ff808c56ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=067d528855940fd1693668297… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Jul 13 20:53:09 2012 +0200 comctl32/treeview: Send WM_CONTEXTMENU only to parent window. --- dlls/comctl32/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index b784924..0b118b7 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4263,7 +4263,7 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) ClientToScreen(infoPtr->hwnd, &ht.pt); /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ - SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU, + SendMessageW(infoPtr->hwndNotify, WM_CONTEXTMENU, (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); } }

1 0