- wine-gitlab - winehq.org

Re: [PATCH v2 0/1] MR5802: dwrite/tests: Fix a test failure on some Win10 machines with CJK locales. - approved
by Alexandre Julliard (＠julliard) 06 Jun '24

06 Jun '24

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

1 0

Re: [PATCH v4 0/3] MR5799: winex11: Fix some incorrect usage of NtGdiDdDDICreateDCFromMemory. - approved
by Alexandre Julliard (＠julliard) 06 Jun '24

06 Jun '24

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

1 0

Re: [PATCH v3 0/1] MR5777: win32u: Limit GDI object generation by 127 for a 64-bit build. - approved
by Alexandre Julliard (＠julliard) 06 Jun '24

06 Jun '24

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

1 0

Re: [PATCH v3 0/1] MR5789: server: Remove limitation for waiting on idle_event of the current process. - approved
by Alexandre Julliard (＠julliard) 06 Jun '24

06 Jun '24

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

1 0

Re: [PATCH v4 0/5] MR5776: win32u: Parameterize DPI in some driver calls. - approved
by Alexandre Julliard (＠julliard) 06 Jun '24

06 Jun '24

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

1 0

Re: [PATCH v4 0/1] MR3518: wininet: unify timeout values closer to hInternet
by Jacob Pfeiffer (＠Cthuflu) 06 Jun '24

06 Jun '24

On Wed Jun 5 23:33:45 2024 +0000, Jacek Caban wrote: > Setting the timeout on the socket is quite expensive (requires a > wineserver call). Maybe we could store the last set timeout separate > from configure timeout and update socket timeout only when they don't match? Would this proposal be only for `read_more_data` or in the broader scope of any call to `NETCON_set_timeout`? If it is for the latter, it could be tracked in `netconn_t`. I can add that into a separate merge. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3518#note_72609

1 0

Re: [PATCH v4 0/1] MR3518: wininet: unify timeout values closer to hInternet
by Jacob Pfeiffer (＠Cthuflu) 06 Jun '24

06 Jun '24

On Wed Jun 5 23:33:45 2024 +0000, Jacek Caban wrote: > Do we still need it? I think that with implementation in both > `set_global_option` and `INET_SetOption`, we could simply remove those > cases from `InternetSetOptionW` fallback. If we can assume that `vtbl->SetOption` is guaranteed to handle its own implementation of each timeout (or fallback to `INET_SetOption`), I could see dropping these cases from `InternetSetOptionW`. I'll amend those changes. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3518#note_72608

1 0

Re: [PATCH v8 0/11] MR5444: jscript: Do not allocate dispex_prop_t for indexed props.
by Jacek Caban (＠jacek) 06 Jun '24

06 Jun '24

> Well, I expect them to behave like JS functions. If it were a JS function, it would check to see if the object type matches, and then do its thing. If you think of it like this, it wouldn't make much sense for it to use another object type's function. I'm not talking about another objects' functions, I'm talking about separate objects having the same prototypes in JS sense but being otherwise separate implementations of the same interfaces in C. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5444#note_72607

1 0

Re: [PATCH v8 0/11] MR5444: jscript: Do not allocate dispex_prop_t for indexed props.
by Gabriel Ivăncescu (＠insn) 06 Jun '24

06 Jun '24

On Thu Jun 6 19:05:56 2024 +0000, Jacek Caban wrote: > > In such case, instead of failing, it would call the other function > that was looked up, since it matches in IID and DISPID. It won't crash, > but I don't think it would be quite correct, either. > That's the whole point, the reason it's safe and I don't see why you > think it's incorrect. BTW, IID is intentionally abstract in my proposal; > a bit closer to the actual meaning would be to use something like > prototype ID once we have those (interface ID is just already available > and close enough). > > Continuing the above, IMO the following would make it the most robust: > we look it up as mentioned from the func_info_t's dispid and IID, and > then compare to see if it's the same `func_info_t` pointer. > Sure, but it can't compare `func_info_t`s by a pointer, it would need to > compare IID or something like that anyway. So in your proposal, the > opaque pointer serves as (ID,IID) carrier, nothing else. > > BTW, is there a reason you renamed `IWineJSDispatchHost` to just > `IJSDispatchHost` when it's Wine's own interface? I thought it's better > to avoid ambiguity with a native interface, especially if we're to > extend it (obviously we can't touch native interfaces), makes it a lot > more obvious. > It's all Wine code, I don't see how putting "wine" in random places > makes it any cleaner, but it's not a strong preference and I won't > insist either way. Well, I expect them to behave like JS functions. If it were a JS function, it would check to see if the object type matches, and then do its thing. If you think of it like this, it wouldn't make much sense for it to use another object type's function. As for Wine prefix, we typically have that already for our own custom interfaces in mshtml, and even though it's all Wine code, it makes it clearer for someone unfamiliar to understand that the interface is not something from Windows—so they can find its documentation/code in Wine code with grep instead of a Google search, and can freely change them around, etc. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5444#note_72606

1 0

Re: [PATCH v8 0/11] MR5444: jscript: Do not allocate dispex_prop_t for indexed props.
by Jacek Caban (＠jacek) 06 Jun '24

06 Jun '24

> In such case, instead of failing, it would call the other function that was looked up, since it matches in IID and DISPID. It won't crash, but I don't think it would be quite correct, either. That's the whole point, the reason it's safe and I don't see why you think it's incorrect. BTW, IID is intentionally abstract in my proposal; a bit closer to the actual meaning would be to use something like prototype ID once we have those (interface ID is just already available and close enough). > Continuing the above, IMO the following would make it the most robust: we look it up as mentioned from the func_info_t's dispid and IID, and then compare to see if it's the same `func_info_t` pointer. Sure, but it can't compare `func_info_t`s by a pointer, it would need to compare IID or something like that anyway. So in your proposal, the opaque pointer serves as (ID,IID) carrier, nothing else. > BTW, is there a reason you renamed `IWineJSDispatchHost` to just `IJSDispatchHost` when it's Wine's own interface? I thought it's better to avoid ambiguity with a native interface, especially if we're to extend it (obviously we can't touch native interfaces), makes it a lot more obvious. It's all Wine code, I don't see how putting "wine" in random places makes it any cleaner, but it's not a strong preference and I won't insist either way. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5444#note_72605

1 0

[PATCH v2 0/12] MR5796: kernelbase, ntdll: Implement DOS wildcards matching in NtQueryDirectoryFile and use that in FindFirstFile().
by Paul Gofman (＠gofman) 06 Jun '24

06 Jun '24

-- v2: kernelbase: Preprocess wildcarded mask and pass it with NtQueryDirectoryFile(). https://gitlab.winehq.org/wine/wine/-/merge_requests/5796

3 14

[PATCH v36 0/2] MR5752: msvcrt: [PR53960] Fix ucrt has different struct layout than msvcrt
by cqwrteur (＠trcrsired) 06 Jun '24

06 Jun '24

UCRT's FILE struct and fd struct have different layouts, and their locks are different. Implementation in Wine does not match UCRT in Windows, causing ABI issues. see: https://bugs.winehq.org/show_bug.cgi?id=53960 -- v36: ucrtbase: Fix incorrect layout of FILE. ucrtbase: Add FILE structure tests. https://gitlab.winehq.org/wine/wine/-/merge_requests/5752

3 3

Re: [PATCH v8 0/11] MR5444: jscript: Do not allocate dispex_prop_t for indexed props.
by Gabriel Ivăncescu (＠insn) 06 Jun '24

06 Jun '24

On Thu Jun 6 15:55:43 2024 +0000, Gabriel Ivăncescu wrote: > Actually you don't even need to query IID anymore. Just look up the > function by dispid, and then check if it's same func_info_t, that's enough. BTW, is there a reason you renamed `IWineJSDispatchHost` to just `IJSDispatchHost` when it's Wine's own interface? I thought it's better to avoid ambiguity with a native interface, especially if we're to extend it (obviously we can't touch native interfaces), makes it a lot more obvious. And to add to what I said above, what I meant with "retrieving a potentially different function" is mostly theoretical, because as you said current mshtml likely has only one struct layout per interface. **But** if we were to assume this is not the case (addressing the original concern), then two objects could have same IID but different struct layouts and different functions. In such case, instead of failing, it would call the other function that was looked up, since it matches in IID and DISPID. It won't crash, but I don't think it would be quite correct, either. And it still makes the code simpler anyway. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5444#note_72601

1 0

[PATCH v3 0/7] MR5732: winegstreamer: Get rid of the wg_transform internal output_format.
by Rémi Bernon (＠rbernon) 06 Jun '24

06 Jun '24

-- v3: winegstreamer: Request the new transform output format explicitly. winegstreamer: Use a caps to store the desired output format. winegstreamer: Only report format changes when frontend supports it. winegstreamer: Rename allow_size_change to allow_format_change. winegstreamer: Enforce default stride presence in the video processor. winegstreamer: Enforce default stride value in the video decoder. winegstreamer: Allow to clear video decoder input/output types. https://gitlab.winehq.org/wine/wine/-/merge_requests/5732

