Extract binary resources to files, to fit the standard.

Make.rules.in

@@ -65,6 +65,7 @@ RUNTEST      = $(TOPSRCDIR)/tools/runtest
 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)
@@ -148,6 +149,13 @@ filter:
 
 .PHONY: all filter
 
+# Rules for resources
+
+$(RC_BINARIES): $(BIN2RES) $(RC_BINSRC)
+	$(BIN2RES) -f -o $@ $(SRCDIR)/$(RC_BINSRC)
+
+$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) $(RC_BINARIES)
+
 # Rule for main module debug channels
 
 $(MODULE).dbg.c: $(C_SRCS) $(C_SRCS16) $(WINEBUILD)
@@ -208,7 +216,7 @@ $(EXTRASUBDIRS:%=%/__clean__): dummy
 testclean:: $(SUBDIRS:%=%/__testclean__)
 
 clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__)
-	$(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(PROGRAMS)
+	$(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(PROGRAMS) $(RC_BINARIES)
 
 .PHONY: clean testclean $(SUBDIRS:%=%/__clean__) $(SUBDIRS:%=%/__testclean__) $(EXTRASUBDIRS:%=%/__clean__)
 
@@ -253,8 +261,6 @@ $(SUBDIRS:%=%/__crosstest__): dummy
 
 # Misc. rules
 
-$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC)
-
 $(MC_SRCS:.mc=.mc.rc): $(WMC)
 
 $(IDL_SRCS:.idl=.h): $(WIDL)

dlls/comctl32/.cvsignore

@@ -3,4 +3,9 @@ comctl32.dll
 comctl32.dll.dbg.c
 comctl32.spec.c
 comctl32.spec.def
+idb_hist_large.bmp
+idb_hist_small.bmp
+idb_std_large.bmp
+idb_view_large.bmp
+idb_view_small.bmp
 rsrc.res

dlls/comctl32/Makefile.in

@@ -40,6 +40,13 @@ C_SRCS = \
 	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
 

dlls/comctl32/rsrc.rc

@@ -176,8 +176,8 @@ IDB_STD_SMALL BITMAP LOADONCALL DISCARDABLE
 }
 
 /* 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 @@ IDB_STD_LARGE BITMAP LOADONCALL DISCARDABLE
  '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 @@ IDB_VIEW_SMALL BITMAP LOADONCALL DISCARDABLE
  '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 @@ IDB_VIEW_LARGE BITMAP LOADONCALL MOVEABLE DISCARDABLE
  '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 @@ IDB_HIST_SMALL BITMAP LOADONCALL DISCARDABLE
  '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 @@ IDB_HIST_LARGE BITMAP LOADONCALL DISCARDABLE
  '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

dlls/commdlg/.cvsignore

@@ -1,6 +1,17 @@
+800.bmp
 Makefile
+cdrom.ico
 comdlg32.dll.dbg.c
 comdlg32.spec.c
 comdlg32.spec.def
 commdlg.spec.c
+floppy.ico
+folder.ico
+folder2.ico
+hdisk.ico
+network.ico
+pd32_collate.ico
+pd32_landscape.ico
+pd32_nocollate.ico
+pd32_portrait.ico
 rsrc.res

dlls/commdlg/Makefile.in

@@ -31,7 +31,20 @@ C_SRCS16  = \
 	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@
 

dlls/commdlg/cdlg_xx.rc

@@ -57,8 +57,8 @@ FILETYPE	VFT_DLL
 }
 
 /* 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 @@ PD32_COLLATE ICON DISCARDABLE LOADONCALL
  '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 @@ PD32_NOCOLLATE ICON
  '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 @@ PD32_PORTRAIT ICON
  '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 @@ PD32_LANDSCAPE ICON
  '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 @@ PD32_LANDSCAPE ICON
  '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 @@ FOLDER ICON
  '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 @@ FOLDER2 ICON
  '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 @@ FLOPPY ICON
  '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 @@ CDROM ICON
  '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 @@ HDISK ICON
  '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 @@ NETWORK ICON
  '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'
-}
+} */

dlls/ole32/.cvsignore

@@ -1,5 +1,9 @@
 Makefile
 compobj.spec.c
