Version resources

Ge van Geldorp gvg at reactos.com
Sun Oct 17 10:32:55 CDT 2004


Some Wine .dlls have a separate version.rc, e.g. dlls/mpr. These .dlls will
have two .res files (mpr.res and version.res). Unfortunately, for PE builds
only the resources stored in the first of these .res files will be accessible.
The version information is irretrievable.
This patch changes a few .dlls to use only one .res file by including
version.rc from the main .rc file. Only the .dlls ported to ReactOS are
included in this patch, if it is accepted I'll change the other .dlls too.

Changelog:
  Ge van Geldorp <gvg at reactos.com>
  - Use only one .res file

Index: dlls/mpr/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/mpr/Makefile.in,v
retrieving revision 1.15
diff -u -r1.15 Makefile.in
--- dlls/mpr/Makefile.in	5 Apr 2004 23:14:26 -0000	1.15
+++ dlls/mpr/Makefile.in	17 Oct 2004 15:09:54 -0000
@@ -15,8 +15,7 @@
 	wnet.c
 
 RC_SRCS = \
-	mpr.rc \
-	version.rc
+	mpr.rc
 
 
 @MAKE_DLL_RULES@
Index: dlls/mpr/mpr.rc
===================================================================
RCS file: /home/wine/wine/dlls/mpr/mpr.rc,v
retrieving revision 1.8
diff -u -r1.8 mpr.rc
--- dlls/mpr/mpr.rc	9 Sep 2004 19:18:58 -0000	1.8
+++ dlls/mpr/mpr.rc	17 Oct 2004 15:09:54 -0000
@@ -21,6 +21,8 @@
 #include "winbase.h"
 #include "mprres.h"
 
+#include "version.rc"
+
 #include "mpr_Cs.rc"
 #include "mpr_De.rc"
 #include "mpr_En.rc"
Index: dlls/ole32/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/ole32/Makefile.in,v
retrieving revision 1.39
diff -u -r1.39 Makefile.in
--- dlls/ole32/Makefile.in	21 Sep 2004 00:35:03 -0000	1.39
+++ dlls/ole32/Makefile.in	17 Oct 2004 15:09:54 -0000
@@ -53,7 +53,7 @@
 	ole2thk.spec \
 	storage.spec
 
-RC_SRCS = ole32res.rc version.rc
+RC_SRCS = ole32res.rc
 RC_BINSRC = ole32res.rc
 RC_BINARIES = \
 	drag_copy.cur \
Index: dlls/ole32/ole32res.rc
===================================================================
RCS file: /home/wine/wine/dlls/ole32/ole32res.rc,v
retrieving revision 1.5
diff -u -r1.5 ole32res.rc
--- dlls/ole32/ole32res.rc	3 Oct 2003 05:01:34 -0000	1.5
+++ dlls/ole32/ole32res.rc	17 Oct 2004 15:09:54 -0000
@@ -23,6 +23,8 @@
 #include "winuser.h"
 #include "winnls.h"
 
+#include "version.rc"
+
 /*
  * Everything that does not depend on language,
  * like textless bitmaps etc, go into the
Index: dlls/oleaut32/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/Makefile.in,v
retrieving revision 1.56
diff -u -r1.56 Makefile.in
--- dlls/oleaut32/Makefile.in	11 Aug 2004 23:59:07 -0000	1.56
+++ dlls/oleaut32/Makefile.in	17 Oct 2004 15:09:54 -0000
@@ -36,8 +36,7 @@
 	typelib.spec
 
 RC_SRCS = \
-	oleaut32.rc \
-	version.rc
+	oleaut32.rc
 
 SUBDIRS = tests
 
Index: dlls/oleaut32/oleaut32.rc
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/oleaut32.rc,v
retrieving revision 1.3
diff -u -r1.3 oleaut32.rc
--- dlls/oleaut32/oleaut32.rc	30 Aug 2004 18:38:27 -0000	1.3
+++ dlls/oleaut32/oleaut32.rc	17 Oct 2004 15:09:54 -0000
@@ -22,6 +22,8 @@
 #include "winbase.h"
 #include "resource.h"
 
+#include "version.rc"
+
 #include "oleaut32_De.rc"
 #include "oleaut32_Dk.rc"
 #include "oleaut32_En.rc"
Index: dlls/shell32/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/shell32/Makefile.in,v
retrieving revision 1.85
diff -u -r1.85 Makefile.in
--- dlls/shell32/Makefile.in	29 Sep 2004 21:13:58 -0000	1.85
+++ dlls/shell32/Makefile.in	17 Oct 2004 15:09:54 -0000
@@ -48,7 +48,7 @@
 	shv_item_cmenu.c \
 	systray.c
 
-RC_SRCS = shres.rc version.rc
+RC_SRCS = shres.rc
 RC_BINSRC = shres.rc
 RC_BINARIES = \
 	cdrom.ico \
Index: dlls/shell32/shres.rc
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shres.rc,v
retrieving revision 1.35
diff -u -r1.35 shres.rc
--- dlls/shell32/shres.rc	29 Sep 2004 21:13:58 -0000	1.35
+++ dlls/shell32/shres.rc	17 Oct 2004 15:10:00 -0000
@@ -26,6 +26,8 @@
 #include "shlobj.h"
 #include "shresdef.h"
 
+#include "version.rc"
+
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 shv_accel ACCELERATORS



More information about the wine-patches mailing list