Hello!
This patch removes references to binary resources (like res/folder3.bmp
and winefile.ico) in regedit and winefile. Those files are not in the
Wine sources. This patch allows building regedit and winefile for Windows
from Wine sources without having to define __WINE__ in wrc.
ChangeLog:
programs/regedit/resource.rc, programs/winefile/resource.rc
Remove references to missing binary resources
--
Regards,
Pavel Roskin
--- programs/regedit/resource.rc
+++ programs/regedit/resource.rc
@@ -19,9 +19,6 @@
*/
IDB_OPEN_FILE BITMAP DISCARDABLE
-#ifndef __WINE__
-"res/folder3.bmp"
-#else
/* BINRES folder3.bmp */
{
'42 4D F6 00 00 00 00 00 00 00 76 00 00 00 28 00'
@@ -41,12 +38,8 @@
'00 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88'
'88 88 88 88 88 88'
}
-#endif
IDB_CLOSED_FILE BITMAP DISCARDABLE
-#ifndef __WINE__
-"res/folder2.bmp"
-#else
/* BINRES folder2.bmp */
{
'42 4D F6 00 00 00 00 00 00 00 76 00 00 00 28 00'
@@ -66,12 +59,8 @@
'7B 7B 8F FF FF FF FF F8 88 88 FF FF FF FF FF FF'
'FF FF FF FF FF FF'
}
-#endif
IDB_ROOT BITMAP DISCARDABLE
-#ifndef __WINE__
-"res/folder1.bmp"
-#else
/* BINRES folder1.bmp */
{
'42 4D F6 00 00 00 00 00 00 00 76 00 00 00 28 00'
@@ -91,6 +80,5 @@
'7B 7B 8F FF FF FF FF F8 88 88 FF FF FF FF FF FF'
'FF FF FF FF FF FF'
}
-#endif
#include "wine/wine_common_ver.rc"
--- programs/winefile/resource.rc
+++ programs/winefile/resource.rc
@@ -29,9 +29,6 @@
}
IDI_WINEFILE ICON DISCARDABLE
-#ifndef __WINE__
- "winefile.ico"
-#else
{
'00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
@@ -82,12 +79,8 @@
'01 FF 80 00 01 FF C0 00 01 FF E0 00 01 FF F0 00'
'01 FF F8 00 01 FF FF FF FF FF FF FF FF FF'
}
-#endif
IDB_TOOLBAR BITMAP DISCARDABLE
-#ifndef __WINE__
- "toolbar.bmp"
-#else
{
'42 4D BE 03 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 70 00 00 00 0F 00 00 00 01 00 04 00 00 00'
@@ -150,12 +143,8 @@
'77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77'
'77 77 7C 77 77 77 08 77 70 00 70 70 70 77'
}
-#endif
IDB_DRIVEBAR BITMAP DISCARDABLE
-#ifndef __WINE__
- "drivebar.bmp"
-#else
{
'42 4D E6 02 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 60 00 00 00 0D 00 00 00 01 00 04 00 00 00'
@@ -205,12 +194,8 @@
'77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77'
'77 77 77 77 77 77'
}
-#endif
IDB_IMAGES BITMAP DISCARDABLE
-#ifndef __WINE__
- "images.bmp"
-#else
{
'42 4D 86 04 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 A0 00 00 00 0D 00 00 00 01 00 04 00 00 00'
@@ -286,4 +271,3 @@
'77 77 AA AA AA AA AA AA AA AA AA AA AA AA AA AA'
'AA AA AA AA AA AA'
}
-#endif
