user32: Renamed the user/ directory to user32.

b8a2e3b8 · Alexandre Julliard · b9807c2a · b8a2e3b8 · b8a2e3b8 · b8a2e3b8
Commit b8a2e3b8 authored Nov 16, 2006 by Alexandre Julliard
128 changed files
--- a/Makefile.in
+++ b/Makefile.in
@@ -361,8 +361,8 @@ ALL_MAKEFILES = \
 	dlls/url/Makefile \
 	dlls/urlmon/Makefile \
 	dlls/urlmon/tests/Makefile \
-	dlls/user/Makefile \
-	dlls/user/tests/Makefile \
+	dlls/user32/Makefile \
+	dlls/user32/tests/Makefile \
 	dlls/userenv/Makefile \
 	dlls/usp10/Makefile \
 	dlls/usp10/tests/Makefile \
@@ -685,8 +685,8 @@ dlls/unicows/Makefile: dlls/unicows/Makefile.in dlls/Makedll.rules
 dlls/url/Makefile: dlls/url/Makefile.in dlls/Makedll.rules
 dlls/urlmon/Makefile: dlls/urlmon/Makefile.in dlls/Makedll.rules
 dlls/urlmon/tests/Makefile: dlls/urlmon/tests/Makefile.in dlls/Maketest.rules
-dlls/user/Makefile: dlls/user/Makefile.in dlls/Makedll.rules
-dlls/user/tests/Makefile: dlls/user/tests/Makefile.in dlls/Maketest.rules
+dlls/user32/Makefile: dlls/user32/Makefile.in dlls/Makedll.rules
+dlls/user32/tests/Makefile: dlls/user32/tests/Makefile.in dlls/Maketest.rules
 dlls/userenv/Makefile: dlls/userenv/Makefile.in dlls/Makedll.rules
 dlls/usp10/Makefile: dlls/usp10/Makefile.in dlls/Makedll.rules
 dlls/usp10/tests/Makefile: dlls/usp10/tests/Makefile.in dlls/Maketest.rules

--- a/configure
+++ b/configure
--- a/configure.ac
+++ b/configure.ac
@@ -1498,7 +1498,7 @@ AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])
 WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv)
 WINE_CONFIG_EXTRA_DIR(dlls/gdi32/mfdrv)
 WINE_CONFIG_EXTRA_DIR(dlls/kernel32/nls)
-WINE_CONFIG_EXTRA_DIR(dlls/user/resources)
+WINE_CONFIG_EXTRA_DIR(dlls/user32/resources)
 WINE_CONFIG_EXTRA_DIR(dlls/wineps.drv/data)
 WINE_CONFIG_EXTRA_DIR(include/wine)

@@ -1729,8 +1729,8 @@ dlls/unicows/Makefile
 dlls/url/Makefile
 dlls/urlmon/Makefile
 dlls/urlmon/tests/Makefile
-dlls/user/Makefile
-dlls/user/tests/Makefile
+dlls/user32/Makefile
+dlls/user32/tests/Makefile
 dlls/userenv/Makefile
 dlls/usp10/Makefile
 dlls/usp10/tests/Makefile

--- a/dlls/.gitignore
+++ b/dlls/.gitignore
@@ -17,7 +17,6 @@
 /imm.dll16
 /keyboard.drv16
 /krnl386.exe16
-/libuser32.def
 /libwinspool.def
 /lzexpand.dll16
 /mmsystem.dll16
@@ -155,7 +154,7 @@ tapi32/libtapi32.def
 unicows/libunicows.def
 url/liburl.def
 urlmon/liburlmon.def
-user/libuser32.def
+user32/libuser32.def
 usp10/libusp10.def
 uxtheme/libuxtheme.def
 vdmdbg/libvdmdbg.def

--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -169,7 +169,7 @@ BASEDIRS = \
 	unicows \
 	url \
 	urlmon \
-	user \
+	user32 \
 	userenv \
 	usp10 \
 	uxtheme \