+drag_copy.cur
+drag_link.cur
+drag_move.cur
+nodrop.cur
 ole2.spec.c
 ole2conv.spec.c
 ole2nls.spec.c

dlls/ole32/Makefile.in

@@ -51,6 +51,12 @@ C_SRCS16 = \
 	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@
 

dlls/ole32/ole32res.rc

@@ -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 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
  '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 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
  '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 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
  '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 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
  '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'
-}
+} */
 
 
 /*

dlls/shell32/.cvsignore

@@ -1,4 +1,10 @@
 Makefile
+desktop.ico
+document.ico
+drive.ico
+folder.ico
+folder_open.ico
+mycomputer.ico
 shell.spec.c
 shell32.dll.dbg.c
 shell32.spec.c

dlls/shell32/Makefile.in

@@ -52,6 +52,14 @@ C_SRCS = \
 	systray.c
 
 RC_SRCS = shres.rc version.rc
+RC_BINSRC = shres.rc
+RC_BINARIES = \
+	desktop.ico \
+	document.ico \
+	drive.ico \
+	folder.ico \
+	folder_open.ico \
+	mycomputer.ico
 
 C_SRCS16  = shell.c
 RC_SRCS16 = version16.rc

dlls/shell32/shres.rc

@@ -33,9 +33,9 @@ BEGIN
 	VK_F5, FCIDM_SHVIEW_REFRESH, VIRTKEY
 END
 
-/* BINRES 000.ico document */
+/* BINRES document.ico */
-0 ICON
+0 ICON document.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 @@ END
  '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 */
+/* BINRES folder.ico */
-3 ICON
+3 ICON folder.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 @@ END
  '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 */
+/* BINRES folder_open.ico */
-4 ICON
+4 ICON folder_open.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 @@ END
  '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 */
+/* BINRES drive.ico */
-8 ICON
+8 ICON drive.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 @@ END
  '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 */
+/* BINRES mycomputer.ico */
-15 ICON
+15 ICON mycomputer.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 @@ END
  '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 */
+/* BINRES desktop.ico */
-34 ICON
+34 ICON desktop.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 @@ END
  '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'
-}
+} */
 
 
 

dlls/user/Makefile.in

@@ -93,6 +93,70 @@ C_SRCS16 = \
 
 RC_SRCS = resources/user32.rc
 
+RC_BMPS = \
+	resources/obm_btncorners.bmp \
+	resources/obm_btsize.bmp \
+	resources/obm_check.bmp \
+	resources/obm_checkboxes.bmp \
+	resources/obm_close.bmp \
+	resources/obm_combo.bmp \
+	resources/obm_dnarrow.bmp \
+	resources/obm_dnarrowd.bmp \
+	resources/obm_dnarrowi.bmp \
+	resources/obm_lfarrow.bmp \
+	resources/obm_lfarrowd.bmp \
+	resources/obm_lfarrowi.bmp \
+	resources/obm_mnarrow.bmp \
+	resources/obm_old_close.bmp \
+	resources/obm_old_dnarrow.bmp \
+	resources/obm_old_lfarrow.bmp \
+	resources/obm_old_reduce.bmp \
+	resources/obm_old_restore.bmp \
+	resources/obm_old_rgarrow.bmp \
+	resources/obm_old_uparrow.bmp \
+	resources/obm_old_zoom.bmp \
+	resources/obm_reduce.bmp \
+	resources/obm_reduced.bmp \
+	resources/obm_restore.bmp \
+	resources/obm_restored.bmp \
+	resources/obm_rgarrow.bmp \
+	resources/obm_rgarrowd.bmp \
+	resources/obm_rgarrowi.bmp \
+	resources/obm_size.bmp \
+	resources/obm_trtype.bmp \
+	resources/obm_uparrow.bmp \
+	resources/obm_uparrowd.bmp \
+	resources/obm_uparrowi.bmp \
+	resources/obm_zoom.bmp \
+	resources/obm_zoomd.bmp
+
+RC_CURS = \
+	resources/ocr_appstarting.cur \
+	resources/ocr_cross.cur \
+	resources/ocr_dragobject.cur \
+	resources/ocr_hand.cur \
+	resources/ocr_help.cur \
+	resources/ocr_ibeam.cur \
+	resources/ocr_icon.cur \
+	resources/ocr_no.cur \
+	resources/ocr_normal.cur \
+	resources/ocr_sizeall.cur \
+	resources/ocr_size.cur \
+	resources/ocr_sizenesw.cur \
+	resources/ocr_sizens.cur \
+	resources/ocr_sizenwse.cur \
+	resources/ocr_sizewe.cur \
+	resources/ocr_up.cur \
+	resources/ocr_wait.cur
+
+RC_ICOS = \
+	resources/oic_bang.ico \
+	resources/oic_hand.ico \
+	resources/oic_note.ico \
+	resources/oic_ques.ico \
+	resources/oic_sample.ico \
+	resources/oic_winlogo.ico
+
 RC_SRCS16 = \
 	resources/display.rc \
 	resources/mouse.rc \
