wine-devel

wine-devel@winehq.org

4 participants
84464 discussions

[PATCH] WWN ISS 419
by Cressida Silver 27 May '22

27 May '22

--- news/en/2022052702.xml | 13 ++ wwn/en/wn20220527_419.xml | 440 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 453 insertions(+) create mode 100644 news/en/2022052702.xml create mode 100644 wwn/en/wn20220527_419.xml diff --git a/news/en/2022052702.xml b/news/en/2022052702.xml new file mode 100644 index 00000000..b6c1ddd7 --- /dev/null +++ b/news/en/2022052702.xml @@ -0,0 +1,13 @@ +<news> + <date>May 27, 2022</date> + <title>World Wine News Issue 419</title> + <body> + <a href="{$root}/wwn/419">WWN Issue 419</a> was released today. + <p> + <ul> + <li><a href="{$root}/wwn/419#Wine 7.9" class="">Wine 7.9</a></li> + <li><a href="{$root}/wwn/419#A Bug's Life" class="">A Bug's Life</a></li> + </ul> + </p> + </body> +</news> diff --git a/wwn/en/wn20220527_419.xml b/wwn/en/wn20220527_419.xml new file mode 100644 index 00000000..f449208d --- /dev/null +++ b/wwn/en/wn20220527_419.xml @@ -0,0 +1,440 @@ +<kc> + <title>Wine Traffic</title> + <author contact="mailto:wwn@winehq.org">Cressida Silver</author> + <issue num="419" date="5/27/2022"/> + <intro> + <p> + This is the 419th issue of the World Wine News publication. Its main goal is to inform you of what's going on around Wine. + Wine is an open-source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. + Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code. + </p> + </intro> + + <section title="Wine 7.9"> + <p> + <a href="https://www.winehq.org/wwn/408#Conversion%20to%20PE%20Files">PE</a> conversion marches onward — preliminary work started for the macOS driver. + </p> + + <p> + Bugs closed with this release are listed below. + </p> + + </section> + + <section title="A Bug's Life"> + <p> + <center> + <table border="2"> + <tr> + <td width="100" align="center"> + <b>Bug ID</b> + </td> + <td width="100" align="center"> + <b>Open Date</b> + </td> + <td width="100" align="center"> + <b>Days Open</b> + </td> + <td width="100" align="center"> + <b>Weeks Open</b> + </td> + <td width="100" align="center"> + <b>Months Open</b> + </td> + <td width="100" align="center"> + <b>Years Open</b> + </td> + <td width="850" align="center"> + <b>Bug Summary</b> + </td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=14841">14841</a> + </td> + <td align="center">8/11/08</td> + <td align="center">5,030</td> + <td align="center">719</td> + <td align="center">165</td> + <td align="center">14</td> + <td>ntdll:file tests are flaky</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=19183">19183</a> + </td> + <td align="center">7/4/09</td> + <td align="center">4,703</td> + <td align="center">672</td> + <td align="center">154</td> + <td align="center">13</td> + <td>"make test" still fails on d3d9/tests/visual.c</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=28220">28220</a> + </td> + <td align="center">8/29/11</td> + <td align="center">3,917</td> + <td align="center">560</td> + <td align="center">128</td> + <td align="center">11</td> + <td>kernel32/process.ok: test fails when redirected</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=28508">28508</a> + </td> + <td align="center">9/27/11</td> + <td align="center">3,888</td> + <td align="center">555</td> + <td align="center">127</td> + <td align="center">11</td> + <td>user32:monitor tests fail occasionally</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=34782">34782</a> + </td> + <td align="center">10/22/13</td> + <td align="center">3,132</td> + <td align="center">447</td> + <td align="center">102</td> + <td align="center">9</td> + <td>crypt32/chain tests crash with gcc-4.8.1 (win64)</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=39346">39346</a> + </td> + <td align="center">9/27/15</td> + <td align="center">2,427</td> + <td align="center">347</td> + <td align="center">79</td> + <td align="center">7</td> + <td>Lego Rock Raiders crashes on startup (d3drm_device_init doesn't handle device version 3 case)</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=45959">45959</a> + </td> + <td align="center">10/8/18</td> + <td align="center">1,320</td> + <td align="center">189</td> + <td align="center">43</td> + <td align="center">4</td> + <td>Editpad Lite 7 GUI not rendered correctly</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=45960">45960</a> + </td> + <td align="center">10/9/18</td> + <td align="center">1,319</td> + <td align="center">188</td> + <td align="center">43</td> + <td align="center">4</td> + <td>Editpad Lite 7 displays empty boxes instead of text in some menus</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=49285">49285</a> + </td> + <td align="center">5/28/20</td> + <td align="center">722</td> + <td align="center">103</td> + <td align="center">23</td> + <td align="center">2</td> + <td>PNotesPortable crashes inside WritePrivateProfileStructW</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=50462">50462</a> + </td> + <td align="center">1/6/21</td> + <td align="center">499</td> + <td align="center">71</td> + <td align="center">16</td> + <td align="center">1</td> + <td>Ulead Photo Explorer 8.5 crashes on startup (needs {4a2286e0-7bef-11ce-9bd9-0000e202599c} CLSID_CMpegAudioCodec)</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51104">51104</a> + </td> + <td align="center">5/7/21</td> + <td align="center">378</td> + <td align="center">54</td> + <td align="center">12</td> + <td align="center">1</td> + <td>mf:mf crashes on Windows + AMD/NVidia</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51283">51283</a> + </td> + <td align="center">6/17/21</td> + <td align="center">337</td> + <td align="center">48</td> + <td align="center">11</td> + <td align="center">1</td> + <td>d3d8:device breaks evr:evr on w7u-2qxl</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51297">51297</a> + </td> + <td align="center">6/20/21</td> + <td align="center">334</td> + <td align="center">48</td> + <td align="center">11</td> + <td align="center">1</td> + <td>d3d8:visual & d3d9:visual, test_sample_mask() fails on Nvidia (cw-gtx560)</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51298">51298</a> + </td> + <td align="center">6/20/21</td> + <td align="center">334</td> + <td align="center">48</td> + <td align="center">11</td> + <td align="center">1</td> + <td>d3d8:visual: lighting_test() fails on Windows 10 >= 2004</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51376">51376</a> + </td> + <td align="center">7/1/21</td> + <td align="center">323</td> + <td align="center">46</td> + <td align="center">10</td> + <td align="center">1</td> + <td>Wine causes PC to lock or crash wine when loading more than 1 VST addon into WaveLab 6</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51612">51612</a> + </td> + <td align="center">8/15/21</td> + <td align="center">278</td> + <td align="center">40</td> + <td align="center">9</td> + <td align="center">1</td> + <td>Stellaris launcher (Paradox) does not launch</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51680">51680</a> + </td> + <td align="center">8/25/21</td> + <td align="center">268</td> + <td align="center">38</td> + <td align="center">8</td> + <td align="center">1</td> + <td>nsi:nsi test_ip_neighbour() fails on unreachable link local entry</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51783">51783</a> + </td> + <td align="center">9/23/21</td> + <td align="center">239</td> + <td align="center">34</td> + <td align="center">7</td> + <td align="center">1</td> + <td>The ieframe:webbrowser output is too big in Wine</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51827">51827</a> + </td> + <td align="center">10/1/21</td> + <td align="center">231</td> + <td align="center">33</td> + <td align="center">7</td> + <td align="center">1</td> + <td>d3dx10_34:d3dx10 crashes on all versions of Windows</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52686">52686</a> + </td> + <td align="center">3/17/22</td> + <td align="center">64</td> + <td align="center">9</td> + <td align="center">2</td> + <td align="center">0</td> + <td>DateAdd not implemented</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52751">52751</a> + </td> + <td align="center">3/30/22</td> + <td align="center">51</td> + <td align="center">7</td> + <td align="center">1</td> + <td align="center">0</td> + <td>`winetricks nocrashdialog` no longer works properly with Wine 7.5(but works with 7.4)</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52761">52761</a> + </td> + <td align="center">4/1/22</td> + <td align="center">49</td> + <td align="center">7</td> + <td align="center">1</td> + <td align="center">0</td> + <td>mscoree:mscoree test fails without a display or console</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52821">52821</a> + </td> + <td align="center">4/15/22</td> + <td align="center">35</td> + <td align="center">5</td> + <td align="center">1</td> + <td align="center">0</td> + <td>Cxbx Reloaded needs unimplemented function msvcp140_atomic_wait.dll.__std_atomic_wait_direct</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52848">52848</a> + </td> + <td align="center">4/21/22</td> + <td align="center">29</td> + <td align="center">4</td> + <td align="center">0</td> + <td align="center">0</td> + <td>Mavis Beacon Teaches Typing 15: Typed characters not spaced correctly</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52874">52874</a> + </td> + <td align="center">4/23/22</td> + <td align="center">27</td> + <td align="center">4</td> + <td align="center">0</td> + <td align="center">0</td> + <td>win32u change prevents chromium from starting</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52892">52892</a> + </td> + <td align="center">4/26/22</td> + <td align="center">24</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td>The 64-bit ntdll:thread fails on w7pro64 and w864</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52908">52908</a> + </td> + <td align="center">4/26/22</td> + <td align="center">24</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td>mf:mf - The 64-bit test_wma_decoder() fails on 64-bit Debian 11 + Intel</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52914">52914</a> + </td> + <td align="center">4/26/22</td> + <td align="center">24</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td>mf:mf - The 64-bit test_h264_decoder() fails on 64-bit Debian 11 + Intel GPU</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52937">52937</a> + </td> + <td align="center">4/29/22</td> + <td align="center">21</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td>msvcr110:msvcr110 fails on Windows with the UTF-8 codepage</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52961">52961</a> + </td> + <td align="center">5/6/22</td> + <td align="center">14</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + <td>crypt32:str - test_CertGetNameString() fails on Windows 7</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52969">52969</a> + </td> + <td align="center">5/6/22</td> + <td align="center">14</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + <td>mshtml:script fails on up-to-date Windows 8.1 machines</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52970">52970</a> + </td> + <td align="center">5/6/22</td> + <td align="center">14</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + <td>kernelbase:process breaks lz32:lzexpand_main on Windows 1809+</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52975">52975</a> + </td> + <td align="center">5/8/22</td> + <td align="center">12</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + <td>VTFEdit fails to start: err:module:LdrInitializeThunk "MSVCP80.dll" failed to initialize, aborting</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=53004">53004</a> + </td> + <td align="center">5/14/22</td> + <td align="center">6</td> + <td align="center">1</td> + <td align="center">0</td> + <td align="center">0</td> + <td>63ce060 causes a white border line in winecfg</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=53015">53015</a> + </td> + <td align="center">5/17/22</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td align="center">0</td> + <td>winscp bookmark adding error</td> + </tr> + </table> + </center> + </p> + </section> +</kc> -- 2.25.1

1 0

[PATCH v2 0/2] MR138: d3drm: IDirect3DRMTexture3 Get/SetDecalTransparency
by Alistair Leslie-Hughes (＠alesliehughes) 27 May '22

27 May '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v2: d3drm: IDirect3DRMTexture3 Get/SetDecalSize https://gitlab.winehq.org/wine/wine/-/merge_requests/138

3 4

[PATCH 0/2] MR143: d3drm: Implement more IDirect3DRMTexture3 methods.
by Zebediah Figura (＠zfigura) 27 May '22

27 May '22

This supersedes merge request 138. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/143

2 2

[PATCH v2 0/2] MR130: user32: Progress toward PE conversion of raw input APIs.
by Zebediah Figura (＠zfigura) 27 May '22

27 May '22

-- v2: d3drm: Implement IDirect3DRMTexture3::{Get,Set}DecalSize(). d3drm: Implement IDirect3DRMTexture3::{Get,Set}DecalTransparency(). https://gitlab.winehq.org/wine/wine/-/merge_requests/130

2 2

[PATCH v2 0/7] MR141: d3d11: Initialize output pointers on failure
by Nikolay Sivov (＠nsivov) 27 May '22

27 May '22

Similar changes were done before for views, that fixed actual issue when object couldn't and shouldn't have been created, but pointer was still used afterwards. These are the same kind of changes for shader objects. -- v2: d3d11: Always initialize out shader pointer in CreateComputeShader(). d3d11: Always initialize out shader pointer in CreateDomainShader(). d3d11: Always initialize out shader pointer in CreateHullShader(). d3d11: Always initialize out shader pointer in CreatePixelShader(). d3d11: Always initialize out shader pointer in CreateGeometryShaderWithStreamOutput(). d3d11: Always initialize out shader pointer in CreateGeometryShader(). d3d11: Always initialize out shader pointer in CreateVertexShader(). https://gitlab.winehq.org/wine/wine/-/merge_requests/141

4 11

[PATCH 1/4] mshtml: Handle empty strings in heap_strndupWtoU.
by Gabriel Ivăncescu 27 May '22

27 May '22

The HTTP response header status text can be empty, so process_response_status_text would erroneously return E_OUTOFMEMORY. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/mshtml_private.h | 6 +++--- dlls/wininet/tests/http.c | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ad1fca0..0a7c3a2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1392,11 +1392,11 @@ static inline char *heap_strndupWtoU(LPCWSTR str, unsigned len) char *ret = NULL; DWORD size; - if(str && len) { - size = WideCharToMultiByte(CP_UTF8, 0, str, len, NULL, 0, NULL, NULL); + if(str) { + size = len ? WideCharToMultiByte(CP_UTF8, 0, str, len, NULL, 0, NULL, NULL) : 0; ret = heap_alloc(size + 1); if(ret) { - WideCharToMultiByte(CP_UTF8, 0, str, len, ret, size, NULL, NULL); + if(len) WideCharToMultiByte(CP_UTF8, 0, str, len, ret, size, NULL, NULL); ret[size] = '\0'; } } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ec576ae..bc1b829 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4526,6 +4526,13 @@ static const http_status_test_t http_status_tests[] = { 200, "" }, + { + "HTTP/1.1 200 \r\n" + "Content-Length: 1\r\n" + "\r\nx", + 200, + "" + }, { "HTTP/1.1 410 \r\n" "Content-Length: 1\r\n" -- 2.34.1

3 8

[PATCH 0/5] MR142: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 27 May '22

27 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/142

3 6

[PATCH v2 0/2] MR135: Cancel asyncs queued by thread when the thread is terminated
by Paul Gofman (＠gofman) 27 May '22

27 May '22

Inspired by the discussion for MR 127 (https://www.winehq.org/pipermail/wine-devel/2022-May/217832.html) and is aimed to replace the second patch (ws2_32: Use allocated IO status block in select().) in that MR. When the thread calls server's terminate_thread for itself queuing the system APC though SIGUSR1 might race with the thread exit, there seems no easy and reliable way to be sure that signal is processed before the thread's stack and TEB are freed. Thus I am making the system APCs to be queued to the thread to be processed by server_select() after (terminate_thread) server call. When terminate_thread is called for the other thread the system APC will always be delivered through some other thread. Thread stack and TEB are not freed when the thread is killed externally, so completing the async from another thread should probably be fine. -- v2: ntdll: Cancel asyncs when thread is terminated. ws2_32/tests: Add tests for terminated thread asyncs completion. https://gitlab.winehq.org/wine/wine/-/merge_requests/135

2 3

Re: [PATCH 1/2]mscms/test: test whether the value of bmformat is correct.
by Hans Leidekker 27 May '22

27 May '22

On Fri, 2022-05-27 at 16:43 +0800, Zhao Yi wrote: > These profiles belong to a specific printer driver and are required for > data conversion during printing. However, these profiles are not available in > the default wine prefix of the Linux system, resulting in the failure of my > test program. Here's a test using the standard RGB color profile which shows our mapping is wrong. I think this is sufficient to show the general problem and we can assume that the CMYK case should be fixed accordingly.

1 0

[PATCH 0/7] MR141: d3d11: Initialize output pointers on failure
by Nikolay Sivov (＠nsivov) 27 May '22

27 May '22

3 12

[PATCH v2 0/4] MR140: qasf: More ASF reader filter implementation.
by Rémi Bernon (＠rbernon) 27 May '22

27 May '22

-- v2: qasf: Implement ASF Reader filter pin DecideBufferSize. qasf: Implement ASF Reader filter pin_query_accept. winegstreamer: Implement IWMOutputMediaProps_SetMediaType. qasf: Implement ASF Reader filter pin_get_media_type. https://gitlab.winehq.org/wine/wine/-/merge_requests/140

2 4

[PATCH v3 3/3] d2d1: Add some tests for ID2D1Bitmap1::Map()/::Unmap().
by Dmitry Timoshkov 27 May '22

27 May '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/tests/d2d1.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d5adb0c749c..e34d1070637 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11388,6 +11388,78 @@ static void test_image_bounds(BOOL d3d11) release_test_context(&ctx); } +static void test_bitmap_map(BOOL d3d11) +{ + struct d2d1_test_context ctx; + D2D1_SIZE_U size; + IDXGISurface *surface; + ID2D1Bitmap1 *bitmap; + D2D1_MAPPED_RECT mapped_rect; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + set_size_u(&size, 4, 4); + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_NONE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + ID2D1Bitmap1_Release(bitmap); + + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ; + hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_NONE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Unmap(bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Unmap(bitmap); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + + ID2D1Bitmap1_Release(bitmap); + + surface = create_surface(ctx.device, DXGI_FORMAT_B8G8R8A8_UNORM); + + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); + todo_wine + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + ID2D1Bitmap1_Release(bitmap); + + IDXGISurface_Release(surface); + + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -11464,6 +11536,7 @@ START_TEST(d2d1) queue_test(test_effect_grayscale); queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); + queue_test(test_bitmap_map); run_queued_tests(); } -- 2.36.1

2 1

[PATCH v3 2/3] d2d1: Implement ID2D1Bitmap1::Unmap().
by Dmitry Timoshkov 27 May '22

27 May '22

v3: Don't Unmap on Release. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/bitmap.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index a75a9be62be..9d9d980b4c9 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -285,9 +285,23 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_Map(ID2D1Bitmap1 *iface, D2D1_MAP_OP static HRESULT STDMETHODCALLTYPE d2d_bitmap_Unmap(ID2D1Bitmap1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); + ID3D11Device *device; + ID3D11DeviceContext *context; - return E_NOTIMPL; + TRACE("iface %p.\n", iface); + + if (!bitmap->staging_resource) + return D2DERR_WRONG_STATE; + + ID3D11Resource_GetDevice(bitmap->resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + ID3D11DeviceContext_Unmap(context, bitmap->staging_resource, 0); + bitmap->staging_resource = NULL; + ID3D11DeviceContext_Release(context); + ID3D11Device_Release(device); + + return S_OK; } static const struct ID2D1Bitmap1Vtbl d2d_bitmap_vtbl = -- 2.36.1

2 1

[PATCH v2 2/3] d2d1: Implement ID2D1Bitmap1::Unmap().
by Dmitry Timoshkov 27 May '22

27 May '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/bitmap.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index b48c0bf2384..91594ad58a0 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -66,6 +66,8 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap1 *iface) if (!refcount) { + if (bitmap->staging_resource) + ID2D1Bitmap1_Unmap(iface); if (bitmap->srv) ID3D11ShaderResourceView_Release(bitmap->srv); if (bitmap->rtv) @@ -281,9 +283,23 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_Map(ID2D1Bitmap1 *iface, D2D1_MAP_OP static HRESULT STDMETHODCALLTYPE d2d_bitmap_Unmap(ID2D1Bitmap1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); + ID3D11Device *device; + ID3D11DeviceContext *context; - return E_NOTIMPL; + TRACE("iface %p.\n", iface); + + if (!bitmap->staging_resource) + return D2DERR_WRONG_STATE; + + ID3D11Resource_GetDevice(bitmap->resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + ID3D11DeviceContext_Unmap(context, bitmap->staging_resource, 0); + bitmap->staging_resource = NULL; + ID3D11DeviceContext_Release(context); + ID3D11Device_Release(device); + + return S_OK; } static const struct ID2D1Bitmap1Vtbl d2d_bitmap_vtbl = -- 2.36.1

2 2

[PATCH v2 1/3] d2d1: Implement ID2D1Bitmap1::Map().
by Dmitry Timoshkov 27 May '22

27 May '22

v2: Support only D2D1_MAP_OPTIONS_READ and always use staging resource. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/bitmap.c | 49 ++++++++++++++++++++++++++++++++++++++-- dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 971e3c7ff6b..b48c0bf2384 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -229,9 +229,54 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_GetSurface(ID2D1Bitmap1 *iface, IDXG static HRESULT STDMETHODCALLTYPE d2d_bitmap_Map(ID2D1Bitmap1 *iface, D2D1_MAP_OPTIONS options, D2D1_MAPPED_RECT *mapped_rect) { - FIXME("iface %p, options %#x, mapped_rect %p stub!\n", iface, options, mapped_rect); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); + ID3D11Device *device; + ID3D11DeviceContext *context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11Texture2D *staging_texture; + D3D11_MAPPED_SUBRESOURCE mapped_subresource; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, options %#x, mapped_rect %p.\n", iface, options, mapped_rect); + + if (options != D2D1_MAP_OPTIONS_READ) + { + FIXME("Unhandled map options %#x.\n", options); + return E_INVALIDARG; + } + + if (!(bitmap->options & D2D1_BITMAP_OPTIONS_CPU_READ)) + return E_INVALIDARG; + + if (bitmap->staging_resource) + return D2DERR_WRONG_STATE; + + ID3D11Resource_GetDevice(bitmap->resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + ID3D11Texture2D_GetDesc((ID3D11Texture2D *)bitmap->resource, &texture_desc); + + texture_desc.Usage = D3D11_USAGE_STAGING; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; + ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &staging_texture); + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)staging_texture, bitmap->resource); + if (SUCCEEDED(hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)staging_texture, 0, + D3D11_MAP_READ, 0, &mapped_subresource))) + { + mapped_rect->pitch = mapped_subresource.RowPitch; + mapped_rect->bits = mapped_subresource.pData; + bitmap->staging_resource = (ID3D11Resource *)staging_texture; + } + else + { + WARN("Failed to map resource, hr %#lx.\n", hr); + ID3D11Texture2D_Release(staging_texture); + } + + ID3D11DeviceContext_Release(context); + ID3D11Device_Release(device); + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_bitmap_Unmap(ID2D1Bitmap1 *iface) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 8edfa030ee1..b886ac52dd9 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -395,6 +395,7 @@ struct d2d_bitmap ID3D11RenderTargetView *rtv; IDXGISurface *surface; ID3D11Resource *resource; + ID3D11Resource *staging_resource; D2D1_SIZE_U pixel_size; D2D1_PIXEL_FORMAT format; float dpi_x; -- 2.36.1

2 2

[PATCH v2 resend] crypt32: CryptAcquireCertificatePrivateKey() should reset last error code on success.
by Dmitry Timoshkov 27 May '22

27 May '22

One of Chrome crypto plugins depends on this. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 1 + dlls/crypt32/tests/cert.c | 45 ++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index ad39b7d18c7..b57cc685212 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1006,6 +1006,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, CryptMemFree(info); if (cert_in_store) CertFreeCertificateContext(cert_in_store); + if (ret) SetLastError(0); return ret; } diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 0f8684a5483..ea25826f4ed 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -4305,45 +4305,42 @@ static void testAcquireCertPrivateKey(void) CERT_KEY_CONTEXT keyContext; /* Don't cache provider */ + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); - if (ret) - { - ok(callerFree, "Expected callerFree to be TRUE\n"); - CryptReleaseContext(certCSP, 0); - } + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); + ok(callerFree, "Expected callerFree to be TRUE\n"); + CryptReleaseContext(certCSP, 0); + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, NULL, NULL); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); CryptReleaseContext(certCSP, 0); /* Use the key prov info's caching (there shouldn't be any) */ + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); - if (ret) - { - ok(callerFree, "Expected callerFree to be TRUE\n"); - CryptReleaseContext(certCSP, 0); - } + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); + ok(callerFree, "Expected callerFree to be TRUE\n"); + CryptReleaseContext(certCSP, 0); /* Cache it (and check that it's cached) */ + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_CACHE_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); ok(!callerFree, "Expected callerFree to be FALSE\n"); size = sizeof(keyContext); ret = CertGetCertificateContextProperty(cert, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); - ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", - GetLastError()); + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); /* Remove the cached provider */ CryptReleaseContext(keyContext.hCryptProv, 0); @@ -4354,17 +4351,17 @@ static void testAcquireCertPrivateKey(void) CertSetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); /* Now use the key prov info's caching */ + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); ok(!callerFree, "Expected callerFree to be FALSE\n"); size = sizeof(keyContext); ret = CertGetCertificateContextProperty(cert, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); - ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", - GetLastError()); + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); CryptReleaseContext(certCSP, 0); CryptDestroyKey(key); -- 2.36.1

