[PATCH] msvcr80: Update manifest resource

[Louis Lenders]

https://bugs.winehq.org/show_bug.cgi?id=52975

Signed-off-by: Louis Lenders 
---
 dlls/msvcr80/msvcr80.rc          | 3 +++
 dlls/msvcr80/msvcr80_61.manifest | 7 +++++++
 2 files changed, 10 insertions(+)
 create mode 100644 dlls/msvcr80/msvcr80_61.manifest

diff --git a/dlls/msvcr80/msvcr80.rc b/dlls/msvcr80/msvcr80.rc
index 458c5df6f98..2d9f5457569 100644
--- a/dlls/msvcr80/msvcr80.rc
+++ b/dlls/msvcr80/msvcr80.rc
@@ -20,3 +20,6 @@

/* @makedep: msvcr80.manifest */
 WINE_MANIFEST 24 msvcr80.manifest
+
+/* @makedep: msvcr80.manifest */
+WINE_MANIFEST61 24 msvcr80_61.manifest
diff --git a/dlls/msvcr80/msvcr80_61.manifest b/dlls/msvcr80/msvcr80_61.manifest
new file mode 100644
index 00000000000..4298d242046
--- /dev/null
+++ b/dlls/msvcr80/msvcr80_61.manifest
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity type="win32" name="Microsoft.VC80.CRT" version="8.0.50727.6195" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/>
+  <file name="msvcr80.dll"/>
+  <file name="msvcp80.dll"/>
+  <file name="msvcm80.dll"/>
+</assembly>

[Piotr Caban]

Hi Louis,
> On 9 May 2022, at 11:30, Louis Lenders  wrote:
> /* @makedep: msvcr80.manifest */
> WINE_MANIFEST 24 msvcr80.manifest
> -
>
> +/* @makedep: msvcr80.manifest */
> +WINE_MANIFEST61 24 msvcr80_61.manifest

Is there a reason for not updating the version in current manifest file?

Thanks,
Piotr

[Louis Lenders]

Hi Piotr,
> Is there a reason for not updating the version in current manifest file?

I just noticed that for gdiplus there were different versions living side
by side in winsxs, and I thought that was the way to go? I don`t have
enough knowledge of this stuff so if you could give answer what way to go
it`d be nice
Regards

Op ma 9 mei 2022 om 11:30 schreef Louis Lenders <[e-mail]
> :
> https://bugs.winehq.org/show_bug.cgi?id=52975
> Signed-off-by: Louis Lenders
>
> dlls/msvcr80/msvcr80.rc          | 3 +++
>  dlls/msvcr80/msvcr80_61.manifest | 7 +++++++
>  2 files changed, 10 insertions(+)
>  create mode 100644 dlls/msvcr80/msvcr80_61.manifest
>
> diff --git a/dlls/msvcr80/msvcr80.rc b/dlls/msvcr80/msvcr80.rc
> index 458c5df6f98..2d9f5457569 100644
> --- a/dlls/msvcr80/msvcr80.rc
> +++ b/dlls/msvcr80/msvcr80.rc
> @@ -20,3 +20,6 @@
>
> /* @makedep: msvcr80.manifest */
>  WINE_MANIFEST 24 msvcr80.manifest
> -
>
> +/* @makedep: msvcr80.manifest */
> +WINE_MANIFEST61 24 msvcr80_61.manifest
> diff --git a/dlls/msvcr80/msvcr80_61.manifest
> b/dlls/msvcr80/msvcr80_61.manifest
> new file mode 100644
> index 00000000000..4298d242046
> --- /dev/null
> +++ b/dlls/msvcr80/msvcr80_61.manifest
> @@ -0,0 +1,7 @@
> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
> - <assemblyIdentity type="win32" name="Microsoft.VC80.CRT"
>
> version="8.0.50727.6195" processorArchitecture=""
> publicKeyToken="1fc8b3b9a1e18e3b"/>
> -
>
> <file name="msvcr80.dll"/>
> -
>
> <file name="msvcp80.dll"/>
> -
>
> <file name="msvcm80.dll"/>
> +</assembly>
>
> 2.36.0

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=114396

Your paranoid android.

=== debian11 (build log) ===

Task: Patch failed to apply

=== debian11 (build log) ===

Task: Patch failed to apply

[Piotr Caban]

Hi Louis,

On 5/10/22 16:06, Louis Lenders wrote:
> Hi Piotr,
> > Is there a reason for not updating the version in current manifest file?
>
> I just noticed that for gdiplus there were different versions living 
> side by side in winsxs, and I thought that was the way to go? I don`t 
> have enough knowledge of this stuff so if you could give answer what way 
> to go it`d be nice

In case of msvcr80 there's no need for multiple manifest files (newer 
versions are supposed to be backwards compatible). The newest version I 
have installed on my system is 8.0.50727.9672. Please update it to this 
version.

Thanks,
Piotr