@@ -128,4 +192,20 @@ resources/mouse.res: resources/mouse.rc
 resources/version16.res: resources/version16.rc
 	$(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/resources/version16.rc
 
+$(RC_BMPS): resources/user32_bitmaps.rc
+	$(BIN2RES) -f -o $@ $(SRCDIR)/resources/user32_bitmaps.rc
+
+$(RC_CURS): resources/user32_cursors.rc
+	$(BIN2RES) -f -o $@ $(SRCDIR)/resources/user32_cursors.rc
+
+$(RC_ICOS): resources/user32_icons.rc
+	$(BIN2RES) -f -o $@ $(SRCDIR)/resources/user32_icons.rc
+
+$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(RC_BMPS) $(RC_CURS) $(RC_ICOS)
+
+$(RC_BMPS) $(RC_CURS) $(RC_ICOS): $(BIN2RES)
+
+clean::
+	$(RM) $(RC_BMPS) $(RC_CURS) $(RC_ICOS)
+
 ### Dependencies:

dlls/user/resources/.cvsignore

@@ -1,4 +1,62 @@
 display.res
 mouse.res
+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
+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_size.cur
+ocr_sizeall.cur
+ocr_sizenesw.cur
+ocr_sizens.cur
+ocr_sizenwse.cur
+ocr_sizewe.cur
+ocr_up.cur
+ocr_wait.cur
+oic_bang.ico
+oic_hand.ico
+oic_note.ico
+oic_ques.ico
+oic_sample.ico
+oic_winlogo.ico
 user32.res
 version16.res

dlls/user/resources/display.rc

@@ -53,55 +53,4 @@
 	0x00000000L		/* inactive caption text */
 }
 
-/* BINRES oic_hand.ico */
+1 ICON resources/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'
-}

dlls/user/resources/user32_bitmaps.rc

@@ -18,9 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* BINRES obm_trtype.bmp */
+/* BINRES resources/obm_trtype.bmp */
-OBM_TRTYPE BITMAP
+OBM_TRTYPE BITMAP resources/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 @@ OBM_TRTYPE BITMAP
  '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 */
+/* BINRES resources/obm_lfarrowi.bmp */
-OBM_LFARROWI BITMAP
+OBM_LFARROWI BITMAP resources/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 @@ OBM_LFARROWI BITMAP
  '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 */
+/* BINRES resources/obm_rgarrowi.bmp */
-OBM_RGARROWI BITMAP
+OBM_RGARROWI BITMAP resources/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 @@ OBM_RGARROWI BITMAP
  '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 */
+/* BINRES resources/obm_dnarrowi.bmp */
-OBM_DNARROWI BITMAP
+OBM_DNARROWI BITMAP resources/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 @@ OBM_DNARROWI BITMAP
  '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 */
+/* BINRES resources/obm_uparrowi.bmp */
-OBM_UPARROWI BITMAP
+OBM_UPARROWI BITMAP resources/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 @@ OBM_UPARROWI BITMAP
  '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 */
+/* BINRES resources/obm_combo.bmp */
-OBM_COMBO BITMAP
+OBM_COMBO BITMAP resources/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 @@ OBM_COMBO BITMAP
  '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 */
+/* BINRES resources/obm_mnarrow.bmp */
-OBM_MNARROW BITMAP
+OBM_MNARROW BITMAP resources/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 @@ OBM_MNARROW BITMAP
  '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 */
