resources added for commdlg.dll

osfree-project · Apr 15, 2023 · 6c49809 · 6c49809
1 parent 821cefb
commit 6c49809
Show file tree

Hide file tree

Showing 32 changed files with 38 additions and 30 deletions.
diff --git a/dlls/commdlg/Commdlg.rc b/dlls/commdlg/Commdlg.rc
@@ -21,49 +21,49 @@
 //
 ============================================================================*/
 
-IDC_COLORCROSSHAIR			CURSOR         "bmp/colorcrosshair.cur"
-IDC_LUMINOSITY					CURSOR         "bmp/luminosity.cur"
+IDC_COLORCROSSHAIR			CURSOR         "res/colorcrosshair.cur"
+IDC_LUMINOSITY					CURSOR         "res/luminosity.cur"
 
 /*============================================================================
 //
 // Icon
 //
 ============================================================================*/
 
-IDI_PORTRAIT            ICON         "bmp/portrait.ico"
-IDI_LANDSCAPE           ICON         "bmp/landscape.ico"
-IDI_WILLOWS							ICON				 "bmp/willows.ico"
-IDI_COLORCROSSHAIR			ICON         "bmp/colorcrosshair.ico"
-IDI_LUMINOSITY					ICON         "bmp/luminosity.ico"
+IDI_PORTRAIT            ICON         "res/portrait.ico"
+IDI_LANDSCAPE           ICON         "res/landscape.ico"
+IDI_WILLOWS							ICON				 "res/willows.ico"
+IDI_COLORCROSSHAIR			ICON         "res/colorcrosshair.ico"
+IDI_LUMINOSITY					ICON         "res/luminosity.ico"
 
 /*============================================================================
 //
 // Bitmap
 //
 ============================================================================*/
 
