Commit f231a70f authored by Alexandre Julliard's avatar Alexandre Julliard

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

parent bb7f2f9c
...@@ -381,6 +381,7 @@ ALL_MAKEFILES = \ ...@@ -381,6 +381,7 @@ ALL_MAKEFILES = \
dlls/winecrt0/Makefile \ dlls/winecrt0/Makefile \
dlls/wined3d/Makefile \ dlls/wined3d/Makefile \
dlls/winedos/Makefile \ dlls/winedos/Makefile \
dlls/winejoystick.drv/Makefile \
dlls/winemp3.acm/Makefile \ dlls/winemp3.acm/Makefile \
dlls/wineps.drv/Makefile \ dlls/wineps.drv/Makefile \
dlls/winequartz.drv/Makefile \ dlls/winequartz.drv/Makefile \
...@@ -388,7 +389,6 @@ ALL_MAKEFILES = \ ...@@ -388,7 +389,6 @@ ALL_MAKEFILES = \
dlls/wininet/Makefile \ dlls/wininet/Makefile \
dlls/wininet/tests/Makefile \ dlls/wininet/tests/Makefile \
dlls/winmm/Makefile \ dlls/winmm/Makefile \
dlls/winmm/joystick/Makefile \
dlls/winmm/tests/Makefile \ dlls/winmm/tests/Makefile \
dlls/winmm/winealsa/Makefile \ dlls/winmm/winealsa/Makefile \
dlls/winmm/winearts/Makefile \ dlls/winmm/winearts/Makefile \
...@@ -706,6 +706,7 @@ dlls/w32skrnl/Makefile: dlls/w32skrnl/Makefile.in dlls/Makedll.rules ...@@ -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/winecrt0/Makefile: dlls/winecrt0/Makefile.in dlls/Makeimplib.rules
dlls/wined3d/Makefile: dlls/wined3d/Makefile.in dlls/Makedll.rules dlls/wined3d/Makefile: dlls/wined3d/Makefile.in dlls/Makedll.rules
dlls/winedos/Makefile: dlls/winedos/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/winemp3.acm/Makefile: dlls/winemp3.acm/Makefile.in dlls/Makedll.rules
dlls/wineps.drv/Makefile: dlls/wineps.drv/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 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 ...@@ -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/Makefile: dlls/wininet/Makefile.in dlls/Makedll.rules
dlls/wininet/tests/Makefile: dlls/wininet/tests/Makefile.in dlls/Maketest.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/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/tests/Makefile: dlls/winmm/tests/Makefile.in dlls/Maketest.rules
dlls/winmm/winealsa/Makefile: dlls/winmm/winealsa/Makefile.in dlls/Makedll.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 dlls/winmm/winearts/Makefile: dlls/winmm/winearts/Makefile.in dlls/Makedll.rules
......
...@@ -1749,6 +1749,7 @@ dlls/w32skrnl/Makefile ...@@ -1749,6 +1749,7 @@ dlls/w32skrnl/Makefile
dlls/winecrt0/Makefile dlls/winecrt0/Makefile
dlls/wined3d/Makefile dlls/wined3d/Makefile
dlls/winedos/Makefile dlls/winedos/Makefile
dlls/winejoystick.drv/Makefile
dlls/winemp3.acm/Makefile dlls/winemp3.acm/Makefile
dlls/wineps.drv/Makefile dlls/wineps.drv/Makefile
dlls/winequartz.drv/Makefile dlls/winequartz.drv/Makefile
...@@ -1756,7 +1757,6 @@ dlls/winex11.drv/Makefile ...@@ -1756,7 +1757,6 @@ dlls/winex11.drv/Makefile
dlls/wininet/Makefile dlls/wininet/Makefile
dlls/wininet/tests/Makefile dlls/wininet/tests/Makefile
dlls/winmm/Makefile dlls/winmm/Makefile
dlls/winmm/joystick/Makefile
dlls/winmm/tests/Makefile dlls/winmm/tests/Makefile
dlls/winmm/winealsa/Makefile dlls/winmm/winealsa/Makefile
dlls/winmm/winearts/Makefile dlls/winmm/winearts/Makefile
......
...@@ -183,11 +183,11 @@ BASEDIRS = \ ...@@ -183,11 +183,11 @@ BASEDIRS = \
vwin32.vxd \ vwin32.vxd \
w32skrnl \ w32skrnl \
winedos \ winedos \
winejoystick.drv \
winemp3.acm \ winemp3.acm \
wineps.drv \ wineps.drv \
wininet \ wininet \
winmm \ winmm \
winmm/joystick \
winmm/winealsa \ winmm/winealsa \
winmm/winearts \ winmm/winearts \
winmm/wineaudioio \ winmm/wineaudioio \
...@@ -343,7 +343,6 @@ WIN16_FILES = \ ...@@ -343,7 +343,6 @@ WIN16_FILES = \
SYMLINKS_SO = \ SYMLINKS_SO = \
@WIN16_FILES@ \ @WIN16_FILES@ \
joystick.drv.so \
winealsa.drv.so \ winealsa.drv.so \
winearts.drv.so \ winearts.drv.so \
wineaudioio.drv.so \ wineaudioio.drv.so \
...@@ -365,9 +364,6 @@ symlinks: $(BUILDSUBDIRS) ...@@ -365,9 +364,6 @@ symlinks: $(BUILDSUBDIRS)
# Map symlink name to the corresponding library # 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 winealsa.drv.so: winmm/winealsa/winealsa.drv.so
$(RM) $@ && $(LN_S) winmm/winealsa/winealsa.drv.so $@ $(RM) $@ && $(LN_S) winmm/winealsa/winealsa.drv.so $@
...@@ -977,7 +973,6 @@ $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__): $(IMPOR ...@@ -977,7 +973,6 @@ $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__): $(IMPOR
# Map library name to the corresponding directory # Map library name to the corresponding directory
winmm/joystick/joystick.drv.so: winmm/joystick
winmm/winealsa/winealsa.drv.so: winmm/winealsa winmm/winealsa/winealsa.drv.so: winmm/winealsa
winmm/winearts/winearts.drv.so: winmm/winearts winmm/winearts/winearts.drv.so: winmm/winearts
winmm/wineaudioio/wineaudioio.drv.so: winmm/wineaudioio winmm/wineaudioio/wineaudioio.drv.so: winmm/wineaudioio
......
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = joystick.drv MODULE = winejoystick.drv
IMPORTS = winmm user32 kernel32 IMPORTS = winmm user32 kernel32
C_SRCS = \ C_SRCS = \
......
...@@ -73,7 +73,7 @@ static BOOL JOY_LoadDriver(DWORD dwJoyID) ...@@ -73,7 +73,7 @@ static BOOL JOY_LoadDriver(DWORD dwJoyID)
if (JOY_Sticks[dwJoyID].hDriver) if (JOY_Sticks[dwJoyID].hDriver)
return TRUE; 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); return (JOY_Sticks[dwJoyID].hDriver != 0);
} }
......
...@@ -55,7 +55,6 @@ static const char * const builtin_only[] = ...@@ -55,7 +55,6 @@ static const char * const builtin_only[] =
"glu32", "glu32",
"icmp", "icmp",
"iphlpapi", "iphlpapi",
"joystick.drv",
"kernel32", "kernel32",
"mswsock", "mswsock",
"ntdll", "ntdll",
...@@ -74,6 +73,7 @@ static const char * const builtin_only[] = ...@@ -74,6 +73,7 @@ static const char * const builtin_only[] =
"winedos", "winedos",
"wineesd.drv", "wineesd.drv",
"winejack.drv", "winejack.drv",
"winejoystick.drv",
"winemp3.acm", "winemp3.acm",
"winenas.drv", "winenas.drv",
"wineoss.drv", "wineoss.drv",
......
...@@ -1585,19 +1585,6 @@ LPVOID * ...@@ -1585,19 +1585,6 @@ LPVOID *
REFCLSID REFCLSID
REFIID REFIID
%%joystick.drv
%long
HDRVR
LPARAM
LRESULT
UINT
%long --pointer
DWORD_PTR
%%kernel32.dll %%kernel32.dll
%long %long
...@@ -4798,6 +4785,19 @@ WORD ...@@ -4798,6 +4785,19 @@ WORD
DWORD_PTR DWORD_PTR
%%winejoystick.drv
%long
HDRVR
LPARAM
LRESULT
UINT
%long --pointer
DWORD_PTR
%%winemp3.acm %%winemp3.acm
%long %long
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment