[sorry, use this one instead, I forgot something in the first one]
It works with separate src/build dirs too just fine.
ChangeLog
Extract binary resources to files, to fit the standard.
Index: Make.rules.in
===================================================================
RCS file: /var/cvs/wine/Make.rules.in,v
retrieving revision 1.161
diff -u -r1.161 Make.rules.in
--- Make.rules.in 24 Sep 2003 19:01:44 -0000 1.161
+++ Make.rules.in 2 Oct 2003 16:48:58 -0000
@@ -65,6 +65,7 @@
WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild
MAKEDEP = $(TOOLSDIR)/tools/makedep
WRC = $(TOOLSDIR)/tools/wrc/wrc
+BIN2RES = $(TOOLSDIR)/tools/bin2res
WMC = $(TOOLSDIR)/tools/wmc/wmc
WIDL = $(TOOLSDIR)/tools/widl/widl
RC = $(WRC)
@@ -147,6 +148,13 @@
@$(TOPSRCDIR)/tools/winapi/make_filter --make $(MAKE) all
.PHONY: all filter
+
+# Rules for binary resources
+
+$(RC_BINARIES): $(RC_BINSRC)
+ $(BIN2RES) -o $@ $<
+
+$(RC_SRCS:.rc=.res): $(RC_BINARIES)
# Rule for main module debug channels
Index: dlls/comctl32/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/Makefile.in,v
retrieving revision 1.30
diff -u -r1.30 Makefile.in
--- dlls/comctl32/Makefile.in 15 May 2003 23:58:48 -0000 1.30
+++ dlls/comctl32/Makefile.in 2 Oct 2003 00:48:46 -0000
@@ -40,6 +40,13 @@
updown.c
RC_SRCS = rsrc.rc
+RC_BINSRC = rsrc.rc
+RC_BINARIES = \
+ idb_hist_large.bmp \
+ idb_hist_small.bmp \
+ idb_std_large.bmp \
+ idb_view_large.bmp \
+ idb_view_small.bmp
SUBDIRS = tests
Index: dlls/commdlg/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/commdlg/Makefile.in,v
retrieving revision 1.32
diff -u -r1.32 Makefile.in
--- dlls/commdlg/Makefile.in 2 Aug 2003 00:41:41 -0000 1.32
+++ dlls/commdlg/Makefile.in 2 Oct 2003 00:49:20 -0000
@@ -24,14 +24,27 @@
generic.c \
printdlg.c
-C_SRCS16 = \
+C_SRCS16 = \
colordlg16.c \
filedlg16.c \
finddlg.c \
fontdlg16.c \
printdlg16.c
-RC_SRCS= rsrc.rc
+RC_SRCS = rsrc.rc
+RC_BINSRC = cdlg_xx.rc
+RC_BINARIES = \
+ 800.bmp \
+ cdrom.ico \
+ floppy.ico \
+ folder2.ico \
+ folder.ico \
+ hdisk.ico \
+ network.ico \
+ pd32_collate.ico \
+ pd32_landscape.ico \
+ pd32_nocollate.ico \
+ pd32_portrait.ico
@MAKE_DLL_RULES@
Index: dlls/ole32/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/Makefile.in,v
retrieving revision 1.31
diff -u -r1.31 Makefile.in
--- dlls/ole32/Makefile.in 9 Jul 2003 19:49:12 -0000 1.31
+++ dlls/ole32/Makefile.in 2 Oct 2003 00:49:52 -0000
@@ -51,6 +51,12 @@
storage.c
RC_SRCS = ole32res.rc version.rc
+RC_BINSRC = ole32res.rc
+RC_BINARIES = \
+ drag_copy.cur \
+ drag_link.cur \
+ drag_move.cur \
+ nodrop.cur
@MAKE_DLL_RULES@
Index: dlls/shell32/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/Makefile.in,v
retrieving revision 1.71
diff -u -r1.71 Makefile.in
--- dlls/shell32/Makefile.in 24 Sep 2003 19:01:44 -0000 1.71
+++ dlls/shell32/Makefile.in 2 Oct 2003 00:50:37 -0000
@@ -52,6 +52,14 @@
systray.c
RC_SRCS = shres.rc version.rc
+RC_BINSRC = shres.rc
+RC_BINARIES = \
+ 000.ico \
+ 003.ico \
+ 004.ico \
+ 008.ico \
+ 015.ico \
+ 034.ico
C_SRCS16 = shell.c
RC_SRCS16 = version16.rc
Index: dlls/user/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/user/Makefile.in,v
retrieving revision 1.73
diff -u -r1.73 Makefile.in
--- dlls/user/Makefile.in 27 Sep 2003 02:32:53 -0000 1.73
+++ dlls/user/Makefile.in 2 Oct 2003 01:41:28 -0000
@@ -92,6 +92,70 @@
wnd16.c
RC_SRCS = resources/user32.rc
+RC_BMPSRC = resources/user32_bitmaps.rc
+RC_BMPS = \
+ obm_btncorners.bmp \
+ obm_btsize.bmp \
+ obm_check.bmp \
+ obm_checkboxes.bmp \
+ obm_close.bmp \
+ obm_combo.bmp \
+ obm_dnarrow.bmp \
+ obm_dnarrowd.bmp \
+ obm_dnarrowi.bmp \
+ obm_lfarrow.bmp \
+ obm_lfarrowd.bmp \
+ obm_lfarrowi.bmp \
+ obm_mnarrow.bmp \
+ obm_old_close.bmp \
+ obm_old_dnarrow.bmp \
+ obm_old_lfarrow.bmp \
+ obm_old_reduce.bmp \
+ obm_old_restore.bmp \
+ obm_old_rgarrow.bmp \
+ obm_old_uparrow.bmp \
+ obm_old_zoom.bmp \
+ obm_reduce.bmp \
+ obm_reduced.bmp \
+ obm_restore.bmp \
+ obm_restored.bmp \
+ obm_rgarrow.bmp \
+ obm_rgarrowd.bmp \
+ obm_rgarrowi.bmp \
+ obm_size.bmp \
+ obm_trtype.bmp \
+ obm_uparrow.bmp \
+ obm_uparrowd.bmp \
+ obm_uparrowi.bmp \
+ obm_zoom.bmp \
+ obm_zoomd.bmp
+RC_CURSRC = resources/user32_cursors.rc
+RC_CURS = \
+ ocr_appstarting.cur \
+ ocr_cross.cur \
+ ocr_dragobject.cur \
+ ocr_hand.cur \
+ ocr_help.cur \
+ ocr_ibeam.cur \
+ ocr_icon.cur \
+ ocr_no.cur \
+ ocr_normal.cur \
+ ocr_sizeall.cur \
+ ocr_size.cur \
+ ocr_sizenesw.cur \
+ ocr_sizens.cur \
+ ocr_sizenwse.cur \
+ ocr_sizewe.cur \
+ ocr_up.cur \
+ ocr_wait.cur
+RC_ICOSRC = resources/user32_icons.rc
+RC_ICOS = \
+ oic_bang.ico \
+ oic_hand.ico \
+ oic_note.ico \
+ oic_ques.ico \
+ oic_sample.ico \
+ oic_winlogo.ico
RC_SRCS16 = \
resources/display.rc \
@@ -127,5 +191,18 @@
resources/version16.res: resources/version16.rc
$(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/resources/version16.rc
+
+$(RC_BMPS): $(RC_BMPSRC)
+ $(BIN2RES) -o $@ $<
+
+$(RC_CURS): $(RC_CURSRC)
+ $(BIN2RES) -o $@ $<
+
+$(RC_ICOS): $(RC_ICOSRC)
+ $(BIN2RES) -o $@ $<
+
+resources/user32.res: $(RC_BMPS) $(RC_CURS) $(RC_ICOS)
+
+display.res: oic_hand.ico
### Dependencies:
Index: programs/regedit/Makefile.in
===================================================================
RCS file: /var/cvs/wine/programs/regedit/Makefile.in,v
retrieving revision 1.10
diff -u -r1.10 Makefile.in
--- programs/regedit/Makefile.in 7 Aug 2003 03:10:13 -0000 1.10
+++ programs/regedit/Makefile.in 2 Oct 2003 00:51:03 -0000
@@ -19,6 +19,12 @@
treeview.c
RC_SRCS = rsrc.rc
+RC_BINSRC = resource.rc
+RC_BINARIES = \
+ folder1.bmp \
+ folder2.bmp \
+ folder3.bmp
+
EXTRARCFLAGS = -D__WINE__
PLTESTS = \
Index: programs/winecfg/Makefile.in
===================================================================
RCS file: /var/cvs/wine/programs/winecfg/Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 Makefile.in
--- programs/winecfg/Makefile.in 30 Sep 2003 00:27:55 -0000 1.5
+++ programs/winecfg/Makefile.in 2 Oct 2003 00:42:54 -0000
@@ -15,6 +15,8 @@
x11drvdlg.c
RC_SRCS = winecfg.rc
+RC_BINSRC = winecfg.rc
+RC_BINARIES = idb_wine.bmp
@MAKE_PROG_RULES@
Index: ./dlls/comctl32/rsrc.rc
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/rsrc.rc,v
retrieving revision 1.30
diff -u -r1.30 rsrc.rc
--- ./dlls/comctl32/rsrc.rc 22 Sep 2003 21:16:57 -0000 1.30
+++ ./dlls/comctl32/rsrc.rc 2 Oct 2003 16:26:40 -0000
@@ -176,8 +176,8 @@
}
/* BINRES idb_std_large.bmp */
-IDB_STD_LARGE BITMAP LOADONCALL DISCARDABLE
-{
+IDB_STD_LARGE BITMAP LOADONCALL DISCARDABLE idb_std_large.bmp
+/* {
'42 4D D6 0A 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 68 01 00 00 18 00 00 00 01 00 04 00 02 00'
'00 00 60 0A 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -352,12 +352,12 @@
'14 00 04 77 0C 00 41 77 05 00 1F 77 02 11 1B 77'
'00 00 B6 77 04 00 91 77 01 17 1C 77 00 00 FF 77'
'69 77 00 00 00 01'
-}
+} */
/* BINRES idb_view_small.bmp */
-IDB_VIEW_SMALL BITMAP LOADONCALL DISCARDABLE
-{
+IDB_VIEW_SMALL BITMAP LOADONCALL DISCARDABLE idb_view_small.bmp
+/* {
'42 4D 36 10 00 00 00 00 00 00 36 04 00 00 28 00'
'00 00 C0 00 00 00 10 00 00 00 01 00 08 00 00 00'
'00 00 00 0C 00 00 EB 0A 00 00 EB 0A 00 00 00 01'
@@ -618,12 +618,12 @@
'07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
'07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
'07 FF 00 07 07 07'
-}
+} */
/* BINRES idb_view_large.bmp */
-IDB_VIEW_LARGE BITMAP LOADONCALL MOVEABLE DISCARDABLE
-{
+IDB_VIEW_LARGE BITMAP LOADONCALL MOVEABLE DISCARDABLE idb_view_large.bmp
+/* {
'42 4D DE 08 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 20 01 00 00 18 00 00 00 01 00 04 00 02 00'
'00 00 68 08 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -766,12 +766,12 @@
'02 71 06 77 02 74 08 44 02 47 04 77 02 71 08 77'
'02 74 06 44 06 77 02 71 5E 77 02 07 04 77 00 00'
'FE 77 22 77 00 00 FE 77 22 77 00 00 00 01'
-}
+} */
/* BINRES idb_hist_small.bmp */
-IDB_HIST_SMALL BITMAP LOADONCALL DISCARDABLE
-{
+IDB_HIST_SMALL BITMAP LOADONCALL DISCARDABLE idb_hist_small.bmp
+/* {
'42 4D 8A 05 00 00 00 00 00 00 8A 00 00 00 28 00'
'00 00 50 00 00 00 10 00 00 00 01 00 08 00 00 00'
'00 00 00 05 00 00 12 0B 00 00 12 0B 00 00 15 00'
@@ -861,12 +861,12 @@
'08 08 08 08 08 08 08 08 08 08 06 06 06 06 06 06'
'06 06 06 08 08 08 08 06 08 08 08 08 08 08 08 08'
'08 08 08 08 08 08 08 08 08 08'
-}
+} */
/* BINRES idb_hist_large.bmp */
-IDB_HIST_LARGE BITMAP LOADONCALL DISCARDABLE
-{
+IDB_HIST_LARGE BITMAP LOADONCALL DISCARDABLE idb_hist_large.bmp
+/* {
'42 4D 16 06 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 78 00 00 00 18 00 00 00 01 00 04 00 00 00'
'00 00 A0 05 00 00 12 0B 00 00 12 0B 00 00 10 00'
@@ -965,7 +965,7 @@
'88 88 88 88 88 88 88 88 88 88 88 88 88 88 86 66'
'66 66 66 66 68 88 88 88 68 88 88 88 88 88 88 88'
'88 88 88 88 88 88'
-}
+} */
IDC_DIVIDER CURSOR LOADONCALL DISCARDABLE
Index: ./dlls/commdlg/cdlg_xx.rc
===================================================================
RCS file: /var/cvs/wine/dlls/commdlg/cdlg_xx.rc,v
retrieving revision 1.14
diff -u -r1.14 cdlg_xx.rc
--- ./dlls/commdlg/cdlg_xx.rc 5 Sep 2003 23:08:42 -0000 1.14
+++ ./dlls/commdlg/cdlg_xx.rc 2 Oct 2003 16:26:45 -0000
@@ -57,8 +57,8 @@
}
/* BINRES pd32_collate.ico */
-PD32_COLLATE ICON DISCARDABLE LOADONCALL
-{
+PD32_COLLATE ICON DISCARDABLE LOADONCALL pd32_collate.ico
+/* {
'00 00 01 00 01 00 4C 18 10 00 00 00 00 00 48 05'
'00 00 16 00 00 00 28 00 00 00 4C 00 00 00 30 00'
'00 00 01 00 04 00 00 00 00 00 E0 04 00 00 00 00'
@@ -145,13 +145,13 @@
'00 1F FF FC 00 01 FF F0 00 00 FF F0 00 3F FF FF'
'00 03 FF F0 00 00 FF F0 00 3F FF FF 00 03 FF F0'
'00 00 FF F0 00 3F FF FF 00 03 FF F0 00 00'
-}
+} */
/* BINRES pd32_nocollate.ico */
-PD32_NOCOLLATE ICON
-{
+PD32_NOCOLLATE ICON pd32_nocollate.ico
+/* {
'00 00 01 00 01 00 4C 18 10 00 00 00 00 00 48 05'
'00 00 16 00 00 00 28 00 00 00 4C 00 00 00 30 00'
'00 00 01 00 04 00 00 00 00 00 E0 04 00 00 00 00'
@@ -238,11 +238,11 @@
'3F E0 00 0F F8 00 03 FF FF FF 80 00 FF E0 00 3F'
'F8 00 0F F0 00 00 FF C3 FF FF F0 FF FF FC 3F FF'
'FF FF FF E7 FF FF F9 FF FF FE 7F F0 00 00'
-}
+} */
/* BINRES pd32_portrait.ico */
-PD32_PORTRAIT ICON
-{
+PD32_PORTRAIT ICON pd32_portrait.ico
+/* {
'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'
'00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00'
@@ -291,11 +291,11 @@
'00 07 E0 00 00 07 E0 00 00 07 E0 00 00 07 E0 00'
'00 07 E0 00 00 07 E0 00 00 0F E0 00 00 1F E0 00'
'00 3F E0 00 00 7F E0 00 00 FF E0 00 01 FF'
-}
+} */
/* BINRES pd32_landscape.ico */
-PD32_LANDSCAPE ICON
-{
+PD32_LANDSCAPE ICON pd32_landscape.ico
+/* {
'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'
'00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00'
@@ -344,11 +344,11 @@
'00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00'
'00 03 00 00 00 07 00 00 00 0F 00 00 00 1F 00 00'
'00 3F FF FF FF FF FF FF FF FF FF FF FF FF'
-}
+} */
/* BINRES 800.bmp */
-800 BITMAP DISCARDABLE LOADONCALL
-{
+800 BITMAP DISCARDABLE LOADONCALL 800.bmp
+/* {
'42 4D 36 05 00 00 00 00 00 00 36 04 00 00 28 00'
'00 00 10 00 00 00 10 00 00 00 01 00 08 00 00 00'
'00 00 00 01 00 00 12 0B 00 00 12 0B 00 00 00 01'
@@ -433,12 +433,12 @@
'01 00 08 08 07 07 07 07 07 07 07 00 0B 0B 00 07'
'01 00 07 07 07 07 07 07 07 07 07 07 00 00 07 07'
'01 00 07 07 07 07'
-}
+} */
/* BINRES folder.ico */
-FOLDER ICON
-{
+FOLDER ICON folder.ico
+/* {
'00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01'
'00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00'
'00 00 01 00 04 00 00 00 00 00 C0 00 00 00 00 00'
@@ -459,12 +459,12 @@
'00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00'
'00 00 80 00 00 00 80 00 00 00 80 01 00 00 C0 7F'
'00 00 E0 FF 00 00 FF FF 00 00 FF FF 00 00'
-}
+} */
/* BINRES folder2.ico */
-FOLDER2 ICON
-{
+FOLDER2 ICON folder2.ico
+/* {
'00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01'
'00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00'
'00 00 01 00 04 00 00 00 00 00 C0 00 00 00 00 00'
@@ -485,12 +485,12 @@
'00 00 80 00 00 00 00 00 00 00 00 00 00 00 00 00'
'00 00 80 00 00 00 80 00 00 00 80 01 00 00 C0 7F'
'00 00 E0 FF 00 00 FF FF 00 00 FF FF 00 00'
-}
+} */
/* BINRES floppy.ico */
-FLOPPY ICON
-{
+FLOPPY ICON floppy.ico
+/* {
'00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01'
'00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00'
'00 00 01 00 04 00 00 00 00 00 C0 00 00 00 00 00'
@@ -511,12 +511,12 @@
'00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00'
'00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00'
'00 00 FF FF 00 00 FF FF 00 00 FF FF 00 00'
-}
+} */
/* BINRES cdrom.ico */
-CDROM ICON
-{
+CDROM ICON cdrom.ico
+/* {
'00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01'
'00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00'
'00 00 01 00 04 00 00 00 00 00 C0 00 00 00 00 00'
@@ -537,12 +537,12 @@
'00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00'
'00 00 80 00 00 00 C0 01 00 00 C0 01 00 00 E0 03'
'00 00 F0 07 00 00 FC 1F 00 00 FF FF 00 00'
-}
+} */
/* BINRES hdisk.ico */
-HDISK ICON
-{
+HDISK ICON hdisk.ico
+/* {
'00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01'
'00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00'
'00 00 01 00 04 00 00 00 00 00 C0 00 00 00 00 00'
@@ -563,12 +563,12 @@
'00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00'
'00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00'
'00 00 FF FF 00 00 FF FF 00 00 FF FF 00 00'
-}
+} */
/* BINRES network.ico */
-NETWORK ICON
-{
+NETWORK ICON network.ico
+/* {
'00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01'
'00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00'
'00 00 01 00 04 00 00 00 00 00 C0 00 00 00 00 00'
@@ -589,4 +589,4 @@
'00 00 FE 7F 00 00 C0 03 00 00 80 01 00 00 80 00'
'00 00 80 00 00 00 80 00 00 00 80 00 00 00 C0 00'
'00 00 E0 01 00 00 FF FF 00 00 FF FF 00 00'
-}
+} */
Index: ./dlls/ole32/ole32res.rc
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/ole32res.rc,v
retrieving revision 1.4
diff -u -r1.4 ole32res.rc
--- ./dlls/ole32/ole32res.rc 8 Sep 2003 19:38:46 -0000 1.4
+++ ./dlls/ole32/ole32res.rc 2 Oct 2003 16:26:46 -0000
@@ -31,9 +31,9 @@
*/
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-0 CURSOR
/* BINRES nodrop.cur */
-{
+0 CURSOR nodrop.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 80 00 00 00 00 00'
@@ -55,11 +55,11 @@
'01 FF FF C0 03 FF FF E0 07 FF FF F8 1F FF FF FF'
'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF'
-}
+} */
-1 CURSOR
/* BINRES drag_move.cur */
-{
+1 CURSOR drag_move.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 12 00 16 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -81,11 +81,11 @@
'FF FF 80 3F FF FF 80 7F FF FF 80 FF FF FF 81 FF'
'FF FF 83 FF FF FF 87 FF FF FF 8F FF FF FF 9F FF'
'FF FF FF FF FF FF'
-}
+} */
-2 CURSOR
/* BINRES drag_copy.cur */
-{
+2 CURSOR drag_copy.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 01 00 01 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -107,11 +107,11 @@
'FF FF 80 3F FF FF 80 7F FF FF 80 FF FF FF 81 FF'
'FF FF 83 FF FF FF 87 FF FF FF 8F FF FF FF 9F FF'
'FF FF FF FF FF FF'
-}
+} */
-3 CURSOR
/* BINRES drag_link.cur */
-{
+3 CURSOR drag_link.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 12 00 16 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -133,7 +133,7 @@
'FF FF 80 3F FF FF 80 7F FF FF 80 FF FF FF 81 FF'
'FF FF 83 FF FF FF 87 FF FF FF 8F FF FF FF 9F FF'
'FF FF FF FF FF FF'
-}
+} */
/*
Index: ./dlls/shell32/shres.rc
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shres.rc,v
retrieving revision 1.30
diff -u -r1.30 shres.rc
--- ./dlls/shell32/shres.rc 30 Sep 2003 00:25:28 -0000 1.30
+++ ./dlls/shell32/shres.rc 2 Oct 2003 16:26:47 -0000
@@ -34,8 +34,8 @@
END
/* BINRES 000.ico document */
-0 ICON
-{
+0 ICON 000.ico
+/* {
'00 00 01 00 04 00 10 10 10 00 01 00 04 00 28 01'
'00 00 46 00 00 00 10 10 00 00 01 00 08 00 68 05'
'00 00 6E 01 00 00 20 20 10 00 01 00 04 00 E8 02'
@@ -331,15 +331,15 @@
'00 7F FE 00 00 FF FE 00 01 FF FE 00 03 FF FE 00'
'07 FF FE 00 0F FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF'
-}
+} */
/* BINRES 003.ico folder */
-3 ICON
-{
+3 ICON 003.ico
+/* {
'00 00 01 00 04 00 10 10 10 00 01 00 04 00 28 01'
'00 00 46 00 00 00 10 10 00 00 01 00 08 00 68 05'
'00 00 6E 01 00 00 20 20 10 00 01 00 04 00 E8 02'
@@ -635,11 +635,11 @@
'00 00 00 00 00 01 00 00 00 03 00 00 0F FF 80 00'
'1F FF C0 00 3F FF E0 00 7F FF F0 00 FF FF FF FF'
'FF FF FF FF FF FF'
-}
+} */
/* BINRES 004.ico folder */
-4 ICON
-{
+4 ICON 004.ico
+/* {
'00 00 01 00 01 00 10 10 10 00 00 00 00 00 68 05'
'00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00'
'00 00 01 00 08 00 00 00 00 00 00 01 00 00 00 00'
@@ -728,11 +728,11 @@
'00 00 80 00 30 30 80 00 00 00 00 00 00 00 00 00'
'00 00 00 00 A0 9A 80 00 00 00 80 00 A0 9A 80 01'
'00 00 C0 7F A0 9A E0 FF 00 00 FF FF 9A A0'
-}
+} */
/* BINRES 008.ico drive */
-8 ICON
-{
+8 ICON 008.ico
+/* {
'00 00 01 00 04 00 10 10 10 00 01 00 04 00 28 01'
'00 00 46 00 00 00 10 10 00 00 01 00 08 00 68 05'
'00 00 6E 01 00 00 20 20 10 00 01 00 04 00 E8 02'
@@ -1028,14 +1028,14 @@
'00 03 FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF'
-}
+} */
/* BINRES 015.ico mycomputer */
-15 ICON
-{
+15 ICON 015.ico
+/* {
'00 00 01 00 02 00 10 10 10 00 01 00 04 00 28 01'
'00 00 26 00 00 00 20 20 10 00 01 00 04 00 E8 02'
'00 00 4E 01 00 00 28 00 00 00 10 00 00 00 20 00'
@@ -1104,14 +1104,14 @@
'00 1F F8 00 00 1F F8 00 00 1F F8 00 00 1F F8 00'
'00 1F F8 00 00 1F FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF'
-}
+} */
/* BINRES 034.ico desktop */
-34 ICON
-{
+34 ICON 034.ico
+/* {
'00 00 01 00 02 00 10 10 10 00 00 00 00 00 28 01'
'00 00 26 00 00 00 20 20 10 00 00 00 00 00 E8 02'
'00 00 4E 01 00 00 28 00 00 00 10 00 00 00 20 00'
@@ -1180,7 +1180,7 @@
'FF FF FF DF FF FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF'
-}
+} */
Index: dlls/user/resources/display.rc
===================================================================
RCS file: /var/cvs/wine/dlls/user/resources/display.rc,v
retrieving revision 1.4
diff -u -r1.4 display.rc
--- dlls/user/resources/display.rc 1 Oct 2002 18:14:04 -0000 1.4
+++ dlls/user/resources/display.rc 2 Oct 2003 17:06:20 -0000
@@ -53,55 +53,5 @@
0x00000000L /* inactive caption text */
}
-/* BINRES oic_hand.ico */
-1 ICON
-{
- '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'
- '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
- '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0'
- 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
- '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
- '00 00 00 00 07 77 77 77 70 00 00 00 00 00 00 00'
- '00 00 00 77 77 77 77 77 77 77 00 00 00 00 00 00'
- '00 00 07 71 11 11 11 17 77 77 70 00 00 00 00 00'
- '00 07 11 19 99 99 99 91 11 77 77 70 00 00 00 00'
- '00 71 99 99 99 99 99 99 99 17 77 77 00 00 00 00'
- '01 19 99 99 99 99 99 99 99 91 17 77 70 00 00 00'
- '19 99 99 99 99 99 99 99 99 99 91 77 70 00 00 01'
- '99 99 99 99 99 99 99 99 99 99 99 17 77 00 00 01'
- '99 99 99 99 99 99 99 99 99 99 99 17 77 70 00 19'
- '99 99 9F 99 99 99 99 99 F9 99 99 91 77 70 01 99'
- '99 99 FF F9 99 99 99 9F FF 99 99 99 17 70 01 99'
- '99 9F FF FF 99 99 99 FF FF F9 99 99 17 77 01 99'
- '99 99 FF FF F9 99 9F FF FF 99 99 99 17 77 19 99'
- '99 99 9F FF FF 99 FF FF F9 99 99 99 91 77 19 99'
- '99 99 99 FF FF FF FF FF 99 99 99 99 91 77 19 99'
- '99 99 99 9F FF FF FF F9 99 99 99 99 91 77 19 99'
- '99 99 99 99 FF FF FF 99 99 99 99 99 91 77 19 99'
- '99 99 99 99 FF FF FF 99 99 99 99 99 91 77 19 99'
- '99 99 99 9F FF FF FF F9 99 99 99 99 91 77 19 99'
- '99 99 99 FF FF FF FF FF 99 99 99 99 91 70 19 99'
- '99 99 9F FF FF 99 FF FF F9 99 99 99 91 70 01 99'
- '99 99 FF FF F9 99 9F FF FF 99 99 99 17 70 01 99'
- '99 9F FF FF 99 99 99 FF FF F9 99 99 17 00 01 99'
- '99 99 FF F9 99 99 99 9F FF 99 99 99 10 00 00 19'
- '99 99 9F 99 99 99 99 99 F9 99 99 91 70 00 00 01'
- '99 99 99 99 99 99 99 99 99 99 99 17 00 00 00 01'
- '99 99 99 99 99 99 99 99 99 99 99 10 00 00 00 00'
- '19 99 99 99 99 99 99 99 99 99 91 00 00 00 00 00'
- '01 19 99 99 99 99 99 99 99 91 10 00 00 00 00 00'
- '00 01 99 99 99 99 99 99 99 10 00 00 00 00 00 00'
- '00 00 11 19 99 99 99 91 11 00 00 00 00 00 00 00'
- '00 00 00 01 11 11 11 10 00 00 00 00 00 00 FF F8'
- '07 FF FF C0 00 FF FF 80 00 7F FE 00 00 1F FC 00'
- '00 0F F8 00 00 07 F0 00 00 07 E0 00 00 03 E0 00'
- '00 01 C0 00 00 01 80 00 00 01 80 00 00 00 80 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00'
- '00 01 80 00 00 01 80 00 00 03 80 00 00 07 C0 00'
- '00 07 E0 00 00 0F E0 00 00 1F F0 00 00 3F F8 00'
- '00 7F FE 00 01 FF FF 00 03 FF FF E0 1F FF'
-}
+1 ICON oic_hand.ico
+
Index: ./dlls/user/resources/user32_bitmaps.rc
===================================================================
RCS file: /var/cvs/wine/dlls/user/resources/user32_bitmaps.rc,v
retrieving revision 1.3
diff -u -r1.3 user32_bitmaps.rc
--- ./dlls/user/resources/user32_bitmaps.rc 9 Mar 2002 23:44:31 -0000 1.3
+++ ./dlls/user/resources/user32_bitmaps.rc 2 Oct 2003 16:26:47 -0000
@@ -19,8 +19,8 @@
*/
/* BINRES obm_trtype.bmp */
-OBM_TRTYPE BITMAP
-{
+OBM_TRTYPE BITMAP obm_trtype.bmp
+/* {
'42 4D E6 00 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 0E 00 00 00 0E 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -36,11 +36,11 @@
'10 00 00 00 02 00 21 22 11 22 12 22 22 00 21 12'
'11 21 12 22 22 00 21 11 11 11 12 22 22 00 22 22'
'22 22 22 22 22 00'
-}
+} */
/* BINRES obm_lfarrowi.bmp */
-OBM_LFARROWI BITMAP
-{
+OBM_LFARROWI BITMAP obm_lfarrowi.bmp
+/* {
'42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -62,11 +62,11 @@
'11 11 11 11 11 22 00 00 00 00 03 33 33 33 33 33'
'33 32 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
'00 00'
-}
+} */
/* BINRES obm_rgarrowi.bmp */
-OBM_RGARROWI BITMAP
-{
+OBM_RGARROWI BITMAP obm_rgarrowi.bmp
+/* {
'42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -88,11 +88,11 @@
'11 11 11 11 11 22 00 00 00 00 03 33 33 33 33 33'
'33 32 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
'00 00'
-}
+} */
/* BINRES obm_dnarrowi.bmp */
-OBM_DNARROWI BITMAP
-{
+OBM_DNARROWI BITMAP obm_dnarrowi.bmp
+/* {
'42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -114,11 +114,11 @@
'11 11 11 11 11 22 00 00 00 00 03 33 33 33 33 33'
'33 32 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
'00 00'
-}
+} */
/* BINRES obm_uparrowi.bmp */
-OBM_UPARROWI BITMAP
-{
+OBM_UPARROWI BITMAP obm_uparrowi.bmp
+/* {
'42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -140,11 +140,11 @@
'11 11 11 11 11 22 00 00 00 00 03 33 33 33 33 33'
'33 32 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
'00 00'
-}
+} */
/* BINRES obm_combo.bmp */
-OBM_COMBO BITMAP
-{
+OBM_COMBO BITMAP obm_combo.bmp
+/* {
'42 4D 62 00 00 00 00 00 00 00 3E 00 00 00 28 00'
'00 00 07 00 00 00 09 00 00 00 01 00 01 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -152,11 +152,11 @@
'00 00 FE 00 00 00 EE 00 00 00 C6 00 00 00 82 00'
'00 00 00 00 00 00 C6 00 00 00 C6 00 00 00 C6 00'
'00 00'
-}
+} */
/* BINRES obm_mnarrow.bmp */
-OBM_MNARROW BITMAP
-{
+OBM_MNARROW BITMAP obm_mnarrow.bmp
+/* {
'42 4D 6A 00 00 00 00 00 00 00 3E 00 00 00 28 00'
'00 00 07 00 00 00 0B 00 00 00 01 00 01 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -164,11 +164,11 @@
'00 00 BE 00 00 00 9E 00 00 00 8E 00 00 00 86 00'
'00 00 82 00 00 00 86 00 00 00 8E 00 00 00 9E 00'
'00 00 BE 00 00 00 FE 00 00 00'
-}
+} */
/* BINRES obm_lfarrowd.bmp */
-OBM_LFARROWD BITMAP
-{
+OBM_LFARROWD BITMAP obm_lfarrowd.bmp
+/* {
'42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -190,11 +190,11 @@
'11 11 11 11 11 11 00 00 00 00 02 22 22 22 22 22'
'22 22 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
'00 00'
-}
+} */
/* BINRES obm_rgarrowd.bmp */
-OBM_RGARROWD BITMAP
-{
+OBM_RGARROWD BITMAP obm_rgarrowd.bmp
+/* {
'42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -216,11 +216,11 @@
'11 11 11 11 11 11 00 00 00 00 02 22 22 22 22 22'
'22 22 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
'00 00'
-}
+} */
/* BINRES obm_dnarrowd.bmp */
-OBM_DNARROWD BITMAP
-{
+OBM_DNARROWD BITMAP obm_dnarrowd.bmp
+/* {
'42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -242,11 +242,11 @@
'11 11 11 11 11 11 00 00 00 00 02 22 22 22 22 22'
'22 22 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
'00 00'
-}
+} */
/* BINRES obm_uparrowd.bmp */
-OBM_UPARROWD BITMAP
-{
+OBM_UPARROWD BITMAP obm_uparrowd.bmp
+/* {
'42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -268,11 +268,11 @@
'11 11 11 11 11 11 00 00 00 00 02 22 22 22 22 22'
'22 22 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
'00 00'
-}
+} */
/* BINRES obm_restored.bmp */
-OBM_RESTORED BITMAP
-{
+OBM_RESTORED BITMAP obm_restored.bmp
+/* {
'42 4D E6 00 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 10 00 00 00 0E 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -288,11 +288,11 @@
'11 00 00 00 11 24 03 11 11 00 00 00 11 24 03 11'
'11 11 11 11 11 24 03 33 33 33 33 33 33 24 00 00'
'00 00 00 00 00 04'
-}
+} */
/* BINRES obm_zoomd.bmp */
-OBM_ZOOMD BITMAP
-{
+OBM_ZOOMD BITMAP obm_zoomd.bmp
+/* {
'42 4D E6 00 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 10 00 00 00 0E 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -308,11 +308,11 @@
'00 00 00 00 01 24 03 11 00 00 00 00 01 24 03 11'
'11 11 11 11 11 24 03 33 33 33 33 33 33 24 00 00'
'00 00 00 00 00 00'
-}
+} */
/* BINRES obm_reduced.bmp */
-OBM_REDUCED BITMAP
-{
+OBM_REDUCED BITMAP obm_reduced.bmp
+/* {
'42 4D E6 00 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 10 00 00 00 0E 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -328,11 +328,11 @@
'11 11 11 11 11 24 03 11 11 11 11 11 11 24 03 11'
'11 11 11 11 11 24 03 33 33 33 33 33 33 24 00 00'
'00 00 00 00 00 00'
-}
+} */
/* BINRES obm_restore.bmp */
-OBM_RESTORE BITMAP
-{
+OBM_RESTORE BITMAP obm_restore.bmp
+/* {
'42 4D E6 00 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 10 00 00 00 0E 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -348,11 +348,11 @@
'10 11 11 01 11 30 42 11 10 00 00 01 11 30 42 11'
'10 00 00 01 11 30 42 22 22 22 22 22 22 30 44 44'
'44 44 44 44 44 40'
-}
+} */
/* BINRES obm_zoom.bmp */
-OBM_ZOOM BITMAP
-{
+OBM_ZOOM BITMAP obm_zoom.bmp
+/* {
'42 4D E6 00 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 10 00 00 00 0E 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -368,11 +368,11 @@
'11 11 11 10 11 30 42 10 00 00 00 00 11 30 42 10'
'00 00 00 00 11 30 42 22 22 22 22 22 22 30 44 44'
'44 44 44 44 44 40'
-}
+} */
/* BINRES obm_reduce.bmp */
-OBM_REDUCE BITMAP
-{
+OBM_REDUCE BITMAP obm_reduce.bmp
+/* {
'42 4D E6 00 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 10 00 00 00 0E 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -388,11 +388,11 @@
'11 11 11 11 11 30 42 11 11 11 11 11 11 30 42 11'
'11 11 11 11 11 30 42 22 22 22 22 22 22 30 44 44'
'44 44 44 44 44 40'
-}
+} */
/* BINRES obm_lfarrow.bmp */
-OBM_LFARROW BITMAP
-{
+OBM_LFARROW BITMAP obm_lfarrow.bmp
+/* {
'42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -414,11 +414,11 @@
'11 11 11 11 11 22 00 00 00 00 03 33 33 33 33 33'
'33 32 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
'00 00'
-}
+} */
/* BINRES obm_rgarrow.bmp */
-OBM_RGARROW BITMAP
-{
+OBM_RGARROW BITMAP obm_rgarrow.bmp
+/* {
'42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -440,11 +440,11 @@
'11 11 11 11 11 22 00 00 00 00 03 33 33 33 33 33'
'33 32 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
'00 00'
-}
+} */
/* BINRES obm_dnarrow.bmp */
-OBM_DNARROW BITMAP
-{
+OBM_DNARROW BITMAP obm_dnarrow.bmp
+/* {
'42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -466,11 +466,11 @@
'11 11 11 11 11 22 00 00 00 00 03 33 33 33 33 33'
'33 32 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
'00 00'
-}
+} */
/* BINRES obm_uparrow.bmp */
-OBM_UPARROW BITMAP
-{
+OBM_UPARROW BITMAP obm_uparrow.bmp
+/* {
'42 4D 42 01 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -492,11 +492,11 @@
'11 11 11 11 11 22 00 00 00 00 03 33 33 33 33 33'
'33 32 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
'00 00'
-}
+} */
/* BINRES obm_close.bmp */
-OBM_CLOSE BITMAP
-{
+OBM_CLOSE BITMAP obm_close.bmp
+/* {
'42 4D DE 01 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 24 00 00 00 12 00 00 00 01 00 04 00 00 00'
'00 00 68 01 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -527,11 +527,11 @@
'8F 08 88 88 00 00 88 88 88 88 70 00 88 88 88 88'
'88 88 88 70 00 88 88 88 00 00 88 88 88 88 88 88'
'88 88 88 88 88 88 88 88 88 88 88 88 00 00'
-}
+} */
/* BINRES obm_old_restore.bmp */
-OBM_OLD_RESTORE BITMAP
-{
+OBM_OLD_RESTORE BITMAP obm_old_restore.bmp
+/* {
'42 4D 8A 00 00 00 00 00 00 00 3E 00 00 00 28 00'
'00 00 19 00 00 00 13 00 00 00 01 00 01 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -541,11 +541,11 @@
'CF 80 FB 9D CF 80 FB 9D C3 80 FB 81 C1 80 FB 97'
'F3 80 FB 9B E7 80 FB 9D CF 80 FB 9E 9F 80 F8 3F'
'7F 80 FF FF FF 80 FF FF FF 80'
-}
+} */
/* BINRES obm_old_zoom.bmp */
-OBM_OLD_ZOOM BITMAP
-{
+OBM_OLD_ZOOM BITMAP obm_old_zoom.bmp
+/* {
'42 4D 8A 00 00 00 00 00 00 00 3E 00 00 00 28 00'
'00 00 19 00 00 00 13 00 00 00 01 00 01 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -555,11 +555,11 @@
'FF 80 FF DC FF 80 FF DC 3F 80 FE 1C 1F 80 FF 7F'
'3F 80 FF BE 7F 80 FF DC FF 80 FF E9 FF 80 FF F7'
'FF 80 FF FF FF 80 FF FF FF 80'
-}
+} */
/* BINRES obm_old_reduce.bmp */
-OBM_OLD_REDUCE BITMAP
-{
+OBM_OLD_REDUCE BITMAP obm_old_reduce.bmp
+/* {
'42 4D 8A 00 00 00 00 00 00 00 3E 00 00 00 28 00'
'00 00 19 00 00 00 13 00 00 00 01 00 01 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -569,11 +569,11 @@
'FF 80 FF DC FF 80 FF DC FF 80 FF DC FF 80 FF DC'
'FF 80 FF DC FF 80 FF DD FF 80 FF C1 FF 80 FF FF'
'FF 80 FF FF FF 80 FF FF FF 80'
-}
+} */
/* BINRES obm_btncorners.bmp */
-OBM_BTNCORNERS BITMAP
-{
+OBM_BTNCORNERS BITMAP obm_btncorners.bmp
+/* {
'42 4D 76 00 00 00 00 00 00 00 3E 00 00 00 28 00'
'00 00 0E 00 00 00 0E 00 00 00 01 00 01 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -582,11 +582,11 @@
'00 00 E0 1C 00 00 E0 1C 00 00 E0 1C 00 00 E0 1C'
'00 00 F0 3C 00 00 F8 7C 00 00 FF FC 00 00 FF FC'
'00 00 FF FC 00 00'
-}
+} */
/* BINRES obm_checkboxes.bmp */
-OBM_CHECKBOXES BITMAP
-{
+OBM_CHECKBOXES BITMAP obm_checkboxes.bmp
+/* {
'42 4D 76 01 00 00 00 00 00 00 3E 00 00 00 28 00'
'00 00 38 00 00 00 27 00 00 00 01 00 01 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -611,11 +611,11 @@
'DD D3 FE 4D D9 00 7F F5 BE D3 FE 4B E9 00 7F F5'
'7F 53 FE 47 F1 00 7F F4 FF 90 00 40 01 00 00 04'
'00 10 00 40 01 00'
-}
+} */
/* BINRES obm_check.bmp */
-OBM_CHECK BITMAP
-{
+OBM_CHECK BITMAP obm_check.bmp
+/* {
'42 4D 76 00 00 00 00 00 00 00 3E 00 00 00 28 00'
'00 00 0E 00 00 00 0E 00 00 00 01 00 01 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -624,11 +624,11 @@
'00 00 FD 7C 00 00 F9 3C 00 00 F3 BC 00 00 FF 9C'
'00 00 FF DC 00 00 FF CC 00 00 FF EC 00 00 FF EC'
'00 00 FF FC 00 00'
-}
+} */
/* BINRES obm_btsize.bmp */
-OBM_BTSIZE BITMAP
-{
+OBM_BTSIZE BITMAP obm_btsize.bmp
+/* {
'42 4D 7A 00 00 00 00 00 00 00 3E 00 00 00 28 00'
'00 00 0F 00 00 00 0F 00 00 00 01 00 01 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -637,11 +637,11 @@
'00 00 7F FC 00 00 00 7C 00 00 7F 7C 00 00 7F 7C'
'00 00 7F 7C 00 00 7F 7C 00 00 7F 7C 00 00 7F 7C'
'00 00 7F 7C 00 00 00 00 00 00'
-}
+} */
/* BINRES obm_old_lfarrow.bmp */
-OBM_OLD_LFARROW BITMAP
-{
+OBM_OLD_LFARROW BITMAP obm_old_lfarrow.bmp
+/* {
'42 4D 7A 00 00 00 00 00 00 00 3E 00 00 00 28 00'
'00 00 0F 00 00 00 0F 00 00 00 01 00 01 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -650,11 +650,11 @@
'00 00 F8 FE 00 00 F0 0E 00 00 E0 0E 00 00 F0 0E'
'00 00 F8 FE 00 00 FC FE 00 00 FE FE 00 00 FF FE'
'00 00 FF FE 00 00 FF FE 00 00'
-}
+} */
/* BINRES obm_old_rgarrow.bmp */
-OBM_OLD_RGARROW BITMAP
-{
+OBM_OLD_RGARROW BITMAP obm_old_rgarrow.bmp
+/* {
'42 4D 7A 00 00 00 00 00 00 00 3E 00 00 00 28 00'
'00 00 0F 00 00 00 0F 00 00 00 01 00 01 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -663,11 +663,11 @@
'00 00 FE 3E 00 00 E0 1E 00 00 E0 0E 00 00 E0 1E'
'00 00 FE 3E 00 00 FE 7E 00 00 FE FE 00 00 FF FE'
'00 00 FF FE 00 00 FF FE 00 00'
-}
+} */
/* BINRES obm_old_dnarrow.bmp */
-OBM_OLD_DNARROW BITMAP
-{
+OBM_OLD_DNARROW BITMAP obm_old_dnarrow.bmp
+/* {
'42 4D 7A 00 00 00 00 00 00 00 3E 00 00 00 28 00'
'00 00 0F 00 00 00 0F 00 00 00 01 00 01 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -676,11 +676,11 @@
'00 00 F8 3E 00 00 F0 1E 00 00 E0 0E 00 00 FC 7E'
'00 00 FC 7E 00 00 FC 7E 00 00 FC 7E 00 00 FF FE'
'00 00 FF FE 00 00 FF FE 00 00'
-}
+} */
/* BINRES obm_old_uparrow.bmp */
-OBM_OLD_UPARROW BITMAP
-{
+OBM_OLD_UPARROW BITMAP obm_old_uparrow.bmp
+/* {
'42 4D 7A 00 00 00 00 00 00 00 3E 00 00 00 28 00'
'00 00 0F 00 00 00 0F 00 00 00 01 00 01 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -689,11 +689,11 @@
'00 00 FC 7E 00 00 FC 7E 00 00 E0 0E 00 00 F0 1E'
'00 00 F8 3E 00 00 FC 7E 00 00 FE FE 00 00 FF FE'
'00 00 FF FE 00 00 FF FE 00 00'
-}
+} */
/* BINRES obm_size.bmp */
-OBM_SIZE BITMAP
-{
+OBM_SIZE BITMAP obm_size.bmp
+/* {
'42 4D 72 00 00 00 00 00 00 00 3E 00 00 00 28 00'
'00 00 0D 00 00 00 0D 00 00 00 01 00 01 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -702,11 +702,11 @@
'00 00 00 F8 00 00 00 F8 00 00 FF F8 00 00 FF F8'
'00 00 FF F8 00 00 FF F8 00 00 FF F8 00 00 FF F8'
'00 00'
-}
+} */
/* BINRES obm_old_close.bmp */
-OBM_OLD_CLOSE BITMAP
-{
+OBM_OLD_CLOSE BITMAP obm_old_close.bmp
+/* {
'42 4D DE 01 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 24 00 00 00 12 00 00 00 01 00 04 00 00 00'
'00 00 68 01 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -737,4 +737,4 @@
'88 88 88 88 00 00 88 88 88 88 88 88 88 88 88 88'
'88 88 88 88 88 88 88 88 00 00 88 88 88 88 88 88'
'88 88 88 88 88 88 88 88 88 88 88 88 00 00'
-}
+} */
Index: ./dlls/user/resources/user32_cursors.rc
===================================================================
RCS file: /var/cvs/wine/dlls/user/resources/user32_cursors.rc,v
retrieving revision 1.3
diff -u -r1.3 user32_cursors.rc
--- ./dlls/user/resources/user32_cursors.rc 9 Mar 2002 23:44:31 -0000 1.3
+++ ./dlls/user/resources/user32_cursors.rc 2 Oct 2003 16:26:47 -0000
@@ -19,8 +19,8 @@
*/
/* BINRES ocr_normal.cur */
-OCR_NORMAL CURSOR
-{
+OCR_NORMAL CURSOR ocr_normal.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 00 00 00 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -42,11 +42,11 @@
'FF FF 00 3F FF FF 00 7F FF FF 00 FF FF FF 01 FF'
'FF FF 03 FF FF FF 07 FF FF FF 0F FF FF FF 1F FF'
'FF FF 3F FF FF FF'
-}
+} */
/* BINRES ocr_ibeam.cur */
-OCR_IBEAM CURSOR
-{
+OCR_IBEAM CURSOR ocr_ibeam.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -68,11 +68,11 @@
'7F FF FF E0 0F FF FF E0 0F FF FF E1 0F FF FF FF'
'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF'
-}
+} */
/* BINRES ocr_wait.cur */
-OCR_WAIT CURSOR
-{
+OCR_WAIT CURSOR ocr_wait.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -94,11 +94,11 @@
'07 FF FF C0 07 FF FF C0 07 FF FF 00 01 FF FF 00'
'01 FF FF 00 01 FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF'
-}
+} */
/* BINRES ocr_cross.cur */
-OCR_CROSS CURSOR
-{
+OCR_CROSS CURSOR ocr_cross.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -120,11 +120,11 @@
'7F FF FF FC 7F FF FF FC 7F FF FF FC 7F FF FF FF'
'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF'
-}
+} */
/* BINRES ocr_up.cur */
-OCR_UP CURSOR
-{
+OCR_UP CURSOR ocr_up.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 06 00 00 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -146,11 +146,11 @@
'FF FF C0 0F FF FF E0 1F FF FF E0 1F FF FF F0 3F'
'FF FF F0 3F FF FF F8 7F FF FF F8 7F FF FF FC FF'
'FF FF FC FF FF FF'
-}
+} */
/* BINRES ocr_size.cur */
-OCR_SIZE CURSOR
-{
+OCR_SIZE CURSOR ocr_size.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -172,11 +172,11 @@
'0F FF FF F0 1F FF FF F8 3F FF FF FC 7F FF FF FE'
'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF'
-}
+} */
/* BINRES ocr_icon.cur */
-OCR_ICON CURSOR
-{
+OCR_ICON CURSOR ocr_icon.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 08 00 06 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -198,11 +198,11 @@
'7F FF 00 00 7F FF 00 00 7F FF 00 00 7F FF 00 00'
'7F FF 00 00 7F FF 00 00 7F FF 00 00 7F FF 00 00'
'7F FF 00 00 7F FF'
-}
+} */
/* BINRES ocr_sizenwse.cur */
-OCR_SIZENWSE CURSOR
-{
+OCR_SIZENWSE CURSOR ocr_sizenwse.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -224,11 +224,11 @@
'FF FF FF 01 FF FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF'
-}
+} */
/* BINRES ocr_sizenesw.cur */
-OCR_SIZENESW CURSOR
-{
+OCR_SIZENESW CURSOR ocr_sizenesw.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -250,11 +250,11 @@
'01 FF FF FF 01 FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF'
-}
+} */
/* BINRES ocr_sizewe.cur */
-OCR_SIZEWE CURSOR
-{
+OCR_SIZEWE CURSOR ocr_sizewe.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -276,11 +276,11 @@
'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF'
-}
+} */
/* BINRES ocr_sizens.cur */
-OCR_SIZENS CURSOR
-{
+OCR_SIZENS CURSOR ocr_sizens.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -302,11 +302,11 @@
'0F FF FF F0 1F FF FF F8 3F FF FF FC 7F FF FF FE'
'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF'
-}
+} */
/* BINRES ocr_sizeall.cur */
-OCR_SIZEALL CURSOR
-{
+OCR_SIZEALL CURSOR ocr_sizeall.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -328,11 +328,11 @@
'0F FF FF F0 1F FF FF F8 3F FF FF FC 7F FF FF FE'
'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF'
-}
+} */
/* BINRES ocr_no.cur */
-OCR_NO CURSOR
-{
+OCR_NO CURSOR ocr_no.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 0F 00 0F 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -354,11 +354,11 @@
'01 FF FF C0 03 FF FF E0 07 FF FF F8 1F FF FF FF'
'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF'
-}
+} */
/* BINRES ocr_hand.cur */
-OCR_HAND CURSOR
-{
+OCR_HAND CURSOR ocr_hand.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 07 00 00 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -380,11 +380,11 @@
'1F FF F8 00 3F FF F8 00 7F FF F8 01 FF FF F8 0F'
'FF FF F8 3F FF FF F8 3F FF FF F8 3F FF FF F8 3F'
'FF FF FC 7F FF FF'
-}
+} */
/* BINRES ocr_appstarting.cur */
-OCR_APPSTARTING CURSOR
-{
+OCR_APPSTARTING CURSOR ocr_appstarting.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 00 00 00 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -406,11 +406,11 @@
'1F FF 00 7E 1F FF 00 FC 0F FF 01 F8 07 FF 03 F8'
'07 FF 07 F8 07 FF 0F F0 03 FF 1F F0 03 FF 3F F0'
'03 FF 7F FF FF FF'
-}
+} */
/* BINRES ocr_help.cur */
-OCR_HELP CURSOR
-{
+OCR_HELP CURSOR ocr_help.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 00 00 00 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -432,11 +432,11 @@
'1F FF 00 02 0F FF 00 83 07 FF 01 83 03 FF 03 83'
'03 FF 07 83 03 FF 0F C0 07 FF 1F E0 0F FF 3F F0'
'1F FF 7F FF FF FF'
-}
+} */
/* BINRES ocr_dragobject.cur */
-OCR_DRAGOBJECT CURSOR
-{
+OCR_DRAGOBJECT CURSOR ocr_dragobject.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 05 00 09 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -458,4 +458,4 @@
'FF FF 00 0F FF FF 00 0F FF FF 00 0F FF FF 00 0F'
'FF FF 00 0F FF FF 00 0F FF FF 00 1F FF FF 00 3F'
'FF FF 00 7F FF FF'
-}
+} */
Index: ./dlls/user/resources/user32_icons.rc
===================================================================
RCS file: /var/cvs/wine/dlls/user/resources/user32_icons.rc,v
retrieving revision 1.4
diff -u -r1.4 user32_icons.rc
--- ./dlls/user/resources/user32_icons.rc 9 Mar 2002 23:44:31 -0000 1.4
+++ ./dlls/user/resources/user32_icons.rc 2 Oct 2003 16:26:47 -0000
@@ -19,8 +19,8 @@
*/
/* BINRES oic_sample.ico */
-OIC_SAMPLE ICON
-{
+OIC_SAMPLE ICON oic_sample.ico
+/* {
'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'
'00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00'
@@ -69,12 +69,12 @@
'00 07 C0 00 00 07 C0 00 00 07 C0 00 00 07 C0 00'
'00 07 C0 00 00 07 C0 00 00 07 C0 00 00 07 FF FF'
'FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
-}
+} */
/* BINRES oic_hand.ico */
-OIC_HAND ICON
-{
+OIC_HAND ICON oic_hand.ico
+/* {
'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'
'00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00'
@@ -123,12 +123,12 @@
'00 01 80 00 00 01 80 00 00 03 80 00 00 07 C0 00'
'00 07 E0 00 00 0F E0 00 00 1F F0 00 00 3F F8 00'
'00 7F FE 00 01 FF FF 00 03 FF FF E0 1F FF'
-}
+} */
/* BINRES oic_ques.ico */
-OIC_QUES ICON
-{
+OIC_QUES ICON oic_ques.ico
+/* {
'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'
'00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00'
@@ -177,12 +177,12 @@
'00 00 00 00 00 01 00 00 00 01 80 00 00 03 80 00'
'00 07 C0 00 00 0F E0 00 00 1F F0 00 00 3F F8 00'
'00 7F FC 00 00 FF FF 00 03 FF FF E0 1F FF'
-}
+} */
/* BINRES oic_bang.ico */
-OIC_BANG ICON
-{
+OIC_BANG ICON oic_bang.ico
+/* {
'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'
'00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00'
@@ -231,12 +231,12 @@
'00 FF FE 00 00 FF FF 00 01 FF FF 00 01 FF FF 80'
'03 FF FF 80 03 FF FF C0 07 FF FF C0 07 FF FF E0'
'0F FF FF E0 1F FF FF F0 7F FF FF F8 FF FF'
-}
+} */
/* BINRES oic_note.ico */
-OIC_NOTE ICON
-{
+OIC_NOTE ICON oic_note.ico
+/* {
'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'
'00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00'
@@ -285,12 +285,12 @@
'00 00 00 00 00 01 00 00 00 01 80 00 00 03 80 00'
'00 07 C0 00 00 0F E0 00 00 1F F0 00 00 3F F8 00'
'00 7F FC 00 00 FF FF 00 03 FF FF E0 1F FF'
-}
+} */
/* BINRES oic_winlogo.ico */
-OIC_WINLOGO ICON
-{
+OIC_WINLOGO ICON oic_winlogo.ico
+/* {
'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'
'00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00'
@@ -339,4 +339,4 @@
'00 03 FF C0 00 01 FF C0 00 00 FF E0 00 00 FF E0'
'00 00 FF F0 00 00 FF F0 00 00 FF F8 00 00 FF F8'
'00 00 FF FC 00 01 FF FE 00 03 FF FF 00 07'
-}
+} */
Index: ./programs/regedit/resource.rc
===================================================================
RCS file: /var/cvs/wine/programs/regedit/resource.rc,v
retrieving revision 1.1
diff -u -r1.1 resource.rc
--- ./programs/regedit/resource.rc 7 Aug 2003 03:10:13 -0000 1.1
+++ ./programs/regedit/resource.rc 2 Oct 2003 16:26:49 -0000
@@ -18,12 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-IDB_OPEN_FILE BITMAP DISCARDABLE
-#ifndef __WINE__
-"res/folder3.bmp"
-#else
/* BINRES folder3.bmp */
-{
+IDB_OPEN_FILE BITMAP DISCARDABLE folder3.bmp
+/* {
'42 4D F6 00 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 10 00 00 00 10 00 00 00 01 00 04 00 00 00'
'00 00 80 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -40,15 +37,11 @@
'BB BB BB BB 08 88 80 BB B0 00 00 00 08 88 80 00'
'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 */
-{
+IDB_CLOSED_FILE BITMAP DISCARDABLE folder2.bmp
+/* {
'42 4D F6 00 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 10 00 00 00 10 00 00 00 01 00 04 00 00 00'
'00 00 80 00 00 00 12 0B 00 00 12 0B 00 00 10 00'
@@ -65,15 +58,11 @@
'FF FF FF FF FF 80 F8 B7 B7 B7 B8 88 88 8F FF 8B'
'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 */
-{
+IDB_ROOT BITMAP DISCARDABLE folder1.bmp
+/* {
'42 4D F6 00 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 10 00 00 00 10 00 00 00 01 00 04 00 00 00'
'00 00 80 00 00 00 00 00 00 00 00 00 00 00 10 00'
@@ -90,7 +79,6 @@
'FF FF FF FF FF 80 F8 B7 B7 B7 B8 88 88 8F FF 8B'
'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"
Index: ./programs/winecfg/winecfg.rc
===================================================================
RCS file: /var/cvs/wine/programs/winecfg/winecfg.rc,v
retrieving revision 1.8
diff -u -r1.8 winecfg.rc
--- ./programs/winecfg/winecfg.rc 17 Sep 2003 20:08:20 -0000 1.8
+++ ./programs/winecfg/winecfg.rc 2 Oct 2003 16:26:49 -0000
@@ -36,8 +36,8 @@
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
/* BINRES idb_wine.bmp */
-IDB_WINE BITMAP
-{
+IDB_WINE BITMAP idb_wine.bmp
+/* {
'42 4D 16 39 00 00 00 00 00 00 36 04 00 00 28 00'
'00 00 8E 00 00 00 5E 00 00 00 01 00 08 00 00 00'
'00 00 E0 34 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -952,4 +952,4 @@
'1B 1B 1B 1B 1B 1B 1B 1B 1B 1B 1B 1B 1B 1B 1B 1B'
'1B 1B 1B 1B 1B 1B 1B 1B 1B 1B 1B 1B 1B 1B 1B 1B'
'1B 1B 1B 1B 00 00'
-}
+} */
--
Dimi.
