- Wine-Devel - list.winehq.org

Re: [PATCH v2 0/2] MR72: win32u: Handle sys color brushes in fill_rect. - approved
by Alexandre Julliard (＠julliard) May 16, 2022

May 16, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/72

1 0

Re: [PATCH v2 0/4] MR32: ntdll: Collect logical processor info just once at process start. - approved
by Alexandre Julliard (＠julliard) May 16, 2022

May 16, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/32

1 0

Re: [PATCH v4 0/6] MR62: windows.gaming.input: More force feedback implementation. - approved
by Alexandre Julliard (＠julliard) May 16, 2022

May 16, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/62

1 0

Re: [PATCH v2 0/1] MR67: shell32/tests: Use 'shellpath' as tmpfile name in PathResolve tests - approved
by Alexandre Julliard (＠julliard) May 16, 2022

May 16, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/67

1 0

Re: [PATCH v5 0/5] MR34: windows.media.speech: Changes for IAsyncAction. - approved
by Alexandre Julliard (＠julliard) May 16, 2022

May 16, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/34

1 0

Would implementing UMDF support be useful (or even viable)?
by Mark N May 16, 2022

May 16, 2022

Hello, I was reading about the Windows User Mode Device Framework (aka UMDF) and I was interested in possibly working on adding support for UMDF drivers in Wine. I think there are Windows drivers out there that run entirely in usermode (e.g. some USB drivers) which could be successfully ported to Linux this way. However I'm still new to Wine so I thought I'd ask - has anybody else ever explored doing this? Would this sort of thing be a good fit for Wine in general? Thanks! Mark N

4 4

[PATCH v2 0/3] MR69: include: Add __WINE_MALLOC attribute and use it for allocation functions.
by Brendan Shanks (＠bshanks) May 16, 2022

May 16, 2022

With this patch, lib/wine/x86_64-windows/ ends up 100 KB smaller, and I would expect performance benefits too. >From https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-ma…: Attribute malloc indicates that a function is malloc-like, i.e., that the pointer P returned by the function cannot alias any other pointer valid when the function returns, and moreover no pointers to valid objects occur in any storage addressed by P. In addition, the GCC predicts that a function with the attribute returns non-null in most cases. Using the attribute with no arguments is designed to improve optimization by relying on the aliasing property it implies. Functions like malloc and calloc have this property because they return a pointer to uninitialized or zeroed-out, newly obtained storage. However, functions like realloc do not have this property, as they may return pointers to storage containing pointers to existing objects. Additionally, since all such functions are assumed to return null only infrequently, callers can be optimized based on that assumption. -- v2: crypt32/tests: Fix mismatched deallocation function. include: Add __WINE_DEALLOC attribute and use it for allocation functions. include: Add __WINE_MALLOC attribute and use it for allocation functions. https://gitlab.winehq.org/wine/wine/-/merge_requests/69

2 4

32bit Wine on macOS Catalina
by Eddie Hillenbrand May 16, 2022

May 16, 2022

