[PATCH 0/1] MR5300: oleaut32: Bump version resource to Windows 10.

[Andrew Nguyen (＠arethusa)]

The installer of the Arcom Updater2561 tool expects oleaut32.dll to have a version resource that corresponds at least to updated Windows 7 SP1. Otherwise, it will corrupt the 32-bit oleaut32.dll by replacing it with its own bundled 64-bit version.

As Wine defaults to Windows 10, the oleaut32.dll version resource follows suit by reporting a Windows 10 version.

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

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

[PATCH 1/1] oleaut32: Bump version resource to Windows 10.

[Andrew Nguyen]

From: Andrew Nguyen <arethusa26(a)gmail.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55876
---
 dlls/oleaut32/oleaut32.rc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/oleaut32/oleaut32.rc b/dlls/oleaut32/oleaut32.rc
index c4614f2e4bb..e1033816353 100644
--- a/dlls/oleaut32/oleaut32.rc
+++ b/dlls/oleaut32/oleaut32.rc
@@ -41,8 +41,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 #define WINE_FILEDESCRIPTION_STR "Wine OLE dll"
 #define WINE_FILENAME_STR "oleaut32.dll"
-#define WINE_FILEVERSION 6, 0, 6001, 18000 /* version from Vista SP1 */
-#define WINE_FILEVERSION_STR "6.0.6001.18000"
+#define WINE_FILEVERSION 10, 0, 19043, 1466 /* version from Win10 2009 */
+#define WINE_FILEVERSION_STR "10.0.19043.1466"
 #define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
-- 
GitLab

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

[PATCH 1/1] oleaut32: Bump version resource to Windows 10.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=144037

Your paranoid android.


=== debian11b (64 bit WoW report) ===

d3dx10_34:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011BB9A0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011BB9A0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011A4920.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011E3990.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011BB9A0.

d3dx10_35:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011B22A0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011B60D0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011B4D80.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011B1E90.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011B1E90.

d3dx10_36:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001195C50.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011C3380.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 0000000001195B50.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011C3550.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011C3380.

d3dx10_37:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011D3EC0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 0000000001239EF0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 0000000001195910.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 0000000001195AE0.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 0000000001195CB0.

d3dx10_38:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011E3AA0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011E3AA0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011E3C70.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011E3AA0.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011BB820.

d3dx10_39:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011E2EA0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011E2DD0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011E2DD0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011E2E90.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011B34A0.

d3dx10_40:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011E3980.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011D5760.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011E3B50.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011E3980.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D5760.

d3dx10_41:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239DF0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 0000000001239DF0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 0000000001239DF0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 0000000001239DF0.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011BB560.

d3dx10_42:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011C3380.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 0000000001195C00.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011C3550.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011E3BB0.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011E3D80.

d3dx10_43:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011D7320.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011D7320.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011E3780.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 0000000001193980.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011E3780.