joystick.drv: Renamed the dlls/winmm/joystick directory to dlls/winejoystick.drv.

Makefile.in

@@ -381,6 +381,7 @@ ALL_MAKEFILES = \
 	dlls/winecrt0/Makefile \
 	dlls/wined3d/Makefile \
 	dlls/winedos/Makefile \
+	dlls/winejoystick.drv/Makefile \
 	dlls/winemp3.acm/Makefile \
 	dlls/wineps.drv/Makefile \
 	dlls/winequartz.drv/Makefile \
@@ -388,7 +389,6 @@ ALL_MAKEFILES = \
 	dlls/wininet/Makefile \
 	dlls/wininet/tests/Makefile \
 	dlls/winmm/Makefile \
-	dlls/winmm/joystick/Makefile \
 	dlls/winmm/tests/Makefile \
 	dlls/winmm/winealsa/Makefile \
 	dlls/winmm/winearts/Makefile \
@@ -706,6 +706,7 @@ dlls/w32skrnl/Makefile: dlls/w32skrnl/Makefile.in dlls/Makedll.rules
 dlls/winecrt0/Makefile: dlls/winecrt0/Makefile.in dlls/Makeimplib.rules
 dlls/wined3d/Makefile: dlls/wined3d/Makefile.in dlls/Makedll.rules
 dlls/winedos/Makefile: dlls/winedos/Makefile.in dlls/Makedll.rules
+dlls/winejoystick.drv/Makefile: dlls/winejoystick.drv/Makefile.in dlls/Makedll.rules
 dlls/winemp3.acm/Makefile: dlls/winemp3.acm/Makefile.in dlls/Makedll.rules
 dlls/wineps.drv/Makefile: dlls/wineps.drv/Makefile.in dlls/Makedll.rules
 dlls/winequartz.drv/Makefile: dlls/winequartz.drv/Makefile.in dlls/Makedll.rules
@@ -713,7 +714,6 @@ dlls/winex11.drv/Makefile: dlls/winex11.drv/Makefile.in dlls/Makedll.rules
 dlls/wininet/Makefile: dlls/wininet/Makefile.in dlls/Makedll.rules
 dlls/wininet/tests/Makefile: dlls/wininet/tests/Makefile.in dlls/Maketest.rules
 dlls/winmm/Makefile: dlls/winmm/Makefile.in dlls/Makedll.rules
-dlls/winmm/joystick/Makefile: dlls/winmm/joystick/Makefile.in dlls/Makedll.rules
 dlls/winmm/tests/Makefile: dlls/winmm/tests/Makefile.in dlls/Maketest.rules
 dlls/winmm/winealsa/Makefile: dlls/winmm/winealsa/Makefile.in dlls/Makedll.rules
 dlls/winmm/winearts/Makefile: dlls/winmm/winearts/Makefile.in dlls/Makedll.rules

configure.ac

@@ -1749,6 +1749,7 @@ dlls/w32skrnl/Makefile
 dlls/winecrt0/Makefile
 dlls/wined3d/Makefile
 dlls/winedos/Makefile
+dlls/winejoystick.drv/Makefile
 dlls/winemp3.acm/Makefile
 dlls/wineps.drv/Makefile
 dlls/winequartz.drv/Makefile
@@ -1756,7 +1757,6 @@ dlls/winex11.drv/Makefile
 dlls/wininet/Makefile
 dlls/wininet/tests/Makefile
 dlls/winmm/Makefile
-dlls/winmm/joystick/Makefile
 dlls/winmm/tests/Makefile
 dlls/winmm/winealsa/Makefile
 dlls/winmm/winearts/Makefile

dlls/Makefile.in

@@ -183,11 +183,11 @@ BASEDIRS = \
 	vwin32.vxd \
 	w32skrnl \
 	winedos \
+	winejoystick.drv \
 	winemp3.acm \
 	wineps.drv \
 	wininet \
 	winmm \
-	winmm/joystick \
 	winmm/winealsa \
 	winmm/winearts \
 	winmm/wineaudioio \
@@ -343,7 +343,6 @@ WIN16_FILES = \
 
 SYMLINKS_SO = \
 	@WIN16_FILES@ \
-	joystick.drv.so \
 	winealsa.drv.so \
 	winearts.drv.so \
 	wineaudioio.drv.so \
@@ -365,9 +364,6 @@ symlinks: $(BUILDSUBDIRS)
 
 # Map symlink name to the corresponding library
 
-joystick.drv.so: winmm/joystick/joystick.drv.so
-	$(RM) $@ && $(LN_S) winmm/joystick/joystick.drv.so $@
-
 winealsa.drv.so: winmm/winealsa/winealsa.drv.so
 	$(RM) $@ && $(LN_S) winmm/winealsa/winealsa.drv.so $@
 
@@ -977,7 +973,6 @@ $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__): $(IMPOR
 
 # Map library name to the corresponding directory
 
-winmm/joystick/joystick.drv.so: winmm/joystick
 winmm/winealsa/winealsa.drv.so: winmm/winealsa
 winmm/winearts/winearts.drv.so: winmm/winearts
 winmm/wineaudioio/wineaudioio.drv.so: winmm/wineaudioio

dlls/winejoystick.drv/Makefile.in

@@ -1,8 +1,8 @@
 TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../../..
+TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = joystick.drv
+MODULE    = winejoystick.drv
 IMPORTS   = winmm user32 kernel32
 
 C_SRCS = \

dlls/winmm/joystick.c

@@ -73,7 +73,7 @@ static	BOOL JOY_LoadDriver(DWORD dwJoyID)
     if (JOY_Sticks[dwJoyID].hDriver)
 	return TRUE;
 
-    JOY_Sticks[dwJoyID].hDriver = OpenDriverA("joystick.drv", 0, dwJoyID);
+    JOY_Sticks[dwJoyID].hDriver = OpenDriverA("winejoystick.drv", 0, dwJoyID);
     return (JOY_Sticks[dwJoyID].hDriver != 0);
 }
 

programs/winecfg/libraries.c

@@ -55,7 +55,6 @@ static const char * const builtin_only[] =
     "glu32",
     "icmp",
     "iphlpapi",
-    "joystick.drv",
     "kernel32",
     "mswsock",
     "ntdll",
@@ -74,6 +73,7 @@ static const char * const builtin_only[] =
     "winedos",
     "wineesd.drv",
     "winejack.drv",
+    "winejoystick.drv",
     "winemp3.acm",
     "winenas.drv",
     "wineoss.drv",

tools/winapi/win32.api

@@ -1585,19 +1585,6 @@ LPVOID *
 REFCLSID
 REFIID
 
-%%joystick.drv
-
-%long
-
-HDRVR
-LPARAM
-LRESULT
-UINT
-
-%long --pointer
-
-DWORD_PTR
-
 %%kernel32.dll
 
 %long
@@ -4798,6 +4785,19 @@ WORD
 
 DWORD_PTR
 
+%%winejoystick.drv
+
+%long
+
+HDRVR
+LPARAM
+LRESULT
+UINT
+
+%long --pointer
+
+DWORD_PTR
+
 %%winemp3.acm
 
 %long