4 10

[PATCH v3 0/7] MR5717: Improve dmo_wrapper_sink_Receive.
by Ziqing Hui (＠zhui) 06 Jun '24

06 Jun '24

This reduce the chance of buffer allocating issue for Kirikiri2 games(eg. Super Naughty Maid) when the game is trying to play videos. -- v3: qasf/dmowrapper: Sync Stop() and Receive() for dmo wrapper filter. qasf/dmowrapper: Return VFW_E_WRONG_STATE in dmo_wrapper_sink_Receive. qasf/dmowrapper: Allocate output samples before calling ProcessInput(). qasf/dmowrapper: Return failure in dmo_wrapper_sink_Receive if samples allocating fails. qasf/dmowrapper: Introduce release_output_samples. qasf/dmowrapper: Introduce get_output_samples. qasf/tests: Add more tests for dmo_wrapper_sink_Receive. https://gitlab.winehq.org/wine/wine/-/merge_requests/5717

3 8

Re: [PATCH v8 0/11] MR5444: jscript: Do not allocate dispex_prop_t for indexed props.
by Gabriel Ivăncescu (＠insn) 06 Jun '24

06 Jun '24

On Thu Jun 6 15:51:53 2024 +0000, Gabriel Ivăncescu wrote: > > But then you assume that all objects implementing the interface will > use the same struct layout for that. I can't think of an example inside > MSHTML where it's currently not the case, but that's not generally a > promise that QI gives. > In theory, there's a similar concern when looking up the function via > IID and DISPID, specifically, that it might find a different function. > In practice as you said it probably doesn't happen but… > > So what's the point of it then? Avoiding one argument in a call? > Continuing the above, IMO the following would make it the most robust: > we look it up as mentioned from the func_info_t's dispid and IID, and > then compare to see if it's the same `func_info_t` pointer. If not, > return E_UNEXPECTED since it's the wrong function. And yes, one less > argument to keep track of, but also one less thing to keep track of (in > the ProxyFunction for instance, and everywhere else). > > I think that you misinterprets your observations. Here is a test > proving that currentStyle should have a setter that throws an error > (unless used for modifiable style object): > Okay, thanks for the test, I guess there's more at play here indeed. Actually you don't even need to query IID anymore. Just look up the function by dispid, and then check if it's same func_info_t, that's enough. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5444#note_72595

1 0

[PATCH v3 0/3] MR5799: winex11: Fix some incorrect usage of NtGdiDdDDICreateDCFromMemory.
by Rémi Bernon (＠rbernon) 06 Jun '24

06 Jun '24

Didn't notice that it was failing until I did the same for winemac with https://gitlab.winehq.org/wine/wine/-/merge_requests/5798. It was silently falling back to copies while winemac can't do that. -- v3: gdi.exe16: Fix some incorrect usage of NtGdiDdDDICreateDCFromMemory. winex11: Fix some incorrect usage of NtGdiDdDDICreateDCFromMemory. winex11: Wrap more window surface formats with NtGdiDdDDICreateDCFromMemory. https://gitlab.winehq.org/wine/wine/-/merge_requests/5799

2 3

Re: [PATCH v8 0/11] MR5444: jscript: Do not allocate dispex_prop_t for indexed props.
by Gabriel Ivăncescu (＠insn) 06 Jun '24

06 Jun '24

> But then you assume that all objects implementing the interface will use the same struct layout for that. I can't think of an example inside MSHTML where it's currently not the case, but that's not generally a promise that QI gives. In theory, there's a similar concern when looking up the function via IID and DISPID, specifically, that it might find a different function. In practice as you said it probably doesn't happen but… > So what's the point of it then? Avoiding one argument in a call? Continuing the above, IMO the following would make it the most robust: we look it up as mentioned from the func_info_t's dispid and IID, and then compare to see if it's the same `func_info_t` pointer. If not, return E_UNEXPECTED since it's the wrong function. And yes, one less argument to keep track of, but also one less thing to keep track of (in the ProxyFunction for instance, and everywhere else). > I think that you misinterprets your observations. Here is a test proving that currentStyle should have a setter that throws an error (unless used for modifiable style object): Okay, thanks for the test, I guess there's more at play here indeed. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5444#note_72591

1 0

[PATCH 0/3] MR5799: winex11: Fix some incorrect usage of NtGdiDdDDICreateDCFromMemory.
by Rémi Bernon (＠rbernon) 06 Jun '24

06 Jun '24

Didn't notice that it was failing until I did the same for winemac with https://gitlab.winehq.org/wine/wine/-/merge_requests/5798. It was silently falling back to copies while winemac can't do that. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5799

3 5

Re: [PATCH v8 0/11] MR5444: jscript: Do not allocate dispex_prop_t for indexed props.
by Jacek Caban (＠jacek) 06 Jun '24

06 Jun '24

