February 2017 - Wine-Commits

Nikolay Sivov : oleview: Use Treeview notifications to release created instances.
by Alexandre Julliard Feb. 6, 2017

Feb. 6, 2017

Module: wine Branch: master Commit: 4c55ea3e1c52410ceeb2093a25f2a67088669757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c55ea3e1c52410ceeb2093a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 6 01:28:01 2017 +0300 oleview: Use Treeview notifications to release created instances. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/oleview/oleview.c | 2 +- programs/oleview/tree.c | 48 ++++++++++++++-------------------------------- 2 files changed, 15 insertions(+), 35 deletions(-) diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index f1713b8..d1877b0 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -469,8 +469,8 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, MenuCommand(LOWORD(wParam), hWnd); break; case WM_DESTROY: - OleUninitialize(); EmptyTree(); + OleUninitialize(); PostQuitMessage(0); break; case WM_MENUSELECT: diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index decedc4..2a4ca65 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -604,40 +604,7 @@ static void AddBaseEntries(void) void EmptyTree(void) { - HTREEITEM cur, del; - TVITEMW tvi; - - tvi.mask = TVIF_PARAM; - cur = (HTREEITEM)SendMessageW(globals.hTree, TVM_GETNEXTITEM, - TVGN_CHILD, (LPARAM)TVI_ROOT); - - while(TRUE) - { - del = cur; - cur = (HTREEITEM)SendMessageW(globals.hTree, TVM_GETNEXTITEM, - TVGN_CHILD, (LPARAM)del); - - if(!cur) cur = (HTREEITEM)SendMessageW(globals.hTree, - TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)del); - if(!cur) - { - cur = (HTREEITEM)SendMessageW(globals.hTree, TVM_GETNEXTITEM, - TVGN_PREVIOUS, (LPARAM)del); - if(!cur) cur = (HTREEITEM)SendMessageW(globals.hTree, - TVM_GETNEXTITEM, TVGN_PARENT, (LPARAM)del); - - tvi.hItem = del; - if(SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi) && tvi.lParam) - { - if(((ITEM_INFO *)tvi.lParam)->loaded) ReleaseInst(del); - HeapFree(GetProcessHeap(), 0, (ITEM_INFO *)tvi.lParam); - - SendMessageW(globals.hTree, TVM_DELETEITEM, 0, (LPARAM)del); - } - - if(!cur) break; - } - } + SendMessageW(globals.hTree, TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT); } void AddTreeEx(void) @@ -678,6 +645,19 @@ static LRESULT CALLBACK TreeProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPa RefreshMenu(((NMTREEVIEWW *)lParam)->itemNew.hItem); RefreshDetails(((NMTREEVIEWW *)lParam)->itemNew.hItem); break; + case TVN_DELETEITEMW: + { + NMTREEVIEWW *nm = (NMTREEVIEWW*)lParam; + ITEM_INFO *info = (ITEM_INFO*)nm->itemOld.lParam; + + if (info) + { + if (info->loaded) + ReleaseInst(nm->itemOld.hItem); + HeapFree(GetProcessHeap(), 0, info); + } + break; + } } break; case WM_SIZE:

1 0

Jactry Zeng : zh: Update search page.
by Jeremy Newman Feb. 6, 2017

Feb. 6, 2017

Module: website Branch: master Commit: 31e074f929fbac781f2c7e7aed4716542e694308 URL: http://source.winehq.org/git/website.git/?a=commit;h=31e074f929fbac781f2c7e… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Feb 4 11:42:57 2017 +0800 zh: Update search page. Signed-off-by: Jactry Zeng <jactry92(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/zh-cn/search.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/zh-cn/search.template b/templates/zh-cn/search.template index d0a976b..719ce66 100644 --- a/templates/zh-cn/search.template +++ b/templates/zh-cn/search.template @@ -1,7 +1,7 @@   -<h1 class="title" style="margin-bottom: 10px;">搜索结果</h1> +<h1 class="title margin-bottom-md">搜索结果</h1> <div id="cse-search-results"></div> <script type="text/javascript">

1 0

Jactry Zeng : zh: Update irc page.
by Jeremy Newman Feb. 6, 2017

Feb. 6, 2017