+/* BINRES resources/obm_lfarrowd.bmp */
-OBM_LFARROWD BITMAP
+OBM_LFARROWD BITMAP resources/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 @@ OBM_LFARROWD BITMAP
  '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 */
+/* BINRES resources/obm_rgarrowd.bmp */
-OBM_RGARROWD BITMAP
+OBM_RGARROWD BITMAP resources/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 @@ OBM_RGARROWD BITMAP
  '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 */
+/* BINRES resources/obm_dnarrowd.bmp */
-OBM_DNARROWD BITMAP
+OBM_DNARROWD BITMAP resources/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 @@ OBM_DNARROWD BITMAP
  '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 */
+/* BINRES resources/obm_uparrowd.bmp */
-OBM_UPARROWD BITMAP
+OBM_UPARROWD BITMAP resources/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 @@ OBM_UPARROWD BITMAP
  '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 */
+/* BINRES resources/obm_restored.bmp */
-OBM_RESTORED BITMAP
+OBM_RESTORED BITMAP resources/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 @@ OBM_RESTORED BITMAP
  '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 */
+/* BINRES resources/obm_zoomd.bmp */
-OBM_ZOOMD BITMAP
+OBM_ZOOMD BITMAP resources/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 @@ OBM_ZOOMD BITMAP
  '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 */
+/* BINRES resources/obm_reduced.bmp */
-OBM_REDUCED BITMAP
+OBM_REDUCED BITMAP resources/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 @@ OBM_REDUCED BITMAP
  '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 */
+/* BINRES resources/obm_restore.bmp */
-OBM_RESTORE BITMAP
+OBM_RESTORE BITMAP resources/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 @@ OBM_RESTORE BITMAP
  '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 */
+/* BINRES resources/obm_zoom.bmp */
-OBM_ZOOM BITMAP
+OBM_ZOOM BITMAP resources/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 @@ OBM_ZOOM BITMAP
  '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 */
+/* BINRES resources/obm_reduce.bmp */
-OBM_REDUCE BITMAP
+OBM_REDUCE BITMAP resources/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 @@ OBM_REDUCE BITMAP
  '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 */
+/* BINRES resources/obm_lfarrow.bmp */
-OBM_LFARROW BITMAP
+OBM_LFARROW BITMAP resources/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 @@ OBM_LFARROW BITMAP
  '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 */
+/* BINRES resources/obm_rgarrow.bmp */
-OBM_RGARROW BITMAP
+OBM_RGARROW BITMAP resources/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 @@ OBM_RGARROW BITMAP
  '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 */
+/* BINRES resources/obm_dnarrow.bmp */
-OBM_DNARROW BITMAP
+OBM_DNARROW BITMAP resources/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 @@ OBM_DNARROW BITMAP
  '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 */
+/* BINRES resources/obm_uparrow.bmp */
-OBM_UPARROW BITMAP
+OBM_UPARROW BITMAP resources/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 @@ OBM_UPARROW BITMAP
  '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 */
+/* BINRES resources/obm_close.bmp */
-OBM_CLOSE BITMAP
+OBM_CLOSE BITMAP resources/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 @@ OBM_CLOSE BITMAP
  '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 */
+/* BINRES resources/obm_old_restore.bmp */
-OBM_OLD_RESTORE BITMAP
+OBM_OLD_RESTORE BITMAP resources/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 @@ OBM_OLD_RESTORE BITMAP
  '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 */
+/* BINRES resources/obm_old_zoom.bmp */
-OBM_OLD_ZOOM BITMAP
+OBM_OLD_ZOOM BITMAP resources/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 @@ OBM_OLD_ZOOM BITMAP
  '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 */
+/* BINRES resources/obm_old_reduce.bmp */
-OBM_OLD_REDUCE BITMAP
+OBM_OLD_REDUCE BITMAP resources/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 @@ OBM_OLD_REDUCE BITMAP
  '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 */
+/* BINRES resources/obm_btncorners.bmp */
-OBM_BTNCORNERS BITMAP
+OBM_BTNCORNERS BITMAP resources/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 @@ OBM_BTNCORNERS BITMAP
  '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 */
