Moved all USER resources to new dlls/user/resources directory.

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 
 

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

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
+Uwe Bonnes bon@elektron.ikp.physik.tu-darmstadt.de

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"

resources/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-user32.s

resources/Makefile.in

@@ -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:

resources/user32.rc

@@ -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"