Module: website Branch: master Commit: 128f0ba827d862e5881a378282819f90d00a526c URL: http://source.winehq.org/git/website.git/?a=commit;h=128f0ba827d862e5881a37… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Feb 4 11:42:46 2017 +0800 zh: Update irc page. Signed-off-by: Jactry Zeng <jactry92(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/zh-cn/irc.template | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/templates/zh-cn/irc.template b/templates/zh-cn/irc.template index e9d9f10..b865e6d 100644 --- a/templates/zh-cn/irc.template +++ b/templates/zh-cn/irc.template @@ -1,5 +1,4 @@  - <h1 class="title">在线聊天社区</h1> @@ -15,10 +14,10 @@ <p>你可以根据你想讨论的话题来选择频道：</p> <blockquote> - <b>#winehq:</b> 用户支持和运行 Wine 的帮助<br /> - <b>#crossover:</b> 用户支持和运行 Crossover 的支持<br /> - <b>#winehackers:</b> 开发和其他对 Wine 的贡献<br /> - <b>#winehq-social:</b> 和其他社区成员闲聊灌水<br /> + <b>#winehq:</b> Wine 用户频道<br /> + <b>#crossover:</b> CrossOver 用户支持频道<br /> + <b>#winehackers:</b> Wine 开发者与其它贡献者频道<br /> + <b>#winehq-social:</b> 灌水闲聊频道<br /> </blockquote> <p>使用 Firefox 或者其他支持 IRC 地址的浏览器，可以通过点击加入聊天：</p> @@ -32,7 +31,7 @@ <p>为了使讨论更加专注和尽可能有效，在 IRC 提问之前可以先尝试搜索你的问题。 <a href="https://wiki.winehq.org/FAQ">Wine FAQ</a>、 <a href="//appdb.winehq.org">AppDB</a>、 -<a href="//www.winehq.org/site/download">下载页面</a> 都是值得首先检查的资源。</p> +<a href="//www.winehq.org/download">下载页面</a> 都是值得首先查阅的资源。</p> <h2>IRC 规定和惩罚</h2> @@ -45,54 +44,58 @@ <a href="mailto:wine-devel(a)winehq.org">wine-devel 邮件列表</a>，当你被禁止进入 <b>#winehq-social</b> 时），并且首先解释你为什么会被禁止和为什么你认为禁令应该解除。</p> -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - <tr align="center" bgcolor="black"> - <th><b><font color="white" class="small">规定</font></b></th> - <th><b><font color="white" class="small">说明</font></b></th> - <th><b><font color="white" class="small">警告</font></b></th> - <th><b><font color="white" class="small">踢出</font></b></th> +<table class="table"> +<thead> + <tr class="black inverse small"> + <th>规定</th> + <th>说明</th> + <th>警告</th> + <th>踢出</th> </tr> - <tr bgcolor="#ffffff"> +</thead> +<tbody> + <tr> <td>不要发送垃圾邮件。</td> <td></td> <td>1</td> <td>2</td> </tr> - <tr bgcolor="#ffffff"> + <tr> <td>当粘贴内容超过一或两行时者使用 pastebin。</td> <td><a href="http://winehq.pastebin.com">winehq.pastebin.com</a> 和 <a href="http://pastebin.ca">pastebin.ca</a> 都是可以使用的。</td> <td>0</td> <td>5</td> </tr> - <tr bgcolor="#ffffff"> + <tr> <td>在合适的频道中讨论合适的话题。</td> <td>如果不确定，可以在 <b>#winehq</b> 询问应该加入什么频道。</td> <td>2</td> <td>3</td> </tr> - <tr bgcolor="#ffffff"> + <tr> <td>只有 Wine 和 Crossover 才会在他们对应的频道获得支持。</td> <td>Sidenet、WineDoors、Cedega、IEs4Linux 等等是<b>不会</b>被支持的。</td> <td>2</td> <td>1</td> </tr> - <tr bgcolor="#ffffff"> + <tr> <td>在 <b>#winehq</b> 提问前，确保你正在使用的是最新版本的 Wine。</td> <td>如果不确定，在命令行中使用 <tt>wine --version</tt> 来确定你的版本。</td> <td>3</td> <td>1</td> </tr> - <tr bgcolor="#ffffff"> + <tr> <td>请等候直到轮到你获取帮助。</td> <td></td> <td>3</td> <td>1</td> </tr> - <tr bgcolor="#ffffff"> + <tr> <td><b>不要</b>讨论有关盗版软件的。</td> <td></td> <td>1</td> <td>1</td> </tr> +</tbody> </table>

1 0

Jactry Zeng : zh: Update home page.
by Jeremy Newman Feb. 6, 2017