+/* BINRES resources/obm_checkboxes.bmp */
-OBM_CHECKBOXES BITMAP
+OBM_CHECKBOXES BITMAP resources/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 @@ OBM_CHECKBOXES BITMAP
  '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 */
+/* BINRES resources/obm_check.bmp */
-OBM_CHECK BITMAP
+OBM_CHECK BITMAP resources/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 @@ OBM_CHECK BITMAP
  '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 */
+/* BINRES resources/obm_btsize.bmp */
-OBM_BTSIZE BITMAP
+OBM_BTSIZE BITMAP resources/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 @@ OBM_BTSIZE BITMAP
  '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 */
+/* BINRES resources/obm_old_lfarrow.bmp */
-OBM_OLD_LFARROW BITMAP
+OBM_OLD_LFARROW BITMAP resources/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 @@ OBM_OLD_LFARROW BITMAP
  '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 */
+/* BINRES resources/obm_old_rgarrow.bmp */
-OBM_OLD_RGARROW BITMAP
+OBM_OLD_RGARROW BITMAP resources/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 @@ OBM_OLD_RGARROW BITMAP
  '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 */
+/* BINRES resources/obm_old_dnarrow.bmp */
-OBM_OLD_DNARROW BITMAP
+OBM_OLD_DNARROW BITMAP resources/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 @@ OBM_OLD_DNARROW BITMAP
  '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 */
+/* BINRES resources/obm_old_uparrow.bmp */
-OBM_OLD_UPARROW BITMAP
+OBM_OLD_UPARROW BITMAP resources/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 @@ OBM_OLD_UPARROW BITMAP
  '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 */
+/* BINRES resources/obm_size.bmp */
-OBM_SIZE BITMAP
+OBM_SIZE BITMAP resources/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 @@ OBM_SIZE BITMAP
  '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 */
+/* BINRES resources/obm_old_close.bmp */
-OBM_OLD_CLOSE BITMAP
+OBM_OLD_CLOSE BITMAP resources/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 @@ OBM_OLD_CLOSE BITMAP
  '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'
-}
+} */

dlls/user/resources/user32_cursors.rc

@@ -18,9 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* BINRES ocr_normal.cur */
+/* BINRES resources/ocr_normal.cur */
-OCR_NORMAL CURSOR
+OCR_NORMAL CURSOR resources/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 @@ OCR_NORMAL CURSOR
  '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 */
+/* BINRES resources/ocr_ibeam.cur */
-OCR_IBEAM CURSOR
+OCR_IBEAM CURSOR resources/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 @@ OCR_IBEAM CURSOR
  '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 */
+/* BINRES resources/ocr_wait.cur */
-OCR_WAIT CURSOR
+OCR_WAIT CURSOR resources/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 @@ OCR_WAIT CURSOR
  '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 */
+/* BINRES resources/ocr_cross.cur */
-OCR_CROSS CURSOR
+OCR_CROSS CURSOR resources/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 @@ OCR_CROSS CURSOR
  '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 */
+/* BINRES resources/ocr_up.cur */
-OCR_UP CURSOR
+OCR_UP CURSOR resources/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 @@ OCR_UP CURSOR
  '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 */
+/* BINRES resources/ocr_size.cur */
-OCR_SIZE CURSOR
+OCR_SIZE CURSOR resources/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 @@ OCR_SIZE CURSOR
  '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 */
+/* BINRES resources/ocr_icon.cur */
-OCR_ICON CURSOR
+OCR_ICON CURSOR resources/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 @@ OCR_ICON CURSOR
  '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 */
+/* BINRES resources/ocr_sizenwse.cur */
-OCR_SIZENWSE CURSOR
+OCR_SIZENWSE CURSOR resources/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 @@ OCR_SIZENWSE CURSOR
  '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 */
+/* BINRES resources/ocr_sizenesw.cur */
-OCR_SIZENESW CURSOR
+OCR_SIZENESW CURSOR resources/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 @@ OCR_SIZENESW CURSOR
  '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 */
+/* BINRES resources/ocr_sizewe.cur */
-OCR_SIZEWE CURSOR
+OCR_SIZEWE CURSOR resources/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 @@ OCR_SIZEWE CURSOR
  '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 */