-IDB_FOLDERSDRIVES       BITMAP    "bmp/foldersdrives.bmp"
-IDB_CROSSLED            BITMAP    "bmp/crossled.bmp"
-IDB_RAISEDLEFT          BITMAP      "bmp/raisedleft.bmp"
-IDB_RECESSLEFT          BITMAP      "bmp/recessleft.bmp"
-IDB_RAISEDRIGHT         BITMAP      "bmp/raisedright.bmp"
-IDB_RECESSRIGHT         BITMAP      "bmp/recessright.bmp"
-IDB_RAISEDUP            BITMAP      "bmp/raisedup.bmp"
-IDB_RECESSUP            BITMAP      "bmp/recessup.bmp"
-IDB_RAISEDDOWN          BITMAP      "bmp/raiseddown.bmp"
-IDB_RECESSDOWN          BITMAP      "bmp/recessdown.bmp"
-IDB_TRUETYPEPRINTER     BITMAP      "bmp/truetypeprinter.bmp"
-IDB_FLOPPYDRIVE         BITMAP      "bmp/floppy.bmp"
-IDB_HARDDRIVE           BITMAP      "bmp/harddrive.bmp"
-IDB_NETWORKDRIVE        BITMAP      "bmp/networkdrive.bmp"
-IDB_MAPPEDDRIVE         BITMAP      "bmp/mappeddrive.bmp"
-IDB_RAMDRIVE            BITMAP      "bmp/ramdrive.bmp"
-IDB_CDROMDRIVE          BITMAP      "bmp/cdrom.bmp"
-IDB_DIR                 BITMAP      "bmp/dir.bmp"
-IDB_OPENDIR             BITMAP      "bmp/opendir.bmp"
-IDB_OPENCURRDIR         BITMAP      "bmp/opencurrdir.bmp"
-WCF_IDB_TRUETYPE        BITMAP      "bmp/truetype.bmp"
-WCF_IDB_PRINTER         BITMAP      "bmp/printer.bmp"
+IDB_FOLDERSDRIVES       BITMAP    "res/foldersdrives.bmp"
+IDB_CROSSLED            BITMAP    "res/crossled.bmp"
+IDB_RAISEDLEFT          BITMAP      "res/raisedleft.bmp"
+IDB_RECESSLEFT          BITMAP      "res/recessleft.bmp"
+IDB_RAISEDRIGHT         BITMAP      "res/raisedright.bmp"
+IDB_RECESSRIGHT         BITMAP      "res/recessright.bmp"
+IDB_RAISEDUP            BITMAP      "res/raisedup.bmp"
+IDB_RECESSUP            BITMAP      "res/recessup.bmp"
+IDB_RAISEDDOWN          BITMAP      "res/raiseddown.bmp"
+IDB_RECESSDOWN          BITMAP      "res/recessdown.bmp"
+IDB_TRUETYPEPRINTER     BITMAP      "res/truetypeprinter.bmp"
+IDB_FLOPPYDRIVE         BITMAP      "res/floppy.bmp"
+IDB_HARDDRIVE           BITMAP      "res/harddrive.bmp"
+IDB_NETWORKDRIVE        BITMAP      "res/networkdrive.bmp"
+IDB_MAPPEDDRIVE         BITMAP      "res/mappeddrive.bmp"
+IDB_RAMDRIVE            BITMAP      "res/ramdrive.bmp"
+IDB_CDROMDRIVE          BITMAP      "res/cdrom.bmp"
+IDB_DIR                 BITMAP      "res/dir.bmp"
+IDB_OPENDIR             BITMAP      "res/opendir.bmp"
+IDB_OPENCURRDIR         BITMAP      "res/opencurrdir.bmp"
+WCF_IDB_TRUETYPE        BITMAP      "res/truetype.bmp"
+WCF_IDB_PRINTER         BITMAP      "res/printer.bmp"
 
 /*============================================================================
 //

diff --git a/dlls/commdlg/makefile b/dlls/commdlg/makefile
@@ -5,6 +5,7 @@
 #
 
 PROJ     = commdlg
+PROJ1     = commdlg1
 TRGT     = $(PROJ).dll
 DESC     = Windows Common Dialogs Library
 srcfiles = $(p)libmain$(e) $(p)ChooseColor$(e) $(p)ChooseFont$(e) $(p)Commdlg$(e) $(p)FindReplDlg$(e) $(p)GetOpenFileName$(e) $(p)PrintDlg$(e)
@@ -39,6 +40,13 @@ EXPORTS = &
 #	DWOKSUBCLASS.31
 
 DEST = os2$(SEP)mdos$(SEP)winos2$(SEP)system
-#ADD_COPT=-pl
 
 !include $(%ROOT)tools/mk/appsw16.mk
+
+TARGETS = $(PATH)$(PROJ1).dll
+
+#.ico: $(MYDIR)res
+
+$(PATH)$(PROJ1).dll: $(PATH)$(PROJ).dll $(MYDIR)Commdlg.rc
+ @$(SAY) RESCMP   $^. $(LOG)
+ @wrc -dCARDSTYLE_DEFAULT -q -bt=windows $]@ $[@ -fe=$@ -fo=$^@ -i=$(MYDIR) -i=$(%WATCOM)$(SEP)h$(SEP)win
diff --git a/resources/bitmaps/cdrom.bmp → dlls/commdlg/res/cdrom.bmp b/resources/bitmaps/cdrom.bmp → dlls/commdlg/res/cdrom.bmp
diff --git a/resources/cursors/colorcrosshair.cur → dlls/commdlg/res/colorcrosshair.cur b/resources/cursors/colorcrosshair.cur → dlls/commdlg/res/colorcrosshair.cur
diff --git a/resources/icons/colorcrosshair.ico → dlls/commdlg/res/colorcrosshair.ico b/resources/icons/colorcrosshair.ico → dlls/commdlg/res/colorcrosshair.ico
diff --git a/resources/bitmaps/crossled.bmp → dlls/commdlg/res/crossled.bmp b/resources/bitmaps/crossled.bmp → dlls/commdlg/res/crossled.bmp
diff --git a/resources/bitmaps/dir.bmp → dlls/commdlg/res/dir.bmp b/resources/bitmaps/dir.bmp → dlls/commdlg/res/dir.bmp
diff --git a/resources/bitmaps/floppy.bmp → dlls/commdlg/res/floppy.bmp b/resources/bitmaps/floppy.bmp → dlls/commdlg/res/floppy.bmp
diff --git a/resources/bitmaps/foldersdrives.bmp → dlls/commdlg/res/foldersdrives.bmp b/resources/bitmaps/foldersdrives.bmp → dlls/commdlg/res/foldersdrives.bmp
diff --git a/resources/bitmaps/harddrive.bmp → dlls/commdlg/res/harddrive.bmp b/resources/bitmaps/harddrive.bmp → dlls/commdlg/res/harddrive.bmp
diff --git a/resources/icons/landscape.ico → dlls/commdlg/res/landscape.ico b/resources/icons/landscape.ico → dlls/commdlg/res/landscape.ico
diff --git a/resources/cursors/luminosity.cur → dlls/commdlg/res/luminosity.cur b/resources/cursors/luminosity.cur → dlls/commdlg/res/luminosity.cur
diff --git a/resources/icons/luminosity.ico → dlls/commdlg/res/luminosity.ico b/resources/icons/luminosity.ico → dlls/commdlg/res/luminosity.ico
diff --git a/resources/bitmaps/mappeddrive.bmp → dlls/commdlg/res/mappeddrive.bmp b/resources/bitmaps/mappeddrive.bmp → dlls/commdlg/res/mappeddrive.bmp
diff --git a/resources/bitmaps/networkdrive.bmp → dlls/commdlg/res/networkdrive.bmp b/resources/bitmaps/networkdrive.bmp → dlls/commdlg/res/networkdrive.bmp
diff --git a/resources/bitmaps/opencdir.bmp → dlls/commdlg/res/opencdir.bmp b/resources/bitmaps/opencdir.bmp → dlls/commdlg/res/opencdir.bmp
diff --git a/resources/bitmaps/opencurrdir.bmp → dlls/commdlg/res/opencurrdir.bmp b/resources/bitmaps/opencurrdir.bmp → dlls/commdlg/res/opencurrdir.bmp
diff --git a/resources/bitmaps/opendir.bmp → dlls/commdlg/res/opendir.bmp b/resources/bitmaps/opendir.bmp → dlls/commdlg/res/opendir.bmp
diff --git a/resources/icons/portrait.ico → dlls/commdlg/res/portrait.ico b/resources/icons/portrait.ico → dlls/commdlg/res/portrait.ico
diff --git a/resources/bitmaps/printer.bmp → dlls/commdlg/res/printer.bmp b/resources/bitmaps/printer.bmp → dlls/commdlg/res/printer.bmp
diff --git a/resources/bitmaps/raiseddown.bmp → dlls/commdlg/res/raiseddown.bmp b/resources/bitmaps/raiseddown.bmp → dlls/commdlg/res/raiseddown.bmp
diff --git a/resources/bitmaps/raisedleft.bmp → dlls/commdlg/res/raisedleft.bmp b/resources/bitmaps/raisedleft.bmp → dlls/commdlg/res/raisedleft.bmp
diff --git a/resources/bitmaps/raisedright.bmp → dlls/commdlg/res/raisedright.bmp b/resources/bitmaps/raisedright.bmp → dlls/commdlg/res/raisedright.bmp
diff --git a/resources/bitmaps/raisedup.bmp → dlls/commdlg/res/raisedup.bmp b/resources/bitmaps/raisedup.bmp → dlls/commdlg/res/raisedup.bmp
diff --git a/resources/bitmaps/ramdrive.bmp → dlls/commdlg/res/ramdrive.bmp b/resources/bitmaps/ramdrive.bmp → dlls/commdlg/res/ramdrive.bmp
diff --git a/resources/bitmaps/recessdown.bmp → dlls/commdlg/res/recessdown.bmp b/resources/bitmaps/recessdown.bmp → dlls/commdlg/res/recessdown.bmp
diff --git a/resources/bitmaps/recessleft.bmp → dlls/commdlg/res/recessleft.bmp b/resources/bitmaps/recessleft.bmp → dlls/commdlg/res/recessleft.bmp
diff --git a/resources/bitmaps/recessright.bmp → dlls/commdlg/res/recessright.bmp b/resources/bitmaps/recessright.bmp → dlls/commdlg/res/recessright.bmp
diff --git a/resources/bitmaps/recessup.bmp → dlls/commdlg/res/recessup.bmp b/resources/bitmaps/recessup.bmp → dlls/commdlg/res/recessup.bmp
diff --git a/resources/bitmaps/truetype.bmp → dlls/commdlg/res/truetype.bmp b/resources/bitmaps/truetype.bmp → dlls/commdlg/res/truetype.bmp
diff --git a/resources/bitmaps/truetypeprinter.bmp → dlls/commdlg/res/truetypeprinter.bmp b/resources/bitmaps/truetypeprinter.bmp → dlls/commdlg/res/truetypeprinter.bmp
diff --git a/resources/icons/willows.ico → dlls/commdlg/res/willows.ico b/resources/icons/willows.ico → dlls/commdlg/res/willows.ico