Feb. 6, 2017

Module: website Branch: master Commit: 172bfbfde0174d6a374531af068c9b0521ae73e8 URL: http://source.winehq.org/git/website.git/?a=commit;h=172bfbfde0174d6a374531… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Feb 4 11:43:09 2017 +0800 zh: Update home page. Signed-off-by: Jactry Zeng <jactry92(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/zh-cn/home.template | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/templates/zh-cn/home.template b/templates/zh-cn/home.template index 5bb785f..f0df5d5 100644 --- a/templates/zh-cn/home.template +++ b/templates/zh-cn/home.template @@ -1,7 +1,7 @@    - +  <div class="row"> @@ -53,7 +53,7 @@ Wine 不是像虚拟机或者模拟器一样模仿内部的 Windows 逻辑，而 <a class="winehq_menu_item dl" href="{$root}/download"> <span class="icon"></span> <span class="title">下载</span> - <span class="subtitle">安装最新的 Wine.</span> + <span class="subtitle">安装最新版的 Wine.</span> </a> <div class="clear"></div> @@ -64,10 +64,10 @@ Wine 不是像虚拟机或者模拟器一样模仿内部的 Windows 逻辑，而 </a> <div class="clear"></div> - <a class="winehq_menu_item devel" href="{$root}/devel"> + <a class="winehq_menu_item devel" href="{$root}/getinvolved"> <span class="icon"></span> - <span class="title">开发</span> - <span class="subtitle">成为 Wine 开发者.</span> + <span class="title">参与</span> + <span class="subtitle">成为 Wine 维护者.</span> </a> <div class="clear"></div> @@ -85,10 +85,12 @@ Wine 不是像虚拟机或者模拟器一样模仿内部的 Windows 逻辑，而 <div class="whq-page-container margin-top-md"> - <h1 class="title"><a href="{$root}/news">新闻</a></h1> + <h1 class="title"><a href="{$root}/news">新闻与更新</a></h1> -  +  - <p><a href="{$root}/news">更多新闻……</a></p> + <p><a href="{$root}/news" class="btn btn-default"><span class="glyphicon glyphicon-chevron-right"></span> 更多新闻...</a></p> </div> + +

1 0

Alexandre Julliard : Wine release 2.1
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: website Branch: master Commit: 2eb1620b2b2de5789256c6e1c26dd59c8ee77d07 URL: http://source.winehq.org/git/website.git/?a=commit;h=2eb1620b2b2de5789256c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 3 20:31:44 2017 +0100 Wine release 2.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017020301.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/news/en/2017020301.xml b/news/en/2017020301.xml new file mode 100644 index 0000000..2f01c18 --- /dev/null +++ b/news/en/2017020301.xml @@ -0,0 +1,19 @@ +<news> +<date>February 3, 2017</date> +<title>Wine 2.1 Released</title> +<body> +<p> The Wine development release 2.1 is now available.</p> +<p> <a href="{$root}/announce/2.1">What's new</a> in this release: +<ul> + <li>Many fixes that were deferred during code freeze.</li> + <li>More Shader Model 5 instructions.</li> + <li>A number of improvements to MIME message handling.</li> + <li>Line breaking improvements in DirectWrite.</li> + <li>HID bus service now running by default.</li> + <li>Direct2D rendering improvements.</li> + <li>Various bug fixes.</li> + <li>Source release tarballs now use xz compression.</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.1.tar.xz">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>. +</p></body></news>

1 0

Alexandre Julliard : Release 2.1.
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: e08ed6cac218fc09044d06d3cbe2a54f7ec898cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e08ed6cac218fc09044d06d3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 3 20:26:41 2017 +0100 Release 2.1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 930 ++++++++++++++++++++++++++++++++++++++++---------------------- AUTHORS | 6 + VERSION | 2 +- configure | 18 +- 4 files changed, 625 insertions(+), 331 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e08ed6cac218fc09044d0…

1 0