@@ -261,7 +261,7 @@ TESTSUBDIRS = \
 	shell32/tests \
 	shlwapi/tests \
 	urlmon/tests \
-	user/tests \
+	user32/tests \
 	usp10/tests \
 	uxtheme/tests \
 	version/tests \
@@ -344,7 +344,6 @@ WIN16_FILES = \
 SYMLINKS_SO = \
 	@WIN16_FILES@ \
 	joystick.drv.so \
-	user32.dll.so \
 	winealsa.drv.so \
 	winearts.drv.so \
 	wineaudioio.drv.so \
@@ -369,9 +368,6 @@ symlinks: $(BUILDSUBDIRS)
 joystick.drv.so: winmm/joystick/joystick.drv.so
 	$(RM) $@ && $(LN_S) winmm/joystick/joystick.drv.so $@

-user32.dll.so: user/user32.dll.so
-	$(RM) $@ && $(LN_S) user/user32.dll.so $@
-
 winealsa.drv.so: winmm/winealsa/winealsa.drv.so
 	$(RM) $@ && $(LN_S) winmm/winealsa/winealsa.drv.so $@

@@ -484,7 +480,6 @@ winsock.dll16:
 STATIC_IMPLIBEXT = $(IMPLIBEXT:def=def.a)

 IMPORT_SYMLINKS = \
-	libuser32.$(IMPLIBEXT) \
 	libwinspool.$(IMPLIBEXT)

 IMPORT_LIBS = \
@@ -596,7 +591,7 @@ IMPORT_LIBS = \
 	unicows/libunicows.$(IMPLIBEXT) \
 	url/liburl.$(IMPLIBEXT) \
 	urlmon/liburlmon.$(IMPLIBEXT) \
-	user/libuser32.$(IMPLIBEXT) \
+	user32/libuser32.$(IMPLIBEXT) \
 	usp10/libusp10.$(IMPLIBEXT) \
 	uxtheme/libuxtheme.$(IMPLIBEXT) \
 	vdmdbg/libvdmdbg.$(IMPLIBEXT) \
@@ -921,8 +916,8 @@ url/liburl.$(IMPLIBEXT): url/url.spec $(WINEBUILD)
 urlmon/liburlmon.$(IMPLIBEXT): urlmon/urlmon.spec $(WINEBUILD)
 	@cd urlmon && $(MAKE) liburlmon.$(IMPLIBEXT)

-user/libuser32.$(IMPLIBEXT): user/user32.spec $(WINEBUILD)
-	@cd user && $(MAKE) libuser32.$(IMPLIBEXT)
+user32/libuser32.$(IMPLIBEXT): user32/user32.spec $(WINEBUILD)
+	@cd user32 && $(MAKE) libuser32.$(IMPLIBEXT)

 usp10/libusp10.$(IMPLIBEXT): usp10/usp10.spec $(WINEBUILD)
 	@cd usp10 && $(MAKE) libusp10.$(IMPLIBEXT)
@@ -978,9 +973,6 @@ wsock32/libwsock32.$(IMPLIBEXT): wsock32/wsock32.spec $(WINEBUILD)
 wtsapi32/libwtsapi32.$(IMPLIBEXT): wtsapi32/wtsapi32.spec $(WINEBUILD)
 	@cd wtsapi32 && $(MAKE) libwtsapi32.$(IMPLIBEXT)

-libuser32.$(IMPLIBEXT): user/libuser32.$(IMPLIBEXT)
-	$(RM) $@ && $(LN_S) user/libuser32.$(IMPLIBEXT) $@
-
 libwinspool.$(IMPLIBEXT): winspool.drv/libwinspool.$(IMPLIBEXT)
 	$(RM) $@ && $(LN_S) winspool.drv/libwinspool.$(IMPLIBEXT) $@

