November 2008 - Wine-Commits

Andrew Fenn : xinput: Added the function XInputGetState with test case.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 29789a8ef4729401f685f3f5d7960ba654711e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29789a8ef4729401f685f3f5d… Author: Andrew Fenn <andrewfenn(a)gmail.com> Date: Mon Nov 10 16:32:33 2008 +0000 xinput: Added the function XInputGetState with test case. --- configure | 9 ++++ configure.ac | 1 + dlls/xinput1_3/tests/Makefile.in | 13 ++++++ dlls/xinput1_3/tests/xinput.c | 81 ++++++++++++++++++++++++++++++++++++++ dlls/xinput1_3/xinput1_3.spec | 2 +- dlls/xinput1_3/xinput1_3_main.c | 14 +++++++ 6 files changed, 119 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 316e9cf..9c677ee 100755 --- a/configure +++ b/configure @@ -26858,6 +26858,14 @@ dlls/xinput1_3/Makefile: dlls/xinput1_3/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/xinput1_3/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/xinput1_3/tests/Makefile" +test "x$enable_xinput1_3_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + xinput1_3/tests" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/xinput1_3/tests/Makefile: dlls/xinput1_3/tests/Makefile.in dlls/Maketest.rules" +ac_config_files="$ac_config_files dlls/xinput1_3/tests/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/xinput9_1_0/Makefile" test "x$enable_xinput9_1_0" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ xinput9_1_0" @@ -28400,6 +28408,7 @@ do "dlls/xinput1_1/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_1/Makefile" ;; "dlls/xinput1_2/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_2/Makefile" ;; "dlls/xinput1_3/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_3/Makefile" ;; + "dlls/xinput1_3/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_3/tests/Makefile" ;; "dlls/xinput9_1_0/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput9_1_0/Makefile" ;; "documentation/Makefile") CONFIG_FILES="$CONFIG_FILES documentation/Makefile" ;; "fonts/Makefile") CONFIG_FILES="$CONFIG_FILES fonts/Makefile" ;; diff --git a/configure.ac b/configure.ac index ed61fbe..00f2ddb 100644 --- a/configure.ac +++ b/configure.ac @@ -2097,6 +2097,7 @@ WINE_CONFIG_MAKEFILE([dlls/wtsapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_D WINE_CONFIG_MAKEFILE([dlls/xinput1_1/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput1_2/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput1_3/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/xinput1_3/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput9_1_0/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([fonts/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) diff --git a/dlls/xinput1_3/tests/Makefile.in b/dlls/xinput1_3/tests/Makefile.in new file mode 100644 index 0000000..e38b858 --- /dev/null +++ b/dlls/xinput1_3/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = xinput1_3.dll +IMPORTS = user32 kernel32 + +CTESTS = \ + xinput.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c new file mode 100644 index 0000000..2cdc168 --- /dev/null +++ b/dlls/xinput1_3/tests/xinput.c @@ -0,0 +1,81 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * 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 <windows.h> +#include <stdio.h> + +#include "xinput.h" +#include "wine/test.h" + +static DWORD (WINAPI *pXInputGetState)(DWORD, XINPUT_STATE*); + +static void test_get_state(void) +{ + + XINPUT_STATE controllerState; + DWORD controllerNum; + DWORD result; + + for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + { + ZeroMemory(&controllerState, sizeof(XINPUT_STATE)); + + result = pXInputGetState(controllerNum, &controllerState); + ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputGetState failed with (%d)\n", result); + + if (ERROR_DEVICE_NOT_CONNECTED == result) + { + skip("Controller %d is not connected\n", controllerNum); + } + else + { + trace("-- Results for controller %d --\n", controllerNum); + trace("XInputGetState: %d\n", result); + trace("State->dwPacketNumber: %d\n", controllerState.dwPacketNumber); + trace("Gamepad Variables --\n"); + trace("Gamepad.wButtons: %#x\n", controllerState.Gamepad.wButtons); + trace("Gamepad.bLeftTrigger: 0x%08x\n", controllerState.Gamepad.bLeftTrigger); + trace("Gamepad.bRightTrigger: 0x%08x\n", controllerState.Gamepad.bRightTrigger); + trace("Gamepad.sThumbLX: %d\n", controllerState.Gamepad.sThumbLX); + trace("Gamepad.sThumbLY: %d\n", controllerState.Gamepad.sThumbLY); + trace("Gamepad.sThumbRX: %d\n", controllerState.Gamepad.sThumbRX); + trace("Gamepad.sThumbRY: %d\n", controllerState.Gamepad.sThumbRY); + } + } + + ZeroMemory(&controllerState, sizeof(XINPUT_STATE)); + result = pXInputGetState(XUSER_MAX_COUNT+1, &controllerState); + ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); +} + +START_TEST(xinput) +{ + HMODULE hXinput; + hXinput = LoadLibraryA( "xinput1_3.dll" ); + + if (hXinput) + { + pXInputGetState = (void*)GetProcAddress(hXinput, "XInputGetState"); + test_get_state(); + } + else + { + skip("Could not load xinput1_3.dll\n"); + } +} diff --git a/dlls/xinput1_3/xinput1_3.spec b/dlls/xinput1_3/xinput1_3.spec index 5caaa37..8fb6353 100644 --- a/dlls/xinput1_3/xinput1_3.spec +++ b/dlls/xinput1_3/xinput1_3.spec @@ -1,6 +1,6 @@ @ stub XInputEnable #(long) @ stub XInputSetState #(long ptr) -@ stub XInputGetState #(long ptr) +@ stdcall XInputGetState(long ptr) @ stub XInputGetKeystroke #(long long ptr) @ stub XInputGetCapabilities #(long long ptr) @ stub XInputGetDSoundAudioDeviceGuids #(long ptr ptr) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index 6198b3b..f2b6500 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -27,6 +27,8 @@ #include "winbase.h" #include "winerror.h" +#include "xinput.h" + WINE_DEFAULT_DEBUG_CHANNEL(xinput); BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) @@ -43,3 +45,15 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) } return TRUE; } + +DWORD WINAPI XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState) +{ + FIXME("(%u %p)\n", dwUserIndex, pState); + + if (dwUserIndex < XUSER_MAX_COUNT) + { + return ERROR_DEVICE_NOT_CONNECTED; + /* If controller exists then return ERROR_SUCCESS */ + } + return ERROR_BAD_ARGUMENTS; +}

1 0

Andrew Fenn : xinput1_2: Initial implementation.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 85a4a1dd4463f8b2b9c361667bdbac6c17ce6653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85a4a1dd4463f8b2b9c361667… Author: Andrew Fenn <andrewfenn(a)gmail.com> Date: Mon Nov 10 16:30:13 2008 +0000 xinput1_2: Initial implementation. --- configure | 9 +++++++++ configure.ac | 1 + dlls/xinput1_2/Makefile.in | 15 +++++++++++++++ dlls/xinput1_2/version.rc | 27 +++++++++++++++++++++++++++ dlls/xinput1_2/xinput1_2.spec | 5 +++++ dlls/xinput1_2/xinput1_2_main.c | 39 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 96 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 0f74b21..316e9cf 100755 --- a/configure +++ b/configure @@ -26842,6 +26842,14 @@ dlls/xinput1_1/Makefile: dlls/xinput1_1/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/xinput1_1/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/xinput1_2/Makefile" +test "x$enable_xinput1_2" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + xinput1_2" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/xinput1_2/Makefile: dlls/xinput1_2/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/xinput1_2/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/xinput1_3/Makefile" test "x$enable_xinput1_3" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ xinput1_3" @@ -28390,6 +28398,7 @@ do "dlls/wsock32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wsock32/Makefile" ;; "dlls/wtsapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wtsapi32/Makefile" ;; "dlls/xinput1_1/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_1/Makefile" ;; + "dlls/xinput1_2/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_2/Makefile" ;; "dlls/xinput1_3/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_3/Makefile" ;; "dlls/xinput9_1_0/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput9_1_0/Makefile" ;; "documentation/Makefile") CONFIG_FILES="$CONFIG_FILES documentation/Makefile" ;; diff --git a/configure.ac b/configure.ac index 45531a3..ed61fbe 100644 --- a/configure.ac +++ b/configure.ac @@ -2095,6 +2095,7 @@ WINE_CONFIG_MAKEFILE([dlls/ws2_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ WINE_CONFIG_MAKEFILE([dlls/wsock32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wtsapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput1_1/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/xinput1_2/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput1_3/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput9_1_0/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in new file mode 100644 index 0000000..f8934f4 --- /dev/null +++ b/dlls/xinput1_2/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = xinput1_2.dll +IMPORTS = kernel32 + +C_SRCS = \ + xinput1_2_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/xinput1_2/version.rc b/dlls/xinput1_2/version.rc new file mode 100644 index 0000000..5dec834 --- /dev/null +++ b/dlls/xinput1_2/version.rc @@ -0,0 +1,27 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Common Controller API" +#define WINE_FILENAME_STR "xinput1_2.dll" +#define WINE_FILEVERSION 9,14,701,0000 +#define WINE_FILEVERSION_STR "9.14.701.0000" +#define WINE_PRODUCTVERSION 9,14,701,0000 +#define WINE_PRODUCTVERSION_STR "9.14" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/xinput1_2/xinput1_2.spec b/dlls/xinput1_2/xinput1_2.spec new file mode 100644 index 0000000..95759c3 --- /dev/null +++ b/dlls/xinput1_2/xinput1_2.spec @@ -0,0 +1,5 @@ +@ stdcall XInputEnable(long) xinput1_3.XInputEnable +@ stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities +@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) xinput1_3.XInputGetDSoundAudioDeviceGuids +@ stdcall XInputSetState(long ptr) xinput1_3.XInputSetState +@ stdcall XInputGetState(long ptr) xinput1_3.XInputGetState diff --git a/dlls/xinput1_2/xinput1_2_main.c b/dlls/xinput1_2/xinput1_2_main.c new file mode 100644 index 0000000..18cde9e --- /dev/null +++ b/dlls/xinput1_2/xinput1_2_main.c @@ -0,0 +1,39 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * 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; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +}

1 0

Andrew Fenn : xinput9_1_0: Initial implementation.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: c4cd3bc7536581a239727a9a36826d5b0a506ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4cd3bc7536581a239727a9a3… Author: Andrew Fenn <andrewfenn(a)gmail.com> Date: Mon Nov 10 16:26:05 2008 +0000 xinput9_1_0: Initial implementation. --- configure | 9 ++++++++ configure.ac | 1 + dlls/xinput9_1_0/Makefile.in | 15 +++++++++++++ dlls/xinput9_1_0/version.rc | 27 ++++++++++++++++++++++++ dlls/xinput9_1_0/xinput9_1_0.spec | 4 +++ dlls/xinput9_1_0/xinput9_1_0_main.c | 39 +++++++++++++++++++++++++++++++++++ 6 files changed, 95 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 632b942..cd1c461 100755 --- a/configure +++ b/configure @@ -26842,6 +26842,14 @@ dlls/xinput1_3/Makefile: dlls/xinput1_3/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/xinput1_3/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/xinput9_1_0/Makefile" +test "x$enable_xinput9_1_0" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + xinput9_1_0" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/xinput9_1_0/Makefile: dlls/xinput9_1_0/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/xinput9_1_0/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ documentation/Makefile" test "x$enable_documentation" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ documentation" @@ -28374,6 +28382,7 @@ do "dlls/wsock32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wsock32/Makefile" ;; "dlls/wtsapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wtsapi32/Makefile" ;; "dlls/xinput1_3/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_3/Makefile" ;; + "dlls/xinput9_1_0/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput9_1_0/Makefile" ;; "documentation/Makefile") CONFIG_FILES="$CONFIG_FILES documentation/Makefile" ;; "fonts/Makefile") CONFIG_FILES="$CONFIG_FILES fonts/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; diff --git a/configure.ac b/configure.ac index 663df14..4756cd1 100644 --- a/configure.ac +++ b/configure.ac @@ -2095,6 +2095,7 @@ WINE_CONFIG_MAKEFILE([dlls/ws2_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ WINE_CONFIG_MAKEFILE([dlls/wsock32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wtsapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput1_3/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/xinput9_1_0/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([fonts/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([include/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in new file mode 100644 index 0000000..f63d2c1 --- /dev/null +++ b/dlls/xinput9_1_0/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = xinput9_1_0.dll +IMPORTS = kernel32 + +C_SRCS = \ + xinput9_1_0_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/xinput9_1_0/version.rc b/dlls/xinput9_1_0/version.rc new file mode 100644 index 0000000..9e4d13e --- /dev/null +++ b/dlls/xinput9_1_0/version.rc @@ -0,0 +1,27 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Common Controller API" +#define WINE_FILENAME_STR "xinput9_1_0.dll" +#define WINE_FILEVERSION 9,10,455,0000 +#define WINE_FILEVERSION_STR "9.10.455.0000" +#define WINE_PRODUCTVERSION 9,10,455,0000 +#define WINE_PRODUCTVERSION_STR "9.10" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/xinput9_1_0/xinput9_1_0.spec b/dlls/xinput9_1_0/xinput9_1_0.spec new file mode 100644 index 0000000..5d95b3e --- /dev/null +++ b/dlls/xinput9_1_0/xinput9_1_0.spec @@ -0,0 +1,4 @@ +@ stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities +@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) xinput1_3.XInputGetDSoundAudioDeviceGuids +@ stdcall XInputSetState(long ptr) xinput1_3.XInputSetState +@ stdcall XInputGetState(long ptr) xinput1_3.XInputGetState diff --git a/dlls/xinput9_1_0/xinput9_1_0_main.c b/dlls/xinput9_1_0/xinput9_1_0_main.c new file mode 100644 index 0000000..18cde9e --- /dev/null +++ b/dlls/xinput9_1_0/xinput9_1_0_main.c @@ -0,0 +1,39 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * 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; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +}

1 0

Andrew Fenn : xinput1_1: Initial implementation.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 68ede59fa5d174336328906049980a9fe28b3d52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68ede59fa5d17433632890604… Author: Andrew Fenn <andrewfenn(a)gmail.com> Date: Mon Nov 10 16:29:29 2008 +0000 xinput1_1: Initial implementation. --- configure | 9 +++++++++ configure.ac | 1 + dlls/xinput1_1/Makefile.in | 15 +++++++++++++++ dlls/xinput1_1/version.rc | 27 +++++++++++++++++++++++++++ dlls/xinput1_1/xinput1_1.spec | 5 +++++ dlls/xinput1_1/xinput1_1_main.c | 39 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 96 insertions(+), 0 deletions(-) diff --git a/configure b/configure index cd1c461..0f74b21 100755 --- a/configure +++ b/configure @@ -26834,6 +26834,14 @@ dlls/wtsapi32/Makefile: dlls/wtsapi32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wtsapi32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/xinput1_1/Makefile" +test "x$enable_xinput1_1" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + xinput1_1" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/xinput1_1/Makefile: dlls/xinput1_1/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/xinput1_1/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/xinput1_3/Makefile" test "x$enable_xinput1_3" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ xinput1_3" @@ -28381,6 +28389,7 @@ do "dlls/ws2_32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ws2_32/tests/Makefile" ;; "dlls/wsock32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wsock32/Makefile" ;; "dlls/wtsapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wtsapi32/Makefile" ;; + "dlls/xinput1_1/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_1/Makefile" ;; "dlls/xinput1_3/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_3/Makefile" ;; "dlls/xinput9_1_0/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput9_1_0/Makefile" ;; "documentation/Makefile") CONFIG_FILES="$CONFIG_FILES documentation/Makefile" ;; diff --git a/configure.ac b/configure.ac index 4756cd1..45531a3 100644 --- a/configure.ac +++ b/configure.ac @@ -2094,6 +2094,7 @@ WINE_CONFIG_MAKEFILE([dlls/ws2_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/ws2_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wsock32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wtsapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/xinput1_1/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput1_3/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput9_1_0/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in new file mode 100644 index 0000000..04670f5 --- /dev/null +++ b/dlls/xinput1_1/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = xinput1_1.dll +IMPORTS = kernel32 + +C_SRCS = \ + xinput1_1_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/xinput1_1/version.rc b/dlls/xinput1_1/version.rc new file mode 100644 index 0000000..e93aa90 --- /dev/null +++ b/dlls/xinput1_1/version.rc @@ -0,0 +1,27 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Common Controller API" +#define WINE_FILENAME_STR "xinput1_1.dll" +#define WINE_FILEVERSION 9,12,589,0000 +#define WINE_FILEVERSION_STR "9.12.589.0000" +#define WINE_PRODUCTVERSION 9,12,589,0000 +#define WINE_PRODUCTVERSION_STR "9.12" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/xinput1_1/xinput1_1.spec b/dlls/xinput1_1/xinput1_1.spec new file mode 100644 index 0000000..95759c3 --- /dev/null +++ b/dlls/xinput1_1/xinput1_1.spec @@ -0,0 +1,5 @@ +@ stdcall XInputEnable(long) xinput1_3.XInputEnable +@ stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities +@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) xinput1_3.XInputGetDSoundAudioDeviceGuids +@ stdcall XInputSetState(long ptr) xinput1_3.XInputSetState +@ stdcall XInputGetState(long ptr) xinput1_3.XInputGetState diff --git a/dlls/xinput1_1/xinput1_1_main.c b/dlls/xinput1_1/xinput1_1_main.c new file mode 100644 index 0000000..18cde9e --- /dev/null +++ b/dlls/xinput1_1/xinput1_1_main.c @@ -0,0 +1,39 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * 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; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +}

1 0

Andrew Fenn : xinput1_3: Initial implementation.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 457a22deac90ba47a785d09cf4c6d53991287794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=457a22deac90ba47a785d09cf… Author: Andrew Fenn <andrewfenn(a)gmail.com> Date: Mon Nov 10 16:22:35 2008 +0000 xinput1_3: Initial implementation. --- .gitignore | 1 + configure | 9 +++++++ configure.ac | 1 + dlls/Makefile.in | 19 +++++++++++++-- dlls/xinput1_3/Makefile.in | 16 +++++++++++++ dlls/xinput1_3/version.rc | 27 +++++++++++++++++++++++ dlls/xinput1_3/xinput1_3.spec | 7 ++++++ dlls/xinput1_3/xinput1_3_main.c | 45 +++++++++++++++++++++++++++++++++++++++ 8 files changed, 122 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1caea1b..afd7219 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,7 @@ dlls/keyboard.drv16 dlls/krnl386.exe16 dlls/libd3dx9.def dlls/libwinspool.def +dlls/libxinput.def dlls/lzexpand.dll16 dlls/mmsystem.dll16 dlls/mouse.drv16 diff --git a/configure b/configure index 6918414..632b942 100755 --- a/configure +++ b/configure @@ -26834,6 +26834,14 @@ dlls/wtsapi32/Makefile: dlls/wtsapi32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wtsapi32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/xinput1_3/Makefile" +test "x$enable_xinput1_3" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + xinput1_3" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/xinput1_3/Makefile: dlls/xinput1_3/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/xinput1_3/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ documentation/Makefile" test "x$enable_documentation" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ documentation" @@ -28365,6 +28373,7 @@ do "dlls/ws2_32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ws2_32/tests/Makefile" ;; "dlls/wsock32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wsock32/Makefile" ;; "dlls/wtsapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wtsapi32/Makefile" ;; + "dlls/xinput1_3/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_3/Makefile" ;; "documentation/Makefile") CONFIG_FILES="$CONFIG_FILES documentation/Makefile" ;; "fonts/Makefile") CONFIG_FILES="$CONFIG_FILES fonts/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; diff --git a/configure.ac b/configure.ac index e83ee37..663df14 100644 --- a/configure.ac +++ b/configure.ac @@ -2094,6 +2094,7 @@ WINE_CONFIG_MAKEFILE([dlls/ws2_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/ws2_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wsock32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wtsapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/xinput1_3/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([fonts/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([include/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 69d30b9..56e0506 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -165,7 +165,8 @@ STATIC_IMPLIBEXT = $(IMPLIBEXT:def=def.a) IMPORT_SYMLINKS = \ libd3dx9.$(IMPLIBEXT) \ - libwinspool.$(IMPLIBEXT) + libwinspool.$(IMPLIBEXT) \ + libxinput.$(IMPLIBEXT) IMPORT_LIBS = \ $(IMPORT_SYMLINKS) \ @@ -311,11 +312,13 @@ IMPORT_LIBS = \ wow32/libwow32.$(IMPLIBEXT) \ ws2_32/libws2_32.$(IMPLIBEXT) \ wsock32/libwsock32.$(IMPLIBEXT) \ - wtsapi32/libwtsapi32.$(IMPLIBEXT) + wtsapi32/libwtsapi32.$(IMPLIBEXT) \ + xinput1_3/libxinput.$(IMPLIBEXT) CROSS_IMPLIBS = \ libd3dx9.a \ libwinspool.a \ + libxinput.a \ activeds/libactiveds.a \ advapi32/libadvapi32.a \ advpack/libadvpack.a \ @@ -449,7 +452,8 @@ CROSS_IMPLIBS = \ wow32/libwow32.a \ ws2_32/libws2_32.a \ wsock32/libwsock32.a \ - wtsapi32/libwtsapi32.a + wtsapi32/libwtsapi32.a \ + xinput1_3/libxinput.a $(TESTSUBDIRS:%=%/__crosstest__): $(CROSS_IMPLIBS) @@ -865,6 +869,9 @@ wsock32/libwsock32.def wsock32/libwsock32.a: wsock32/wsock32.spec $(WINEBUILD) wtsapi32/libwtsapi32.def wtsapi32/libwtsapi32.a: wtsapi32/wtsapi32.spec $(WINEBUILD) @cd wtsapi32 && $(MAKE) `basename $@` +xinput1_3/libxinput.def xinput1_3/libxinput.a: xinput1_3/xinput1_3.spec $(WINEBUILD) + @cd xinput1_3 && $(MAKE) `basename $@` + libd3dx9.a: d3dx9_36/libd3dx9.a $(RM) $@ && $(LN_S) d3dx9_36/libd3dx9.a $@ @@ -877,6 +884,12 @@ libwinspool.a: winspool.drv/libwinspool.a libwinspool.def: winspool.drv/libwinspool.def $(RM) $@ && $(LN_S) winspool.drv/libwinspool.def $@ +libxinput.a: xinput1_3/libxinput.a + $(RM) $@ && $(LN_S) xinput1_3/libxinput.a $@ + +libxinput.def: xinput1_3/libxinput.def + $(RM) $@ && $(LN_S) xinput1_3/libxinput.def $@ + $(BUILDSUBDIRS): $(IMPORT_LIBS) $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__): $(IMPORT_LIBS) diff --git a/dlls/xinput1_3/Makefile.in b/dlls/xinput1_3/Makefile.in new file mode 100644 index 0000000..7e8f571 --- /dev/null +++ b/dlls/xinput1_3/Makefile.in @@ -0,0 +1,16 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = xinput1_3.dll +IMPORTLIB = xinput +IMPORTS = kernel32 + +C_SRCS = \ + xinput1_3_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/xinput1_3/version.rc b/dlls/xinput1_3/version.rc new file mode 100644 index 0000000..191b142 --- /dev/null +++ b/dlls/xinput1_3/version.rc @@ -0,0 +1,27 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Common Controller API" +#define WINE_FILENAME_STR "xinput1_3.dll" +#define WINE_FILEVERSION 9,15,779,0000 +#define WINE_FILEVERSION_STR "9.15.779.0000" +#define WINE_PRODUCTVERSION 9,15,779,0000 +#define WINE_PRODUCTVERSION_STR "9.15" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/xinput1_3/xinput1_3.spec b/dlls/xinput1_3/xinput1_3.spec new file mode 100644 index 0000000..5caaa37 --- /dev/null +++ b/dlls/xinput1_3/xinput1_3.spec @@ -0,0 +1,7 @@ +@ stub XInputEnable #(long) +@ stub XInputSetState #(long ptr) +@ stub XInputGetState #(long ptr) +@ stub XInputGetKeystroke #(long long ptr) +@ stub XInputGetCapabilities #(long long ptr) +@ stub XInputGetDSoundAudioDeviceGuids #(long ptr ptr) +@ stub XInputGetBatteryInformation diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c new file mode 100644 index 0000000..6198b3b --- /dev/null +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -0,0 +1,45 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * 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 <assert.h> +#include <stdarg.h> +#include <string.h> + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winerror.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xinput); + +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; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +}

1 0

Alexandre Julliard : kernel32: Implemented the Ex variants of CreateEvent/ Mutex/Semaphore/WaitableTimer.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: c1d2d86be7d3f487906faced9ecb549ecfdb7285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1d2d86be7d3f487906faced9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 11 12:17:05 2008 +0100 kernel32: Implemented the Ex variants of CreateEvent/Mutex/Semaphore/WaitableTimer. --- dlls/kernel32/kernel32.spec | 8 +++ dlls/kernel32/sync.c | 131 +++++++++++++++++++++++++++++++++++-------- include/winbase.h | 18 ++++++ 3 files changed, 134 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1d2d86be7d3f487906fa…

1 0

Kai Blin : advapi32: Implement LsaSetSecret stub.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: b740819e30cab90036cadc50dd0c78e6178943e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b740819e30cab90036cadc50d… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue Nov 11 08:12:23 2008 +0100 advapi32: Implement LsaSetSecret stub. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/lsa.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index cb4dd4d..ec924ff 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -397,7 +397,7 @@ @ stdcall LsaSetInformationPolicy(long long ptr) @ stub LsaSetInformationTrustedDomain # @ stub LsaSetQuotasForAccount -@ stub LsaSetSecret +@ stdcall LsaSetSecret(ptr ptr ptr) # @ stub LsaSetSecurityObject @ stub LsaSetSystemAccessAccount @ stdcall LsaSetTrustedDomainInfoByName(ptr ptr long ptr) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 5a136b6..cb1a6f3 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -624,6 +624,30 @@ NTSTATUS WINAPI LsaSetInformationPolicy( } /****************************************************************************** + * LsaSetSecret [ADVAPI32.@] + * + * Set old and new values on a secret handle + * + * PARAMS + * SecretHandle [I] Handle to a secret object. + * EncryptedCurrentValue [I] Pointer to encrypted new value, can be NULL + * EncryptedOldValue [I] Pointer to encrypted old value, can be NULL + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: NTSTATUS code. + */ +NTSTATUS WINAPI LsaSetSecret( + IN LSA_HANDLE SecretHandle, + IN PLSA_UNICODE_STRING EncryptedCurrentValue, + IN PLSA_UNICODE_STRING EncryptedOldValue) +{ + FIXME("(%p,%p,%p) stub\n", SecretHandle, EncryptedCurrentValue, + EncryptedOldValue); + return STATUS_SUCCESS; +} + +/****************************************************************************** * LsaSetTrustedDomainInfoByName [ADVAPI32.@] * */

1 0

Hans Leidekker : inetcomm: Get rid of the server info copy.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 2c594fb79cc3df41daa84df72fb137e8153b2aaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c594fb79cc3df41daa84df72… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 11 10:17:58 2008 +0100 inetcomm: Get rid of the server info copy. --- dlls/inetcomm/pop3transport.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index 511a14b..30dd187 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -47,7 +47,6 @@ typedef struct { InternetTransport InetTransport; ULONG refs; - INETSERVER server; POP3COMMAND command; POP3CMDTYPE type; char *response; @@ -671,11 +670,11 @@ static void POP3Transport_CallbackProcessUSERResp(IInternetTransport *iface, cha IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); - len = sizeof(pass) + strlen(This->server.szPassword) + 2; /* "\r\n" */ + len = sizeof(pass) + strlen(This->InetTransport.ServerInfo.szPassword) + 2; /* "\r\n" */ command = HeapAlloc(GetProcessHeap(), 0, len); strcpy(command, pass); - strcat(command, This->server.szPassword); + strcat(command, This->InetTransport.ServerInfo.szPassword); strcat(command, "\r\n"); init_parser(This, POP3_PASS, POP3_NONE); @@ -701,11 +700,11 @@ static void POP3Transport_CallbackSendUSERCmd(IInternetTransport *iface, char *p TRACE("\n"); - len = sizeof(user) + strlen(This->server.szUserName) + 2; /* "\r\n" */ + len = sizeof(user) + strlen(This->InetTransport.ServerInfo.szUserName) + 2; /* "\r\n" */ command = HeapAlloc(GetProcessHeap(), 0, len); strcpy(command, user); - strcat(command, This->server.szUserName); + strcat(command, This->InetTransport.ServerInfo.szUserName); strcat(command, "\r\n"); InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvUSERResp); @@ -820,8 +819,6 @@ static HRESULT WINAPI POP3Transport_Connect(IPOP3Transport *iface, return hr; init_parser(This, POP3_USER, POP3_NONE); - - This->server = *pInetServer; return InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackSendUSERCmd); }

1 0

Hans Leidekker : inetcomm: Add an implementation of IVirtualStream.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 55b086b24e38e7f0bc0579daa433a9a7a895005e URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b086b24e38e7f0bc0579daa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 11 10:17:38 2008 +0100 inetcomm: Add an implementation of IVirtualStream. --- dlls/inetcomm/inetcomm_main.c | 5 +++++ dlls/inetcomm/inetcomm_private.h | 1 + dlls/inetcomm/mimeole.c | 10 ++++++++++ dlls/inetcomm/regsvr.c | 6 ++++++ 4 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/inetcomm/inetcomm_main.c b/dlls/inetcomm/inetcomm_main.c index 1d71877..22f1919 100644 --- a/dlls/inetcomm/inetcomm_main.c +++ b/dlls/inetcomm/inetcomm_main.c @@ -139,6 +139,7 @@ static cf mime_body_cf = { &cf_vtbl, MimeBody_create }; static cf mime_allocator_cf = { &cf_vtbl, MimeAllocator_create }; static cf mime_message_cf = { &cf_vtbl, MimeMessage_create }; static cf mime_security_cf = { &cf_vtbl, MimeSecurity_create }; +static cf virtual_stream_cf = { &cf_vtbl, VirtualStream_create }; /*********************************************************************** * DllGetClassObject (INETCOMM.@) @@ -177,6 +178,10 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { cf = (IClassFactory*) &mime_allocator_cf.lpVtbl; } + else if( IsEqualCLSID( rclsid, &CLSID_IVirtualStream )) + { + cf = (IClassFactory*) &virtual_stream_cf.lpVtbl; + } if ( !cf ) { diff --git a/dlls/inetcomm/inetcomm_private.h b/dlls/inetcomm/inetcomm_private.h index 589f92c..1d752c0 100644 --- a/dlls/inetcomm/inetcomm_private.h +++ b/dlls/inetcomm/inetcomm_private.h @@ -77,6 +77,7 @@ HRESULT MimeBody_create(IUnknown *outer, void **obj); HRESULT MimeAllocator_create(IUnknown *outer, void **obj); HRESULT MimeMessage_create(IUnknown *outer, void **obj); HRESULT MimeSecurity_create(IUnknown *outer, void **obj); +HRESULT VirtualStream_create(IUnknown *outer, void **obj); HRESULT MimeInternational_Construct(IMimeInternational **internat); diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 07aa6bd..bcc08dc 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2989,3 +2989,13 @@ HRESULT WINAPI MimeOleGetAllocator(IMimeAllocator **alloc) { return MimeAllocator_create(NULL, (void**)alloc); } + +HRESULT VirtualStream_create(IUnknown *outer, void **obj) +{ + FIXME("(%p, %p)\n", outer, obj); + + *obj = NULL; + if (outer) return CLASS_E_NOAGGREGATION; + + return MimeOleCreateVirtualStream((IStream **)obj); +} diff --git a/dlls/inetcomm/regsvr.c b/dlls/inetcomm/regsvr.c index 4c7310c..8ac982e 100644 --- a/dlls/inetcomm/regsvr.c +++ b/dlls/inetcomm/regsvr.c @@ -464,6 +464,12 @@ static struct regsvr_coclass const coclass_list[] = { "inetcomm.dll", "Both" }, + { &CLSID_IVirtualStream, + "CLSID_IVirtualStream", + NULL, + "inetcomm.dll", + "Both" + }, { NULL } /* list terminator */ };