Hi all, Reading everything I can find about Wine on macOS, seems like there still isn't a good solution for 32bit on Catalina and beyond.[1] I'm currently running Catalina and don't intend to upgrade my Mac or the OS anytime soon. My goal is to compile everything on Catalina and to run 32bit Wine on Catalina. I can compile 64bit Wine without a problem and 32bit Wine compiles against the MacOSX10.13.sdk. I can run 32bit Wine with the `no32exec=0' boot argument and DYLD_ROOT_PATH pointing at a directory containing `/System' & `/usr/lib' from a machine running 10.13. It crashes because of kernel changes that are incompatible with libraries from High Sierra. Specifically, (10.15) libdispatch redefined work queue priorities, so the (10.15) kernel starts the work queue thread with an invalid priority as understood by (10.13) libdispatch. Exception Type: EXC_BAD_INSTRUCTION (SIGILL) Exception Codes: 0x0000000000000001, 0x0000000000000000 Exception Note: EXC_CORPSE_NOTIFY Termination Signal: Illegal instruction: 4 Termination Reason: Namespace SIGNAL, Code 0x4 Terminating Process: exc handler [22976] Application Specific Information: dyld2 mode BUG IN CLIENT OF LIBDISPATCH: Corrupted priority [...] Thread 1 Crashed: 0 libdispatch.dylib 0x0643aef5 _dispatch_worker_thread3 + 180 1 libsystem_pthread.dylib 0x068c3fa5 _pthread_wqthread + 1356 2 libsystem_pthread.dylib 0x068c3a32 start_wqthread + 34 Initially, I thought using DYLD_ROOT_PATH with 10.13 system directories was the way to go. So I modified libdispatch to use the new priority definitions and replaced `/usr/lib/system/libdispatch.dylib' in the DYLD_ROOT_PATH with my modified version. This got past the work queue crash, but a few other crashes emerged that needed to be squashed in libdispatch, eventually I made it to NSApplication initialization. Unfortunately, the application initialization crashes when it tries to initialize the user defaults subsystem. I was hoping I would only have to solve a few crashes in some of the open source libraries. Of course this wasn't the case. Since I had made it past the initial app bootstrapping and into ObjC frameworks I was no longer in open source code. I could have kept playing Whac-A-Mole, as it is especially easy to monkey patch ObjC code with method swizzling. I considered going down this path, but before going there, I decided to try a DYLD_ROOT_PATH with system directories from 10.14. I'm glad I tried using 10.14 dylibs before sinking more time into patching and hacking my way through 10.13 dylibs. The 10.14 dylibs don't crash, instead the WindowServer refuses to allow a connection from a 32bit process. _RegisterApplication(), FAILED TO REGISTER PROCESS WITH CPS/CoreGraphics in WindowServer, err=-304 I suspected this might be an AppKit limitation so I tried using the deprecated Carbon libs and got the same error. Then I tried using private WindowServer APIs directly, which didn't error in the same way, but also didn't draw anything.[2] Compiling the same code for 64bit, however, draws as expected. A way forward for 32bit Wine is possible. Just do drawing in a 64bit process. It might sound like a hack, but drawing or interacting with the WindowServer is already done using IPC—it is just transparent to the developer. I already made a proof of concept, so I know the technique is solid. Additionally, on Catalina at least, this removes the need for the DYLD_ROOT_PATH since the 32bit process would, in theory, only need to link with libSystem and it ships with 32bit binaries. $ sw_vers -productVersion 10.15.7 $ lipo -info /usr/lib/libSystem.dylib Architectures in the fat file: /usr/lib/libSystem.dylib are: x86_64 i386 And by extension, most everything in the umbrella framework `/usr/lib/system/*' also contains 32bit binaries. My intention is to put the winemac.drv in its own 64bit process. I don't really have a question, this is more a statement of intent, but I'd welcome any feedback, thoughts, or concerns. If nothing else this email memorializes the things someone is likely to encounter if they try to make 32bit Wine run on Catalina or anyone that tries to run any 32bit app on Catalina. Eddie [1] I'm aware of CrossOver, etc. [2] I did eventually get one of the private functions to return -304 which is probably significant as it matches the _RegisterApplication() error.

6 8

[PATCH v2 0/7] MR68: rsaenh RC2 bigger keys weirdness support and MAC hashes fixes.
by Paul Gofman (＠gofman) May 16, 2022

May 16, 2022

Part of the fix required Vivox chat server connection in "We Were Here Forever". It is actually patch 5 which is required specifically for the game, the rest are bugs found on the way of testing that functionality. WRT the game, it also seems to depend on certain rsaenh functions clearing last error on success, I am going to send that part once this one is clear. -- v2: rsaenh: Output FIXME when HMAC hash algorithm is not found. rsaenh: Allow importing bigger RC2 keys. rsaenh: Factor out alloc_key() function. rsaenh: Store key state in hash data for _MAC hash algorithm. rsaenh: Factor out block_encrypt() function. rsaenh: Handle uneven hash data updates sizes for CALG_MAC. rsaenh: Use CRT memory allocators. https://gitlab.winehq.org/wine/wine/-/merge_requests/68