2 1

[PATCH 0/4] MR140: qasf: More ASF reader filter implementation.
by Rémi Bernon (＠rbernon) 27 May '22

27 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/140

3 8

[PATCH 0/4] MR139: winegstreamer: Implement video plane alignment for the H264 decoder.
by Rémi Bernon (＠rbernon) 27 May '22

27 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/139

3 7

[PATCH 0/2] MR138: d3drm: IDirect3DRMTexture3 Get/SetDecalTransparency
by Alistair Leslie-Hughes (＠alesliehughes) 27 May '22

27 May '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/138

3 3

[PATCH 1/2]mscms/test: test whether the value of bmformat is correct.
by Zhao Yi 27 May '22

27 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/mscms/tests/profile.c | 118 +++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index e0bfbd70e10..77165877275 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -62,6 +62,7 @@ static BOOL (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL); static BOOL (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL); static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD); +static BOOL (WINAPI *pTranslateBitmapBits)(HTRANSFORM,PVOID,BMFORMAT,DWORD,DWORD,DWORD,PVOID,BMFORMAT,DWORD,PBMCALLBACKFN,ULONG); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( hmscms, #func ); \ if (!p##func) return FALSE; @@ -97,6 +98,7 @@ static BOOL init_function_ptrs( void ) GETFUNCPTR( UninstallColorProfileW ) pEnumDisplayDevicesA = (void *)GetProcAddress( huser32, "EnumDisplayDevicesA" ); + GETFUNCPTR( TranslateBitmapBits ) return TRUE; } @@ -123,6 +125,16 @@ L"\\color\\srgb color space profile.icm"; static const WCHAR profile2W[] = L"\\spool\\drivers\\color\\srgb color space profile.icm"; +static const char binfile1[] = +"\\w32x86\\3\\SS0IIN03.BIN"; +static const char binfile1_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IIN03.BIN"; + +static const char binfile2[] = +"\\w32x86\\3\\SS0IO15.BIN"; +static const char binfile2_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IO15.BIN"; + static BOOL have_color_profile; static const unsigned char rgbheader[] = @@ -1359,6 +1371,110 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp } } +static void test_TranslateBitmapBits(void) +{ + PROFILE profile; + HPROFILE handle[2]; + HTRANSFORM transform; + DWORD intents = INTENT_PERCEPTUAL; + + #define DESTBUFSIZE 4 + HANDLE binfile_handle; + UINT uret; + char binfilefile1[MAX_PATH], binfilefile1_ex[MAX_PATH], binfilefile2[MAX_PATH], binfilefile2_ex[MAX_PATH]; + char *standbinfile1 = NULL; + char *standbinfile2 = NULL; + BYTE srcbits[] = {0,0,0xff}; + BMFORMAT input = BM_BGRTRIPLETS; + DWORD width = 1; + DWORD height = 1; + DWORD inputstride = 3; + PVOID destbits = HeapAlloc( GetProcessHeap(), 0, DESTBUFSIZE); + BMFORMAT output = BM_KYMCQUADS; + DWORD outputstride = 4; + PBMCALLBACKFN callback = NULL; + ULONG data = 0; + BYTE expect_destbits[]={0xff, 0xb6, 0, 0}; + BOOL bret = FALSE; + + uret = GetSystemDirectoryA( binfilefile1, sizeof(binfilefile1) ); + ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); + ok(binfilefile1[0] && lstrlenA(binfilefile1) < MAX_PATH, + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile1)); + lstrcpyA(binfilefile1_ex, binfilefile1); + + uret = GetSystemDirectoryA( binfilefile2, sizeof(binfilefile2) ); + ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); + ok(binfilefile2[0] && lstrlenA(binfilefile2) < MAX_PATH, + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile2)); + lstrcpyA(binfilefile2_ex, binfilefile2); + + lstrcatA( binfilefile1, binfile1 ); + binfile_handle = CreateFileA( binfilefile1, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile1 = binfilefile1; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile1_ex, binfile1_ex ); + binfile_handle = CreateFileA( binfilefile1_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile1 = binfilefile1_ex; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile2, binfile2 ); + binfile_handle = CreateFileA( binfilefile2, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile2 = binfilefile2; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile2_ex, binfile2_ex ); + binfile_handle = CreateFileA( binfilefile2_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile2 = binfilefile2_ex; + CloseHandle( binfile_handle ); + } + + if (standbinfile1 && standbinfile2) + { + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standbinfile1; + profile.cbDataSize = strlen(standbinfile1); + + handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[0] != NULL, "got %lu\n", GetLastError() ); + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standbinfile2; + profile.cbDataSize = strlen(standbinfile2); + + handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[1] != NULL, "got %lu\n", GetLastError() ); + + transform = pCreateMultiProfileTransform( handle, 2, &intents, 1, 3, 0 ); + ok( transform != NULL, "got %lu\n", GetLastError() ); + + ZeroMemory(destbits,DESTBUFSIZE); + bret = pTranslateBitmapBits(transform,srcbits,input,width,height,inputstride,destbits,output,outputstride,callback,data); + ok(bret && memcmp(expect_destbits, destbits, sizeof(expect_destbits)) == 0, "get err destbits data\n"); + HeapFree( GetProcessHeap(), 0, destbits ); + + pDeleteColorTransform( transform ); + pCloseColorProfile( handle[0] ); + pCloseColorProfile( handle[1] ); + } +} + START_TEST(profile) { UINT len; @@ -1470,6 +1586,8 @@ START_TEST(profile) test_AssociateColorProfileWithDeviceA( testprofile ); test_CreateMultiProfileTransform( standardprofile, testprofile ); + test_TranslateBitmapBits( ); + if (testprofile) DeleteFileA( testprofile ); FreeLibrary( huser32 ); FreeLibrary( hmscms ); -- 2.20.1

3 2

[PATCH 1/2]mscms/test: test whether the value of bmformat is correct.
by zhaoyi_uos 27 May '22

27 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/mscms/tests/profile.c | 118 +++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index e0bfbd70e10..3d24f5aa62a 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -62,6 +62,7 @@ static BOOL (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL); static BOOL (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL); static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD); +static BOOL (WINAPI *pTranslateBitmapBits)(HTRANSFORM,PVOID,BMFORMAT,DWORD,DWORD,DWORD,PVOID,BMFORMAT,DWORD,PBMCALLBACKFN,ULONG); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( hmscms, #func ); \ if (!p##func) return FALSE; @@ -95,6 +96,7 @@ static BOOL init_function_ptrs( void ) GETFUNCPTR( SetStandardColorSpaceProfileW ) GETFUNCPTR( UninstallColorProfileA ) GETFUNCPTR( UninstallColorProfileW ) + GETFUNCPTR( TranslateBitmapBits ) pEnumDisplayDevicesA = (void *)GetProcAddress( huser32, "EnumDisplayDevicesA" ); @@ -123,6 +125,16 @@ L"\\color\\srgb color space profile.icm"; static const WCHAR profile2W[] = L"\\spool\\drivers\\color\\srgb color space profile.icm"; +static const char binfile1[] = +"\\w32x86\\3\\SS0IIN03.BIN"; +static const char binfile1_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IIN03.BIN"; + +static const char binfile2[] = +"\\w32x86\\3\\SS0IO15.BIN"; +static const char binfile2_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IO15.BIN"; + static BOOL have_color_profile; static const unsigned char rgbheader[] = @@ -1359,6 +1371,111 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp } } +static void test_TranslateBitmapBits() +{ + PROFILE profile; + HPROFILE handle[2]; + HTRANSFORM transform; + DWORD intents = INTENT_PERCEPTUAL; + + #define DESTBUFSIZE 4 + HANDLE binfile_handle; + UINT uret; + char binfilefile1[MAX_PATH], binfilefile1_ex[MAX_PATH], binfilefile2[MAX_PATH], binfilefile2_ex[MAX_PATH]; + WCHAR binfilefile1W[MAX_PATH]; + char *standbinfile1 = NULL; + char *standbinfile2 = NULL; + BYTE srcbits[] = {0,0,0xff}; + BMFORMAT input = BM_BGRTRIPLETS; + DWORD width = 1; + DWORD height = 1; + DWORD inputstride = 3; + PVOID destbits = HeapAlloc( GetProcessHeap(), 0, DESTBUFSIZE); + BMFORMAT output = BM_KYMCQUADS; + DWORD outputstride = 4; + PBMCALLBACKFN callback = NULL; + ULONG data = 0; + BYTE expect_destbits[]={0xff, 0xb6, 0, 0}; + BOOL bret = FALSE; + + uret = GetSystemDirectoryA( binfilefile1, sizeof(binfilefile1) ); + ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); + ok(binfilefile1[0] && lstrlenA(binfilefile1) < MAX_PATH, + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile1)); + lstrcpyA(binfilefile1_ex, binfilefile1); + + uret = GetSystemDirectoryA( binfilefile2, sizeof(binfilefile2) ); + ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); + ok(binfilefile2[0] && lstrlenA(binfilefile2) < MAX_PATH, + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile2)); + lstrcpyA(binfilefile2_ex, binfilefile2); + + lstrcatA( binfilefile1, binfile1 ); + binfile_handle = CreateFileA( binfilefile1, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile1 = binfilefile1; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile1_ex, binfile1_ex ); + binfile_handle = CreateFileA( binfilefile1_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile1 = binfilefile1_ex; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile2, binfile2 ); + binfile_handle = CreateFileA( binfilefile2, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile2 = binfilefile2; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile2_ex, binfile2_ex ); + binfile_handle = CreateFileA( binfilefile2_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile2 = binfilefile2_ex; + CloseHandle( binfile_handle ); + } + + if (standbinfile1 && standbinfile2) + { + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standbinfile1; + profile.cbDataSize = strlen(standbinfile1); + + handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[0] != NULL, "got %lu\n", GetLastError() ); + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standbinfile2; + profile.cbDataSize = strlen(standbinfile2); + + handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[1] != NULL, "got %lu\n", GetLastError() ); + + transform = pCreateMultiProfileTransform( handle, 2, &intents, 1, 3, 0 ); + ok( transform != NULL, "got %lu\n", GetLastError() ); + + ZeroMemory(destbits,DESTBUFSIZE); + bret = pTranslateBitmapBits(transform,srcbits,input,width,height,inputstride,destbits,output,outputstride,callback,data); + ok(bret && memcmp(expect_destbits, destbits, sizeof(expect_destbits)) == 0, "get err destbits data\n"); + HeapFree( GetProcessHeap(), 0, destbits ); + + pDeleteColorTransform( transform ); + pCloseColorProfile( handle[0] ); + pCloseColorProfile( handle[1] ); + } +} + START_TEST(profile) { UINT len; @@ -1469,6 +1586,7 @@ START_TEST(profile) test_AssociateColorProfileWithDeviceA( testprofile ); test_CreateMultiProfileTransform( standardprofile, testprofile ); + test_TranslateBitmapBits( ); if (testprofile) DeleteFileA( testprofile ); FreeLibrary( huser32 ); -- 2.20.1

2 1

[PATCH 2/2]mscms: make the correct value for bmformat.
by zhaoyi_uos 27 May '22

27 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/mscms/transform.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 0d48e217d66..21f58e73134 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -39,12 +39,12 @@ static DWORD from_bmformat( BMFORMAT format ) switch (format) { - case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; - case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; + case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break; + case BM_BGRTRIPLETS: ret = TYPE_RGB_8; break; case BM_GRAY: ret = TYPE_GRAY_8; break; - case BM_xRGBQUADS: ret = TYPE_ARGB_8; break; - case BM_xBGRQUADS: ret = TYPE_ABGR_8; break; - case BM_KYMCQUADS: ret = TYPE_KYMC_8; break; + case BM_xRGBQUADS: ret = TYPE_ABGR_8; break; + case BM_xBGRQUADS: ret = TYPE_ARGB_8; break; + case BM_KYMCQUADS: ret = TYPE_CMYK_8; break; default: if (!quietfixme) { -- 2.20.1

2 1

[PATCH 1/3] d2d1/tests: Test effect property if register effect multiple times with different xml.
by Ziqing Hui 27 May '22

27 May '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d5adb0c749c..29d3780a6e7 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -37,7 +37,7 @@ DEFINE_GUID(GUID_TestPixelShader, 0x53015748,0xfc13,0x4168,0xbd,0x13,0x0f,0xcf, static const WCHAR *effect_xml_a = L"<?xml version='1.0'?> \ <Effect> \ - <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='DisplayName' type='string' value='TestEffectA'/> \ <Property name='Author' type='string' value='The Wine Project'/> \ <Property name='Category' type='string' value='Test'/> \ <Property name='Description' type='string' value='Test effect.'/> \ @@ -56,7 +56,7 @@ L"<?xml version='1.0'?> \ static const WCHAR *effect_xml_b = L"<?xml version='1.0'?> \ <Effect> \ - <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='DisplayName' type='string' value='TestEffectB'/> \ <Property name='Author' type='string' value='The Wine Project'/> \ <Property name='Category' type='string' value='Test'/> \ <Property name='Description' type='string' value='Test effect.'/> \ @@ -72,7 +72,7 @@ L"<?xml version='1.0'?> \ static const WCHAR *effect_xml_c = L"<?xml version='1.0'?> \ <Effect> \ - <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='DisplayName' type='string' value='TestEffectC'/> \ <Property name='Author' type='string' value='The Wine Project'/> \ <Property name='Category' type='string' value='Test'/> \ <Property name='Description' type='string' value='Test effect.'/> \ @@ -10488,8 +10488,11 @@ static HRESULT STDMETHODCALLTYPE effect_impl_get_context(const IUnknown *iface, static void test_effect_register(BOOL d3d11) { + ID2D1DeviceContext *device_context; struct d2d1_test_context ctx; ID2D1Factory1 *factory; + WCHAR display_name[64]; + ID2D1Effect *effect; unsigned int i; HRESULT hr; @@ -10529,6 +10532,7 @@ static void test_effect_register(BOOL d3d11) if (!init_test_context(&ctx, d3d11)) return; + device_context = ctx.context; factory = ctx.factory1; if (!factory) { @@ -10564,9 +10568,31 @@ static void test_effect_register(BOOL d3d11) hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, effect_xml_a, NULL, 0, effect_impl_create); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1DeviceContext_CreateEffect(device_context, &CLSID_TestEffect, &effect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + { + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)display_name, sizeof(display_name)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(display_name, L"TestEffectA"), "Got unexpected display name %s.\n", debugstr_w(display_name)); + ID2D1Effect_Release(effect); + } + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, effect_xml_b, NULL, 0, effect_impl_create); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1DeviceContext_CreateEffect(device_context, &CLSID_TestEffect, &effect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + { + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)display_name, sizeof(display_name)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(display_name, L"TestEffectA"), "Got unexpected display name %s.\n", debugstr_w(display_name)); + ID2D1Effect_Release(effect); + } + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); -- 2.25.1

2 5

[PATCH 2/2]mscms: make the correct value for bmformat.
by Zhao Yi 27 May '22

27 May '22

2 1

[PATCH 1/6] secur32: Simplify get_session_peer_certificate unixlib interface.
by Nikolay Sivov 27 May '22

27 May '22

Use single buffer for returned certificate blobs, instead of an array of CERT_BLOB that contains pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel.c | 18 +++++++++++------- dlls/secur32/schannel_gnutls.c | 14 +++++++------- dlls/secur32/secur32_priv.h | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 6ab5507becf..2e663872f71 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1026,7 +1026,6 @@ static SECURITY_STATUS ensure_remote_cert(struct schan_context *ctx) HCERTSTORE store; PCCERT_CONTEXT cert = NULL; SECURITY_STATUS status; - CERT_BLOB *certs; ULONG count, size = 0; struct get_session_peer_certificate_params params = { ctx->transport.session, NULL, &size, &count }; @@ -1036,28 +1035,33 @@ static SECURITY_STATUS ensure_remote_cert(struct schan_context *ctx) status = GNUTLS_CALL( get_session_peer_certificate, &params ); if (status != SEC_E_BUFFER_TOO_SMALL) goto done; - if (!(certs = malloc( size ))) + if (!(params.buffer = malloc( size ))) { status = SEC_E_INSUFFICIENT_MEMORY; goto done; } - params.certs = certs; status = GNUTLS_CALL( get_session_peer_certificate, &params ); if (status == SEC_E_OK) { unsigned int i; + ULONG *sizes; + BYTE *blob; + + sizes = (ULONG *)params.buffer; + blob = params.buffer + count * sizeof(*sizes); + for (i = 0; i < count; i++) { - if (!CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, certs[i].pbData, - certs[i].cbData, CERT_STORE_ADD_REPLACE_EXISTING, - i ? NULL : &cert)) + if (!CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, blob, sizes[i], + CERT_STORE_ADD_REPLACE_EXISTING, i ? NULL : &cert)) { if (i) CertFreeCertificateContext(cert); return GetLastError(); } + blob += sizes[i]; } } - free(certs); + free(params.buffer); done: ctx->cert = cert; CertCloseStore(store, 0); diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 0145c59e0f0..7c6a0bc0cfc 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -792,28 +792,28 @@ static NTSTATUS schan_get_session_peer_certificate( void *args ) { const struct get_session_peer_certificate_params *params = args; gnutls_session_t s = (gnutls_session_t)params->session; - CERT_BLOB *certs = params->certs; const gnutls_datum_t *datum; unsigned int i, size; BYTE *ptr; unsigned int count; + ULONG *sizes; if (!(datum = pgnutls_certificate_get_peers(s, &count))) return SEC_E_INTERNAL_ERROR; - size = count * sizeof(certs[0]); + size = count * sizeof(*sizes); for (i = 0; i < count; i++) size += datum[i].size; - if (!certs || *params->bufsize < size) + if (!params->buffer || *params->bufsize < size) { *params->bufsize = size; return SEC_E_BUFFER_TOO_SMALL; } - ptr = (BYTE *)&certs[count]; + sizes = (ULONG *)params->buffer; + ptr = params->buffer + count * sizeof(*sizes); for (i = 0; i < count; i++) { - certs[i].cbData = datum[i].size; - certs[i].pbData = ptr; - memcpy(certs[i].pbData, datum[i].data, datum[i].size); + sizes[i] = datum[i].size; + memcpy(ptr, datum[i].data, datum[i].size); ptr += datum[i].size; } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index be375618266..5c35e4244c8 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -145,7 +145,7 @@ struct get_connection_info_params struct get_session_peer_certificate_params { schan_session session; - CERT_BLOB *certs; + BYTE *buffer; /* Starts with array of ULONG sizes, followed by contiguous data blob. */ ULONG *bufsize; ULONG *retcount; }; -- 2.35.1

1 5

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel