- wine-gitlab - winehq.org

Re: [PATCH v2 0/1] MR3912: msvcp90: Silence FIXME in _Locinfo::_Locinfo_ctor and _Locinfo::_Locinfo_Addcats functions. - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH v2 0/5] MR3911: mshtml: Use more dispex vtbl methods instead of the nodes'. - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3883: d3d10core/tests: Test performing a full clear after a draw. - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3864: wined3d: Pass a wined3d_stateblock_state to wined3d_device_validate_device(). - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3857: d3d11/tests: Properly mark the indexed sample position test as succeeding with the Vulkan backend. - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3856: wined3d: Don't validate the frontbuffer's DRAWABLE location in wined3d_swapchain_resize_buffers() when NO3D is set. - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3853: d3drm: Correctly query for the returned interface - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3869: dsound: Use malloc and free instead of _recalloc. - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH v2 0/2] MR3895: wineps: Don't crash when loading Type 1 font in T42_download_header. - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3894: winmm/tests: Avoid truncating the handle passed to waveInGetDevCapsW(). - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH v3 0/1] MR3630: msi: Use CreateFileW() for handling path from cabinet_open() instead. - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3904: wshom: Use the wcsdup function instead of reimplementing it. - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3903: shell32: Use the wcsdup function instead of reimplementing it. - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3902: ncrypt: Use the wcsdup function instead of reimplementing it. - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3901: msvfw32: Use CRT allocation functions. - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3900: mciwave: Use CRT allocation functions. - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3898: gameux: Use CRT allocation functions. - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3897: advpack: Use CRT allocation functions. - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH v4 0/4] MR3617: oleaut32: Use CRT allocation functions. - approved
by Alexandre Julliard (＠julliard) 20 Sep '23

20 Sep '23

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

1 0

Re: [PATCH 0/6] MR3909: winewayland.drv: part 7: Basic window management
by Dallas Strouse (＠orowith2os) 20 Sep '23

20 Sep '23

Hi, I'm back again :P Since it's probably about time for it, and I forgot to send that email a while back, I might as well ask now: are there plans to make Wine use libdecor at some point in the future, so that there are "native" window decorations for desktops that don't provide xdg-decoration? A lot of the work here for compositor-initiated window closing is a requirement for that. There may be performance implications for this, IIRC, since you'd have to work with another library's event loop on top of another GUI toolkit not made for games, and GTK doesn't support wl_subsurfaces normally *iirc*. SDL does it, at least, so there's that. But something to maybe consider. I'm satisfied with the default window decorations right now, myself. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3909#note_46062

1 0

[PATCH v2 0/1] MR349: vkd3d-shader/ir: Remove dead code during normalisation.
by Giovanni Mascellani (＠giomasce) 20 Sep '23

20 Sep '23

-- v2: vkd3d-shader/ir: Remove dead code during normalisation. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/349

2 2

[PATCH 0/1] MR3913: user32/tests: Fix WM_WINDOWPOSCHANGED entries.
by Esme Povirk (＠madewokherd) 20 Sep '23

20 Sep '23

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

2 1

Re: [PATCH v6 0/7] MR320: vkd3d-shader/dxil: Implement DX instruction LoadInput.
by Henri Verbeet (＠hverbeet) 20 Sep '23

20 Sep '23

> ```diff > +static uint32_t spirv_compiler_emit_load_ssa_reg(struct spirv_compiler *compiler, > + const struct vkd3d_shader_register *reg, enum vkd3d_shader_component_type component_type, > + unsigned int swizzle, unsigned int write_mask) > +{ > + uint32_t val_id = spirv_compiler_get_ssa_register_id(compiler, reg); > + assert(val_id); > + return val_id; > +} > ``` This doesn't emit anything, and "component_type", "swizzle", and "write_mask" are unused. More generally, it seems the only caller could just call spirv_compiler_get_ssa_register_id() instead. > ```diff > @@ -3912,6 +3938,13 @@ static void spirv_compiler_emit_store_reg(struct spirv_compiler *compiler, > > assert(!register_is_constant_or_undef(reg)); > > + if (reg->type == VKD3DSPR_SSA) > + { > + assert(reg->idx[0].offset < compiler->ssa_register_count); > + compiler->ssa_register_ids[reg->idx[0].offset] = val_id; > + return; > + } > + > ``` Here we seem to go entirely the other way, and simply inline the counterpart to spirv_compiler_get_ssa_register_id(). I.e., why do we have spirv_compiler_get_ssa_register_id() but not spirv_compiler_set_ssa_register_id()? > ```diff > +static void spirv_compiler_emit_ssas(struct spirv_compiler *compiler, unsigned int count) > +{ > + assert(!compiler->ssa_register_ids); > + if (!(compiler->ssa_register_ids = vkd3d_calloc(count, sizeof(*compiler->ssa_register_ids)))) > + { > + ERR("Failed to allocate SSA register value id array, count %u.\n", count); > + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_OUT_OF_MEMORY, > + "Failed to allocate SSA register value id array of count %u.", count); > + } > + compiler->ssa_register_count = count; > +} > ``` This doesn't emit any SPIR-V. > ```diff > @@ -523,6 +524,7 @@ enum vkd3d_shader_register_type > VKD3DSPR_RASTERIZER, > VKD3DSPR_OUTSTENCILREF, > VKD3DSPR_UNDEF, > + VKD3DSPR_SSA, > > VKD3DSPR_COUNT, > ``` This is perhaps subtle, but note that this will cause init_sm4_lookup_tables() to map VKD3DSPR_SSA (like VKD3DSPR_UNDEF) to VKD3D_SM4_RT_TEMP, while ideally that lookup would fail. > ```diff > @@ -2838,7 +2855,8 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t > return ret; > } > > - if (!(sm6->output_params = shader_parser_get_dst_params(&sm6->p, output_signature->element_count))) > + if (!(sm6->output_params = shader_parser_get_dst_params(&sm6->p, output_signature->element_count)) > + || !(sm6->input_params = shader_parser_get_dst_params(&sm6->p, input_signature->element_count))) > { > ERR("Failed to allocate output parameters.\n"); > vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, > ``` That makes the error message inaccurate. > ```diff > +static inline unsigned int sm6_parser_alloc_ssa_id(struct sm6_parser *sm6) > +{ > + return sm6->ssa_next_id++; > +} > ``` Why is that "static inline"? The main thing it'll do in .c files is to make it harder to spot unused code. We seem to have some more instances of that in both the existing dxil.c code and this MR. > ```diff > +static void register_init_with_id(struct vkd3d_shader_register *reg, > + enum vkd3d_shader_register_type reg_type, enum vkd3d_data_type data_type, unsigned int index) > +{ > + shader_register_init(reg, reg_type, data_type, 1); > + reg->idx[0].offset = index; > +} > ``` This is pretty minor in the scheme of things, but where is the ID above? I'm guessing it's supposed to be the "index" parameter. > ```diff > +static void register_init_ssa_vector(struct vkd3d_shader_register *reg, enum vkd3d_data_type data_type, > + unsigned int component_count, struct sm6_parser *sm6) > ... > +static inline void register_init_ssa_scalar(struct vkd3d_shader_register *reg, const struct sm6_type *type, > + struct sm6_parser *sm6) > ``` Why does initialising a SSA vector require a vkd3d_data_type, while initialising a SSA scalar requires a sm6_type? Also, register_init_ssa_vector() is only ever called with a "component_count" of 1. > ```diff > +static void instruction_dst_param_init_ssa_scalar_component(struct vkd3d_shader_instruction *ins, > + unsigned int component_idx, struct sm6_parser *sm6) > +{ > + struct vkd3d_shader_dst_param *param = instruction_dst_params_alloc(ins, 1, sm6); > + struct sm6_value *dst = sm6_parser_get_current_value(sm6); > + > + dst_param_init_ssa_scalar(param, dst->type, sm6); > + param->write_mask = VKD3DSP_WRITEMASK_0 << component_idx; > + dst->u.reg = param->reg; > +} > ``` Somewhat like register_init_ssa_vector() above, we're only ever calling instruction_dst_param_init_ssa_scalar_component() with a "component_idx" of 0. I'm guessing future patches will make some of these issues go away, but that's not ideal. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/320#note_46057

1 0

Re: [PATCH 0/2] MR356: Release 1.9.
by Henri Verbeet (＠hverbeet) 20 Sep '23

20 Sep '23

Holding this for a bit for some last-minute changes from Zeb. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/356#note_46056

1 0

Re: [PATCH 0/5] MR3910: uiautomationcore: More MSAA proxy provider patches. - approved
by Esme Povirk (＠madewokherd) 20 Sep '23

20 Sep '23

This merge request was approved by Esme Povirk. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3910

1 0

Re: [PATCH v19 0/16] MR3870: mspatcha: Add support for 32-bit file patching and normalization
by Zebediah Figura (＠zfigura) 20 Sep '23

20 Sep '23

On Tue Sep 19 18:27:47 2023 +0000, Aidan Khoury wrote: > This is needed in case the `-Wunused-variable` is used with clang > compiler frontend. The Windows Patch API passes this variable - see https://learn.microsoft.com/en-us/previous-versions/bb417345(v=msdn.10)#nor…. > Though it is unused, I would like to keep it to maintain compatibility > with the Windows API. I assume you mean -Wunused-parameter, since -Wunused-variable alone shouldn't warn on parameters. I don't think -Wunused-parameter is reasonable to enable for Wine. The Windows API has far, far too many unused parameters for annotating them all to be worthwhile. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3870#note_46053

1 0

Re: [PATCH 0/2] MR3906: dmusic: Keep original instrument patch around. - approved
by Michael Stefaniuc (＠mstefani) 20 Sep '23

20 Sep '23

This merge request was approved by Michael Stefaniuc. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3906

1 0

Re: [PATCH 0/2] MR3906: dmusic: Keep original instrument patch around.
by Michael Stefaniuc (＠mstefani) 20 Sep '23

20 Sep '23

Unrelated test failure in user32/msg.c -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3906#note_46051

1 0

Re: [PATCH 0/4] MR3905: dmime/tests: Test DMUS_PMSG with band and sequence tracks. - approved
by Michael Stefaniuc (＠mstefani) 20 Sep '23

20 Sep '23

This merge request was approved by Michael Stefaniuc. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3905

1 0

