Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MSIEXEC][MSI] Sync msiexec to wine-9.8 #6897

Open
wants to merge 78 commits into
base: master
Choose a base branch
from
Open

[MSIEXEC][MSI] Sync msiexec to wine-9.8 #6897

wants to merge 78 commits into from

Conversation

MishaProductions
Copy link

@MishaProductions MishaProductions commented May 16, 2024 •
edited

Purpose

Sync msiexec & msi to wine 9.8

JIRA issue: None

Proposed changes

  • Sync msiexec to wine-9.8
  • Sync msi to wine-9.8

Todo:

  • Test

Before:
image
image
image

After:
image
image
image

@binarymaster binarymaster added the 3rd party sync Updating 3rd party components, such as Wine and others label May 16, 2024
@binarymaster binarymaster added this to New PRs in ReactOS PRs via automation May 16, 2024
HBelusca
HBelusca previously requested changes May 17, 2024
View reviewed changes
Copy link
Contributor

@HBelusca HBelusca left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When syncing a wine module, the corresponding winetest must also be synced.
Shouldn't this MSIEXEC sync go also with a sync of MSI.DLL ?

ReactOS PRs automation moved this from New PRs to WIP / Waiting on contributor May 17, 2024
@HBelusca HBelusca dismissed their stale review May 17, 2024 09:57

(Request for change may not fully apply here)

@HBelusca HBelusca self-requested a review May 17, 2024 09:57
winesync and others added 11 commits May 17, 2024 15:55
@MishaProductions
[WINESYNC] msi: Disable FS redirection for temporary file in cabinet_…
5aea5ea 
…copy_file().

wine commit id a58c6251870dfb7d214464e709bbbc9ca649b900 by Paul Gofman <pgofman@codeweavers.com>
@MishaProductions
[WINESYNC] msi/tests: Correct a couple of failure messages in test_ms…
cedd3cc 
…irecord.

wine commit id 2fde0a3f5c233b0ea1637f409998ce4ee85d28a7 by Alex Henrie <alexhenrie24@gmail.com>
@MishaProductions
[WINESYNC] msi: Use the wcsdup function instead of reimplementing it.
af57145 
wine commit id 7cc7a6defc08d4de7574b7a75d574c3ab1f32db8 by Alex Henrie <alexhenrie24@gmail.com>
@MishaProductions
[WINESYNC] msi: Use _O_* constants from fcntl.h instead of redefining…
c6b722c 
… them.

wine commit id b07c95e79cdf6ae26c5170daa481ad160e0ce76a by Alex Henrie <alexhenrie24@gmail.com>
@MishaProductions
[WINESYNC] msi: Remove wrappers around CRT memory allocation functions.
75930cf 
wine commit id d920aa81ad0c4618c27ebd7e9863618e988328e0 by Alex Henrie <alexhenrie24@gmail.com>
@MishaProductions
[WINESYNC] msi: Initialize all members of WINTRUST_DATA.
be210db 
The pSignatureSettings field was not unitilized so it got a random value from
the stack causing a later crash when it was dereferenced in Wintrust
(SoftPubloadSignature).

wine commit id 904bedb3e96bc68101652e151db102532399abe8 by Philip K. Gisslow <ripxorip@gmail.com>
@MishaProductions
[WINESYNC] msi: Fix memory leak on realloc failure in create_diff_row…
f5dda01 
…_query (cppcheck).

wine commit id 3e231d0f36a56ce991c7edbb6ae7845094e8417e by Alex Henrie <alexhenrie24@gmail.com>
@MishaProductions
[WINESYNC] msi: Fix memory leak on realloc failure in msi_get_window_…
0e31790 
…text (cppcheck).

wine commit id 6c1dd0f2c5669e084eb1f84571c38761a97c0970 by Alex Henrie <alexhenrie24@gmail.com>
@MishaProductions
[WINESYNC] msi: Fix memory leak on realloc failure in search_director…
e8042db 
…y (cppcheck).

wine commit id d394df4a30feb685927908fce2887bf5496b5d66 by Alex Henrie <alexhenrie24@gmail.com>
@MishaProductions
[WINESYNC] ntdll: Default to Windows 10.
b557c1a 
wine commit id 69154f0329aec4fb64886a0689da198b5323dcde by Hans Leidekker <hans@codeweavers.com>
@MishaProductions
[MSI] Fix build
fccb7a8
@MishaProductions MishaProductions changed the title [MSIEXEC] Sync msiexec to wine-9.8 [MSIEXEC][MSI] Sync msiexec to wine-9.8 May 17, 2024
@github-actions github-actions bot added the ROSTESTS Label for ROS testcases PRs. label May 17, 2024
@MishaProductions
Copy link
Author

When syncing a wine module, the corresponding winetest must also be synced. Shouldn't this MSIEXEC sync go also with a sync of MSI.DLL ?

Done

@MishaProductions
[WINESYNC] msi/tests: Avoid test failures when running with insuffici…
bc10cd9 
…ent rights.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51040