> Yeah, I forgot to validate it in my branch. In BuiltinFuncCall, something like this would work: But then you assume that all objects implementing the interface will use the same struct layout for that. I can't think of an example inside MSHTML where it's currently not the case, but that's not generally a promise that QI gives. > Alternatively, we can pass around `func_info_t` instead of dispid and tid, but still look it up like in your branch. So what's the point of it then? Avoiding one argument in a call? > I mean the test will simply start failing if it picks `IHTMLCSSStyleDeclaration` because the assignment does not throw exception anymore (when it should be!). I think that you misinterprets your observations. Here is a test proving that currentStyle should have a setter that throws an error (unless used for modifiable style object): ``` sync_test("currentStyle", function() { if (document.documentMode < 9) return; var s = document.body.currentStyle; var d = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(Object.getPrototypeOf(s)), "zoom"); ok(typeof(d.get) === "function", "d.get = " + d.get); ok(typeof(d.set) === "function", "d.set = " + d.set); d.set.call(document.body.style, "1"); try { d.set.call(s, "1"); ok(false, "exception expected"); }catch(e) { trace("MSG: " + e.message); } }); ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5444#note_72588

1 0

[PATCH v13 0/6] MR5769: Add support for large page backed file mapping objects on Linux.
by Vibhav Pant (＠vibhavp) 06 Jun '24

06 Jun '24

This MR adds support for creating file mapping objects backed by large pages on Linux, by making the following changes: ## wineserver * On Linux, `create_temp_file` will first attempt to use memfds as the backing fd. If it fails, it'll return to the current codepath, creating a temporary file in either the server or config directory. * The created memfd will be sealed against writes, if the caller requesting the appropriate page protection flags. * This removes the requirement that FDs be only created on filesystems/directories that aren't `noexec`. * In the server method `create_mapping` , if large pages have been requested by the caller, hold that the calling thread's token holds `SeLockMemoryPrivilege` . * Additionally, add `SeLockMemoryPrivilege` to the list of privileges enabled for the Administrator. ## `ntdll` * Add `virtual_get_min_large_page_size` and its exported wrapper `wine_unix_get_min_large_page_size`. * On Linux, the minimum page size is determined by going through `/sys/kernel/mm/hugepages`. If hugepage support was not detected, `STATUS_NOT_SUPPORTED` is returned instead. On other platforms, the older hard-coded value of 2\*1024\*1024 is returned instead. * `NtCreateSection` will validate certain parameters if large pages are requested. Specifically, it will return STATUS_INVALID_PARAMETER if the requested mapping is not anonymous/unnamed, or the size is not a multiple of the minimum supported page size. ## `kernelbase` * `GetLargePageMinimum` will use `wine_unix_get_min_large_page_size`. ## `kernel32/tests` * Add new test test_large_page_file_mapping, which validates privilege enforcements and parameter validation while creating large pages backed file mapping obejcts. The tests are skipped if `GetLargePageMinimum` returns 0. -- v13: kernel32: Add tests for large page mapping support. ntdll: Validate parameters to NtCreateSection if large pages are requested. server: Use memfd to back anonymous mappings on Linux. kernelbase: Implement GetLargePageMinimum by returning the value of LargePageMinimum in _KUSER_SHARED_DATA. server: Set LargePageMinimum in _KUSER_SHARED_DATA on Linux. server: Require SeLockMemoryPrivilege to create large page mappings. https://gitlab.winehq.org/wine/wine/-/merge_requests/5769

3 7

Re: [PATCH v8 0/11] MR5444: jscript: Do not allocate dispex_prop_t for indexed props.
by Gabriel Ivăncescu (＠insn) 06 Jun '24

06 Jun '24

On Wed Jun 5 21:57:54 2024 +0000, Jacek Caban wrote: > > But it was still ambiguous as I explained. > If you mean the "zoom" example, I'd appreciate for some details. That > one should already use `IHTMLCSSStyleDeclaration` interface, not > `IHTMLStyle*` ones. > > But since we pass the mshtml-internal tid (called iid in args) which > is opaque to jscript, I don't really see why this is better than passing > the `func_info_t` directly? Well IMO passing the pair is already more > complex and requires more lookups, more args, etc, but that's just me. > `get_dispex_from_this` is one thing, going through the interface take > cares of that. For that part, you could just replace the argument in my branch. > But we should also somehow make sure that the hook is safe to call. By > binding function info to the exact object instance, we guarantee that > it's safe to call `impl_from_*` from hooks. If you accept any function > info as an input, you need to somehow validate that it's safe to call > it. Something like moving QI earlier would only partially mitigate that. > I'm open to other approaches, but unless I'm missing something, there is > no such validation in your current branch. > It seems to me that things like 1ffeaa446613 come from some variation of > solution to that problem. Maybe it was needed in earlier version, but it > shouldn't be needed with "this" being resolved on jscript side. It's no > longer arbitrary when it's used for a `IJSDispatchHost` call. I would > suggest to try removing it. Yeah, I forgot to validate it in my branch. In BuiltinFuncCall, something like this would work: ```c if(func->hook) { hres = IWineJSDispatchHost_QueryInterface(&This->IWineJSDispatchHost_iface, tid_ids[func->tid], (void**)&unk); if(FAILED(hres)) return hres; IUnknown_Release(unk); hres = func->hook(This, setter ? DISPATCH_PROPERTYPUT : DISPATCH_PROPERTYGET, dp, ret, ei, caller); if(hres != S_FALSE) return hres; } ``` Alternatively, we can pass around `func_info_t` instead of dispid and tid, but still look it up like in your branch. We can obtain the dispid and tid from `func_info_t` so that's all that's needed. I'm not sure if that's an improvement over my approach, but I think it's definitely a simplification over yours. What do you think? BTW for `zoom`, the assignment should fail as it does on native (as the test does), are you sure it's supposed to be using `IHTMLCSSStyleDeclaration` which doesn't fail? I mean the test will simply start failing if it picks `IHTMLCSSStyleDeclaration` because the assignment does not throw exception anymore (when it should be!). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5444#note_72586

1 0

[PATCH v12 0/6] MR5769: Add support for large page backed file mapping objects on Linux.
by Vibhav Pant (＠vibhavp) 06 Jun '24

06 Jun '24

This MR adds support for creating file mapping objects backed by large pages on Linux, by making the following changes: ## wineserver * On Linux, `create_temp_file` will first attempt to use memfds as the backing fd. If it fails, it'll return to the current codepath, creating a temporary file in either the server or config directory. * The created memfd will be sealed against writes, if the caller requesting the appropriate page protection flags. * This removes the requirement that FDs be only created on filesystems/directories that aren't `noexec`. * In the server method `create_mapping` , if large pages have been requested by the caller, hold that the calling thread's token holds `SeLockMemoryPrivilege` . * Additionally, add `SeLockMemoryPrivilege` to the list of privileges enabled for the Administrator. ## `ntdll` * Add `virtual_get_min_large_page_size` and its exported wrapper `wine_unix_get_min_large_page_size`. * On Linux, the minimum page size is determined by going through `/sys/kernel/mm/hugepages`. If hugepage support was not detected, `STATUS_NOT_SUPPORTED` is returned instead. On other platforms, the older hard-coded value of 2\*1024\*1024 is returned instead. * `NtCreateSection` will validate certain parameters if large pages are requested. Specifically, it will return STATUS_INVALID_PARAMETER if the requested mapping is not anonymous/unnamed, or the size is not a multiple of the minimum supported page size. ## `kernelbase` * `GetLargePageMinimum` will use `wine_unix_get_min_large_page_size`. ## `kernel32/tests` * Add new test test_large_page_file_mapping, which validates privilege enforcements and parameter validation while creating large pages backed file mapping obejcts. The tests are skipped if `GetLargePageMinimum` returns 0. -- v12: kernel32: Add tests for large page mapping support. ntdll: Validate parameters to NtCreateSection if large pages are requested. server: Use memfd to back anonymous mappings on Linux. kernelbase: Implement GetLargePageMinimum by returning the value of LargePageMinimum in _KUSER_SHARED_DATA. server: Set LargePageMinimum in _KUSER_SHARED_DATA on Linux. server: Require SeLockMemoryPrivilege to create large page mappings. https://gitlab.winehq.org/wine/wine/-/merge_requests/5769

3 7

[PATCH 0/1] MR5651: winex11.drv: Use NtUserShowWindow() instead of WM_SYSCOMMAND to synchronize window state.
by Dmitry Timoshkov (＠dmitry) 06 Jun '24

06 Jun '24

DefWindowProc(WM_SYSCOMMAND) handler ignores commands for a WS_DISABLED window which leads to window state/size mismatch on X11 and win32 sides. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5651

4 7

[PATCH 0/1] MR5800: gdi32/text: Handle null partial extents pointer in GetTextExtentExPointW().
by Nikolay Sivov (＠nsivov) 06 Jun '24

06 Jun '24

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56788 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5800

3 2

[PATCH 0/1] MR5802: dwrite/tests: Fix a test failure on some Win10 machines with CJK locales.
by Nikolay Sivov (＠nsivov) 06 Jun '24

06 Jun '24

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5802

2 1

[PATCH v2 0/1] MR5777: win32u: Limit GDI object generation by 127 for a 64-bit build.
by Dmitry Timoshkov (＠dmitry) 06 Jun '24

06 Jun '24

I have a .Net application that during handling of WM_NCPAINT for one of its windows genarates exception "Arithmetic operation resulted in an overflow.". This happens only in a 64-bit prefix and only for WPARAM that contains an HRGN handle with value over than 0x7fffffff. The application does the following: public static IntPtr GetNativeDC(Message m, IntPtr handle) { if (m.Msg != 0x85) // WM_NCPAINT { return NUser32.GetWindowDC(handle); } int num = 0x200013; // DCX_VALIDATE | DCX_CLIPSIBLINGS | DCX_CACHE | DCX_WINDOW IntPtr intPtr = IntPtr.Zero; IntPtr wParam = m.WParam; if (wParam.ToInt32() != 1) { num |= 0x80; // DCX_INTERSECTRGN intPtr = CreateRectRgn(0, 0, 1, 1); CombineRgn(intPtr, wParam, IntPtr.Zero, 5); // RGN_COPY } return NUser32.GetDCEx(handle, intPtr, num); } The exception is generated by wParam.ToInt32(). MSDN description for ToInt32() https://learn.microsoft.com/en-us/dotnet/api/system.intptr.toint32?view=net… states Exceptions OverflowException In a 64-bit process, the value of this instance is too large or too small to represent as a 32-bit signed integer. MSDN also has a reference to ToInt32() source: https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5… public int ToInt32() { #if TARGET_64BIT return checked((int)_value); #else return (int)_value; #endif } It's not clear why a sign extension may lead to an overflow exception. This patch fixes the problem, and provides a test case that confirms that entry.Generation field of a GDI32 object is limited by 127 on a 64-bit platform, while 32-bit Windows doesn't have such a limitation. -- v2: win32u: Limit GDI object generation by 128. https://gitlab.winehq.org/wine/wine/-/merge_requests/5777

4 6

[PATCH 0/8] MR5801: d3dx9: Use new shared code in D3DXCreateTextureFromFileInMemoryEx().
by Connor McAdams (＠cmcadams) 06 Jun '24

06 Jun '24

This is the first step in moving the various D3DXCreateTextureFromFileInMemory functions over to using shared code. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5801

2 8

[PATCH v2 0/1] MR5789: server: Remove limitation for waiting on idle_event of the current process.
by Dmitry Timoshkov (＠dmitry) 06 Jun '24

06 Jun '24

[test_WaitForInputIdle.tar.bz2](/uploads/a20c5b119741cd7b0b4813488854a992/test_WaitForInputIdle.tar.bz2) Attached test replicates the problem. Basically the application does process = OpenProcess(SYNCHRONIZE | PROCESS_QUERY_INFORMATION, FALSE, GetCurrentProcessId()); ret = WaitForInputIdle(process, 0x7fffffff); assert(ret == 0); With current wine.git WaitForInputIdle() returns WAIT_FAILED because the server call get_process_idle_event() refuses to return idle_event for the current process. If that limitation is removed then wineserver crashes, and other parts of the patch fix the crash. -- v2: server: Remove limitation for waiting on idle_event of the current process. https://gitlab.winehq.org/wine/wine/-/merge_requests/5789

3 3

[PATCH v2 0/5] MR5798: winemac: Push window surface updates to the main thread.
by Rémi Bernon (＠rbernon) 06 Jun '24

06 Jun '24

Instead of accessing the surface with macdrv_get_surface_display_image. -- v2: winemac: Remove now unnecessary cocoa window surface pointer. winemac: Push window surface image updates to the main thread. winemac: Create window surface CGImageRef on surface flush. winemac: Create a provider for the surface and a HBITMAP wrapping it. winemac: Remove unused macdrv_get_surface_display_image copy_data parameter. https://gitlab.winehq.org/wine/wine/-/merge_requests/5798

2 6

[PATCH v5 0/4] MR5741: server: Implement key auto-repeat.
by Alexandros Frantzis (＠afrantzis) 06 Jun '24

06 Jun '24

This is an early draft of an implementation of key auto-repeat in wineserver to get some feedback. Some open questions: 1. queue_keyboard_message requires a `current` thread, but we don't get one in timeout callbacks. At the moment I am manually setting `current` to the foreground thread, but I am wondering if that's acceptable or we should explore other ways forward (also see TODO in code). 2. This draft introduces a new server request to configure auto-repeat (`enable/delay/period`). I am thinking that for more straightforward integration with the keyboard repeat SPI parameters, the request should only support the `enable` flag and the server should query the SPI registry values to get `delay` and `period` when needed. I am wondering if there any caveats here since I don't see other code in the server querying registry values (well, except to implement the registry requests themselves). Also, I would hope that opening and caching the `HKCU\Control Panel\Keyboard` hkey would remove most of the cost of performing this operation (if that's even a concern at all). -- v5: win32u: Implement keyboard auto-repeat using new server request. server: Implement key auto-repeat request. https://gitlab.winehq.org/wine/wine/-/merge_requests/5741

3 6

[PATCH v6 0/4] MR5741: server: Implement key auto-repeat.
by Alexandros Frantzis (＠afrantzis) 06 Jun '24

06 Jun '24

This is an early draft of an implementation of key auto-repeat in wineserver to get some feedback. Some open questions: 1. queue_keyboard_message requires a `current` thread, but we don't get one in timeout callbacks. At the moment I am manually setting `current` to the foreground thread, but I am wondering if that's acceptable or we should explore other ways forward (also see TODO in code). 2. This draft introduces a new server request to configure auto-repeat (`enable/delay/period`). I am thinking that for more straightforward integration with the keyboard repeat SPI parameters, the request should only support the `enable` flag and the server should query the SPI registry values to get `delay` and `period` when needed. I am wondering if there any caveats here since I don't see other code in the server querying registry values (well, except to implement the registry requests themselves). Also, I would hope that opening and caching the `HKCU\Control Panel\Keyboard` hkey would remove most of the cost of performing this operation (if that's even a concern at all). -- v6: win32u: Implement keyboard auto-repeat using new server request. server: Implement key auto-repeat request. https://gitlab.winehq.org/wine/wine/-/merge_requests/5741

2 5

[PATCH 0/5] MR5798: winemac: Push window surface updates to the main thread.
by Rémi Bernon (＠rbernon) 06 Jun '24

06 Jun '24

Instead of accessing the surface with macdrv_get_surface_display_image. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5798

2 6

[PATCH v3 0/5] MR5776: win32u: Parameterize DPI in some driver calls.
by Rémi Bernon (＠rbernon) 06 Jun '24

06 Jun '24

-- v3: win32u: Pass the rect DPI to NtUserIsWindowRectFullScreen. win32u: Introduce a new get_monitor_rect helper. win32u: Pass desired DPI to NtUserGet(Client|Window)Rect. win32u: Introduce NtUserAdjustWindowRect call for AdjustWindowRect*. win32u: Introduce new helpers to convert server rectangle_t. https://gitlab.winehq.org/wine/wine/-/merge_requests/5776

2 7

[PATCH v4 0/1] MR5333: vcruntime140_1: Pass original frame to catch block on stack.
by Daniel Lehman (＠dlehman25) 06 Jun '24

06 Jun '24

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56451 local variables with alignas(32) or higher may cause the unwinding code to fetch the original frame from a different spot on the stack from where the catch block code places it -- v4: vcruntime140_1: Pass original frame to catch block on stack. https://gitlab.winehq.org/wine/wine/-/merge_requests/5333

3 4

[PATCH 0/3] MR5797: wined3d: Miscellaneous.
by Elizabeth Figura (＠zfigura) 06 Jun '24

06 Jun '24

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

2 3

[PATCH 0/12] MR5796: kernelbase, ntdll: Implement DOS wildcards matching in NtQueryDirectoryFile and use that in FindFirstFile().
by Paul Gofman (＠gofman) 06 Jun '24

06 Jun '24

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

3 15

Re: [PATCH v4 0/1] MR3518: wininet: unify timeout values closer to hInternet
by Jacek Caban (＠jacek) 05 Jun '24

05 Jun '24

Jacek Caban (@jacek) commented about dlls/wininet/http.c: > > if (maxlen == -1) maxlen = sizeof(req->read_buf); > > + NETCON_set_timeout(req->netconn, FALSE, req->hdr.receive_timeout); Setting the timeout on the socket is quite expensive (requires a wineserver call). Maybe we could store the last set timeout separate from configure timeout and update socket timeout only when they don't match? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3518#note_72541

1 0

Re: [PATCH v4 0/1] MR3518: wininet: unify timeout values closer to hInternet
by Jacek Caban (＠jacek) 05 Jun '24

05 Jun '24

It looks better, thanks. In addition to minor comments, please split it. Additional `NETCON_set_timeout` fix is a separate fix from setting/getting options. Maybe also separate `NETCON_set_timeout` for send and receive. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3518#note_72542

1 0

Re: [PATCH v4 0/1] MR3518: wininet: unify timeout values closer to hInternet
by Jacek Caban (＠jacek) 05 Jun '24

05 Jun '24

Jacek Caban (@jacek) commented about dlls/wininet/internet.c: > + if (!lpwhh) > + { > + SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); > + return FALSE; > + } > + if (!lpBuffer || dwBufferLength != sizeof(ULONG)) > + { > + SetLastError(ERROR_INVALID_PARAMETER); > + ret = FALSE; > + } > + else > + { > + lpwhh->connect_timeout = *(ULONG *)lpBuffer; > + } > + break; > + } Do we still need it? I think that with implementation in both `set_global_option` and `INET_SetOption`, we could simply remove those cases from `InternetSetOptionW` fallback. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3518#note_72540

1 0

[PATCH v2 0/3] MR5685: Implement MarkupServices_ParseString
by Santino Mazza (＠tati1454) 05 Jun '24

05 Jun '24

-- v2: mshtml: Implement MarkupServices_ParseString. mshtml: Implement MarkupServices_CreateMarkupContainer. mshtml/tests: Test for IMarkupServices. https://gitlab.winehq.org/wine/wine/-/merge_requests/5685

5 11

[PATCH 0/1] MR5761: comclt32: Allow ctrl-tab and tab hotkeys for propsheets
by Fabian Maurer (＠DarkShadow44) 05 Jun '24

05 Jun '24

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56103 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5761

3 6

Re: [PATCH v8 0/11] MR5444: jscript: Do not allocate dispex_prop_t for indexed props.
by Jacek Caban (＠jacek) 05 Jun '24

05 Jun '24

> But it was still ambiguous as I explained. If you mean the "zoom" example, I'd appreciate for some details. That one should already use `IHTMLCSSStyleDeclaration` interface, not `IHTMLStyle*` ones. > But since we pass the mshtml-internal tid (called iid in args) which is opaque to jscript, I don't really see why this is better than passing the `func_info_t` directly? Well IMO passing the pair is already more complex and requires more lookups, more args, etc, but that's just me. `get_dispex_from_this` is one thing, going through the interface take cares of that. For that part, you could just replace the argument in my branch. But we should also somehow make sure that the hook is safe to call. By binding function info to the exact object instance, we guarantee that it's safe to call `impl_from_*` from hooks. If you accept any function info as an input, you need to somehow validate that it's safe to call it. Something like moving QI earlier would only partially mitigate that. I'm open to other approaches, but unless I'm missing something, there is no such validation in your current branch. It seems to me that things like 1ffeaa446613 come from some variation of solution to that problem. Maybe it was needed in earlier version, but it shouldn't be needed with "this" being resolved on jscript side. It's no longer arbitrary when it's used for a `IJSDispatchHost` call. I would suggest to try removing it. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5444#note_72533

1 0

Re: [PATCH v2 0/1] MR5758: ntdll: On macOS, check for xattr existence before calling getxattr. - approved
by Alexandre Julliard (＠julliard) 05 Jun '24

05 Jun '24

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

1 0

Re: [PATCH v6 0/3] MR5737: kernelbase: Use ERROR_DIRECTORY for FindFirstFileExW on invalid name. - approved
by Alexandre Julliard (＠julliard) 05 Jun '24

05 Jun '24

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

1 0

Re: [PATCH v2 0/1] MR5792: server: Avoid calling set_event from within msg_queue_add_queue. - approved
by Alexandre Julliard (＠julliard) 05 Jun '24

05 Jun '24

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

1 0

Re: [PATCH v4 0/9] MR5782: win32u: Move UpdateLayeredWindow implementation to win32u. - approved
by Alexandre Julliard (＠julliard) 05 Jun '24

05 Jun '24

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

1 0

Re: [PATCH v2 0/6] MR5763: wined3d: Fix some corner cases in the FFP pipelines related to unbound streams. - approved
by Alexandre Julliard (＠julliard) 05 Jun '24

05 Jun '24

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

1 0

Re: [PATCH v3 0/1] MR5786: gdi32: Use an internal NtUser call for D3DKMTOpenAdapterFromGdiDisplayName. - approved
by Alexandre Julliard (＠julliard) 05 Jun '24

05 Jun '24

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

1 0

Re: [PATCH v2 0/1] MR5795: scrrun/dictionary: Implement putref_Item() method. - approved
by Alexandre Julliard (＠julliard) 05 Jun '24

05 Jun '24

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

1 0

Re: [PATCH v4 0/1] MR5749: gitlab: Update configuration for the new Mac runner. - approved
by Alexandre Julliard (＠julliard) 05 Jun '24

05 Jun '24

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

1 0

Re: [PATCH v3 0/1] MR5779: win32u: Send EVENT_OBJECT_FOCUS in more cases. - approved
by Alexandre Julliard (＠julliard) 05 Jun '24

05 Jun '24

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

1 0

Re: [PATCH v3 0/5] MR5791: wineps.drv: Page size and orientation fixes - approved
by Alexandre Julliard (＠julliard) 05 Jun '24

05 Jun '24

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

1 0

[PATCH v33 0/1] MR5752: msvcrt: [PR53960] Fix ucrt has different struct layout than msvcrt
by cqwrteur (＠trcrsired) 05 Jun '24

05 Jun '24

UCRT's FILE struct and fd struct have different layouts, and their locks are different. Implementation in Wine does not match UCRT in Windows, causing ABI issues. see: https://bugs.winehq.org/show_bug.cgi?id=53960 -- v33: [PATCH] msvcrt: Fix incorrect layout of FILE in ucrt https://gitlab.winehq.org/wine/wine/-/merge_requests/5752

3 2

Re: [PATCH v8 0/11] MR5444: jscript: Do not allocate dispex_prop_t for indexed props.
by Gabriel Ivăncescu (＠insn) 05 Jun '24

05 Jun '24

On Wed Jun 5 18:25:43 2024 +0000, Jacek Caban wrote: > > Well yes, of course they check for the object type compatibility, but > in the end they should still preserve their "function identity" instead > of being looked up from the object everytime, even if it's completely > detached from it. > I don't know what you mean by that, a pair like (dispid, iid) uniquely > defines a function identity. There is nothing special about dispid > except that we already need its lookup implemented, so that seems convenient. > See https://gitlab.winehq.org/jacek/wine/-/commits/func-call for a draft > of what I mean. It implements `call` only for legacy functions, but I > think it would scale to proper prototypes. It implements > bc02a4fe3be595448, but doesn't need unpleasant things like > `get_dispex_from_this` and uses the new interface instead (so committing > something like that would also be a good opportunity to upstream > "boring" parts of 81800d9dfa59f4fd8). > Extending it with accessors support should be straightforward. For > prototypes, we could just have entries for those functions both in the > instance and prototype objects. In instances, they would be not searched > when doing lookups by name, so the only way to use it would be through > `IJSDispatchHost`. For prototypes, they would be looked up, but an > attempt to call it would fail because prototypes don't actually > implement the required interface (so the result of the lookup would be > useful only for instances). It should also allow skipping 1ffeaa446613 > with all its consequences. What do you think? Well yes, a pair does work, but I wasn't passing the IID, only the DISPID after making sure the object implements the required IID, since I was delegating to the standard InvokeEx (well, almost), which only has DISPID. But it was still ambiguous as I explained. But since we pass the mshtml-internal tid (called iid in args) which is opaque to jscript, I don't really see why this is better than passing the `func_info_t` directly? Well IMO passing the pair is already more complex and requires more lookups, more args, etc, but that's just me. I haven't analyzed the rest yet, I'll look tomorrow as I have to go now, but `get_dispex_from_this` is primarily useful for jscript proxies since they can have arbitrary "this" passed. I was using it here (for legacy function.call) mostly to introduce it earlier and have less to add on the proxy patch which was already big enough as it is, but it's not its main purpose. It was just a "split" attempt. Are you sure you can get rid of it with your method? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5444#note_72511

1 0

[PATCH v4 0/4] MR5741: server: Implement key auto-repeat.
by Alexandros Frantzis (＠afrantzis) 05 Jun '24

05 Jun '24

This is an early draft of an implementation of key auto-repeat in wineserver to get some feedback. Some open questions: 1. queue_keyboard_message requires a `current` thread, but we don't get one in timeout callbacks. At the moment I am manually setting `current` to the foreground thread, but I am wondering if that's acceptable or we should explore other ways forward (also see TODO in code). 2. This draft introduces a new server request to configure auto-repeat (`enable/delay/period`). I am thinking that for more straightforward integration with the keyboard repeat SPI parameters, the request should only support the `enable` flag and the server should query the SPI registry values to get `delay` and `period` when needed. I am wondering if there any caveats here since I don't see other code in the server querying registry values (well, except to implement the registry requests themselves). Also, I would hope that opening and caching the `HKCU\Control Panel\Keyboard` hkey would remove most of the cost of performing this operation (if that's even a concern at all). -- v4: win32u: Implement keyboard auto-repeat using new server request. server: Implement key auto-repeat request. server: Check message target process for raw input device flags. https://gitlab.winehq.org/wine/wine/-/merge_requests/5741

3 12

Re: [PATCH v8 0/11] MR5444: jscript: Do not allocate dispex_prop_t for indexed props.
by Jacek Caban (＠jacek) 05 Jun '24

05 Jun '24

> Well yes, of course they check for the object type compatibility, but in the end they should still preserve their "function identity" instead of being looked up from the object everytime, even if it's completely detached from it. I don't know what you mean by that, a pair like (dispid, iid) uniquely defines a function identity. There is nothing special about dispid except that we already need its lookup implemented, so that seems convenient. See https://gitlab.winehq.org/jacek/wine/-/commits/func-call for a draft of what I mean. It implements `call` only for legacy functions, but I think it would scale to proper prototypes. It implements bc02a4fe3be595448, but doesn't need unpleasant things like `get_dispex_from_this` and uses the new interface instead (so committing something like that would also be a good opportunity to upstream "boring" parts of 81800d9dfa59f4fd8). Extending it with accessors support should be straightforward. For prototypes, we could just have entries for those functions both in the instance and prototype objects. In instances, they would be not searched when doing lookups by name, so the only way to use it would be through `IJSDispatchHost`. For prototypes, they would be looked up, but an attempt to call it would fail because prototypes don't actually implement the required interface (so the result of the lookup would be useful only for instances). It should also allow skipping 1ffeaa446613 with all its consequences. What do you think? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5444#note_72509

1 0

[PATCH v6 0/6] MR5744: winegstreamer: Fix various Cinepak issues
by Alfred Agrell (＠Alcaro) 05 Jun '24

05 Jun '24

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56698 -- v6: quartz: Allow concurrent calls to AVI decoder qc_Notify and Receive. msvfw32/tests: Test that Cinepak rejects unsupported output types. iccvid: Reject unsupported output types. quartz/tests: Add Cinepak test to avi splitter. winegstreamer: Use end of previous frame if the current frame doesn't have a timestamp. winegstreamer: Implement AM_MEDIA_TYPE to wg_format converter for Cinepak video. https://gitlab.winehq.org/wine/wine/-/merge_requests/5744

4 9

[PATCH v3 0/4] MR5741: Draft: server: Implement key auto-repeat.
by Alexandros Frantzis (＠afrantzis) 05 Jun '24

05 Jun '24

This is an early draft of an implementation of key auto-repeat in wineserver to get some feedback. Some open questions: 1. queue_keyboard_message requires a `current` thread, but we don't get one in timeout callbacks. At the moment I am manually setting `current` to the foreground thread, but I am wondering if that's acceptable or we should explore other ways forward (also see TODO in code). 2. This draft introduces a new server request to configure auto-repeat (`enable/delay/period`). I am thinking that for more straightforward integration with the keyboard repeat SPI parameters, the request should only support the `enable` flag and the server should query the SPI registry values to get `delay` and `period` when needed. I am wondering if there any caveats here since I don't see other code in the server querying registry values (well, except to implement the registry requests themselves). Also, I would hope that opening and caching the `HKCU\Control Panel\Keyboard` hkey would remove most of the cost of performing this operation (if that's even a concern at all). -- v3: win32u: Implement keyboard auto-repeat using new server request. server: Implement key auto-repeat request. server: Check message target process for raw keyboard device flags. https://gitlab.winehq.org/wine/wine/-/merge_requests/5741

3 12

Re: [PATCH v32 0/1] MR5752: msvcrt: [PR53960] Fix ucrt has different struct layout than msvcrt
by Piotr Caban (＠piotr) 05 Jun '24

05 Jun '24

On Wed Jun 5 13:11:29 2024 +0000, cqwrteur wrote: > Of course, there is. The problem is that ucrt can be statically linked > from Microsoft UCRT static ucrt can be put back to FILE* in dynamic > linking. And fast_io library is using that. gitlab is not showing the context very well. I was asking about `stdout == stdin+1` test. Does the library depend on that? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5752#note_72456

1 0

[PATCH v2 0/1] MR5786: gdi32: Use an internal NtUser call for D3DKMTOpenAdapterFromGdiDisplayName.
by Rémi Bernon (＠rbernon) 05 Jun '24

05 Jun '24

Fixes a deadlock with display_device_init mutex and display_lock when trying to open the D3DKMT adapter while holding the mutex in the caller. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56764 -- v2: gdi32: Use an internal NtUser call for D3DKMTOpenAdapterFromGdiDisplayName. https://gitlab.winehq.org/wine/wine/-/merge_requests/5786

3 3

Re: [PATCH v32 0/1] MR5752: msvcrt: [PR53960] Fix ucrt has different struct layout than msvcrt
by Piotr Caban (＠piotr) 05 Jun '24

05 Jun '24

On Wed Jun 5 13:02:30 2024 +0000, cqwrteur wrote: > It is not. The problem is that ucrt can be statically linked from > Microsoft UCRT static ucrt can be put back to FILE* in dynamic linking. > And fast_io library is exploiting that to gain huge performance. The `ok(ptrold + cntold == file->_ptr + file->_cnt, ...);` test is redundant. You're testing `ptrold` and `cntold` values in earlier tests. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5752#note_72454

1 0

[PATCH v2 0/5] MR5741: Draft: server: Implement key auto-repeat.
by Alexandros Frantzis (＠afrantzis) 05 Jun '24

05 Jun '24

This is an early draft of an implementation of key auto-repeat in wineserver to get some feedback. Some open questions: 1. queue_keyboard_message requires a `current` thread, but we don't get one in timeout callbacks. At the moment I am manually setting `current` to the foreground thread, but I am wondering if that's acceptable or we should explore other ways forward (also see TODO in code). 2. This draft introduces a new server request to configure auto-repeat (`enable/delay/period`). I am thinking that for more straightforward integration with the keyboard repeat SPI parameters, the request should only support the `enable` flag and the server should query the SPI registry values to get `delay` and `period` when needed. I am wondering if there any caveats here since I don't see other code in the server querying registry values (well, except to implement the registry requests themselves). Also, I would hope that opening and caching the `HKCU\Control Panel\Keyboard` hkey would remove most of the cost of performing this operation (if that's even a concern at all). -- v2: win32u: Remove auto-repeat functionality. server: Implement key auto-repeat. server: Check message target process for raw keyboard device flags. user32: Add tests for cross-process raw keyboard events. server: Pass desktop to get_first_global_hook. https://gitlab.winehq.org/wine/wine/-/merge_requests/5741

3 17

[PATCH 0/1] MR5795: scrrun/dictionary: Implement putref_Item() method.
by Nikolay Sivov (＠nsivov) 05 Jun '24

05 Jun '24

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56781 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5795

3 2

[PATCH v3 0/6] MR5773: mmdevapi: Fake success in a few IAudioSessionControl2 methods
by Fabian Maurer (＠DarkShadow44) 05 Jun '24

05 Jun '24

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56763 -- v3: mmdevapi: Implement IAudioSessionControl2 GetGroupingParam SetGroupingParam mmdevapi: Implement IAudioSessionControl2 GetIconPath / SetIconPath mmdevapi: Implement IAudioSessionControl2 GetDisplayName / SetDisplayName https://gitlab.winehq.org/wine/wine/-/merge_requests/5773

5 11

[PATCH v3 0/1] MR5788: d3d11/tests: Add a test for NV12 textures.
by Giovanni Mascellani (＠giomasce) 05 Jun '24

05 Jun '24

-- v3: d3d11/tests: Add a test for NV12 textures. https://gitlab.winehq.org/wine/wine/-/merge_requests/5788

3 3

[PATCH 0/6] MR5763: wined3d: Fix some corner cases in the FFP pipelines related to unbound streams.
by Elizabeth Figura (＠zfigura) 05 Jun '24

05 Jun '24

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

4 10

[PATCH v2 0/5] MR5791: wineps.drv: Page size and orientation fixes
by Piotr Caban (＠piotr) 05 Jun '24

05 Jun '24

-- v2: wineps.drv: Add partial support for changing page size. wineps.drv: Write PageBoundingBox for every page. wineps.drv: Take all pages into account when computing bounding box. wineps.drv: Write page orientation hint for every page. https://gitlab.winehq.org/wine/wine/-/merge_requests/5791

3 7

[PATCH 0/1] MR5789: server: Remove limitation for waiting on idle_event of the current process.
by Dmitry Timoshkov (＠dmitry) 05 Jun '24

05 Jun '24

[test_WaitForInputIdle.tar.bz2](/uploads/a20c5b119741cd7b0b4813488854a992/test_WaitForInputIdle.tar.bz2) Attached test replicates the problem. Basically the application does process = OpenProcess(SYNCHRONIZE | PROCESS_QUERY_INFORMATION, FALSE, GetCurrentProcessId()); ret = WaitForInputIdle(process, 0x7fffffff); assert(ret == 0); With current wine.git WaitForInputIdle() returns WAIT_FAILED because the server call get_process_idle_event() refuses to return idle_event for the current process. If that limitation is removed then wineserver crashes, and other parts of the patch fix the crash. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5789

3 8

[PATCH v2 0/1] MR5779: win32u: Send EVENT_OBJECT_FOCUS in more cases.
by Esme Povirk (＠madewokherd) 05 Jun '24

05 Jun '24

This adds some wine-only messages, but most of those are cases that follow an existing EVENT_SYSTEM_FOREGROUND wine-only message, so likely correctly reflecting a thing Wine is already known to do wrong. The exception is WmRestore_3. https://testbot.winehq.org/JobDetails.pl?Key=146025 suggests that's also a case where focuses the window and shouldn't. -- v2: win32u: Send EVENT_OBJECT_FOCUS in more cases. https://gitlab.winehq.org/wine/wine/-/merge_requests/5779

4 4

[PATCH v3 0/1] MR5749: Draft: gitlab: Update configuration for the new Mac runner.
by Tim Clem (＠tclem) 05 Jun '24

05 Jun '24

Two main changes: - VM configuration in build.yml for the executor. - The build-mac script is now architecture-agnostic. -- v3: gitlab: Update configuration for the new Mac runner. https://gitlab.winehq.org/wine/wine/-/merge_requests/5749

3 3

Re: [PATCH v2 0/3] MR5793: server: Inherit the source token's label in token_duplicate().
by Elizabeth Figura (＠zfigura) 05 Jun '24

05 Jun '24

The Windows failures here are in a different test unit. They don't look like they should be intermittent, but they don't seem to happen in winetest runs. I don't know what's different about this environment... -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5793#note_72413

1 0

[PATCH v2 0/6] MR5717: Improve dmo_wrapper_sink_Receive.
by Ziqing Hui (＠zhui) 05 Jun '24

05 Jun '24

This reduce the chance of buffer allocating issue for Kirikiri2 games(eg. Super Naughty Maid) when the game is trying to play videos. -- v2: qasf/dmowrapper: Sync Stop() and Receive() for dmo wrapper filter. qasf/dmowrapper: Return VFW_E_WRONG_STATE in dmo_wrapper_sink_Receive. qasf/dmowrapper: Return failure in dmo_wrapper_sink_Receive if samples allocating fails. qasf/dmowrapper: Introduce release_output_samples. qasf/dmowrapper: Introduce get_output_samples. qasf/tests: Add more tests for dmo_wrapper_sink_Receive. https://gitlab.winehq.org/wine/wine/-/merge_requests/5717

4 9

[PATCH v2 0/7] MR5732: winegstreamer: Get rid of the wg_transform internal output_format.
by Rémi Bernon (＠rbernon) 05 Jun '24

05 Jun '24

-- v2: winegstreamer: Request the new transform output format explicitly. winegstreamer: Get rid of the wg_transform internal output_format. winegstreamer: Only report format changes when frontend supports it. winegstreamer: Rename allow_size_change to allow_format_change. winegstreamer: Enforce default stride presence in the video processor. winegstreamer: Enforce default stride value in the video decoder. winegstreamer: Allow to clear video decoder input/output types. https://gitlab.winehq.org/wine/wine/-/merge_requests/5732

4 9

[PATCH 0/3] MR5793: server: Inherit the source token's label in token_duplicate().
by Elizabeth Figura (＠zfigura) 05 Jun '24

05 Jun '24

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

2 3

Re: [PATCH v32 0/1] MR5752: msvcrt: [PR53960] Fix ucrt has different struct layout than msvcrt
by cqwrteur (＠trcrsired) 04 Jun '24

04 Jun '24

I just showed an example of how this code will fail in the issue without any hacking. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5752#note_72404

1 0

Re: [PATCH v32 0/1] MR5752: msvcrt: [PR53960] Fix ucrt has different struct layout than msvcrt
by cqwrteur (＠trcrsired) 04 Jun '24

04 Jun '24

On Tue Jun 4 22:57:24 2024 +0000, cqwrteur wrote: > It was always different in layout. This is a bug for years. UCRT does > not have the same layout of FILE compared to msvcrt. However wine just > assumes they are the same, which is wrong. MSVC allows you to pass FILE* > from a statically linked ucrt to a dynamic linked ucrt provided by the > operating system and that is of course causing abi break. https://github.com/cppfastio/fast_io/blob/next/include/fast_io_legacy_impl/… I have changed my code to make it clearer. msvcrt and ucrt always use different layouts. This should be clearer for you. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5752#note_72402

1 0

Re: [PATCH v32 0/1] MR5752: msvcrt: [PR53960] Fix ucrt has different struct layout than msvcrt
by cqwrteur (＠trcrsired) 04 Jun '24

04 Jun '24

On Fri May 31 21:05:42 2024 +0000, cqwrteur wrote: > Done :) hi. Can you merge the code? @alexhenrie I desperately need this. Please do not break my library. Thank you. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5752#note_72401

1 0

Re: [PATCH v32 0/1] MR5752: msvcrt: [PR53960] Fix ucrt has different struct layout than msvcrt
by cqwrteur (＠trcrsired) 04 Jun '24

04 Jun '24

@piotr Any more issues? If no, then merge it ty. I desperately need this working -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5752#note_72399

1 0

Re: [PATCH v32 0/1] MR5752: msvcrt: [PR53960] Fix ucrt has different struct layout than msvcrt
by cqwrteur (＠trcrsired) 04 Jun '24

04 Jun '24

@piotr @alexhenrie, it is time to merge the code. Ty. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5752#note_72400

1 0

Re: [PATCH v32 0/1] MR5752: msvcrt: [PR53960] Fix ucrt has different struct layout than msvcrt
by cqwrteur (＠trcrsired) 04 Jun '24

04 Jun '24

On Sun Jun 2 22:51:59 2024 +0000, cqwrteur wrote: > changed this line in [version 21 of the diff](/wine/wine/-/merge_requests/5752/diffs?diff_id=116242&start_sha=0ed3968e5c80f1068a89193deb4b3309a69d8e27#1a28d67ae45bfb1e18198f92ca618b484c4e5a63_3171_3164) It is not. The problem is that ucrt can be statically linked from Microsoft UCRT static ucrt can be put back to FILE* in dynamic linking. And fast_io library is exploiting that to gain huge performance. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5752#note_72395

1 0

Re: [PATCH v32 0/1] MR5752: msvcrt: [PR53960] Fix ucrt has different struct layout than msvcrt
by cqwrteur (＠trcrsired) 04 Jun '24

04 Jun '24

On Sun Jun 2 22:59:20 2024 +0000, cqwrteur wrote: > changed this line in [version 22 of the diff](/wine/wine/-/merge_requests/5752/diffs?diff_id=116244&start_sha=f9ce09a15be1de01f4b8f3f2c25cf9c722a4b2d8#1a28d67ae45bfb1e18198f92ca618b484c4e5a63_3144_3149) It was always different in layout. This is a bug for years. UCRT does not have the same layout of FILE compared to msvcrt. However wine just assumes they are the same, which is wrong. MSVC allows you to pass FILE* from a statically linked ucrt to a dynamic linked ucrt provided by the operating system and that is of course causing abi break. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5752#note_72396

1 0

Re: [PATCH v32 0/1] MR5752: msvcrt: [PR53960] Fix ucrt has different struct layout than msvcrt
by cqwrteur (＠trcrsired) 04 Jun '24

04 Jun '24

On Sun Jun 2 22:51:59 2024 +0000, cqwrteur wrote: > changed this line in [version 21 of the diff](/wine/wine/-/merge_requests/5752/diffs?diff_id=116242&start_sha=0ed3968e5c80f1068a89193deb4b3309a69d8e27#1a28d67ae45bfb1e18198f92ca618b484c4e5a63_3173_3164) It should be fixed. Please review it again -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5752#note_72397

1 0

Re: [PATCH v32 0/1] MR5752: msvcrt: [PR53960] Fix ucrt has different struct layout than msvcrt
by cqwrteur (＠trcrsired) 04 Jun '24

04 Jun '24

On Tue Jun 4 22:57:24 2024 +0000, Piotr Caban wrote: > Please move the test to `dlls/ucrtbase/tests/file.c`. Also please add > tests in separate patch. What do you mean by a separate patch? Test Moved. Is it ok for you now? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5752#note_72398

1 0

Re: [PATCH v32 0/1] MR5752: msvcrt: [PR53960] Fix ucrt has different struct layout than msvcrt
by cqwrteur (＠trcrsired) 04 Jun '24

04 Jun '24

On Fri May 31 21:52:56 2024 +0000, cqwrteur wrote: > Add a test. I think this should be ok now. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5752#note_72392

1 0

Re: [PATCH v32 0/1] MR5752: msvcrt: [PR53960] Fix ucrt has different struct layout than msvcrt
by cqwrteur (＠trcrsired) 04 Jun '24

04 Jun '24

Please merge it. Ty. This ABI issue is a big issue for me. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5752#note_72393

1 0

Re: [PATCH v32 0/1] MR5752: msvcrt: [PR53960] Fix ucrt has different struct layout than msvcrt
by cqwrteur (＠trcrsired) 04 Jun '24

04 Jun '24

On Sun Jun 2 22:51:57 2024 +0000, cqwrteur wrote: > changed this line in [version 21 of the diff](/wine/wine/-/merge_requests/5752/diffs?diff_id=116242&start_sha=0ed3968e5c80f1068a89193deb4b3309a69d8e27#1a28d67ae45bfb1e18198f92ca618b484c4e5a63_3153_3158) Of course, there is. The problem is that ucrt can be statically linked from Microsoft UCRT static ucrt can be put back to FILE* in dynamic linking. And fast_io library is using that. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5752#note_72394

1 0

Re: [PATCH v3 0/4] MR5774: win32u: Move desktop resize on WM_DISPLAYCHANGE of the drivers. - approved
by Alexandre Julliard (＠julliard) 04 Jun '24

04 Jun '24

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

1 0

Re: [PATCH v2 0/4] MR5780: mshtml: Unify document node IDispatchEx implementation. - approved
by Alexandre Julliard (＠julliard) 04 Jun '24

04 Jun '24

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

1 0

Re: [PATCH v2 0/1] MR5770: wined3d: Update multisample state when the sample count changes. - approved
by Alexandre Julliard (＠julliard) 04 Jun '24

04 Jun '24

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

1 0

Re: [PATCH v3 0/4] MR5784: win32u: Fix a couple of window surface regressions. - approved
by Alexandre Julliard (＠julliard) 04 Jun '24

04 Jun '24

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

1 0

Re: [PATCH v2 0/1] MR5783: ntdll: Provide fallback values for DMI fields only readable by root. - approved
by Alexandre Julliard (＠julliard) 04 Jun '24

04 Jun '24

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

1 0

Re: [PATCH v6 0/5] MR5641: Cmd engine rewrite (part IV) - approved
by Alexandre Julliard (＠julliard) 04 Jun '24

04 Jun '24

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

1 0

Re: [PATCH v2 0/1] MR5781: include: Add more types to windows.networking.connectivity.idl. - approved
by Alexandre Julliard (＠julliard) 04 Jun '24

04 Jun '24

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

1 0

[PATCH 0/1] MR5779: win32u: Send EVENT_OBJECT_FOCUS in more cases.
by Esme Povirk (＠madewokherd) 04 Jun '24

04 Jun '24

This adds some wine-only messages, but most of those are cases that follow an existing EVENT_SYSTEM_FOREGROUND wine-only message, so likely correctly reflecting a thing Wine is already known to do wrong. The exception is WmRestore_3. https://testbot.winehq.org/JobDetails.pl?Key=146025 suggests that's also a case where focuses the window and shouldn't. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5779

4 5

[PATCH 0/1] MR5792: server: Avoid calling set_event from within msg_queue_add_queue.
by Rémi Bernon (＠rbernon) 04 Jun '24

04 Jun '24

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

2 1

[PATCH 0/1] MR5790: makedep: Support building only tools, headers and import libs.
by Rémi Bernon (＠rbernon) 04 Jun '24

04 Jun '24

I think this would be useful to build a subset of Wine that could then be used to build third-party modules without having to build everything. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5790

3 4

[PATCH 5/5] wineps.drv: Add partial support for changing page size.
by Piotr Caban 04 Jun '24

04 Jun '24

From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wineps.drv/printproc.c | 2 ++ dlls/wineps.drv/ps.c | 14 ++++++++++++-- dlls/wineps.drv/psdrv.h | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index db2979f0fbe..84f4b9f5900 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -3110,6 +3110,8 @@ BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) if (ret) ret = PSDRV_ResetDC(data->ctx, devmode); + if (ret && devmode && (devmode->dmFields & DM_PAPERSIZE)) + ret = PSDRV_WritePageSize(data->ctx); free(devmode); if (!ret) goto cleanup; diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index d48370acef7..31e8c5bdebb 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -396,6 +396,17 @@ static void write_cups_job_ticket( print_ctx *ctx, const struct ticket_info *inf write_spool( ctx, cups_ap_d_inputslot, sizeof(cups_ap_d_inputslot) - 1 ); } +INT PSDRV_WritePageSize( print_ctx *ctx ) +{ + PAGESIZE *page = find_pagesize( ctx->pi->ppd, &ctx->Devmode->dmPublic ); + + if (page && page->InvocationString) + PSDRV_WriteFeature( ctx, "*PageSize", page->Name, page->InvocationString ); + else + WARN("Page size not set\n"); + return 1; +} + INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title ) { char *buf, *escaped_title; @@ -443,8 +454,7 @@ INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title ) if (slot && slot->InvocationString) PSDRV_WriteFeature( ctx, "*InputSlot", slot->Name, slot->InvocationString ); - if (page && page->InvocationString) - PSDRV_WriteFeature( ctx, "*PageSize", page->Name, page->InvocationString ); + PSDRV_WritePageSize( ctx ); if (duplex && duplex->InvocationString) PSDRV_WriteFeature( ctx, "*Duplex", duplex->Name, duplex->InvocationString ); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index d1ac2cc06cd..2c4703de942 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -466,6 +466,7 @@ extern char PSDRV_UnicodeToANSI(int u); extern INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title ); extern INT PSDRV_WriteFooter( print_ctx *ctx ); +extern INT PSDRV_WritePageSize( print_ctx *ctx ); extern INT PSDRV_WriteNewPage( print_ctx *ctx ); extern INT PSDRV_WriteEndPage( print_ctx *ctx ); extern BOOL PSDRV_WriteMoveTo(print_ctx *ctx, INT x, INT y); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5791

1 0

[PATCH 4/5] wineps.drv: Write PageBoundingBox for every page.
by Piotr Caban 04 Jun '24

04 Jun '24

From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wineps.drv/ps.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 8d3db610647..d48370acef7 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -95,6 +95,7 @@ static const char psendfeature[] = static const char psnewpage[] = /* name, number, xres, yres, xtrans, ytrans, rot */ "%%%%Page: %s %d\n" +"%%%%PageBoundingBox: %ld %ld %ld %ld\n" "%%%%PageOrientation: %s\n" "%%%%BeginPageSetup\n" "/pgsave save def\n" @@ -560,6 +561,7 @@ INT PSDRV_WriteNewPage( print_ctx *ctx ) } sprintf(buf, psnewpage, name, ctx->job.PageNo, + bbox.left, bbox.top, bbox.right, bbox.bottom, ctx->Devmode->dmPublic.dmOrientation == DMORIENT_LANDSCAPE ? "Landscape" : "Portrait", GetDeviceCaps(ctx->hdc, ASPECTX), GetDeviceCaps(ctx->hdc, ASPECTY), xtrans, ytrans, rotation); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5791

1 0

[PATCH 3/5] wineps.drv: Take all pages into account when computing bounding box.
by Piotr Caban 04 Jun '24

04 Jun '24

From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wineps.drv/ps.c | 85 +++++++++++++++++++++++------------------ dlls/wineps.drv/psdrv.h | 1 + 2 files changed, 49 insertions(+), 37 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 744bda62497..8d3db610647 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -54,7 +54,7 @@ static const char cups_ap_d_inputslot[] = "%cupsJobTicket: AP_D_InputSlot=\n"; / static const char psheader[] = /* title llx lly urx ury orientation */ "%%%%Creator: Wine PostScript Driver\n" "%%%%Title: %s\n" -"%%%%BoundingBox: %d %d %d %d\n" +"%%%%BoundingBox: (atend)\n" "%%%%Pages: (atend)\n" "%%%%EndComments\n"; @@ -110,6 +110,7 @@ static const char psendpage[] = static const char psfooter[] = /* pages */ "%%%%Trailer\n" +"%%%%BoundingBox: %ld %ld %ld %ld\n" "%%%%Pages: %d\n" "%%%%EOF\n"; @@ -400,7 +401,6 @@ INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title ) INPUTSLOT *slot = find_slot( ctx->pi->ppd, &ctx->Devmode->dmPublic ); PAGESIZE *page = find_pagesize( ctx->pi->ppd, &ctx->Devmode->dmPublic ); DUPLEX *duplex = find_duplex( ctx->pi->ppd, &ctx->Devmode->dmPublic ); - int llx, lly, urx, ury; int ret, len; struct ticket_info ticket_info = { page, duplex }; @@ -419,46 +419,14 @@ INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title ) escaped_title = escape_title(title); buf = HeapAlloc( GetProcessHeap(), 0, sizeof(psheader) + - strlen(escaped_title) + 30 ); + strlen(escaped_title) ); if(!buf) { WARN("HeapAlloc failed\n"); HeapFree(GetProcessHeap(), 0, escaped_title); return 0; } - /* BBox co-ords are in default user co-ord system so urx < ury even in - landscape mode */ - if ((ctx->Devmode->dmPublic.dmFields & DM_PAPERSIZE) && page) - { - if (page->ImageableArea) - { - llx = page->ImageableArea->llx; - lly = page->ImageableArea->lly; - urx = page->ImageableArea->urx; - ury = page->ImageableArea->ury; - } - else - { - llx = lly = 0; - urx = page->PaperDimension->x; - ury = page->PaperDimension->y; - } - } - else if ((ctx->Devmode->dmPublic.dmFields & DM_PAPERLENGTH) && - (ctx->Devmode->dmPublic.dmFields & DM_PAPERWIDTH)) - { - /* Devmode sizes in 1/10 mm */ - llx = lly = 0; - urx = ctx->Devmode->dmPublic.dmPaperWidth * 72.0 / 254.0; - ury = ctx->Devmode->dmPublic.dmPaperLength * 72.0 / 254.0; - } - else - { - llx = lly = urx = ury = 0; - } - /* FIXME should do something better with BBox */ - - sprintf(buf, psheader, escaped_title, llx, lly, urx, ury); + sprintf(buf, psheader, escaped_title); HeapFree(GetProcessHeap(), 0, escaped_title); @@ -498,7 +466,8 @@ INT PSDRV_WriteFooter( print_ctx *ctx ) return 0; } - sprintf(buf, psfooter, ctx->job.PageNo); + sprintf(buf, psfooter, ctx->bbox.left, ctx->bbox.top, + ctx->bbox.right, ctx->bbox.bottom, ctx->job.PageNo); if( write_spool( ctx, buf, strlen(buf) ) != strlen(buf) ) { WARN("WriteSpool error\n"); @@ -520,15 +489,57 @@ INT PSDRV_WriteEndPage( print_ctx *ctx ) } +static void get_bounding_box( print_ctx *ctx, RECT *bbox) +{ + PAGESIZE *page; + + /* BBox co-ords are in default user co-ord system so urx < ury even in + landscape mode */ + if ((ctx->Devmode->dmPublic.dmFields & DM_PAPERSIZE) && + (page = find_pagesize( ctx->pi->ppd, &ctx->Devmode->dmPublic ))) + { + if (page->ImageableArea) + { + bbox->left = page->ImageableArea->llx; + bbox->top = page->ImageableArea->lly; + bbox->right = page->ImageableArea->urx; + bbox->bottom = page->ImageableArea->ury; + } + else + { + bbox->left = bbox->top = 0; + bbox->right = page->PaperDimension->x; + bbox->bottom = page->PaperDimension->y; + } + } + else if ((ctx->Devmode->dmPublic.dmFields & DM_PAPERLENGTH) && + (ctx->Devmode->dmPublic.dmFields & DM_PAPERWIDTH)) + { + /* Devmode sizes in 1/10 mm */ + bbox->left = bbox->top = 0; + bbox->right = ctx->Devmode->dmPublic.dmPaperWidth * 72.0 / 254.0; + bbox->bottom = ctx->Devmode->dmPublic.dmPaperLength * 72.0 / 254.0; + } + else + { + bbox->left = bbox->top = bbox->right = bbox->bottom = 0; + } + /* FIXME should do something better with BBox */ +} + INT PSDRV_WriteNewPage( print_ctx *ctx ) { signed int xtrans, ytrans, rotation; char buf[256], name[16]; + RECT bbox; sprintf(name, "%d", ctx->job.PageNo); + get_bounding_box( ctx, &bbox ); + UnionRect( &ctx->bbox, &bbox, &ctx->bbox ); + if(ctx->Devmode->dmPublic.dmOrientation == DMORIENT_LANDSCAPE) { if(ctx->pi->ppd->LandscapeOrientation == -90) { xtrans = GetDeviceCaps(ctx->hdc, PHYSICALHEIGHT) - diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 31adc36adfc..d1ac2cc06cd 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -368,6 +368,7 @@ typedef struct PSDRV_DEVMODE *Devmode; PRINTERINFO *pi; int pathdepth; + RECT bbox; } print_ctx; extern print_ctx *create_print_ctx( HDC hdc, const WCHAR *device, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5791

1 0

2025

2024

2023

2022

wine-gitlab