Module: wine Branch: master Commit: 0079248f109e91ef6d531e44e15b6c33674dc10e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0079248f109e91ef6d531e44e1...
Author: André Hentschel nerv@dawncrow.de Date: Tue Sep 3 21:07:29 2013 +0200
xinput1_4: Add new dll based on xinput1_3.
---
configure | 1 + configure.ac | 1 + dlls/xinput1_4/Makefile.in | 6 ++++++ dlls/xinput1_4/xinput1_4.spec | 9 +++++++++ dlls/xinput1_4/xinput1_4_main.c | 37 +++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 6 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/configure b/configure index 766ffdf..56c983f 100755 --- a/configure +++ b/configure @@ -16487,6 +16487,7 @@ wine_fn_config_dll xinput1_1 enable_xinput1_1 wine_fn_config_dll xinput1_2 enable_xinput1_2 wine_fn_config_dll xinput1_3 enable_xinput1_3 implib xinput wine_fn_config_test dlls/xinput1_3/tests xinput1_3_test +wine_fn_config_dll xinput1_4 enable_xinput1_4 wine_fn_config_dll xinput9_1_0 enable_xinput9_1_0 wine_fn_config_dll xmllite enable_xmllite wine_fn_config_test dlls/xmllite/tests xmllite_test diff --git a/configure.ac b/configure.ac index 038eec5..3a0007c 100644 --- a/configure.ac +++ b/configure.ac @@ -3169,6 +3169,7 @@ WINE_CONFIG_DLL(xinput1_1) WINE_CONFIG_DLL(xinput1_2) WINE_CONFIG_DLL(xinput1_3,,[implib],[xinput]) WINE_CONFIG_TEST(dlls/xinput1_3/tests) +WINE_CONFIG_DLL(xinput1_4) WINE_CONFIG_DLL(xinput9_1_0) WINE_CONFIG_DLL(xmllite) WINE_CONFIG_TEST(dlls/xmllite/tests) diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in new file mode 100644 index 0000000..5e6b16c --- /dev/null +++ b/dlls/xinput1_4/Makefile.in @@ -0,0 +1,6 @@ +MODULE = xinput1_4.dll + +C_SRCS = \ + xinput1_4_main.c + +@MAKE_DLL_RULES@ diff --git a/dlls/xinput1_4/xinput1_4.spec b/dlls/xinput1_4/xinput1_4.spec new file mode 100644 index 0000000..a911666 --- /dev/null +++ b/dlls/xinput1_4/xinput1_4.spec @@ -0,0 +1,9 @@ +1 stdcall DllMain(long long ptr) +2 stdcall XInputGetState(long ptr) xinput1_3.XInputGetState +3 stdcall XInputSetState(long ptr) xinput1_3.XInputSetState +4 stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities +5 stdcall XInputEnable(long) xinput1_3.XInputEnable +6 stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) xinput1_3.XInputGetDSoundAudioDeviceGuids +7 stdcall XInputGetBatteryInformation(long ptr ptr) xinput1_3.XInputGetBatteryInformation +8 stdcall XInputGetKeystroke(long long ptr) xinput1_3.XInputGetKeystroke +10 stub XInputGetAudioDeviceIds(long ptr ptr ptr ptr) diff --git a/dlls/xinput1_4/xinput1_4_main.c b/dlls/xinput1_4/xinput1_4_main.c new file mode 100644 index 0000000..f91a3c5 --- /dev/null +++ b/dlls/xinput1_4/xinput1_4_main.c @@ -0,0 +1,37 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2013 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + break; + } + return TRUE; +} diff --git a/tools/make_specfiles b/tools/make_specfiles index c0de805..c0e6a06 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -100,6 +100,7 @@ my @dll_groups = ], [ "xinput1_3", + "xinput1_4", "xinput1_2", "xinput1_1", "xinput9_1_0",