wine commit id 79ec3d9fb8551e84e9ff71dcf18861430246278a by Hans Leidekker <hans@codeweavers.com>
winesync and others added 16 commits May 17, 2024 16:46
@MishaProductions
[WINESYNC] msi: Round costs up to 4096 bytes instead of clamping.
e6520b7 
wine commit id 9725a2286acdb791de316295d9bcb11411a3fd56 by Zebediah Figura <zfigura@codeweavers.com>
@MishaProductions
[WINESYNC] msi: Store component cost in 512-byte units.
4dab643 
This avoids overflow when component costs exceed 4 GB.

wine commit id d7bbe884ef29215f4db2027f450fb959314f5383 by Zebediah Figura <zfigura@codeweavers.com>
@MishaProductions
[MSI] store component cost in 512-byte units
b9f0547
@MishaProductions
[WINESYNC] msi: Multiply by 512 in dialog_vcl_add_drives().
be92ee9 
The main motivation here is to avoid overflow, and multiplying in one place seems simpler.

wine commit id 4a227c62a59a55aff9bacf1473c7f478f5c83294 by Zebediah Figura <zfigura@codeweavers.com>
@MishaProductions
[MSI] reduce diff
74a5fc6
@MishaProductions
[WINESYNC] msi: Create the custom action server as an elevated process.
4c3acc7 
Dragon Naturally Speaking 12.5 manually validates that the custom action server
is elevated.

One might imagine that the right approach here is to add a manifest to msiexec;
however, msiexec does not always trigger a UAC prompt on Windows.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51143

wine commit id 366398cc53c76028c8dfe8d8a16c78a6a10ce962 by Zebediah Figura <z.figura12@gmail.com>
@MishaProductions
[WINESYNC] msi/tests: Delete the temp .msi file in all failure cases.
d93b32a 
wine commit id 43fb0ecd0717ad1a6aa0702ed68368ee35d3ecda by Alexandre Julliard <julliard@winehq.org>
@MishaProductions
[WINESYNC] msi/tests: Use the helpers from utils.h in more modules.
4be357e 
wine commit id b3f11ceb7a0ddcf5fe742377f99c947b0b56a051 by Hans Leidekker <hans@codeweavers.com>
@MishaProductions
[MSITEST] include util header
0e78fee
@MishaProductions
[WINESYNC] msi/tests: Try restarting tests elevated.
db62165 
Wine starts processes non-elevated since e92ba2de43d7afbe0704b11b29f7c30f44dfaeca
which means that many tests are skipped now.

wine commit id a6eb51f0e595b2e5ddc521fb61b10d72849dd0f2 by Hans Leidekker <hans@codeweavers.com>
@MishaProductions
[MSITEST] try restarting for tests elevated
5e21d91
@MishaProductions
[WINESYNC] msi/tests: Get rid of workarounds for old Windows versions.
2439e68 
wine commit id 738ec8285583248a84349939734ed600a47ba73d by Hans Leidekker <hans@codeweavers.com>
@MishaProductions
[MSI] fix patch failed
3691aa7
@MishaProductions
[WINESYNC] msi: Install global assemblies before running deferred cus…
7af99ce 
…tom actions.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56493

wine commit id 7f0ca9c284d15d03f14a8fefefac834990d622cd by Hans Leidekker <hans@codeweavers.com>
@MishaProductions
[WINESYNC] msi: Install global assemblies after install custom action…
35776cf 
…s and before commit custom actions.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56609

wine commit id 27f5470ff4c20121b9eacd702c888400191c7d9e by Hans Leidekker <hans@codeweavers.com>
@MishaProductions
[WINESYNC]: msi is now in sync with wine-staging wine-9.8
f4fa339
@maj113
Copy link
Contributor

maj113 commented May 17, 2024

While it doesn't relate to the current build errors you should also remove nonamless defines from the precomp header

@MishaProductions MishaProductions marked this pull request as ready for review May 17, 2024 23:54
cbialorucki
cbialorucki approved these changes May 21, 2024
View reviewed changes
Copy link
Contributor

@cbialorucki cbialorucki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for also syncing the tests.

ReactOS PRs automation moved this from WIP / Waiting on contributor to Approved by reviewers May 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cbialorucki cbialorucki cbialorucki approved these changes

@DarkFire01 DarkFire01 DarkFire01 approved these changes

@HBelusca HBelusca Awaiting requested review from HBelusca

@ThFabba ThFabba Awaiting requested review from ThFabba ThFabba is a code owner

@SergeGautherie SergeGautherie Awaiting requested review from SergeGautherie

Assignees
No one assigned
Labels
3rd party sync Updating 3rd party components, such as Wine and others ROSTESTS Label for ROS testcases PRs.
Projects
ReactOS PRs
  
Approved by reviewers
Milestone
No milestone
7 participants
@MishaProductions @maj113 @HBelusca @cbialorucki @DarkFire01 @SergeGautherie @binarymaster