1 0

Paul Vriens : urlmon/tests: Fix failures on Win9x and WinMe.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 0a11bd813a14490485e62bc03a71175191c97159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a11bd813a14490485e62bc03… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 11 10:54:54 2008 +0100 urlmon/tests: Fix failures on Win9x and WinMe. --- dlls/urlmon/tests/url.c | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index e2cc084..48c2513 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -147,8 +147,10 @@ static const WCHAR wszWineHQSite[] = {'w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR wszWineHQIP[] = {'2','0','9','.','3','2','.','1','4','1','.','3',0}; +static const CHAR wszIndexHtmlA[] = "index.html"; static const WCHAR wszIndexHtml[] = {'i','n','d','e','x','.','h','t','m','l',0}; static const WCHAR cache_fileW[] = {'c',':','\\','c','a','c','h','e','.','h','t','m',0}; +static const CHAR dwl_htmlA[] = "dwl.html"; static const WCHAR dwl_htmlW[] = {'d','w','l','.','h','t','m','l',0}; static const WCHAR emptyW[] = {0}; @@ -2401,7 +2403,7 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul) CHECK_CALLED(OnStopBinding); } - res = DeleteFileW(dwl_htmlW); + res = DeleteFileA(dwl_htmlA); ok(res, "DeleteFile failed: %u\n", GetLastError()); if(prot != FILE_TEST || emul) @@ -2410,35 +2412,33 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul) hres = URLDownloadToFileW(NULL, urls[test_protocol], dwl_htmlW, 0, NULL); ok(hres == S_OK, "URLDownloadToFile failed: %08x\n", hres); - res = DeleteFileW(dwl_htmlW); + res = DeleteFileA(dwl_htmlA); ok(res, "DeleteFile failed: %u\n", GetLastError()); } -static void set_file_url(void) +static void set_file_url(char *path) { - int len; + CHAR file_urlA[INTERNET_MAX_URL_LENGTH]; + CHAR INDEX_HTMLA[MAX_PATH]; - static const WCHAR wszFile[] = {'f','i','l','e',':','/','/'}; + lstrcpyA(file_urlA, "file:///"); + lstrcatA(file_urlA, path); + MultiByteToWideChar(CP_ACP, 0, file_urlA, -1, file_url, INTERNET_MAX_URL_LENGTH); - memcpy(file_url, wszFile, sizeof(wszFile)); - len = sizeof(wszFile)/sizeof(WCHAR); - file_url[len++] = '/'; - len += GetCurrentDirectoryW(sizeof(file_url)/sizeof(WCHAR)-len, file_url+len); - file_url[len++] = '\\'; - memcpy(file_url+len, wszIndexHtml, sizeof(wszIndexHtml)); - - memcpy(INDEX_HTML, wszFile, sizeof(wszIndexHtml)); - memmove(INDEX_HTML+7, file_url+8, (lstrlenW(file_url+8)+1)*sizeof(WCHAR)); + lstrcpyA(INDEX_HTMLA, "file://"); + lstrcatA(INDEX_HTMLA, path); + MultiByteToWideChar(CP_ACP, 0, INDEX_HTMLA, -1, INDEX_HTML, MAX_PATH); } static void create_file(void) { HANDLE file; DWORD size; + CHAR path[MAX_PATH]; static const char html_doc[] = "<HTML></HTML>"; - file = CreateFileW(wszIndexHtml, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + file = CreateFileA(wszIndexHtmlA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); if(file == INVALID_HANDLE_VALUE) @@ -2447,7 +2447,10 @@ static void create_file(void) WriteFile(file, html_doc, sizeof(html_doc)-1, &size, NULL); CloseHandle(file); - set_file_url(); + GetCurrentDirectoryA(MAX_PATH, path); + lstrcatA(path, "\\"); + lstrcatA(path, wszIndexHtmlA); + set_file_url(path); } static void test_ReportResult(HRESULT exhres) @@ -2665,7 +2668,7 @@ START_TEST(url) trace("test failures...\n"); test_BindToStorage_fail(); - DeleteFileW(wszIndexHtml); + DeleteFileA(wszIndexHtmlA); CloseHandle(complete_event); CloseHandle(complete_event2); CoUninitialize();

1 0