+/* BINRES resources/ocr_sizens.cur */
-OCR_SIZENS CURSOR
+OCR_SIZENS CURSOR resources/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 @@ OCR_SIZENS CURSOR
  '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 */
+/* BINRES resources/ocr_sizeall.cur */
-OCR_SIZEALL CURSOR
+OCR_SIZEALL CURSOR resources/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 @@ OCR_SIZEALL CURSOR
  '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 */
+/* BINRES resources/ocr_no.cur */
-OCR_NO CURSOR
+OCR_NO CURSOR resources/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 @@ OCR_NO CURSOR
  '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 */
+/* BINRES resources/ocr_hand.cur */
-OCR_HAND CURSOR
+OCR_HAND CURSOR resources/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 @@ OCR_HAND CURSOR
  '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 */
+/* BINRES resources/ocr_appstarting.cur */
-OCR_APPSTARTING CURSOR
+OCR_APPSTARTING CURSOR resources/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 @@ OCR_APPSTARTING CURSOR
  '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 */
+/* BINRES resources/ocr_help.cur */
-OCR_HELP CURSOR
+OCR_HELP CURSOR resources/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 @@ OCR_HELP CURSOR
  '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 */
+/* BINRES resources/ocr_dragobject.cur */
-OCR_DRAGOBJECT CURSOR
+OCR_DRAGOBJECT CURSOR resources/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 @@ OCR_DRAGOBJECT CURSOR
  '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'
-}
+} */

dlls/user/resources/user32_icons.rc

@@ -18,9 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* BINRES oic_sample.ico */
+/* BINRES resources/oic_sample.ico */
-OIC_SAMPLE ICON
+OIC_SAMPLE ICON resources/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 @@ OIC_SAMPLE ICON
  '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 */
+/* BINRES resources/oic_hand.ico */
-OIC_HAND ICON
+OIC_HAND ICON resources/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 @@ OIC_HAND ICON
  '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 */
+/* BINRES resources/oic_ques.ico */
-OIC_QUES ICON
+OIC_QUES ICON resources/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 @@ OIC_QUES ICON
  '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 */
+/* BINRES resources/oic_bang.ico */
-OIC_BANG ICON
+OIC_BANG ICON resources/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 @@ OIC_BANG ICON
  '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 */
+/* BINRES resources/oic_note.ico */
-OIC_NOTE ICON
+OIC_NOTE ICON resources/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 @@ OIC_NOTE ICON
  '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 */
+/* BINRES resources/oic_winlogo.ico */
-OIC_WINLOGO ICON
+OIC_WINLOGO ICON resources/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 @@ OIC_WINLOGO ICON
  '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'
-}
+} */

programs/regedit/.cvsignore

@@ -1,4 +1,7 @@
 Makefile
+folder1.bmp
+folder2.bmp
+folder3.bmp
 regedit.exe.dbg.c
 regedit.exe.spec.c
 rsrc.res

programs/regedit/Makefile.in

@@ -19,6 +19,12 @@ C_SRCS = \
 	treeview.c
 
 RC_SRCS = rsrc.rc
+RC_BINSRC = resource.rc
+RC_BINARIES = \
+	folder1.bmp \
+	folder2.bmp \
+	folder3.bmp 
+
 EXTRARCFLAGS = -D__WINE__
 
 PLTESTS = \

programs/regedit/resource.rc

@@ -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 @@ IDB_OPEN_FILE BITMAP  DISCARDABLE
  '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 @@ IDB_CLOSED_FILE BITMAP  DISCARDABLE
  '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 @@ IDB_ROOT BITMAP DISCARDABLE
  '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"

programs/winecfg/.cvsignore

@@ -1,4 +1,5 @@
 Makefile
+idb_wine.bmp
 winecfg.exe.dbg.c
 winecfg.exe.spec.c
 winecfg.res

programs/winecfg/Makefile.in

@@ -15,6 +15,8 @@ C_SRCS = \
 	x11drvdlg.c
 
 RC_SRCS = winecfg.rc
+RC_BINSRC = winecfg.rc
+RC_BINARIES = idb_wine.bmp 
 
 @MAKE_PROG_RULES@
 

programs/winecfg/winecfg.rc

@@ -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 @@ IDB_WINE BITMAP
  '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'
-}
+} */