[PATCH 0/1] MR3912: msvcp90: Silence FIXME in _Locinfo::_Locinfo_ctor and _Locinfo::_Locinfo_Addcats functions.
by Piotr Caban (＠piotr) 20 Sep '23

20 Sep '23

So far there were no bugs caused by the functions. It's also not clear if there's anything to improve. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3912

2 1

Re: [PATCH 0/5] MR3911: mshtml: Use more dispex vtbl methods instead of the nodes'. - approved
by Jacek Caban (＠jacek) 20 Sep '23

20 Sep '23

This merge request was approved by Jacek Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3911

1 0

Re: [PATCH v6 0/6] MR3548: windows.applicationmodel: Implement some functions.
by Rémi Bernon (＠rbernon) 20 Sep '23

20 Sep '23

Rémi Bernon (@rbernon) commented about dlls/windows.applicationmodel/tests/model.c: > if (SUCCEEDED(test_register_package( manager, &package ))) > { > test_execute_package( package ); > + test_PackageStatics(); This won't work like that. At this point the test has indeed installed a package (and executed its application), but this code still executes in the context of the normal test executable. You should add the tests in `application.c` if you want to the behavior from within an packaged application. For instance you could have a `test_PackageStatics` there too, which would expect the current package to be always valid. Of course, we don't support running this on Wine yet, because we don't support running packaged applications, so the tests are entirely skipped. But at least it will show us native's behavior. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3548#note_46048

1 0

Re: [PATCH v2 0/1] MR3818: Draft: urlmon: test http with auto redirect disabled, and CreateBinding
by Yuxuan Shui (＠yshui) 19 Sep '23

19 Sep '23

On Tue Sep 19 20:06:50 2023 +0000, Yuxuan Shui wrote: > it fails on Windows because I didn't bother to remove that particular > `CHECK_CALLED`. the reason it fails is because Windows' http protocol > _does not_ handle redirect. > And we are trying to figure out how the native urlmon is different, in > that case isn't this kind of test failures _helpful_? And this MR is a > draft, I wasn't expect it to be merged in this form anyway. > I'll reopen this. In addition calling the test "not interesting" because it fails that particular test makes no sense to me. I feel you are being overly dismissive, and I don't know why. Did I do something wrong to upset you? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3818#note_45927

1 0

Re: [PATCH v2 0/1] MR3818: Draft: urlmon: test http with auto redirect disabled, and CreateBinding
by Yuxuan Shui (＠yshui) 19 Sep '23

19 Sep '23

On Tue Sep 19 19:01:40 2023 +0000, Jacek Caban wrote: > First of all, your test fails on Windows, so it's not interesting in > current form. I will add more comments in !3725. it fails on Windows because I didn't bother to remove that particular `CHECK_CALLED`. the reason it fails is because Windows' http protocol _does not_ handle redirect. And we are trying to figure out how the native urlmon is different, in that case isn't this kind of test failures _helpful_? And this MR is a draft, I wasn't expect it to be merged in this form anyway. I'll reopen this. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3818#note_45926

1 0

[PATCH v10 0/9] MR3870: mspatcha: Add support for 32-bit file patching and normalization
by Aidan Khoury (＠ajkhoury) 19 Sep '23

19 Sep '23

This clears up much of the todo list for mspatcha. GetFilePatchSignature* and NormalizeFileForPatchSignature have now been implemented in these changes. These changes bring better support for things like the Adobe Acrobat installer without the need for things like the winetricks mspatcha.dll native dll override. Still needed is support for interleaved streams in the LZXD decompression logic, however this is a great start to better supporting software installers that use the Windows interface for creating and applying patches to files. This is the beginning of the fixes required for bug 12501: https://bugs.winehq.org/show_bug.cgi?id=12501 -- v10: mspatcha: Fix new file buffer local variable assignment https://gitlab.winehq.org/wine/wine/-/merge_requests/3870

3 15

[PATCH v5 0/2] MR3725: urlmon: fix HTTP redirects when auto redirection is disabled
by Yuxuan Shui (＠yshui) 19 Sep '23

19 Sep '23

If DISABLEAUTOREDIRECTS is set in BINDINFO options, urlmon does not set HTTP verb to GET when handling redirections. Although HTTP specification is vague on the correct behaviour here, many web servers expect this. This is what's causing the "400 Bad Request" error when user tries to log into GMail accounts using Outlook. -- v5: urlmon: test redirection of POST requests urlmon: fix HTTP redirects when auto redirection is disabled https://gitlab.winehq.org/wine/wine/-/merge_requests/3725

3 3

[PATCH v2 0/7] MR3890: uiautomationcore: MSAA proxy provider improvements.
by Connor McAdams (＠cmcadams) 19 Sep '23

19 Sep '23

Patches for debug printing in the tests are also included in this MR. I've been maintaining a separate set of patches for this, but these would make it a lot easier for me or anyone else in the future to write tests IMO. -- v2: uiautomationcore: Don't return oleacc proxy IAccessibles from GetIAccessible for MSAA providers. uiautomationcore: Implement IRawElementProviderFragment::get_FragmentRoot for MSAA providers https://gitlab.winehq.org/wine/wine/-/merge_requests/3890

3 10

[PATCH 0/9] MR3887: dmime: Cleanup segment tracks enumeration loops.
by Rémi Bernon (＠rbernon) 19 Sep '23

19 Sep '23

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

3 10

[PATCH 0/9] MR3886: dmband: Use the new parsing style for band parsing.
by Rémi Bernon (＠rbernon) 19 Sep '23

19 Sep '23

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

3 11

[PATCH v8 0/7] MR3870: mspatcha: Add support for 32-bit file patching and normalization
by Aidan Khoury (＠ajkhoury) 19 Sep '23

19 Sep '23

This clears up much of the todo list for mspatcha. GetFilePatchSignature* and NormalizeFileForPatchSignature have now been implemented in these changes. These changes bring better support for things like the Adobe Acrobat installer without the need for things like the winetricks mspatcha.dll native dll override. Still needed is support for interleaved streams in the LZXD decompression logic, however this is a great start to better supporting software installers that use the Windows interface for creating and applying patches to files. This is the beginning of the fixes required for bug 12501: https://bugs.winehq.org/show_bug.cgi?id=12501 -- v8: mspatcha: Fix progress callback behaviour https://gitlab.winehq.org/wine/wine/-/merge_requests/3870

2 6

[PATCH 0/1] MR3894: winmm/tests: Avoid truncating the handle passed to waveInGetDevCapsW().
by Hans Leidekker (＠hans) 19 Sep '23

19 Sep '23

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

3 2

[PATCH 0/2] MR3895: wineps: Don't crash when loading Type 1 font in T42_download_header.
by Piotr Caban (＠piotr) 19 Sep '23

19 Sep '23

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

2 2

[PATCH v5 0/4] MR3870: mspatcha: Add support for 32-bit file patching and normalization
by Aidan Khoury (＠ajkhoury) 19 Sep '23

19 Sep '23

This clears up much of the todo list for mspatcha. GetFilePatchSignature* and NormalizeFileForPatchSignature have now been implemented in these changes. These changes bring better support for things like the Adobe Acrobat installer without the need for things like the winetricks mspatcha.dll native dll override. Still needed is support for interleaved streams in the LZXD decompression logic, however this is a great start to better supporting software installers that use the Windows interface for creating and applying patches to files. This is the beginning of the fixes required for bug 12501: https://bugs.winehq.org/show_bug.cgi?id=12501 -- v5: mspatcha: Add unit tests for NormalizeFileForPatchSignature and GetFilePatchSignature* https://gitlab.winehq.org/wine/wine/-/merge_requests/3870

3 5

[PATCH v2 0/5] MR3884: winegstreamer/aac decoder: Correctly handle various number of channels in transform_GetOutputAvailableType().
by Paul Gofman (＠gofman) 19 Sep '23

19 Sep '23

-- v2: winegstreamer: Also return output with 2 channels for multichannel inputs from AAC decoder. winegstreamer: Validate maximum channel count in _SetInputType in AAC decoder. winegstreamer: Correct output available types attrs in AAC decoder for channel count > 2. winegstreamer: Handle missing or zero channel count in _GetOutputAvailableType in AAC decoder. mf/tests: Add tests for AAC decoder with different input number of channels. https://gitlab.winehq.org/wine/wine/-/merge_requests/3884

4 7

[PATCH 0/6] MR3892: mshtml: Convert node vtbl's QI methods to the dispex's.
by Gabriel Ivăncescu (＠insn) 19 Sep '23

19 Sep '23

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

3 8

[PATCH 0/1] MR353: build: Add vkd3d_shader_utils.h to libvkd3d_la_SOURCES.
by Henri Verbeet (＠hverbeet) 19 Sep '23

19 Sep '23

-- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/353

2 2

[PATCH v2 0/1] MR3630: msi: Use CreateFileW() for handling path from cabinet_open() instead.
by Jactry Zeng (＠jactry) 19 Sep '23

19 Sep '23

This fixes an issue while the path includes non-ASCII characters. -- v2: msi: Use CreateFileW() for handling path from cabinet_open() instead. https://gitlab.winehq.org/wine/wine/-/merge_requests/3630

2 1

[PATCH 0/7] MR3890: uiautomationcore: MSAA proxy provider improvements.
by Connor McAdams (＠cmcadams) 19 Sep '23

19 Sep '23

Patches for debug printing in the tests are also included in this MR. I've been maintaining a separate set of patches for this, but these would make it a lot easier for me or anyone else in the future to write tests IMO. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3890

3 8

[PATCH 0/3] MR3893: cmd: Always outputs leading zeros when listing file time information.
by Akihiro Sagawa (＠sgwaki) 19 Sep '23

19 Sep '23

Test shows that native always outputs leading zeros for file time information, e.g. `2009/01/03 05:07`. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3893

3 4

[PATCH 0/1] MR3891: msvcp140_atomic_wait: Add __std_acquire_shared_mutex_for_instance implementation.
by Piotr Caban (＠piotr) 19 Sep '23

19 Sep '23

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

2 1

[PATCH 0/2] MR351: vkd3d-shader: Minor documentation fixes.
by Henri Verbeet (＠hverbeet) 19 Sep '23

19 Sep '23

-- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/351

2 3

[PATCH 0/3] MR352: vkd3d-shader: Export vkd3d_shader_build_varying_map.
by Henri Verbeet (＠hverbeet) 19 Sep '23

19 Sep '23

-- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/352

2 4

[PATCH v3 0/1] MR3888: ntdll: Allow empty application nodes in actctx.
by eric pouech (＠epo) 19 Sep '23

19 Sep '23

Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> -- v3: ntdll: Allow empty application nodes in actctx. https://gitlab.winehq.org/wine/wine/-/merge_requests/3888

2 1

[PATCH v2 0/1] MR3888: ntdll: Allow empty application nodes in actctx.
by eric pouech (＠epo) 19 Sep '23

19 Sep '23

Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> -- v2: ntdll: Allow empty application nodes in actctx. https://gitlab.winehq.org/wine/wine/-/merge_requests/3888

2 4

[PATCH v28 0/1] MR3074: Move getpeername() implementation to wineserver
by Ally Sommers (＠dropbear) 19 Sep '23

19 Sep '23

`getpeername()` is currently handled in ntdll. This merge request changes ntdll to forward `getpeername()` to wineserver. The implementation utilises new `peer_addr` and `peer_addr_len` fields in wineserver's `struct sock`. This fixes multiple `todo_wine`s in `ws2_32/tests` and allows for more accurate peer names to be provided in case the address the socket is bound to on the Unix side does not match what `bind()` was called with on the Windows side. *This merge request was originally intended to be included in !2786 (Add support for AF_UNIX sockets) but was split into its own merge request because this is not an insignificant change.* -- v28: server: Move getpeername() implementation from ntdll/unix. https://gitlab.winehq.org/wine/wine/-/merge_requests/3074

3 2

Re: [PATCH v8 0/3] MR3855: Fixes for ntlea
by Yuxuan Shui (＠yshui) 19 Sep '23

19 Sep '23

update: rebasing -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3855#note_45876

1 0

[PATCH 0/1] MR349: vkd3d-shader/spirv: Ensure that all instructions belong to a block.
by Giovanni Mascellani (＠giomasce) 19 Sep '23

19 Sep '23

This is done by creating dummy blocks, which do not have any incoming branch. SPIR-V specification doesn't allow instructions not belonging to any block. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/349

5 9

[PATCH v3 0/1] MR3791: widl: Add initial implementation of the SLTG typelib generator.
by Dmitry Timoshkov (＠dmitry) 19 Sep '23

19 Sep '23

-- v3: widl: Add initial implementation of SLTG typelib generator. https://gitlab.winehq.org/wine/wine/-/merge_requests/3791

2 1

[PATCH 0/5] MR3884: winegstreamer/aac decoder: Correctly handle various number of channels in transform_GetOutputAvailableType().
by Paul Gofman (＠gofman) 19 Sep '23

19 Sep '23

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

4 10

[PATCH v2 0/1] MR3791: widl: Add initial implementation of the SLTG typelib generator.
by Dmitry Timoshkov (＠dmitry) 19 Sep '23

19 Sep '23

-- v2: widl: Add initial implementation of SLTG typelib generator. https://gitlab.winehq.org/wine/wine/-/merge_requests/3791

3 11

[PATCH 0/1] MR3888: ntdll: Allow empty application nodes in actctx.
by eric pouech (＠epo) 19 Sep '23

19 Sep '23

Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3888

3 4

[PATCH 0/1] MR3889: include: Update the d3d12 headers from vkd3d.
by Martin Storsjö (＠mstorsjo) 19 Sep '23

19 Sep '23

This corresponds to vkd3d as of commit e597b0d80f39f716a8740cb0be55edc78f4599d6. This brings in a function signature fix for the implementation of ID3D12CommandQueue::UpdateTileMappings() as well, from vkd3d commit e98e6c9b530995e68bd019a3319d90223ed864cf. Signed-off-by: Martin Storsjö <martin(a)martin.st> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3889

2 1

Re: [PATCH v7 0/2] MR328: ci: Run the tests on macOS.
by Giovanni Mascellani (＠giomasce) 19 Sep '23

19 Sep '23

On Tue Sep 19 08:41:58 2023 +0000, Chip Davis wrote: > Can you set this up to let me and possibly Bill Hollings know if CI on > Mac breaks and it's not your fault? I'd really appreciate knowing when > we've broken things for you. I don't think this is the most appropriate place to detect MoltenVK regressions, because we don't use MoltenVK from git, but a released version, which I think is installed through brew. I don't even think it is the latest released version. At any rate, even when there is a regression I don't have an automated way to know whether what's broken is vkd3d or MoltenVK. Also, notice that currently vkd3d is broken in many ways on top of MoltenVK (the CI job is marked as allowed to fail for this reason); test `d3d12` even segfaults (I am preparing some patches for that). Before this can give a useful signal vkd3d tests should be appropriately marked as todo on MoltenVK, so that actual breakages can be detected. Eventually I hope to do that, but it might take a while (for example, I've been planning to do the same for Intel and NVIDIA on Linux, which have similarly been broken for a long time if not forever; and it hasn't happened yet). Of course we'll be happy to take patches, if you have so me bandwidth for that. To address my first concern, I'd suggest to avoid using this specific project, but rather set up another one that tracks both vkd3d and MoltenVK development branches, and run the tests each time any of the two projects is committed to: this might help to give an idea of which project broke it when there is a problem. Or maybe run the stable vkd3d on the development MoltenVK, I don't know. I can help to set this up, but marking the tests as todo must be done before. BTW, the macOS runner available here is based on an Intel chip. In your experience, can testing on Intel be considered representative of the M1 behavior too, or should we come up with an M1 runner too? -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/328#note_45856

1 0

[PATCH 0/1] MR3885: include: Move RTL functions that belong in winnt.h from winternl.h to winnt.h.
by Alex Henrie (＠alexhenrie) 19 Sep '23

19 Sep '23

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

2 1

[PATCH 0/1] MR3880: ntdll: Only declare/set wow_teb on platforms using it
by Gerald Pfeifer (＠gerald) 19 Sep '23

19 Sep '23

Otherwise we see dlls/ntdll/unix/signal_x86_64.c:2351:14: warning: unused variable 'wow_teb' on FreeBSD. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3880

3 2

[PATCH v3 0/4] MR3617: oleaut32: Use CRT allocation functions.
by Alex Henrie (＠alexhenrie) 19 Sep '23

19 Sep '23

-- v3: oleaut32: Use CRT allocation functions in typelib.c. oleaut32: Use CRT allocation functions in olepicture.c. oleaut32: Use CRT allocation functions in hash.c. oleaut32: Use CRT allocation functions in connpt.c. https://gitlab.winehq.org/wine/wine/-/merge_requests/3617

3 8

[PATCH 0/2] MR3876: Zero-width character handling in GetTextExtentExPoint[AW]
by Torge Matthies (＠tmatthies) 18 Sep '23

18 Sep '23

Certain characters are considered by GetTextExtentExPointA/W to have no width, even if they have a non-zero width and a shape in the font. This MR attempts to bring Wine's implementation of these functions closer to native behavior, though I was not able to get it anywhere near perfect. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3876

4 6

[PATCH v4 0/4] MR3836: Added definitions and initial tests for FileRenameInformationEx and FileLinkInformationEx
by Joel Holdsworth (＠jhol) 18 Sep '23

18 Sep '23

This patch-set adds the definitions and struct modifications required to eventually implement `FileRenameInformationEx` and `FileLinkInformationEx`. The initial tests are copies of the tests for `FileRenameInformation` and `FileLinkInformation`, but with the `ReplaceIfExists` field replaced with the equivalient `Flag` value: `FILE_RENAME_REPLACE_IF_EXISTS` or `FILE_LINK_REPLACE_IF_EXISTS` respectively. -- v4: ntdll/tests: Test both FileLinkInformation and FileLinkInformationEx in test_file_link_information. include: Add flags to FILE_LINK_INFORMATION used by FileLinkInformationEx. ntdll/tests: Test both FileRenameInformation and FileRenameInformationEx in test_file_rename_information. https://gitlab.winehq.org/wine/wine/-/merge_requests/3836

3 6

[PATCH v7 0/3] MR3855: Fixes for ntlea
by Yuxuan Shui (＠yshui) 18 Sep '23

18 Sep '23

Make functions ntlea needs to patch hotpatchable. And add a asm wrapper for `GetWindowLongA` to workaround an assumption ntlea made. -- v7: user32: add hotpatchable wrapper for GetWindowLongA https://gitlab.winehq.org/wine/wine/-/merge_requests/3855

4 6

Re: [PATCH v7 0/2] MR328: ci: Run the tests on macOS.
by Chip Davis (＠cdavis5e) 18 Sep '23

18 Sep '23

Can you set this up to let me and possibly Bill Hollings know if CI on Mac breaks and it's not your fault? I'd really appreciate knowing when we've broken things for you. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/328#note_45837

1 0

[PATCH 0/1] MR3883: d3d10core/tests: Test performing a full clear after a draw.
by Zebediah Figura (＠zfigura) 18 Sep '23

18 Sep '23

This was fixed upstream by ab9e4dd3faba77b6952a76c30e94e7905fb44b28. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3883

2 1

Re: [PATCH v2 0/2] MR3882: msvcr110: Use Context blocking functions in _StructuredTaskCollection class. - approved
by Alexandre Julliard (＠julliard) 18 Sep '23

18 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3875: msvcp110: Add _Winerror_map implementation. - approved
by Alexandre Julliard (＠julliard) 18 Sep '23

18 Sep '23

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

1 0

Re: [PATCH v2 0/11] MR3881: mshtml: Preparatory work for converting more node vtbl methods to dispex. - approved
by Alexandre Julliard (＠julliard) 18 Sep '23

18 Sep '23

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

1 0

Re: [PATCH v4 0/7] MR3851: dmime: Better implement DMUS_PMSG message processing. - approved
by Alexandre Julliard (＠julliard) 18 Sep '23

18 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3874: dbghelp: Check that dwarf unwinder did actually unwind. - approved
by Alexandre Julliard (＠julliard) 18 Sep '23

18 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3879: include: Add missing WinEvent definitions. - approved
by Alexandre Julliard (＠julliard) 18 Sep '23

18 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3878: server: Return WSAEOPNOTSUPP on listen() if the socket's type is SOCK_DGRAM - approved
by Alexandre Julliard (＠julliard) 18 Sep '23

18 Sep '23

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

1 0

Re: [PATCH v3 0/1] MR3868: user32/tests: Account for some messages from dual-monitor setups. - approved
by Alexandre Julliard (＠julliard) 18 Sep '23

18 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3867: mfreadwrite/reader: Update to IMFSourceReaderEx. - approved
by Alexandre Julliard (＠julliard) 18 Sep '23

18 Sep '23

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

1 0

Re: [PATCH v4 0/1] MR1170: wbemprox: Fix out-of-bounds access caused by codepoints above U+00FF. - approved
by Alexandre Julliard (＠julliard) 18 Sep '23

18 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3859: d3d10/effect: Implement 'mov' opcode for expressions. - approved
by Alexandre Julliard (＠julliard) 18 Sep '23

18 Sep '23

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

1 0

Re: [PATCH v3 0/8] MR3852: dmusic: Parse instrument waves and download them to the port. - approved
by Alexandre Julliard (＠julliard) 18 Sep '23

18 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR3861: gdiplus: Copy the compound array in GdipClonePen(). - approved
by Alexandre Julliard (＠julliard) 18 Sep '23

18 Sep '23

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

1 0

Re: [PATCH v2 0/3] MR3819: uiautomationcore: Implement UiaHasServerSideProvider. - approved
by Alexandre Julliard (＠julliard) 18 Sep '23

18 Sep '23

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

1 0

[PATCH v2 0/2] MR3866: gdiplus: Fix GdipCreateFont character set initialization.
by Jeffrey Smith (＠whydoubt) 18 Sep '23

18 Sep '23

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34789 -- v2: gdiplus: Fix GdipCreateFont character set initialization. gdiplus/tests: Test GdipCreateFont character set initialization. https://gitlab.winehq.org/wine/wine/-/merge_requests/3866

3 4

Re: [PATCH v6 0/3] MR347: Fill in more missing details in d3d12.idl - approved
by Alexandre Julliard (＠julliard) 18 Sep '23

18 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR350: vkd3d-shader: Hide support for DXIL sources. - approved
by Alexandre Julliard (＠julliard) 18 Sep '23

18 Sep '23

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

1 0

Re: [PATCH v2 0/1] MR348: tests: Relax the precision of some tests so that they pass on MoltenVK. - approved
by Alexandre Julliard (＠julliard) 18 Sep '23

18 Sep '23

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

1 0

[PATCH v6 0/1] MR3367: server: Ignore EADDRINUSE from listen() unless the provided socket is wildcarded.
by Ally Sommers (＠dropbear) 18 Sep '23

18 Sep '23

This fixes a `todo_wine` in ws2_32's socket tests. -- v6: server: Defer listens on addresses currently bound first by another socket. https://gitlab.winehq.org/wine/wine/-/merge_requests/3367

4 4

[PATCH v6 0/3] MR3855: Fixes for ntlea
by Yuxuan Shui (＠yshui) 18 Sep '23

18 Sep '23

Make functions ntlea needs to patch hotpatchable. And add a asm wrapper for `GetWindowLongA` to workaround an assumption ntlea made. -- v6: user32: add hotpatchable wrapper for GetWindowLongA https://gitlab.winehq.org/wine/wine/-/merge_requests/3855

2 4

[PATCH v5 0/3] MR3855: Fixes for ntlea
by Yuxuan Shui (＠yshui) 18 Sep '23

18 Sep '23

Make functions ntlea needs to patch hotpatchable. And add a asm wrapper for `GetWindowLongA` to workaround an assumption ntlea made. -- v5: user32: add hotpatchable wrapper for GetWindowLongA https://gitlab.winehq.org/wine/wine/-/merge_requests/3855

5 9

[PATCH v27 0/1] MR3074: Move getpeername() implementation to wineserver
by Ally Sommers (＠dropbear) 18 Sep '23

18 Sep '23

`getpeername()` is currently handled in ntdll. This merge request changes ntdll to forward `getpeername()` to wineserver. The implementation utilises new `peer_addr` and `peer_addr_len` fields in wineserver's `struct sock`. This fixes multiple `todo_wine`s in `ws2_32/tests` and allows for more accurate peer names to be provided in case the address the socket is bound to on the Unix side does not match what `bind()` was called with on the Windows side. *This merge request was originally intended to be included in !2786 (Add support for AF_UNIX sockets) but was split into its own merge request because this is not an insignificant change.* -- v27: server: Move getpeername() implementation from ntdll/unix. https://gitlab.winehq.org/wine/wine/-/merge_requests/3074

4 6

[PATCH v5 0/2] MR3877: gdiplus: implement PixelOffsetMode Half and HighQuality for GdipDrawImagePointsRect
by Bartosz Kosiorek (＠gang65) 18 Sep '23

18 Sep '23

-- v5: gdiplus/tests: add tests of InterpolationMode Bilinear for GdipDrawImagePointsRect gdiplus: implement PixelOffsetMode Half and HighQuality for GdipDrawImagePointsRect https://gitlab.winehq.org/wine/wine/-/merge_requests/3877

3 6

[PATCH v3 0/4] MR3836: Added definitions and initial tests for FileRenameInformationEx and FileLinkInformationEx
by Joel Holdsworth (＠jhol) 18 Sep '23

18 Sep '23

This patch-set adds the definitions and struct modifications required to eventually implement `FileRenameInformationEx` and `FileLinkInformationEx`. The initial tests are copies of the tests for `FileRenameInformation` and `FileLinkInformation`, but with the `ReplaceIfExists` field replaced with the equivalient `Flag` value: `FILE_RENAME_REPLACE_IF_EXISTS` or `FILE_LINK_REPLACE_IF_EXISTS` respectively. -- v3: ntdll/tests: Test both FileLinkInformation and FileLinkInformationEx in test_file_link_information. include: Add flags to FILE_LINK_INFORMATION used by FileLinkInformationEx. ntdll/tests: Test both FileRenameInformation and FileRenameInformationEx in test_file_rename_information. https://gitlab.winehq.org/wine/wine/-/merge_requests/3836

4 7

Re: [PATCH v4 0/3] MR3870: mspatcha: Add support for 32-bit file patching and normalization
by Jeffrey Smith (＠whydoubt) 18 Sep '23

18 Sep '23

On Mon Sep 18 17:52:49 2023 +0000, Zebediah Figura wrote: > Why are we adding one here? That doesn't look right. I think I see what the intent is, but it is unnecessarily 'clever'. It would be clearer to use something like a `BOOL modified`, and ultimately `return modified ? NORMALIZE_RESULT_SUCCESS_MODIFIED : NORMALIZE_RESULT_SUCCESS;` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3870#note_45774

1 0

[PATCH v3 0/3] MR3855: Fixes for ntlea
by Yuxuan Shui (＠yshui) 18 Sep '23

18 Sep '23

Make functions ntlea needs to patch hotpatchable. And add a asm wrapper for `GetWindowLongA` to workaround an assumption ntlea made. -- v3: user32: add hotpatchable wrapper for GetWindowLongA https://gitlab.winehq.org/wine/wine/-/merge_requests/3855

3 6

Re: [PATCH v4 0/3] MR3870: mspatcha: Add support for 32-bit file patching and normalization
by Zebediah Figura (＠zfigura) 18 Sep '23

18 Sep '23

Zebediah Figura (@zfigura) commented about dlls/mspatcha/pecoff.h: > +ULONG image_rva_to_file_offset( > + IMAGE_NT_HEADERS32 UNALIGNED *nt_headers, ULONG rva, PUCHAR image_base, ULONG image_size); > + > +ULONG image_directory_rva_and_size( > + IMAGE_NT_HEADERS32 UNALIGNED *nt_header, USHORT directory_entry, ULONG *directory_size, > + PUCHAR image_base, ULONG image_size); > + > +ULONG image_directory_offset_and_size( > + IMAGE_NT_HEADERS32 UNALIGNED *nt_header, USHORT directory_entry, ULONG *directory_size, > + PUCHAR image_base, ULONG image_size); > + > +PVOID image_rva_to_mapped_address( > + IMAGE_NT_HEADERS32 UNALIGNED *nt_headers, ULONG rva, PVOID image_base, ULONG image_size); > + > +PVOID image_directory_mapped_address( > + IMAGE_NT_HEADERS32 UNALIGNED *nt_headers, USHORT directory_entry, ULONG *directory_size, I don't think we need another C or header file for these. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3870#note_45765

1 0

Re: [PATCH v4 0/3] MR3870: mspatcha: Add support for 32-bit file patching and normalization
by Zebediah Figura (＠zfigura) 18 Sep '23

18 Sep '23

Zebediah Figura (@zfigura) commented about dlls/mspatcha/pa19.c: > + } > + } > + > + for (i = 0; i < retain_range_count; ++i) { > + if (retain_range_array[i].OffsetInOldFile <= old_file_size > + && (retain_range_array[i].OffsetInOldFile + retain_range_array[i].LengthInBytes) <= old_file_size) > + { > + memset(&old_file_buffer[retain_range_array[i].OffsetInOldFile], > + 0, > + retain_range_array[i].LengthInBytes); > + result = NORMALIZE_RESULT_SUCCESS; > + } > + } > + } > + > + return result + 1; Why are we adding one here? That doesn't look right. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3870#note_45764

1 0

Re: [PATCH v4 0/3] MR3870: mspatcha: Add support for 32-bit file patching and normalization
by Zebediah Figura (＠zfigura) 18 Sep '23

18 Sep '23

Zebediah Figura (@zfigura) commented about dlls/mspatcha/pa19.c: > + BYTE *old_file_buffer, ULONG old_file_size, > + ULONG option_flags, PATCH_OPTION_DATA *option_data, > + ULONG new_image_base, ULONG new_image_time, > + const PATCH_IGNORE_RANGE *ignore_range_array, ULONG ignore_range_count, > + const PATCH_RETAIN_RANGE *retain_range_array, ULONG retain_range_count) > +{ > + int result = 0; > + ULONG i; > + IMAGE_NT_HEADERS32 UNALIGNED *nt_headers; > + > + UNREFERENCED_PARAMETER(option_data); > + > + TRACE("normalizing image at 0x%p with options 0x%lX, new base 0x%lX, new time %lu", > + old_file_buffer, option_flags, new_image_base, new_image_time); > + > + if (old_file_buffer && old_file_size) Early return would save you a level of indentation here. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3870#note_45763

1 0

2025

2024

2023

2022

wine-gitlab