Tag wine-2.1 : Alexandre Julliard : Release 2.1
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: refs/tags/wine-2.1 Tag: 4256f6ebc641c4c5e3bdc1bec1684da1d511cb3b URL: http://source.winehq.org/git/wine.git/?a=tag;h=4256f6ebc641c4c5e3bdc1bec168… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 3 20:29:25 2017 +0100 Release 2.1

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: f8adb5cad859bc2b113be49d51423044e324c81a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8adb5cad859bc2b113be49d5… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Feb 3 17:34:27 2017 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 54 +++++++++++++++++------------------------------------- 1 file changed, 17 insertions(+), 37 deletions(-) diff --git a/po/fi.po b/po/fi.po index 5cc1ee3..1d96ab3 100644 --- a/po/fi.po +++ b/po/fi.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: 2014-01-11 13:40+0200\n" +"PO-Revision-Date: 2017-02-03 17:32+0200\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: Finnish\n" "Language: fi\n" @@ -8352,10 +8352,8 @@ msgid "Wine Control Panel" msgstr "Winen Ohjauspaneeli" #: shell32.rc:195 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" -msgstr "Suorita tiedosto -valintaikkunaa ei voida näyttää (sisäinen virhe)" +msgstr "Suorita-valintaikkunaa ei voida näyttää (sisäinen virhe)" #: shell32.rc:196 msgid "Unable to display Browse dialog box (internal error)" @@ -11881,52 +11879,44 @@ msgid "(unknown %d)" msgstr "(tuntematon %d)" #: regedit.rc:212 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to modify the selected registry value." -msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "Valitun rekisteriarvon muokkaaminen ei onnistu." #: regedit.rc:213 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry key." -msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "Uuden rekisteriavaimen luominen ei onnistu." #: regedit.rc:214 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry value." -msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "Uuden rekisteriarvon luominen ei onnistu." #: regedit.rc:215 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"Avaimen '%1' nimeäminen ei onnistu.\n" +"Annettu avaimen nimi on jo varattu." #: regedit.rc:216 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"Arvon '%1' nimeäminen ei onnistu.\n" +"Annettu arvon nimi on jo varattu." #: regedit.rc:217 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to delete the selected registry key." -msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "Valitun rekisteriavaimen poistaminen ei onnistu." #: regedit.rc:218 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry key." -msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "Valitun rekisteriavaimen uudelleennimeäminen ei onnistu." #: regedit.rc:219 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry value." -msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "Valitun rekisteriarvon uudelleennimeäminen ei onnistu." #: regedit.rc:371 msgid "" @@ -12154,32 +12144,24 @@ msgid "Displays program information, version number and copyright" msgstr "Näyttää ohjelman tiedot, versionumeron ja tekijänoikeustiedot" #: regedit.rc:181 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry value '%1'." -msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "Rekisteriarvon '%1' hakeminen ei onnistu." #: regedit.rc:182 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "Ei voida muokata avaimia tälle tyypille (%u)" +msgstr "Tämän tyypin (%1!u!) rekisteriavainten muokkaaminen ei onnistu." #: regedit.rc:183 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "Arvo on liian suuri (%u)" +msgstr "Arvo on liian suuri (%1!u!)." #: regedit.rc:184 msgid "Confirm Value Delete" msgstr "Vahvista arvon tuhoaminen" #: regedit.rc:189 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "Haettua merkkijonoa '%s' ei löydy" +msgstr "Haku on valmis. Merkkijonoa '%1' ei löydy." #: regedit.rc:186 msgid "Are you sure you want to delete these values?" @@ -12194,10 +12176,8 @@ msgid "New Value #%d" msgstr "Uusi arvo #%d" #: regedit.rc:180 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry key '%1'." -msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "Rekisteriavaimen '%1' hakeminen ei onnistu." #: regedit.rc:152 msgid "Adds a new multi-string value"

1 0

