[PATCH] msvcm90: Add manifest.

[Dmitry Timoshkov]

Signed-off-by: Dmitry Timoshkov 
---
 dlls/msvcm90/Makefile.in      |  2 ++
 dlls/msvcm90/msvcm90.manifest |  7 +++++++
 dlls/msvcm90/msvcm90.rc       | 22 ++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 dlls/msvcm90/msvcm90.manifest
 create mode 100644 dlls/msvcm90/msvcm90.rc

diff --git a/dlls/msvcm90/Makefile.in b/dlls/msvcm90/Makefile.in
index 86f5616008..f01df662b9 100644
--- a/dlls/msvcm90/Makefile.in
+++ b/dlls/msvcm90/Makefile.in
@@ -5,3 +5,5 @@ EXTRADLLFLAGS = -mno-cygwin

C_SRCS = \
    msvcm_main.c
+
+RC_SRCS = msvcm90.rc
diff --git a/dlls/msvcm90/msvcm90.manifest b/dlls/msvcm90/msvcm90.manifest
new file mode 100644
index 0000000000..588a0fd7b4
--- /dev/null
+++ b/dlls/msvcm90/msvcm90.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.VC90.CRT" version="9.0.30729.6161" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/>
+  <file name="msvcr90.dll"/>
+  <file name="msvcp90.dll"/>
+  <file name="msvcm90.dll"/>
+</assembly>
diff --git a/dlls/msvcm90/msvcm90.rc b/dlls/msvcm90/msvcm90.rc
new file mode 100644
index 0000000000..a3fb202f4b
--- /dev/null
+++ b/dlls/msvcm90/msvcm90.rc
@@ -0,0 +1,22 @@
+/*
+ * Resource file for msvcm90
+ *
+ * Copyright 2020 Dmitry Timoshkov
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* @makedep: msvcm90.manifest */
+WINE_MANIFEST 24 msvcm90.manifest

[Piotr Caban]

Hi Dmitry,

On 9/18/20 11:58 AM, Dmitry Timoshkov wrote:
> +<?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.VC90.CRT" version="9.0.30729.6161" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/>
> -
>
> <file name="msvcr90.dll"/>
> -
>
> <file name="msvcp90.dll"/>
> -
>
> <file name="msvcm90.dll"/>
>
> +</assembly>

I don't like the idea of having 3 copies of the same manifest (and 
updating all of them on e.g. version change). I think it's better to 
copy all the files specified in wine manifest in setupapi. I've sent a 
patch that does it:
https://source.winehq.org/patches/data/193126

Thanks,
Piotr

[Dmitry Timoshkov]

Hi Piotr,

Piotr Caban  wrote:
> On 9/18/20 11:58 AM, Dmitry Timoshkov wrote:
> > +<?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.VC90.CRT" version="9.0.30729.6161" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/>
> > -
> >
> > <file name="msvcr90.dll"/>
> > -
> >
> > <file name="msvcp90.dll"/>
> > -
> >
> > <file name="msvcm90.dll"/>
> >
> > +</assembly>
>
> I don't like the idea of having 3 copies of the same manifest (and 
> updating all of them on e.g. version change). I think it's better to 
> copy all the files specified in wine manifest in setupapi. I've sent a 
> patch that does it:
> https://source.winehq.org/patches/data/193126

Yes, that patch also works, thanks. I had wrong impression that all 3 files
mentioned in manifest should have their own manifest included in each DLL,
however it appears that's not the case.