From 2affae5ae7b86a5d4e6247ddd1a451b3e1afac1d Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 23 Oct 2000 21:32:05 +0000 Subject: [PATCH] Moved all USER resources to new dlls/user/resources directory. --- configure | 3 +- configure.in | 2 +- {resources => dlls/user/resources}/TODO | 59 ++----------------- dlls/user/{disp.rc => resources/display.rc16} | 0 .../user/{mouserc.rc => resources/mouse.rc16} | 0 dlls/user/resources/user32.rc | 47 +++++++++++++++ .../user/resources/user32_Ca.rc | 0 .../user/resources/user32_Cs.rc | 0 .../user/resources/user32_Da.rc | 0 .../user/resources/user32_De.rc | 0 .../user/resources/user32_En.rc | 0 .../user/resources/user32_Eo.rc | 0 .../user/resources/user32_Es.rc | 0 .../user/resources/user32_Fi.rc | 0 .../user/resources/user32_Fr.rc | 0 .../user/resources/user32_Hu.rc | 0 .../user/resources/user32_It.rc | 0 .../user/resources/user32_Ja.rc | 0 .../user/resources/user32_Ko.rc | 0 .../user/resources/user32_Nl.rc | 0 .../user/resources/user32_No.rc | 0 .../user/resources/user32_Pl.rc | 0 .../user/resources/user32_Pt.rc | 0 .../user/resources/user32_Ru.rc | 0 .../user/resources/user32_Sk.rc | 0 .../user/resources/user32_Sv.rc | 0 .../user/resources/user32_Wa.rc | 0 resources/.cvsignore | 2 - resources/Makefile.in | 18 ------ resources/user32.rc | 47 --------------- 30 files changed, 54 insertions(+), 124 deletions(-) rename {resources => dlls/user/resources}/TODO (64%) rename dlls/user/{disp.rc => resources/display.rc16} (100%) rename dlls/user/{mouserc.rc => resources/mouse.rc16} (100%) create mode 100644 dlls/user/resources/user32.rc rename resources/sysres_Ca.rc => dlls/user/resources/user32_Ca.rc (100%) rename resources/sysres_Cs.rc => dlls/user/resources/user32_Cs.rc (100%) rename resources/sysres_Da.rc => dlls/user/resources/user32_Da.rc (100%) rename resources/sysres_De.rc => dlls/user/resources/user32_De.rc (100%) rename resources/sysres_En.rc => dlls/user/resources/user32_En.rc (100%) rename resources/sysres_Eo.rc => dlls/user/resources/user32_Eo.rc (100%) rename resources/sysres_Es.rc => dlls/user/resources/user32_Es.rc (100%) rename resources/sysres_Fi.rc => dlls/user/resources/user32_Fi.rc (100%) rename resources/sysres_Fr.rc => dlls/user/resources/user32_Fr.rc (100%) rename resources/sysres_Hu.rc => dlls/user/resources/user32_Hu.rc (100%) rename resources/sysres_It.rc => dlls/user/resources/user32_It.rc (100%) rename resources/sysres_Ja.rc => dlls/user/resources/user32_Ja.rc (100%) rename resources/sysres_Ko.rc => dlls/user/resources/user32_Ko.rc (100%) rename resources/sysres_Nl.rc => dlls/user/resources/user32_Nl.rc (100%) rename resources/sysres_No.rc => dlls/user/resources/user32_No.rc (100%) rename resources/sysres_Pl.rc => dlls/user/resources/user32_Pl.rc (100%) rename resources/sysres_Pt.rc => dlls/user/resources/user32_Pt.rc (100%) rename resources/sysres_Ru.rc => dlls/user/resources/user32_Ru.rc (100%) rename resources/sysres_Sk.rc => dlls/user/resources/user32_Sk.rc (100%) rename resources/sysres_Sv.rc => dlls/user/resources/user32_Sv.rc (100%) rename resources/sysres_Wa.rc => dlls/user/resources/user32_Wa.rc (100%) delete mode 100644 resources/.cvsignore delete mode 100644 resources/Makefile.in delete mode 100644 resources/user32.rc diff --git a/configure b/configure index 2cff43cf071..22b6bc0fe82 100755 --- a/configure +++ b/configure @@ -6577,7 +6577,6 @@ programs/winemine/Makefile programs/winhelp/Makefile programs/winver/Makefile relay32/Makefile -resources/Makefile scheduler/Makefile server/Makefile tools/Makefile @@ -6811,7 +6810,6 @@ programs/winemine/Makefile programs/winhelp/Makefile programs/winver/Makefile relay32/Makefile -resources/Makefile scheduler/Makefile server/Makefile tools/Makefile @@ -7004,6 +7002,7 @@ dlls/ddraw/direct3d \ dlls/ddraw/dpalette \ dlls/ddraw/dsurface \ dlls/kernel/messages \ +dlls/user/resources \ " for i in $extra_subdirs; do [ -d $i ] || (echo "creating $i" && mkdir $i); done diff --git a/configure.in b/configure.in index 2db3876148a..1117259e8cd 100644 --- a/configure.in +++ b/configure.in @@ -1027,6 +1027,7 @@ dlls/ddraw/direct3d \ dlls/ddraw/dpalette \ dlls/ddraw/dsurface \ dlls/kernel/messages \ +dlls/user/resources \ " for i in $extra_subdirs; do [ -d $i ] || (echo "creating $i" && mkdir $i); done ]) @@ -1146,7 +1147,6 @@ programs/winemine/Makefile programs/winhelp/Makefile programs/winver/Makefile relay32/Makefile -resources/Makefile scheduler/Makefile server/Makefile tools/Makefile diff --git a/resources/TODO b/dlls/user/resources/TODO similarity index 64% rename from resources/TODO rename to dlls/user/resources/TODO index c109edc91c1..8bec53c06f1 100644 --- a/resources/TODO +++ b/dlls/user/resources/TODO @@ -3,10 +3,10 @@ enough to contain the text for every individual language. Therefore: -- Dimensions of controls are based on sysres_En.rc. Other languages should +- Dimensions of controls are based on user32_En.rc. Other languages should change these dimensions in order to make the text fit. -I (krynos@qbc.clic.net) will try to make sysres_Fr.rc fit correctly, if +I (krynos@qbc.clic.net) will try to make user32_Fr.rc fit correctly, if someone is interrested in others languages, message me. I may correct others languages after, but not soon. @@ -27,55 +27,6 @@ flags (WS_??? etc): They control how the dialog behaves. Things like: Frans van Dorsselaer dorssel@rulhm1.LeidenUniv.nl -*************************************************************** -1996, May - -Subject: ChooseColor - =========== - -Please delete the old CHOOSECOLOR in YOUR sysres_??.rc -and insert the new CHOOSECOLOR from sysres_En.rc to YOUR -language file and translate this as you like it - -otherwise you'll get an undefined behavour. - -Today it works well for: -* English -* German -* French -* Italian -* Korean -* Finnish -* Danish -* Dutch -...to be continued...... - -Thank you. - -Albrecht Kleine -kleine@ak.sax.de - -************************************************************** -1996, May - -Subject: ChooseFont - -Just like ChooseColor, please copy CHOSEFONT from sysres_EN.rc, -and translate it to your language. It's okay for: - -* English -* German -* Finnish -* Italian -* French -* Danish -* Dutch -..... - -Thank you. - -Albrecht Kleine -kleine@ak.sax.de - ************************************************************** 1997, January @@ -83,7 +34,7 @@ Subject: EDITMENU There now is a resource EDITMENU. It is the menu that is displayed when you click the right mouse button within an edit control. I included an English -version in all sysres_??.rc files, which needs translation in your language. +version in all user32_??.rc files, which needs translation in your language. This has now been done for: * English @@ -93,7 +44,7 @@ This has now been done for: Note: I picked the IDs of the menuitems "at random". When someone wants to find out the "real" (win95) values, feel free to change them. However, you -should change _all_ sysres_??.rc files and subsequently the function +should change _all_ user32_??.rc files and subsequently the function EDIT_WM_Command() in controls/edit.c. This is a matter of minutes (i.e. no programming skills required). @@ -118,4 +69,4 @@ After you implemented it for your language, please add it to the list above. Bye -Uwe Bonnes bon@elektron.ikp.physik.tu-darmstadt.de \ No newline at end of file +Uwe Bonnes bon@elektron.ikp.physik.tu-darmstadt.de diff --git a/dlls/user/disp.rc b/dlls/user/resources/display.rc16 similarity index 100% rename from dlls/user/disp.rc rename to dlls/user/resources/display.rc16 diff --git a/dlls/user/mouserc.rc b/dlls/user/resources/mouse.rc16 similarity index 100% rename from dlls/user/mouserc.rc rename to dlls/user/resources/mouse.rc16 diff --git a/dlls/user/resources/user32.rc b/dlls/user/resources/user32.rc new file mode 100644 index 00000000000..3946f00b68b --- /dev/null +++ b/dlls/user/resources/user32.rc @@ -0,0 +1,47 @@ +/* + * Top level resource file for Common Dialogs + * + */ + +#include "windef.h" +#include "winuser.h" +#include "winnls.h" +#include "dlgs.h" +#include "mdi.h" + +/* + * Everything that does not depend on language, + * like textless bitmaps etc, go into the + * neutral language. This will prevent them from + * being duplicated for each language. + */ +/*#include "resources/user32_xx.rc"*/ + +/* + * Everything specific to any language goes + * in one of the specific files. + * Note that you can and may override resources + * which also have a neutral version. This is to + * get localized bitmaps for example. + */ +#include "resources/user32_Ca.rc" +#include "resources/user32_Cs.rc" +#include "resources/user32_Da.rc" +#include "resources/user32_De.rc" +#include "resources/user32_En.rc" +#include "resources/user32_Eo.rc" +#include "resources/user32_Es.rc" +#include "resources/user32_Fi.rc" +#include "resources/user32_Fr.rc" +#include "resources/user32_Hu.rc" +#include "resources/user32_It.rc" +#include "resources/user32_Ko.rc" +#include "resources/user32_Nl.rc" +#include "resources/user32_No.rc" +#include "resources/user32_Pl.rc" +#include "resources/user32_Pt.rc" +#include "resources/user32_Ru.rc" +#include "resources/user32_Sk.rc" +#include "resources/user32_Sv.rc" +#include "resources/user32_Wa.rc" +#include "resources/user32_Ja.rc" diff --git a/resources/sysres_Ca.rc b/dlls/user/resources/user32_Ca.rc similarity index 100% rename from resources/sysres_Ca.rc rename to dlls/user/resources/user32_Ca.rc diff --git a/resources/sysres_Cs.rc b/dlls/user/resources/user32_Cs.rc similarity index 100% rename from resources/sysres_Cs.rc rename to dlls/user/resources/user32_Cs.rc diff --git a/resources/sysres_Da.rc b/dlls/user/resources/user32_Da.rc similarity index 100% rename from resources/sysres_Da.rc rename to dlls/user/resources/user32_Da.rc diff --git a/resources/sysres_De.rc b/dlls/user/resources/user32_De.rc similarity index 100% rename from resources/sysres_De.rc rename to dlls/user/resources/user32_De.rc diff --git a/resources/sysres_En.rc b/dlls/user/resources/user32_En.rc similarity index 100% rename from resources/sysres_En.rc rename to dlls/user/resources/user32_En.rc diff --git a/resources/sysres_Eo.rc b/dlls/user/resources/user32_Eo.rc similarity index 100% rename from resources/sysres_Eo.rc rename to dlls/user/resources/user32_Eo.rc diff --git a/resources/sysres_Es.rc b/dlls/user/resources/user32_Es.rc similarity index 100% rename from resources/sysres_Es.rc rename to dlls/user/resources/user32_Es.rc diff --git a/resources/sysres_Fi.rc b/dlls/user/resources/user32_Fi.rc similarity index 100% rename from resources/sysres_Fi.rc rename to dlls/user/resources/user32_Fi.rc diff --git a/resources/sysres_Fr.rc b/dlls/user/resources/user32_Fr.rc similarity index 100% rename from resources/sysres_Fr.rc rename to dlls/user/resources/user32_Fr.rc diff --git a/resources/sysres_Hu.rc b/dlls/user/resources/user32_Hu.rc similarity index 100% rename from resources/sysres_Hu.rc rename to dlls/user/resources/user32_Hu.rc diff --git a/resources/sysres_It.rc b/dlls/user/resources/user32_It.rc similarity index 100% rename from resources/sysres_It.rc rename to dlls/user/resources/user32_It.rc diff --git a/resources/sysres_Ja.rc b/dlls/user/resources/user32_Ja.rc similarity index 100% rename from resources/sysres_Ja.rc rename to dlls/user/resources/user32_Ja.rc diff --git a/resources/sysres_Ko.rc b/dlls/user/resources/user32_Ko.rc similarity index 100% rename from resources/sysres_Ko.rc rename to dlls/user/resources/user32_Ko.rc diff --git a/resources/sysres_Nl.rc b/dlls/user/resources/user32_Nl.rc similarity index 100% rename from resources/sysres_Nl.rc rename to dlls/user/resources/user32_Nl.rc diff --git a/resources/sysres_No.rc b/dlls/user/resources/user32_No.rc similarity index 100% rename from resources/sysres_No.rc rename to dlls/user/resources/user32_No.rc diff --git a/resources/sysres_Pl.rc b/dlls/user/resources/user32_Pl.rc similarity index 100% rename from resources/sysres_Pl.rc rename to dlls/user/resources/user32_Pl.rc diff --git a/resources/sysres_Pt.rc b/dlls/user/resources/user32_Pt.rc similarity index 100% rename from resources/sysres_Pt.rc rename to dlls/user/resources/user32_Pt.rc diff --git a/resources/sysres_Ru.rc b/dlls/user/resources/user32_Ru.rc similarity index 100% rename from resources/sysres_Ru.rc rename to dlls/user/resources/user32_Ru.rc diff --git a/resources/sysres_Sk.rc b/dlls/user/resources/user32_Sk.rc similarity index 100% rename from resources/sysres_Sk.rc rename to dlls/user/resources/user32_Sk.rc diff --git a/resources/sysres_Sv.rc b/dlls/user/resources/user32_Sv.rc similarity index 100% rename from resources/sysres_Sv.rc rename to dlls/user/resources/user32_Sv.rc diff --git a/resources/sysres_Wa.rc b/dlls/user/resources/user32_Wa.rc similarity index 100% rename from resources/sysres_Wa.rc rename to dlls/user/resources/user32_Wa.rc diff --git a/resources/.cvsignore b/resources/.cvsignore deleted file mode 100644 index 1b2f9d38b85..00000000000 --- a/resources/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -user32.s diff --git a/resources/Makefile.in b/resources/Makefile.in deleted file mode 100644 index 5882886e736..00000000000 --- a/resources/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -DEFS = @DLLFLAGS@ -D__WINE__ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = .. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = resources - -RC_SRCS = \ - user32.rc - -all: check_wrc $(MODULE).o - -@MAKE_RULES@ - -$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in - $(LDCOMBINE) $(OBJS) -o $@ - -### Dependencies: diff --git a/resources/user32.rc b/resources/user32.rc deleted file mode 100644 index 1b54261bdc8..00000000000 --- a/resources/user32.rc +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Top level resource file for Common Dialogs - * - */ - -#include "windef.h" -#include "winuser.h" -#include "winnls.h" -#include "dlgs.h" -#include "mdi.h" - -/* - * Everything that does not depend on language, - * like textless bitmaps etc, go into the - * neutral language. This will prevent them from - * being duplicated for each language. - */ -/*#include "sysres_xx.rc"*/ - -/* - * Everything specific to any language goes - * in one of the specific files. - * Note that you can and may override resources - * which also have a neutral version. This is to - * get localized bitmaps for example. - */ -#include "sysres_Ca.rc" -#include "sysres_Cs.rc" -#include "sysres_Da.rc" -#include "sysres_De.rc" -#include "sysres_En.rc" -#include "sysres_Eo.rc" -#include "sysres_Es.rc" -#include "sysres_Fi.rc" -#include "sysres_Fr.rc" -#include "sysres_Hu.rc" -#include "sysres_It.rc" -#include "sysres_Ko.rc" -#include "sysres_Nl.rc" -#include "sysres_No.rc" -#include "sysres_Pl.rc" -#include "sysres_Pt.rc" -#include "sysres_Ru.rc" -#include "sysres_Sk.rc" -#include "sysres_Sv.rc" -#include "sysres_Wa.rc" -#include "sysres_Ja.rc"