@@ -990,7 +982,6 @@ $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__): $(IMPOR
 # Map library name to the corresponding directory

 winmm/joystick/joystick.drv.so: winmm/joystick
-user/user32.dll.so: user
 winmm/winealsa/winealsa.drv.so: winmm/winealsa
 winmm/winearts/winearts.drv.so: winmm/winearts
 winmm/wineaudioio/wineaudioio.drv.so: winmm/wineaudioio

--- a/dlls/user/Makefile.in
+++ b/dlls/user/Makefile.in
--- a/dlls/user/bidi16.c
+++ b/dlls/user/bidi16.c
--- a/dlls/user/button.c
+++ b/dlls/user/button.c
--- a/dlls/user/caret.c
+++ b/dlls/user/caret.c
--- a/dlls/user/class.c
+++ b/dlls/user/class.c
--- a/dlls/user/clipboard.c
+++ b/dlls/user/clipboard.c
--- a/dlls/user/combo.c
+++ b/dlls/user/combo.c
--- a/dlls/user/comm16.c
+++ b/dlls/user/comm16.c
--- a/dlls/user/controls.h
+++ b/dlls/user/controls.h
--- a/dlls/user/cursoricon.c
+++ b/dlls/user/cursoricon.c
--- a/dlls/user/dde_client.c
+++ b/dlls/user/dde_client.c
--- a/dlls/user/dde_misc.c
+++ b/dlls/user/dde_misc.c
--- a/dlls/user/dde_private.h
+++ b/dlls/user/dde_private.h
--- a/dlls/user/dde_server.c
+++ b/dlls/user/dde_server.c
--- a/dlls/user/ddeml.spec
+++ b/dlls/user/ddeml.spec
--- a/dlls/user/ddeml16.c
+++ b/dlls/user/ddeml16.c
--- a/dlls/user/defdlg.c
+++ b/dlls/user/defdlg.c
--- a/dlls/user/defwnd.c
+++ b/dlls/user/defwnd.c
--- a/dlls/user/desktop.c
+++ b/dlls/user/desktop.c
--- a/dlls/user/dialog.c
+++ b/dlls/user/dialog.c
--- a/dlls/user/dialog16.c
+++ b/dlls/user/dialog16.c
--- a/dlls/user/display.c
+++ b/dlls/user/display.c
--- a/dlls/user/display.drv.spec
+++ b/dlls/user/display.drv.spec
--- a/dlls/user/driver.c
+++ b/dlls/user/driver.c
--- a/dlls/user/driver16.c
+++ b/dlls/user/driver16.c
--- a/dlls/user/edit.c
+++ b/dlls/user/edit.c
--- a/dlls/user/exticon.c
+++ b/dlls/user/exticon.c
--- a/dlls/user/focus.c
+++ b/dlls/user/focus.c
--- a/dlls/user/hook.c
+++ b/dlls/user/hook.c
--- a/dlls/user/hook16.c
+++ b/dlls/user/hook16.c
--- a/dlls/user/icontitle.c
+++ b/dlls/user/icontitle.c
--- a/dlls/user/input.c
+++ b/dlls/user/input.c
--- a/dlls/user/kbd16.c
+++ b/dlls/user/kbd16.c
--- a/dlls/user/keyboard.drv.spec
+++ b/dlls/user/keyboard.drv.spec
--- a/dlls/user/listbox.c
+++ b/dlls/user/listbox.c
--- a/dlls/user/lstr.c
+++ b/dlls/user/lstr.c
--- a/dlls/user/mdi.c
+++ b/dlls/user/mdi.c
--- a/dlls/user/menu.c
+++ b/dlls/user/menu.c
--- a/dlls/user/message.c
+++ b/dlls/user/message.c
--- a/dlls/user/misc.c
+++ b/dlls/user/misc.c
--- a/dlls/user/mouse.drv.spec
+++ b/dlls/user/mouse.drv.spec
--- a/dlls/user/mouse16.c
+++ b/dlls/user/mouse16.c
--- a/dlls/user/msg16.c
+++ b/dlls/user/msg16.c
--- a/dlls/user/msgbox.c
+++ b/dlls/user/msgbox.c
--- a/dlls/user/network.c
+++ b/dlls/user/network.c
--- a/dlls/user/nonclient.c
+++ b/dlls/user/nonclient.c
--- a/dlls/user/painting.c
+++ b/dlls/user/painting.c
--- a/dlls/user/property.c
+++ b/dlls/user/property.c
--- a/dlls/user/resource.c
+++ b/dlls/user/resource.c
--- a/dlls/user/resources/display.rc
+++ b/dlls/user/resources/display.rc
--- a/dlls/user/resources/mouse.rc
+++ b/dlls/user/resources/mouse.rc
--- a/dlls/user/resources/user32.rc
+++ b/dlls/user/resources/user32.rc
--- a/dlls/user/resources/user32_Bg.rc
+++ b/dlls/user/resources/user32_Bg.rc
--- a/dlls/user/resources/user32_Ca.rc
+++ b/dlls/user/resources/user32_Ca.rc
--- a/dlls/user/resources/user32_Cs.rc
+++ b/dlls/user/resources/user32_Cs.rc
--- a/dlls/user/resources/user32_Da.rc
+++ b/dlls/user/resources/user32_Da.rc
--- a/dlls/user/resources/user32_De.rc
+++ b/dlls/user/resources/user32_De.rc
--- a/dlls/user/resources/user32_En.rc
+++ b/dlls/user/resources/user32_En.rc
--- a/dlls/user/resources/user32_Eo.rc
+++ b/dlls/user/resources/user32_Eo.rc
--- a/dlls/user/resources/user32_Es.rc
+++ b/dlls/user/resources/user32_Es.rc
--- a/dlls/user/resources/user32_Fi.rc
+++ b/dlls/user/resources/user32_Fi.rc
--- a/dlls/user/resources/user32_Fr.rc
+++ b/dlls/user/resources/user32_Fr.rc
--- a/dlls/user/resources/user32_Hu.rc
+++ b/dlls/user/resources/user32_Hu.rc
--- a/dlls/user/resources/user32_It.rc
+++ b/dlls/user/resources/user32_It.rc
--- a/dlls/user/resources/user32_Ja.rc
+++ b/dlls/user/resources/user32_Ja.rc
--- a/dlls/user/resources/user32_Ko.rc
+++ b/dlls/user/resources/user32_Ko.rc
--- a/dlls/user/resources/user32_Nl.rc
+++ b/dlls/user/resources/user32_Nl.rc
--- a/dlls/user/resources/user32_No.rc
+++ b/dlls/user/resources/user32_No.rc
--- a/dlls/user/resources/user32_Pl.rc
+++ b/dlls/user/resources/user32_Pl.rc
--- a/dlls/user/resources/user32_Pt.rc
+++ b/dlls/user/resources/user32_Pt.rc
--- a/dlls/user/resources/user32_Ru.rc
+++ b/dlls/user/resources/user32_Ru.rc
--- a/dlls/user/resources/user32_Si.rc
+++ b/dlls/user/resources/user32_Si.rc
--- a/dlls/user/resources/user32_Sk.rc
+++ b/dlls/user/resources/user32_Sk.rc
--- a/dlls/user/resources/user32_Sv.rc
+++ b/dlls/user/resources/user32_Sv.rc
--- a/dlls/user/resources/user32_Tr.rc
+++ b/dlls/user/resources/user32_Tr.rc
--- a/dlls/user/resources/user32_Uk.rc
+++ b/dlls/user/resources/user32_Uk.rc
--- a/dlls/user/resources/user32_Wa.rc
+++ b/dlls/user/resources/user32_Wa.rc
--- a/dlls/user/resources/user32_Zh.rc
+++ b/dlls/user/resources/user32_Zh.rc
--- a/dlls/user/resources/user32_bin.rc
+++ b/dlls/user/resources/user32_bin.rc
--- a/dlls/user/resources/version.rc
+++ b/dlls/user/resources/version.rc
--- a/dlls/user/resources/version16.rc
+++ b/dlls/user/resources/version16.rc
--- a/dlls/user/scroll.c
+++ b/dlls/user/scroll.c
--- a/dlls/user/spy.c
+++ b/dlls/user/spy.c
--- a/dlls/user/static.c
+++ b/dlls/user/static.c
--- a/dlls/user/sysparams.c
+++ b/dlls/user/sysparams.c
--- a/dlls/user/tests/Makefile.in
+++ b/dlls/user/tests/Makefile.in
--- a/dlls/user/tests/class.c
+++ b/dlls/user/tests/class.c
--- a/dlls/user/tests/clipboard.c
+++ b/dlls/user/tests/clipboard.c
--- a/dlls/user/tests/cursoricon.c
+++ b/dlls/user/tests/cursoricon.c
--- a/dlls/user/tests/dce.c
+++ b/dlls/user/tests/dce.c
--- a/dlls/user/tests/dde.c
+++ b/dlls/user/tests/dde.c
--- a/dlls/user/tests/dialog.c
+++ b/dlls/user/tests/dialog.c
--- a/dlls/user/tests/edit.c
+++ b/dlls/user/tests/edit.c
--- a/dlls/user/tests/generated.c
+++ b/dlls/user/tests/generated.c
--- a/dlls/user/tests/input.c
+++ b/dlls/user/tests/input.c
--- a/dlls/user/tests/listbox.c
+++ b/dlls/user/tests/listbox.c
--- a/dlls/user/tests/menu.c
+++ b/dlls/user/tests/menu.c
--- a/dlls/user/tests/monitor.c
+++ b/dlls/user/tests/monitor.c
--- a/dlls/user/tests/msg.c
+++ b/dlls/user/tests/msg.c
--- a/dlls/user/tests/resource.c
+++ b/dlls/user/tests/resource.c
--- a/dlls/user/tests/resource.rc
+++ b/dlls/user/tests/resource.rc
--- a/dlls/user/tests/sysparams.c
+++ b/dlls/user/tests/sysparams.c
--- a/dlls/user/tests/text.c
+++ b/dlls/user/tests/text.c
--- a/dlls/user/tests/win.c
+++ b/dlls/user/tests/win.c
--- a/dlls/user/tests/winstation.c
+++ b/dlls/user/tests/winstation.c
--- a/dlls/user/tests/wsprintf.c
+++ b/dlls/user/tests/wsprintf.c
--- a/dlls/user/text.c
+++ b/dlls/user/text.c
--- a/dlls/user/uitools.c
+++ b/dlls/user/uitools.c
--- a/dlls/user/user.exe.spec
+++ b/dlls/user/user.exe.spec
--- a/dlls/user/user16.c
+++ b/dlls/user/user16.c
--- a/dlls/user/user32.spec
+++ b/dlls/user/user32.spec
--- a/dlls/user/user_main.c
+++ b/dlls/user/user_main.c
--- a/dlls/user/user_private.h
+++ b/dlls/user/user_private.h
--- a/dlls/user/win.c
+++ b/dlls/user/win.c
--- a/dlls/user/winhelp.c
+++ b/dlls/user/winhelp.c
--- a/dlls/user/winpos.c
+++ b/dlls/user/winpos.c
--- a/dlls/user/winproc.c
+++ b/dlls/user/winproc.c
--- a/dlls/user/winproc.h
+++ b/dlls/user/winproc.h
--- a/dlls/user/winstation.c
+++ b/dlls/user/winstation.c
--- a/dlls/user/wnd16.c
+++ b/dlls/user/wnd16.c
--- a/dlls/user/wsprintf.c
+++ b/dlls/user/wsprintf.c
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
--- a/tools/winapi/tests.dat
+++ b/tools/winapi/tests.dat