3 9

[PATCH v3 1/7] d3d11/tests: Test logic op.
by Zebediah Figura May 16, 2022

May 16, 2022

From: Chip Davis <cdavis5x(a)gmail.com> Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: fix the clear color... dlls/d3d11/tests/d3d11.c | 166 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6c0ae089f78..99f304e5b68 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -34034,6 +34034,171 @@ static void test_user_defined_annotation(void) release_test_context(&test_context); } +static void test_logic_op(void) +{ + D3D11_FEATURE_DATA_D3D11_OPTIONS options; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11RenderTargetView *rtvs[8]; + ID3D11BlendState1 *blend_state; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Texture2D *rts[8]; + ID3D11Device1 *device1; + ID3D11PixelShader *ps; + ID3D11Device *device; + unsigned int i, j; + DWORD color; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + void main(float4 position : SV_Position, + out uint4 t0 : SV_Target0, out uint4 t1 : SV_Target1, + out uint4 t2 : SV_Target2, out uint4 t3 : SV_Target3, + out uint4 t4 : SV_Target4, out uint4 t5 : SV_Target5, + out uint4 t6 : SV_Target6, out uint4 t7 : SV_Target7) + { + t0 = t1 = t2 = t3 = t4 = t5 = t6 = t7 = uint4(0x00, 0x00, 0xff, 0xff); + } +#endif + 0x43425844, 0x4ed0bba7, 0x9f7d54c4, 0xba1e3dce, 0xc29634f8, 0x00000001, 0x000002b0, 0x00000003, + 0x0000002c, 0x00000060, 0x0000013c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x000000d4, 0x00000008, 0x00000008, 0x000000c8, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x000000c8, 0x00000001, 0x00000000, 0x00000001, 0x00000001, 0x0000000f, + 0x000000c8, 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x0000000f, 0x000000c8, 0x00000003, + 0x00000000, 0x00000001, 0x00000003, 0x0000000f, 0x000000c8, 0x00000004, 0x00000000, 0x00000001, + 0x00000004, 0x0000000f, 0x000000c8, 0x00000005, 0x00000000, 0x00000001, 0x00000005, 0x0000000f, + 0x000000c8, 0x00000006, 0x00000000, 0x00000001, 0x00000006, 0x0000000f, 0x000000c8, 0x00000007, + 0x00000000, 0x00000001, 0x00000007, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, + 0x0000016c, 0x00000040, 0x0000005b, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, + 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x03000065, 0x001020f2, 0x00000003, 0x03000065, + 0x001020f2, 0x00000004, 0x03000065, 0x001020f2, 0x00000005, 0x03000065, 0x001020f2, 0x00000006, + 0x03000065, 0x001020f2, 0x00000007, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000003, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000004, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000005, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000006, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000007, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x0100003e + }; + + D3D11_BLEND_DESC1 blend_desc = + { + .IndependentBlendEnable = TRUE, + .RenderTarget = + { + {FALSE, TRUE, D3D11_BLEND_ONE, D3D11_BLEND_ZERO, D3D11_BLEND_OP_ADD, + D3D11_BLEND_ONE, D3D11_BLEND_ZERO, D3D11_BLEND_OP_ADD, D3D11_LOGIC_OP_CLEAR, + D3D11_COLOR_WRITE_ENABLE_ALL}, + {FALSE, TRUE, D3D11_BLEND_ONE, D3D11_BLEND_ZERO, D3D11_BLEND_OP_ADD, + D3D11_BLEND_ZERO, D3D11_BLEND_ONE, D3D11_BLEND_OP_ADD, D3D11_LOGIC_OP_CLEAR, + D3D11_COLOR_WRITE_ENABLE_ALL}, + }, + }; + + static const struct + { + D3D11_LOGIC_OP op; + DWORD color; + } + tests[] = + { + {D3D11_LOGIC_OP_CLEAR, 0x00000000}, + {D3D11_LOGIC_OP_NOR, 0x000000ff}, + {D3D11_LOGIC_OP_AND_INVERTED, 0x0000ff00}, + {D3D11_LOGIC_OP_COPY_INVERTED, 0x0000ffff}, + {D3D11_LOGIC_OP_AND_REVERSE, 0x00ff0000}, + {D3D11_LOGIC_OP_INVERT, 0x00ff00ff}, + {D3D11_LOGIC_OP_XOR, 0x00ffff00}, + {D3D11_LOGIC_OP_NAND, 0x00ffffff}, + {D3D11_LOGIC_OP_AND, 0xff000000}, + {D3D11_LOGIC_OP_EQUIV, 0xff0000ff}, + {D3D11_LOGIC_OP_NOOP, 0xff00ff00}, + {D3D11_LOGIC_OP_OR_INVERTED, 0xff00ffff}, + {D3D11_LOGIC_OP_COPY, 0xffff0000}, + {D3D11_LOGIC_OP_OR_REVERSE, 0xffff00ff}, + {D3D11_LOGIC_OP_OR, 0xffffff00}, + {D3D11_LOGIC_OP_SET, 0xffffffff}, + }; + static const float clear_color[] = {0.0f, 255.0f, 0.0f, 255.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + if (FAILED(hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D11_OPTIONS, &options, sizeof(options))) + || !options.OutputMergerLogicOp) + { + skip("Logic op is not supported.\n"); + release_test_context(&test_context); + return; + } + + hr = ID3D11Device_QueryInterface(device, &IID_ID3D11Device1, (void **)&device1); + ok(hr == S_OK, "Failed to get ID3D11Device1 interface, hr %#lx.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#lx.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + hr = ID3D11Device1_CreateBlendState1(device1, &blend_desc, &blend_state); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + + blend_desc.IndependentBlendEnable = FALSE; + hr = ID3D11Device1_CreateBlendState1(device1, &blend_desc, &blend_state); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ID3D11BlendState1_Release(blend_state); + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UINT; + for (i = 0; i < 8; ++i) + { + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &rts[i]); + ok(hr == S_OK, "Failed to create texture %u, hr %#lx.\n", i, hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rts[i], NULL, &rtvs[i]); + ok(hr == S_OK, "Failed to create rendertarget view %u, hr %#lx.\n", i, hr); + } + + ID3D11DeviceContext_OMSetRenderTargets(context, 8, rtvs, NULL); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + blend_desc.RenderTarget[0].LogicOp = tests[i].op; + hr = ID3D11Device1_CreateBlendState1(device1, &blend_desc, &blend_state); + ok(hr == S_OK, "Failed to create blend state, hr %#lx.\n", hr); + ID3D11DeviceContext_OMSetBlendState(context, (ID3D11BlendState *)blend_state, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11BlendState1_Release(blend_state); + + for (j = 0; j < 8; ++j) + ID3D11DeviceContext_ClearRenderTargetView(context, rtvs[j], clear_color); + draw_quad(&test_context); + + for (j = 0; j < 8; ++j) + { + get_texture_readback(rts[j], 0, &rb); + color = get_readback_color(&rb, 320, 240, 0); + ok(compare_color(color, tests[i].color, 1), "%u: Got unexpected color 0x%08lx.\n", i, color); + release_resource_readback(&rb); + } + } + + for (i = 0; i < 8; i++) + { + ID3D11Texture2D_Release(rts[i]); + ID3D11RenderTargetView_Release(rtvs[i]); + } + ID3D11PixelShader_Release(ps); + ID3D11Device1_Release(device1); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -34214,6 +34379,7 @@ START_TEST(d3d11) queue_test(test_constant_buffer_offset); queue_test(test_dynamic_map_synchronization); queue_test(test_user_defined_annotation); + queue_test(test_logic_op); run_queued_tests(); -- 2.35.1

1 6