Józef Kucia : d3d9: Fix query result data for not started queries.
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: 6b6c6069ed86e5c1e91ee2e6ab83f6a65178198f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6c6069ed86e5c1e91ee2e6a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 3 14:08:47 2017 +0100 d3d9: Fix query result data for not started queries. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/query.c | 11 ++++++++++- dlls/d3d9/tests/device.c | 16 ++++++++-------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index ba66058..e4f84c3 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -159,7 +159,8 @@ static HRESULT WINAPI d3d9_query_GetData(IDirect3DQuery9 *iface, void *data, DWO size = sizeof(data_disjoint.disjoint); hr = wined3d_query_get_data(query->wined3d_query, &data_disjoint, sizeof(data_disjoint), flags); - memcpy(data, &data_disjoint.disjoint, size); + if (SUCCEEDED(hr)) + memcpy(data, &data_disjoint.disjoint, size); } else { @@ -168,7 +169,15 @@ static HRESULT WINAPI d3d9_query_GetData(IDirect3DQuery9 *iface, void *data, DWO wined3d_mutex_unlock(); if (hr == D3DERR_INVALIDCALL) + { + if (data) + { + DWORD data_size = d3d9_query_GetDataSize(iface); + memset(data, 0, size); + memset(data, 0xdd, min(size, data_size)); + } return S_OK; + } return hr; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 28bc2ec..e776515 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5598,7 +5598,7 @@ static void test_occlusion_query(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DQuery9_GetData(query, &data, data_size, D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(data.dword[0] == 0xdddddddd && data.dword[1] == 0xffffffff, + ok(data.dword[0] == 0xdddddddd && data.dword[1] == 0xffffffff, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); @@ -5810,7 +5810,7 @@ static void test_timestamp_query(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DQuery9_GetData(freq_query, freq, sizeof(DWORD), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(freq[0] == 0xdddddddd && freq[1] == 0xffffffff, + ok(freq[0] == 0xdddddddd && freq[1] == 0xffffffff, "Got unexpected query result 0x%08x%08x.\n", freq[1], freq[0]); hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_TIMESTAMPDISJOINT, &disjoint_query); @@ -5823,12 +5823,12 @@ static void test_timestamp_query(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DQuery9_GetData(disjoint_query, &disjoint, sizeof(WORD), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(disjoint[0] == 0xdddd && disjoint[1] == 0xffff, - "Got unexpected query result 0x%08x%08x.\n", disjoint[1], disjoint[0]); + ok(disjoint[0] == 0xdddd && disjoint[1] == 0xffff, + "Got unexpected query result 0x%04x%04x.\n", disjoint[1], disjoint[0]); hr = IDirect3DQuery9_GetData(disjoint_query, &disjoint, sizeof(DWORD), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(disjoint[0] == 0xdddd && disjoint[1] == 0xdddd, - "Got unexpected query result 0x%08x%08x.\n", disjoint[1], disjoint[0]); + ok(disjoint[0] == 0xdddd && disjoint[1] == 0xdddd, + "Got unexpected query result 0x%04x%04x.\n", disjoint[1], disjoint[0]); hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_TIMESTAMP, &query); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -5860,11 +5860,11 @@ static void test_timestamp_query(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DQuery9_GetData(query, timestamp, sizeof(DWORD), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(timestamp[0] == 0xdddddddd && timestamp[1] == 0xffffffff, + ok(timestamp[0] == 0xdddddddd && timestamp[1] == 0xffffffff, "Got unexpected query result 0x%08x%08x.\n", timestamp[1], timestamp[0]); hr = IDirect3DQuery9_GetData(query, timestamp, sizeof(timestamp), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(timestamp[0] == 0xdddddddd && timestamp[1] == 0xdddddddd, + ok(timestamp[0] == 0xdddddddd && timestamp[1] == 0xdddddddd, "Got unexpected query result 0x%08x%08x.\n", timestamp[1], timestamp[0]); hr = IDirect3DQuery9_Issue(disjoint_query, D3DISSUE_END);

1 0

Nikolay Sivov : gdiplus: Added GdipGetCustomLineCapType().
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: 4e685ebb9bf3cb2f2a1c33975acdee96ac984d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e685ebb9bf3cb2f2a1c33975… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 3 16:42:06 2017 +0300 gdiplus: Added GdipGetCustomLineCapType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/customlinecap.c | 12 ++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/tests/customlinecap.c | 45 ++++++++++++++++++++++++++++++++++++++ include/gdiplusenums.h | 7 ++++++ include/gdiplusflat.h | 1 + 6 files changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 9f4eb40..ca81bee 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -77,6 +77,7 @@ GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath* fillPath, GpPath* strokePath *customCap = heap_alloc_zero(sizeof(GpCustomLineCap)); if(!*customCap) return OutOfMemory; + (*customCap)->type = CustomLineCapTypeDefault; if(strokePath){ (*customCap)->fill = FALSE; pathdata = &strokePath->pathdata; @@ -245,6 +246,17 @@ GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap *customCap, GpLi return Ok; } +GpStatus WINGDIPAPI GdipGetCustomLineCapType(GpCustomLineCap *customCap, CustomLineCapType *type) +{ + TRACE("(%p, %p)\n", customCap, type); + + if(!customCap || !type) + return InvalidParameter; + + *type = customCap->type; + return Ok; +} + GpStatus WINGDIPAPI GdipCreateAdjustableArrowCap(REAL height, REAL width, BOOL fill, GpAdjustableArrowCap **cap) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 98167af..8cf5ab3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -240,7 +240,7 @@ 240 stdcall GdipGetCustomLineCapBaseInset(ptr ptr) 241 stub GdipGetCustomLineCapStrokeCaps 242 stdcall GdipGetCustomLineCapStrokeJoin(ptr ptr) -243 stub GdipGetCustomLineCapType +243 stdcall GdipGetCustomLineCapType(ptr ptr) 244 stdcall GdipGetCustomLineCapWidthScale(ptr ptr) 245 stdcall GdipGetDC(ptr ptr) 246 stdcall GdipGetDpiX(ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 340e9bd..b44340f 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -327,6 +327,7 @@ struct GpPathIterator{ }; struct GpCustomLineCap{ + CustomLineCapType type; GpPathData pathdata; BOOL fill; /* TRUE for fill, FALSE for stroke */ GpLineCap cap; /* as far as I can tell, this value is ignored */ diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index c2a1dab..704f70e 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -267,6 +267,50 @@ todo_wine GdipDeleteCustomLineCap((GpCustomLineCap*)cap); } +static void test_captype(void) +{ + GpAdjustableArrowCap *arrowcap; + GpCustomLineCap *custom; + CustomLineCapType type; + GpStatus stat; + GpPath *path; + + stat = GdipGetCustomLineCapType(NULL, NULL); + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + + type = 10; + stat = GdipGetCustomLineCapType(NULL, &type); + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + ok(type == 10, "Unexpected cap type, %d\n", type); + + /* default cap */ + stat = GdipCreatePath(FillModeAlternate, &path); + ok(stat == Ok, "Failed to create path, %d\n", stat); + stat = GdipAddPathRectangle(path, 5.0, 5.0, 10.0, 10.0); + ok(stat == Ok, "AddPathRectangle failed, %d\n", stat); + + stat = GdipCreateCustomLineCap(NULL, path, LineCapFlat, 0.0, &custom); + ok(stat == Ok, "Failed to create cap, %d\n", stat); + stat = GdipGetCustomLineCapType(custom, &type); + ok(stat == Ok, "Failed to get cap type, %d\n", stat); + ok(type == CustomLineCapTypeDefault, "Unexpected cap type %d\n", stat); + GdipDeleteCustomLineCap(custom); + GdipDeletePath(path); + + /* arrow cap */ + stat = GdipCreateAdjustableArrowCap(17.0, 15.0, TRUE, &arrowcap); +todo_wine + ok(stat == Ok, "Failed to create adjustable cap, %d\n", stat); + if (stat != Ok) + return; + + stat = GdipGetCustomLineCapType((GpCustomLineCap*)arrowcap, &type); + ok(stat == Ok, "Failed to get cap type, %d\n", stat); + ok(type == CustomLineCapTypeAdjustableArrow, "Unexpected cap type %d\n", stat); + + GdipDeleteCustomLineCap((GpCustomLineCap*)arrowcap); +} + START_TEST(customlinecap) { struct GdiplusStartupInput gdiplusStartupInput; @@ -284,6 +328,7 @@ START_TEST(customlinecap) test_inset(); test_scale(); test_create_adjustable_cap(); + test_captype(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 1b1db6f..905a87a 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -73,6 +73,12 @@ enum LineCap LineCapAnchorMask = 0xf0 }; +enum CustomLineCapType +{ + CustomLineCapTypeDefault = 0, + CustomLineCapTypeAdjustableArrow = 1 +}; + enum PathPointType{ PathPointTypeStart = 0, /* start of a figure */ PathPointTypeLine = 1, @@ -712,6 +718,7 @@ typedef enum BrushType BrushType; typedef enum DriverStringOptions DriverStringOptions; typedef enum FillMode FillMode; typedef enum LineCap LineCap; +typedef enum CustomLineCapType CustomLineCapType; typedef enum PathPointType PathPointType; typedef enum LineJoin LineJoin; typedef enum QualityMode QualityMode; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 101d73d..6e5b23f 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -94,6 +94,7 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin); GpStatus WINGDIPAPI GdipGetCustomLineCapWidthScale(GpCustomLineCap*,REAL*); GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap*,REAL); GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap*,REAL); +GpStatus WINGDIPAPI GdipGetCustomLineCapType(GpCustomLineCap*,CustomLineCapType*); /* Font */ GpStatus WINGDIPAPI GdipCloneFont(GpFont*,GpFont**);

1 0