Ros-diffs April 2013

ros-diffs@reactos.org

14 participants
265 discussions

[akhaldi] 58776: [WINHLP32] * Sync with Wine 1.5.26.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 18 11:34:29 2013 New Revision: 58776 URL: http://svn.reactos.org/svn/reactos?rev=58776&view=rev Log: [WINHLP32] * Sync with Wine 1.5.26. Added: trunk/reactos/base/applications/winhlp32/macro.lex.yy.c - copied, changed from r58750, trunk/reactos/base/applications/winhlp32/lex.yy.c Removed: trunk/reactos/base/applications/winhlp32/lex.yy.c Modified: trunk/reactos/base/applications/winhlp32/CMakeLists.txt trunk/reactos/base/applications/winhlp32/callback.c trunk/reactos/base/applications/winhlp32/hlpfile.c trunk/reactos/base/applications/winhlp32/hlpfile.h trunk/reactos/base/applications/winhlp32/macro.c trunk/reactos/base/applications/winhlp32/macro.lex.l trunk/reactos/base/applications/winhlp32/winhelp.c trunk/reactos/base/applications/winhlp32/winhelp_res.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/winhlp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/hlpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/hlpfile.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Removed: trunk/reactos/base/applications/winhlp32/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/macro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/macro.lex.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Copied: trunk/reactos/base/applications/winhlp32/macro.lex.yy.c (from r58750, trunk/reactos/base/applications/winhlp32/lex.yy.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/winhelp_res.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

11 years, 8 months

[tkreuzer] 58775: [NTOSKRNL] Fix KiRaiseAssertion on amd64

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Apr 17 06:05:14 2013 New Revision: 58775 URL: http://svn.reactos.org/svn/reactos?rev=58775&view=rev Log: [NTOSKRNL] Fix KiRaiseAssertion on amd64 Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/trap.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Wed Apr 17 06:05:14 2013 @@ -224,7 +224,7 @@ KiBreakpointTrapKMode: /* Dispatch the exception */ - DispatchException STATUS_BREAKPOINT, 3, 0, 0, 0 + DispatchException STATUS_BREAKPOINT, 3, BREAKPOINT_BREAK, 0, 0 /* Return */ ExitTrap TF_SAVE_ALL @@ -534,7 +534,7 @@ PUBLIC KiRaiseAssertion FUNC KiRaiseAssertion /* We have an error code */ - EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) + EnterTrap (TF_SAVE_ALL) /* Decrement RIP to point to the INT2C instruction (2 bytes, not 1 like INT3) */ sub qword ptr [rbp + KTRAP_FRAME_Rip], 2

11 years, 8 months

[akhaldi] 58774: [DINPUT8] * Sync with Wine 1.5.26.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Apr 16 20:33:34 2013 New Revision: 58774 URL: http://svn.reactos.org/svn/reactos?rev=58774&view=rev Log: [DINPUT8] * Sync with Wine 1.5.26. Added: trunk/reactos/dll/directx/dinput8/dinput8.idl (with props) trunk/reactos/dll/directx/dinput8/dinput8.rgs (with props) Removed: trunk/reactos/dll/directx/dinput8/regsvr.c Modified: trunk/reactos/dll/directx/dinput8/CMakeLists.txt trunk/reactos/dll/directx/dinput8/dinput8_main.c trunk/reactos/dll/directx/dinput8/version.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/dinput8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput8/CMakeL… ============================================================================== --- trunk/reactos/dll/directx/dinput8/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput8/CMakeLists.txt [iso-8859-1] Tue Apr 16 20:33:34 2013 @@ -1,36 +1,17 @@ - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(dinput8.dll dinput8.spec ADD_IMPORTLIB) add_library(dinput8 SHARED dinput8_main.c - regsvr.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/dinput8.def) set_module_type(dinput8 win32dll UNICODE) - -target_link_libraries(dinput8 - dxguid - uuid - wine) - -add_importlibs(dinput8 - msvcrt - user32 - advapi32 - ole32 - winmm - dinput - kernel32 - ntdll) - -add_dependencies(dinput8 psdk) - +target_link_libraries(dinput8 dxguid uuid wine) +add_importlibs(dinput8 dinput ole32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET dinput8 DESTINATION reactos/system32 FOR all) - Added: trunk/reactos/dll/directx/dinput8/dinput8.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput8/dinput… ============================================================================== --- trunk/reactos/dll/directx/dinput8/dinput8.idl (added) +++ trunk/reactos/dll/directx/dinput8/dinput8.idl [iso-8859-1] Tue Apr 16 20:33:34 2013 @@ -1,0 +1,33 @@ +/* + * COM Classes for dinput8 + * + * Copyright 2010 Alexandre Julliard + * + * 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 + */ + +[ + helpstring("DirectInput8 Object"), + threading(both), + uuid(25e609e4-b259-11cf-bfc7-444553540000) +] +coclass DirectInput8 { interface IDirectInput8; } + +[ + helpstring("DirectInputDevice8 Object"), + threading(both), + uuid(25e609e5-b259-11cf-bfc7-444553540000) +] +coclass DirectInputDevice { interface IDirectInputDevice8; } Propchange: trunk/reactos/dll/directx/dinput8/dinput8.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/dinput8/dinput8.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput8/dinput… ============================================================================== --- trunk/reactos/dll/directx/dinput8/dinput8.rgs (added) +++ trunk/reactos/dll/directx/dinput8/dinput8.rgs [iso-8859-1] Tue Apr 16 20:33:34 2013 @@ -1,0 +1,17 @@ +HKCR +{ + NoRemove Interface + { + } + NoRemove CLSID + { + '{25E609E4-B259-11CF-BFC7-444553540000}' = s 'DirectInput8 Object' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + '{25E609E5-B259-11CF-BFC7-444553540000}' = s 'DirectInputDevice8 Object' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + } +} Propchange: trunk/reactos/dll/directx/dinput8/dinput8.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/dinput8/dinput8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput8/dinput… ============================================================================== --- trunk/reactos/dll/directx/dinput8/dinput8_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput8/dinput8_main.c [iso-8859-1] Tue Apr 16 20:33:34 2013 @@ -32,9 +32,13 @@ //#include "windef.h" #include <winbase.h> //#include "winerror.h" +#include <objbase.h> +#include <rpcproxy.h> #include <dinput.h> WINE_DEFAULT_DEBUG_CHANNEL(dinput); + +static HINSTANCE instance; static LONG dll_count; /* @@ -53,37 +57,65 @@ /****************************************************************************** * DirectInput8Create (DINPUT8.@) */ -HRESULT WINAPI DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) { - HRESULT hr; +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) { + IDirectInputA *pDI; + HRESULT hr, hrCo; TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p))\n", hinst, dwVersion, debugstr_guid(riid), punkOuter); - /* The specified version needs to be dinput8 (0x800) or higher */ - if(dwVersion < 0x800) - return DIERR_OLDDIRECTINPUTVERSION; - - if( !(IsEqualGUID(&IID_IDirectInput8A, riid) || IsEqualGUID(&IID_IDirectInput8W, riid) || IsEqualGUID(&IID_IUnknown, riid)) ) - return DIERR_INVALIDPARAM; - - CoInitialize(NULL); - - hr = CoCreateInstance( &CLSID_DirectInput8, punkOuter, CLSCTX_INPROC_SERVER, riid, ppDI); - if(FAILED(hr)) { - ERR("CoCreateInstance failed with hr = %d; Try running wineprefixcreate to fix it.\n", hr); - return DIERR_INVALIDPARAM; - } - - CoUninitialize(); + if (!ppDI) + return E_POINTER; + + if (!IsEqualGUID(&IID_IDirectInput8A, riid) && + !IsEqualGUID(&IID_IDirectInput8W, riid) && + !IsEqualGUID(&IID_IUnknown, riid)) + { + *ppDI = NULL; + return DIERR_NOINTERFACE; + } + + hrCo = CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&pDI); + + /* Ensure balance of calls. */ + if (SUCCEEDED(hrCo)) + CoUninitialize(); + + if (FAILED(hr)) { + ERR("CoCreateInstance failed with hr = 0x%08x\n", hr); + return hr; + } + + hr = IDirectInput_QueryInterface(pDI, riid, ppDI); + IDirectInput_Release(pDI); + + if (FAILED(hr)) + return hr; /* When aggregation is used (punkOuter!=NULL) the application needs to manually call Initialize. */ if(punkOuter == NULL && IsEqualGUID(&IID_IDirectInput8A, riid)) { - LPDIRECTINPUTA DI = *ppDI; - IDirectInput8_Initialize(DI, hinst, dwVersion); + IDirectInput8A *DI = *ppDI; + + hr = IDirectInput8_Initialize(DI, hinst, dwVersion); + if (FAILED(hr)) + { + IDirectInput8_Release(DI); + *ppDI = NULL; + return hr; + } } if(punkOuter == NULL && IsEqualGUID(&IID_IDirectInput8W, riid)) { - LPDIRECTINPUTW DI = *ppDI; - IDirectInput8_Initialize(DI, hinst, dwVersion); + IDirectInput8W *DI = *ppDI; + + hr = IDirectInput8_Initialize(DI, hinst, dwVersion); + if (FAILED(hr)) + { + IDirectInput8_Release(DI); + *ppDI = NULL; + return hr; + } } return S_OK; @@ -95,11 +127,16 @@ typedef struct { /* IUnknown fields */ - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + static HRESULT WINAPI DI8CF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("%p %s %p\n",This,debugstr_guid(riid),ppobj); return E_NOINTERFACE; } @@ -115,11 +152,21 @@ } static HRESULT WINAPI DI8CF_CreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); if( IsEqualGUID( &IID_IDirectInput8A, riid ) || IsEqualGUID( &IID_IDirectInput8W, riid ) || IsEqualGUID( &IID_IUnknown, riid )) { - return DirectInputCreateEx(0, DIRECTINPUT_VERSION, riid, ppobj, pOuter); + IDirectInputA *ppDI; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&ppDI); + if (FAILED(hr)) + return hr; + + hr = IDirectInput_QueryInterface(ppDI, riid, ppobj); + IDirectInput_Release(ppDI); + + return hr; } ERR("(%p,%p,%s,%p) Interface not found!\n",This,pOuter,debugstr_guid(riid),ppobj); @@ -144,7 +191,7 @@ DI8CF_CreateInstance, DI8CF_LockServer }; -static IClassFactoryImpl DINPUT8_CF = { &DI8CF_Vtbl }; +static IClassFactoryImpl DINPUT8_CF = { { &DI8CF_Vtbl } }; /*********************************************************************** @@ -170,3 +217,34 @@ FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; } + +/*********************************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hInstDLL; + DisableThreadLibraryCalls( hInstDLL ); + break; + } + return TRUE; +} + +/*********************************************************************** + * DllRegisterServer (DINPUT8.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( instance ); +} + +/*********************************************************************** + * DllUnregisterServer (DINPUT8.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( instance ); +} Removed: trunk/reactos/dll/directx/dinput8/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput8/regsvr… ============================================================================== --- trunk/reactos/dll/directx/dinput8/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput8/regsvr.c (removed) @@ -1,298 +1,0 @@ -/* - * self-registerable dll functions for dinput8.dll - * - * Copyright (C) 2003 John K. Hohm - * Copyright (C) 2007 Francois Gouget for CodeWeavers - * - * 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 WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <string.h> - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -//#include "wingdi.h" -//#include "winuser.h" -//#include "winerror.h" - -#include <dinput.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(dinput); - -/* - * Near the bottom of this file are the exported DllRegisterServer and - * DllUnregisterServer, which make all this worthwhile. - */ - -/*********************************************************************** - * interface for self-registering - */ - -struct regsvr_coclass -{ - CLSID const *clsid; /* NULL for end of list */ - LPCSTR name; /* can be NULL to omit */ - LPCSTR ips; /* can be NULL to omit */ - LPCSTR ips32; /* can be NULL to omit */ - LPCSTR ips32_tmodel; /* can be NULL to omit */ - LPCSTR clsid_str; /* can be NULL to omit */ - LPCSTR progid; /* can be NULL to omit */ -}; - -static HRESULT register_coclasses(struct regsvr_coclass const *list); -static HRESULT unregister_coclasses(struct regsvr_coclass const *list); - -/*********************************************************************** - * static string constants - */ -static WCHAR const interface_keyname[10] = { - 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; -static WCHAR const base_ifa_keyname[14] = { - 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', - 'e', 0 }; -static WCHAR const num_methods_keyname[11] = { - 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 }; -static WCHAR const ps_clsid_keyname[15] = { - 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', - 'i', 'd', 0 }; -static WCHAR const ps_clsid32_keyname[17] = { - 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', - 'i', 'd', '3', '2', 0 }; -static WCHAR const clsid_keyname[6] = { - 'C', 'L', 'S', 'I', 'D', 0 }; -static WCHAR const ips_keyname[13] = { - 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', - 0 }; -static WCHAR const ips32_keyname[15] = { - 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', - '3', '2', 0 }; -static WCHAR const progid_keyname[7] = { - 'P', 'r', 'o', 'g', 'I', 'D', 0 }; -static char const tmodel_valuename[] = "ThreadingModel"; - -/*********************************************************************** - * static helper functions - */ -static LONG register_key_defvalueW(HKEY base, WCHAR const *name, - WCHAR const *value); -static LONG register_key_defvalueA(HKEY base, WCHAR const *name, - char const *value); - -/*********************************************************************** - * register_coclasses - */ -static HRESULT register_coclasses(struct regsvr_coclass const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY coclass_key; - - res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->clsid; ++list) { - WCHAR buf[39]; - HKEY clsid_key; - - StringFromGUID2(list->clsid, buf, 39); - res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - - if (list->name) { - res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, - (CONST BYTE*)(list->name), - strlen(list->name) + 1); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->ips) { - res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->ips32) { - HKEY ips32_key; - - res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, - &ips32_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, - (CONST BYTE*)list->ips32, - lstrlenA(list->ips32) + 1); - if (res == ERROR_SUCCESS && list->ips32_tmodel) - res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, - (CONST BYTE*)list->ips32_tmodel, - strlen(list->ips32_tmodel) + 1); - RegCloseKey(ips32_key); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->clsid_str) { - res = register_key_defvalueA(clsid_key, clsid_keyname, - list->clsid_str); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->progid) { - HKEY progid_key; - - res = register_key_defvalueA(clsid_key, progid_keyname, - list->progid); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = RegCreateKeyExA(HKEY_CLASSES_ROOT, list->progid, 0, - NULL, 0, KEY_READ | KEY_WRITE, NULL, - &progid_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = register_key_defvalueW(progid_key, clsid_keyname, buf); - RegCloseKey(progid_key); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - error_close_clsid_key: - RegCloseKey(clsid_key); - } - -error_close_coclass_key: - RegCloseKey(coclass_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * unregister_coclasses - */ -static HRESULT unregister_coclasses(struct regsvr_coclass const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY coclass_key; - - res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, - KEY_READ | KEY_WRITE, &coclass_key); - if (res == ERROR_FILE_NOT_FOUND) return S_OK; - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->clsid; ++list) { - WCHAR buf[39]; - - StringFromGUID2(list->clsid, buf, 39); - res = RegDeleteTreeW(coclass_key, buf); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - - if (list->progid) { - res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - } - } - -error_close_coclass_key: - RegCloseKey(coclass_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * regsvr_key_defvalueW - */ -static LONG register_key_defvalueW( - HKEY base, - WCHAR const *name, - WCHAR const *value) -{ - LONG res; - HKEY key; - - res = RegCreateKeyExW(base, name, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &key, NULL); - if (res != ERROR_SUCCESS) return res; - res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value, - (lstrlenW(value) + 1) * sizeof(WCHAR)); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * regsvr_key_defvalueA - */ -static LONG register_key_defvalueA( - HKEY base, - WCHAR const *name, - char const *value) -{ - LONG res; - HKEY key; - - res = RegCreateKeyExW(base, name, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &key, NULL); - if (res != ERROR_SUCCESS) return res; - res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value, - lstrlenA(value) + 1); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * coclass list - */ - -static struct regsvr_coclass const coclass_list[] = { - { &CLSID_DirectInput8, - "DirectInput8 Object", - NULL, - "dinput8.dll", - "Both" - }, - { NULL } /* list terminator */ -}; - -/*********************************************************************** - * DllRegisterServer (DINPUT8.@) - */ -HRESULT WINAPI DllRegisterServer(void) -{ - HRESULT hr; - - TRACE("\n"); - - hr = register_coclasses(coclass_list); - return hr; -} - -/*********************************************************************** - * DllUnregisterServer (DINPUT8.@) - */ -HRESULT WINAPI DllUnregisterServer(void) -{ - HRESULT hr; - - TRACE("\n"); - - hr = unregister_coclasses(coclass_list); - return hr; -} Modified: trunk/reactos/dll/directx/dinput8/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput8/versio… ============================================================================== --- trunk/reactos/dll/directx/dinput8/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput8/version.rc [iso-8859-1] Tue Apr 16 20:33:34 2013 @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +1 WINE_REGISTRY dinput8.rgs + #define WINE_FILEDESCRIPTION_STR "Wine DirectInput 8" #define WINE_FILENAME_STR "dinput8.dll" #define WINE_FILEVERSION 5,1,2600,881 @@ -23,4 +25,4 @@ #define WINE_PRODUCTVERSION 5,1,2600,881 #define WINE_PRODUCTVERSION_STR "5.1" -#include "wine/wine_common_ver.rc" +#include <wine/wine_common_ver.rc> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Apr 16 20:33:34 2013 @@ -29,7 +29,7 @@ reactos/dll/directx/amstream # Synced to Wine-1.3.37 reactos/dll/directx/dinput # Synced to Wine-1.5.26 -reactos/dll/directx/dinput8 # Synced to Wine-20090208 +reactos/dll/directx/dinput8 # Synced to Wine-1.5.26 reactos/dll/directx/dmusic # Synced to Wine-1.5.26 reactos/dll/directx/dplay # Synced to Wine-1.5.26 reactos/dll/directx/dplayx # Synced to Wine-1.5.26

11 years, 8 months

[jimtabor] 58773: [NtUser] - Fix Silverlight installation splash, see CORE-7036 for details.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Apr 15 23:13:41 2013 New Revision: 58773 URL: http://svn.reactos.org/svn/reactos?rev=58773&view=rev Log: [NtUser] - Fix Silverlight installation splash, see CORE-7036 for details. Modified: trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/winpos.c trunk/reactos/win32ss/user/ntuser/winpos.h Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Mon Apr 15 23:13:41 2013 @@ -1213,6 +1213,8 @@ else pt.x = Wnd->rcWindow.left; pt.y = Wnd->rcWindow.top; + + IntScreenToClient(WndOldParent, &pt); if (WndOldParent) UserReferenceObject(WndOldParent); /* Caller must deref */ Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Mon Apr 15 23:13:41 2013 @@ -137,6 +137,34 @@ } return MAKELONG(LOWORD(Delta.x), LOWORD(Delta.y)); +} + +BOOL FASTCALL +IntClientToScreen(PWND Wnd, LPPOINT lpPoint) +{ + if (Wnd && Wnd->fnid != FNID_DESKTOP ) + { + if (Wnd->ExStyle & WS_EX_LAYOUTRTL) + lpPoint->x = Wnd->rcClient.right - lpPoint->x; + else + lpPoint->x += Wnd->rcClient.left; + lpPoint->y += Wnd->rcClient.top; + } + return TRUE; +} + +BOOL FASTCALL +IntScreenToClient(PWND Wnd, LPPOINT lpPoint) +{ + if (Wnd && Wnd->fnid != FNID_DESKTOP ) + { + if (Wnd->ExStyle & WS_EX_LAYOUTRTL) + lpPoint->x = Wnd->rcClient.right - lpPoint->x; + else + lpPoint->x -= Wnd->rcClient.left; + lpPoint->y -= Wnd->rcClient.top; + } + return TRUE; } BOOL FASTCALL IsChildVisible(PWND pWnd) Modified: trunk/reactos/win32ss/user/ntuser/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.h [iso-8859-1] Mon Apr 15 23:13:41 2013 @@ -55,3 +55,5 @@ PWND FASTCALL co_WinPosWindowFromPoint(PWND ScopeWin, POINT *WinPoint, USHORT* HitTest); VOID FASTCALL co_WinPosActivateOtherWindow(PWND); PWND FASTCALL IntRealChildWindowFromPoint(PWND,LONG,LONG); +BOOL FASTCALL IntScreenToClient(PWND,LPPOINT); +BOOL FASTCALL IntClientToScreen(PWND,LPPOINT);

11 years, 8 months

[zguo] 58772: Merge in r58759 due to minimal risk of regressions and increased application compatibility.

by zguo＠svn.reactos.org

Author: zguo Date: Mon Apr 15 20:51:25 2013 New Revision: 58772 URL: http://svn.reactos.org/svn/reactos?rev=58772&view=rev Log: Merge in r58759 due to minimal risk of regressions and increased application compatibility. Modified: branches/ReactOS-0.3.15/ (props changed) branches/ReactOS-0.3.15/win32ss/gdi/eng/pdevobj.c Propchange: branches/ReactOS-0.3.15/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 15 20:51:25 2013 @@ -13,4 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:58534,58553,58561,58614,58627-58628,58633 +/trunk/reactos:58534,58553,58561,58614,58627-58628,58633,58759 Modified: branches/ReactOS-0.3.15/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/win32ss/gdi/eng/… ============================================================================== --- branches/ReactOS-0.3.15/win32ss/gdi/eng/pdevobj.c [iso-8859-1] (original) +++ branches/ReactOS-0.3.15/win32ss/gdi/eng/pdevobj.c [iso-8859-1] Mon Apr 15 20:51:25 2013 @@ -162,6 +162,15 @@ if (ppdev->gdiinfo.ulLogPixelsY == 0) ppdev->gdiinfo.ulLogPixelsY = 96; + + /* Set raster caps */ + ppdev->gdiinfo.flRaster = RC_OP_DX_OUTPUT | RC_GDI20_OUTPUT | RC_BIGFONT; + if ((ppdev->gdiinfo.ulTechnology != DT_PLOTTER) && (ppdev->gdiinfo.ulTechnology != DT_CHARSTREAM)) + ppdev->gdiinfo.flRaster |= RC_STRETCHDIB | RC_STRETCHBLT | RC_DIBTODEV | RC_DI_BITMAP | RC_BITMAP64 | RC_BITBLT; + if (ppdev->gdiinfo.ulTechnology == DT_RASDISPLAY) + ppdev->gdiinfo.flRaster |= RC_FLOODFILL; + if (ppdev->devinfo.flGraphicsCaps & GCAPS_PALMANAGED) + ppdev->gdiinfo.flRaster |= RC_PALETTE; /* Setup Palette */ ppdev->ppalSurf = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault);

11 years, 8 months

[hbelusca] 58771: [REACTOS] Here is all the deprecated code: the old CSR as well as the new one which wasn't included; the ReactOS-specific win32csr and the csr module of win32k.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Apr 15 19:46:07 2013 New Revision: 58771 URL: http://svn.reactos.org/svn/reactos?rev=58771&view=rev Log: [REACTOS] Here is all the deprecated code: the old CSR as well as the new one which wasn't included; the ReactOS-specific win32csr and the csr module of win32k. Added: trunk/reactos/deprecated/ trunk/reactos/deprecated/csr/ - copied from r58766, trunk/reactos/subsystems/csr/ trunk/reactos/deprecated/csr.c - copied unchanged from r58766, trunk/reactos/win32ss/user/ntuser/csr.c trunk/reactos/deprecated/csr.h - copied unchanged from r58766, trunk/reactos/win32ss/user/ntuser/csr.h trunk/reactos/deprecated/csrsrv/ - copied from r58766, trunk/reactos/subsystems/win32/csrss/csrsrv/ trunk/reactos/deprecated/csrsrv/include/ - copied from r58766, trunk/reactos/subsystems/win32/csrss/include/ trunk/reactos/deprecated/win32csr/ - copied from r58766, trunk/reactos/win32ss/user/win32csr/

11 years, 8 months

[hbelusca] 58770: [REACTOS] Merge of the ros-csrss branch created with a three-fold purpose: - Use the new Windows-compatible Client-Server Runtime Subsystem (csrss + csrsrv) written by Alex Ionesc...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Apr 15 19:32:00 2013 New Revision: 58770 URL: http://svn.reactos.org/svn/reactos?rev=58770&view=rev Log: [REACTOS] Merge of the ros-csrss branch created with a three-fold purpose: - Use the new Windows-compatible Client-Server Runtime Subsystem (csrss + csrsrv) written by Alex Ionescu to replace the old hacked one. Also the CSR client part, residing in ntdll, is updated. Some work also done on the dlls side, which communicate with CSR, namely kernel32. - Replace our very old win32csr.dll CSR server by the collection basesrv.dll / winsrv.dll as it is done under Windows. - Since the console subsystem is (for historical purposes on Windows) the only subsystem which exploits all the possibilities of the CSR, I decided to put it in a new CSR dll called 'consrv.dll', even if on Windows it is included together with other APIs inside the winsrv dll (since Windows NT 3.1 release) (I took the name 'consrv' from the dll where it was included in Windows NT 3.1 beta from October 1991). Some work was also done on its internal architecture (the external interface is of course unchanged for compatibility reasons) and a two-layer approach was developed, using the existing idea of console functions + GUI or TUI we already had in win32csr: * the "console server" which dialogs with the console applications, and which maintains a list of all the created consoles. * different "front-ends" corresponding to where you want to output the information (~= console hardware) (Work-In-Progress). Another idea would be to make those front-ends dynamically-loadable (instead of being compiled inside consrv). - I also fixed some parts of the console properties dialog box. More information can be found in http://www.reactos.org/archives/public/ros-dev/2013-April/016121.html CORE-122 CORE-2510 CORE-7002 #resolve #comment Committed in revision r58xxx. Added: trunk/reactos/dll/cpl/console/res/ (props changed) - copied from r58762, branches/ros-csrss/dll/cpl/console/res/ trunk/reactos/dll/win32/kernel32/client/console/ (props changed) - copied from r58762, branches/ros-csrss/dll/win32/kernel32/client/console/ trunk/reactos/dll/win32/kernel32/include/console.h - copied, changed from r58762, branches/ros-csrss/dll/win32/kernel32/include/console.h trunk/reactos/include/reactos/subsys/csr/ (props changed) - copied from r58762, branches/ros-csrss/include/reactos/subsys/csr/ trunk/reactos/include/reactos/subsys/win/basemsg.h - copied unchanged from r58762, branches/ros-csrss/include/reactos/subsys/win/basemsg.h trunk/reactos/include/reactos/subsys/win/conmsg.h - copied unchanged from r58762, branches/ros-csrss/include/reactos/subsys/win/conmsg.h trunk/reactos/include/reactos/subsys/win/console.h - copied unchanged from r58762, branches/ros-csrss/include/reactos/subsys/win/console.h trunk/reactos/include/reactos/subsys/win/winmsg.h - copied unchanged from r58762, branches/ros-csrss/include/reactos/subsys/win/winmsg.h trunk/reactos/subsystems/win/CMakeLists.txt - copied unchanged from r58762, branches/ros-csrss/subsystems/win/CMakeLists.txt trunk/reactos/subsystems/win/basesrv/CMakeLists.txt - copied unchanged from r58762, branches/ros-csrss/subsystems/win/basesrv/CMakeLists.txt trunk/reactos/subsystems/win/basesrv/api.h - copied unchanged from r58762, branches/ros-csrss/subsystems/win/basesrv/api.h trunk/reactos/subsystems/win/basesrv/basesrv.spec - copied unchanged from r58762, branches/ros-csrss/subsystems/win/basesrv/basesrv.spec trunk/reactos/subsystems/win/basesrv/dosdev.c - copied unchanged from r58762, branches/ros-csrss/subsystems/win/basesrv/dosdev.c trunk/reactos/subsystems/win/basesrv/proc.c - copied unchanged from r58762, branches/ros-csrss/subsystems/win/basesrv/proc.c trunk/reactos/subsystems/win/basesrv/sndsntry.c - copied unchanged from r58762, branches/ros-csrss/subsystems/win/basesrv/sndsntry.c trunk/reactos/subsystems/win32/csrsrv/ - copied from r58762, branches/ros-csrss/subsystems/win32/csrsrv/ trunk/reactos/win32ss/user/consrv/ (props changed) - copied from r58762, branches/ros-csrss/win32ss/user/consrv/ trunk/reactos/win32ss/user/winsrv/CMakeLists.txt - copied unchanged from r58762, branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/api.h - copied unchanged from r58762, branches/ros-csrss/win32ss/user/winsrv/api.h trunk/reactos/win32ss/user/winsrv/harderror.c - copied unchanged from r58762, branches/ros-csrss/win32ss/user/winsrv/harderror.c trunk/reactos/win32ss/user/winsrv/lang/ (props changed) - copied from r58762, branches/ros-csrss/win32ss/user/winsrv/lang/ trunk/reactos/win32ss/user/winsrv/register.c - copied unchanged from r58762, branches/ros-csrss/win32ss/user/winsrv/register.c trunk/reactos/win32ss/user/winsrv/resource.h - copied unchanged from r58762, branches/ros-csrss/win32ss/user/winsrv/resource.h trunk/reactos/win32ss/user/winsrv/rsrc.rc - copied unchanged from r58762, branches/ros-csrss/win32ss/user/winsrv/rsrc.rc trunk/reactos/win32ss/user/winsrv/shutdown.c - copied unchanged from r58762, branches/ros-csrss/win32ss/user/winsrv/shutdown.c trunk/reactos/win32ss/user/winsrv/winsrv.spec - copied unchanged from r58762, branches/ros-csrss/win32ss/user/winsrv/winsrv.spec Removed: trunk/reactos/dll/win32/kernel32/client/file/console.c trunk/reactos/include/reactos/subsys/csrss/ trunk/reactos/include/reactos/subsys/win/windows.h trunk/reactos/subsystems/csr/ trunk/reactos/subsystems/win/basesrv/basesrv.def trunk/reactos/subsystems/win/basesrv/main.c trunk/reactos/subsystems/win/basesrv/server.c trunk/reactos/subsystems/win32/csrss/csrsrv/ trunk/reactos/subsystems/win32/csrss/include/ trunk/reactos/win32ss/user/ntuser/csr.c trunk/reactos/win32ss/user/ntuser/csr.h trunk/reactos/win32ss/user/win32csr/ trunk/reactos/win32ss/user/winsrv/dllmain.c trunk/reactos/win32ss/user/winsrv/server.c trunk/reactos/win32ss/user/winsrv/winsrv.def Modified: trunk/reactos/ (props changed) trunk/reactos/base/applications/cmdutils/doskey/doskey.h trunk/reactos/base/system/smss/smloop.c trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/dll/cpl/console/CMakeLists.txt trunk/reactos/dll/cpl/console/colors.c trunk/reactos/dll/cpl/console/console.c trunk/reactos/dll/cpl/console/console.h trunk/reactos/dll/cpl/console/console.rc trunk/reactos/dll/cpl/console/font.c trunk/reactos/dll/cpl/console/lang/bg-BG.rc trunk/reactos/dll/cpl/console/lang/cs-CZ.rc trunk/reactos/dll/cpl/console/lang/de-DE.rc trunk/reactos/dll/cpl/console/lang/en-US.rc trunk/reactos/dll/cpl/console/lang/es-ES.rc trunk/reactos/dll/cpl/console/lang/fr-FR.rc trunk/reactos/dll/cpl/console/lang/he-IL.rc trunk/reactos/dll/cpl/console/lang/id-ID.rc trunk/reactos/dll/cpl/console/lang/it-IT.rc trunk/reactos/dll/cpl/console/lang/no-NO.rc trunk/reactos/dll/cpl/console/lang/pl-PL.rc trunk/reactos/dll/cpl/console/lang/ro-RO.rc trunk/reactos/dll/cpl/console/lang/ru-RU.rc trunk/reactos/dll/cpl/console/lang/sk-SK.rc trunk/reactos/dll/cpl/console/lang/uk-UA.rc trunk/reactos/dll/cpl/console/lang/zh-CN.rc trunk/reactos/dll/cpl/console/layout.c trunk/reactos/dll/cpl/console/options.c trunk/reactos/dll/cpl/console/resource.h trunk/reactos/dll/cpl/console/rsrc.rc trunk/reactos/dll/ntdll/csr/api.c trunk/reactos/dll/ntdll/csr/capture.c trunk/reactos/dll/ntdll/csr/connect.c trunk/reactos/dll/ntdll/include/ntdll.h trunk/reactos/dll/ntdll/include/ntdllp.h trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/client/dllmain.c trunk/reactos/dll/win32/kernel32/client/dosdev.c trunk/reactos/dll/win32/kernel32/client/file/create.c trunk/reactos/dll/win32/kernel32/client/file/deviceio.c trunk/reactos/dll/win32/kernel32/client/file/filename.c trunk/reactos/dll/win32/kernel32/client/path.c trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/dll/win32/kernel32/client/vdm.c trunk/reactos/dll/win32/kernel32/client/vista.c trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/dll/win32/kernel32/k32.h trunk/reactos/dll/win32/shell32/shelllink.cpp trunk/reactos/dll/win32/shell32/shelllink.h trunk/reactos/dll/win32/shell32/shlexec.cpp trunk/reactos/include/ndk/umfuncs.h trunk/reactos/include/ndk/umtypes.h trunk/reactos/include/psdk/shellapi.h trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/wincon.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/subsys/sm/helper.h trunk/reactos/include/reactos/subsys/sm/ns.h trunk/reactos/include/reactos/subsys/sm/smmsg.h trunk/reactos/include/reactos/subsys/win/base.h trunk/reactos/lib/smlib/smclient.c trunk/reactos/subsystems/CMakeLists.txt trunk/reactos/subsystems/win/basesrv/basesrv.h trunk/reactos/subsystems/win/basesrv/basesrv.rc trunk/reactos/subsystems/win/basesrv/init.c trunk/reactos/subsystems/win32/CMakeLists.txt trunk/reactos/subsystems/win32/csrss/CMakeLists.txt trunk/reactos/subsystems/win32/csrss/csrss.c trunk/reactos/subsystems/win32/csrss/csrss.rc trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/gdi/ntgdi/gdikdbgext.c trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/pch.h trunk/reactos/win32ss/user/consrv/frontends/ (props changed) trunk/reactos/win32ss/user/consrv/frontends/gui/ (props changed) trunk/reactos/win32ss/user/consrv/frontends/gui/lang/ (props changed) trunk/reactos/win32ss/user/consrv/frontends/gui/res/ (props changed) trunk/reactos/win32ss/user/consrv/frontends/tui/ (props changed) trunk/reactos/win32ss/user/consrv/lang/ (props changed) trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/ntuser.c trunk/reactos/win32ss/user/ntuser/ntuser.h trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/ntuser/userfuncs.h trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/winsta.c trunk/reactos/win32ss/user/ntuser/winsta.h trunk/reactos/win32ss/user/user32/include/user32.h trunk/reactos/win32ss/user/user32/include/user32p.h trunk/reactos/win32ss/user/user32/include/user_x.h trunk/reactos/win32ss/user/user32/misc/dllmain.c trunk/reactos/win32ss/user/user32/misc/exit.c trunk/reactos/win32ss/user/user32/misc/misc.c trunk/reactos/win32ss/user/winsrv/init.c trunk/reactos/win32ss/user/winsrv/winsrv.h trunk/reactos/win32ss/user/winsrv/winsrv.rc trunk/reactos/win32ss/win32kp.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/system/smss/smloop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smloop.c?… Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… Modified: trunk/reactos/dll/cpl/console/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/CMakeLists… Modified: trunk/reactos/dll/cpl/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/colors.c?r… Modified: trunk/reactos/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.c?… Modified: trunk/reactos/dll/cpl/console/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.h?… Modified: trunk/reactos/dll/cpl/console/console.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.rc… Modified: trunk/reactos/dll/cpl/console/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/font.c?rev… Modified: trunk/reactos/dll/cpl/console/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/bg-BG… Modified: trunk/reactos/dll/cpl/console/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/cs-CZ… Modified: trunk/reactos/dll/cpl/console/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/de-DE… Modified: trunk/reactos/dll/cpl/console/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/en-US… Modified: trunk/reactos/dll/cpl/console/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/es-ES… Modified: trunk/reactos/dll/cpl/console/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/fr-FR… Modified: trunk/reactos/dll/cpl/console/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/he-IL… Modified: trunk/reactos/dll/cpl/console/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/id-ID… Modified: trunk/reactos/dll/cpl/console/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/it-IT… Modified: trunk/reactos/dll/cpl/console/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/no-NO… Modified: trunk/reactos/dll/cpl/console/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/pl-PL… Modified: trunk/reactos/dll/cpl/console/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ro-RO… Modified: trunk/reactos/dll/cpl/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ru-RU… Modified: trunk/reactos/dll/cpl/console/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/sk-SK… Modified: trunk/reactos/dll/cpl/console/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/uk-UA… Modified: trunk/reactos/dll/cpl/console/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/zh-CN… Modified: trunk/reactos/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r… Modified: trunk/reactos/dll/cpl/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/options.c?… Modified: trunk/reactos/dll/cpl/console/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/resource.h… Modified: trunk/reactos/dll/cpl/console/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/rsrc.rc?re… Modified: trunk/reactos/dll/ntdll/csr/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/api.c?rev=58… Modified: trunk/reactos/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/capture.c?re… Modified: trunk/reactos/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/connect.c?re… Modified: trunk/reactos/dll/ntdll/include/ntdll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdll.h?… Modified: trunk/reactos/dll/ntdll/include/ntdllp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h… Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Removed: trunk/reactos/dll/win32/kernel32/client/file/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/file/deviceio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/file/filename.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/vista.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Copied: trunk/reactos/dll/win32/kernel32/include/console.h (from r58762, branches/ros-csrss/dll/win32/kernel32/include/console.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… Modified: trunk/reactos/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/k32.h?r… Modified: trunk/reactos/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… Modified: trunk/reactos/dll/win32/shell32/shelllink.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… Modified: trunk/reactos/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlexec.… Modified: trunk/reactos/include/ndk/umfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/umfuncs.h?rev=… Modified: trunk/reactos/include/ndk/umtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/umtypes.h?rev=… Modified: trunk/reactos/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shellapi.h?re… Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… Modified: trunk/reactos/include/reactos/subsys/sm/helper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/sm/… Modified: trunk/reactos/include/reactos/subsys/sm/ns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/sm/… Modified: trunk/reactos/include/reactos/subsys/sm/smmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/sm/… Modified: trunk/reactos/include/reactos/subsys/win/base.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… Removed: trunk/reactos/include/reactos/subsys/win/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… Modified: trunk/reactos/lib/smlib/smclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/smclient.c?rev=5… Modified: trunk/reactos/subsystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/CMakeLists.txt?… Removed: trunk/reactos/subsystems/win/basesrv/basesrv.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/bas… Modified: trunk/reactos/subsystems/win/basesrv/basesrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/bas… Modified: trunk/reactos/subsystems/win/basesrv/basesrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/bas… Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ini… Removed: trunk/reactos/subsystems/win/basesrv/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/mai… Removed: trunk/reactos/subsystems/win/basesrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ser… Modified: trunk/reactos/subsystems/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/CMakeList… Modified: trunk/reactos/subsystems/win32/csrss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/CMa… Modified: trunk/reactos/subsystems/win32/csrss/csrss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… Modified: trunk/reactos/subsystems/win32/csrss/csrss.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… Modified: trunk/reactos/win32ss/gdi/ntgdi/gdikdbgext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdikdbge… Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… Modified: trunk/reactos/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?rev=58770&r1… Removed: trunk/reactos/win32ss/user/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/csr.c?… Removed: trunk/reactos/win32ss/user/ntuser/csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/csr.h?… Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… Modified: trunk/reactos/win32ss/user/ntuser/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… Modified: trunk/reactos/win32ss/user/ntuser/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userfu… Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… Modified: trunk/reactos/win32ss/user/ntuser/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… Modified: trunk/reactos/win32ss/user/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… Modified: trunk/reactos/win32ss/user/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… Modified: trunk/reactos/win32ss/user/user32/include/user_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… Modified: trunk/reactos/win32ss/user/user32/misc/exit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/e… Modified: trunk/reactos/win32ss/user/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/m… Removed: trunk/reactos/win32ss/user/winsrv/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/dllmai… Modified: trunk/reactos/win32ss/user/winsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/init.c… Removed: trunk/reactos/win32ss/user/winsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/server… Removed: trunk/reactos/win32ss/user/winsrv/winsrv.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv… Modified: trunk/reactos/win32ss/user/winsrv/winsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv… Modified: trunk/reactos/win32ss/user/winsrv/winsrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv… Modified: trunk/reactos/win32ss/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/win32kp.h?rev=5877…

11 years, 8 months

[akhaldi] 58769: [DINPUT_WINETEST] * Import from Wine 1.5.26.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Apr 15 19:31:42 2013 New Revision: 58769 URL: http://svn.reactos.org/svn/reactos?rev=58769&view=rev Log: [DINPUT_WINETEST] * Import from Wine 1.5.26. Added: trunk/rostests/winetests/dinput/ trunk/rostests/winetests/dinput/CMakeLists.txt (with props) trunk/rostests/winetests/dinput/device.c (with props) trunk/rostests/winetests/dinput/dinput.c (with props) trunk/rostests/winetests/dinput/joystick.c (with props) trunk/rostests/winetests/dinput/keyboard.c (with props) trunk/rostests/winetests/dinput/mouse.c (with props) trunk/rostests/winetests/dinput/testlist.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Mon Apr 15 19:31:42 2013 @@ -15,6 +15,7 @@ add_subdirectory(crypt32) add_subdirectory(cryptnet) add_subdirectory(cryptui) +add_subdirectory(dinput) add_subdirectory(dnsapi) add_subdirectory(dsound) add_subdirectory(fusion) Added: trunk/rostests/winetests/dinput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/CMakeLis… ============================================================================== --- trunk/rostests/winetests/dinput/CMakeLists.txt (added) +++ trunk/rostests/winetests/dinput/CMakeLists.txt [iso-8859-1] Mon Apr 15 19:31:42 2013 @@ -1,0 +1,15 @@ + +add_definitions(-D__ROS_LONG64__) + +add_executable(dinput_winetest + device.c + dinput.c + joystick.c + keyboard.c + mouse.c + testlist.c) + +target_link_libraries(dinput_winetest wine dinput_data_formats) +set_module_type(dinput_winetest win32cui) +add_importlibs(dinput_winetest dinput ole32 user32 msvcrt kernel32 ntdll) +add_cd_file(TARGET dinput_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/dinput/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/dinput/device.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/device.c… ============================================================================== --- trunk/rostests/winetests/dinput/device.c (added) +++ trunk/rostests/winetests/dinput/device.c [iso-8859-1] Mon Apr 15 19:31:42 2013 @@ -1,0 +1,273 @@ +/* + * Copyright (c) 2006 Vitaliy Margolen + * + * 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 WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define DIRECTINPUT_VERSION 0x0700 + +#define COBJMACROS +//#include <windows.h> + +#include <wine/test.h> +//#include "windef.h" +#include <dinput.h> + +static const DIOBJECTDATAFORMAT obj_data_format[] = { + { &GUID_YAxis, 16, DIDFT_OPTIONAL|DIDFT_AXIS |DIDFT_MAKEINSTANCE(1), 0}, + { &GUID_Button,15, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(3), 0}, + { &GUID_Key, 0, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(16),0}, + { &GUID_Key, 1, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(17),0}, + { &GUID_Key, 2, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(18),0}, + { &GUID_Key, 3, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(19),0}, + { &GUID_Key, 4, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(20),0}, + { &GUID_Key, 5, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(21),0}, + { &GUID_Key, 6, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(22),0}, + { &GUID_Key, 7, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(23),0}, + { &GUID_Key, 8, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(24),0}, + { &GUID_Key, 9, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(25),0}, + { &GUID_Key, 10, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(26),0}, + { &GUID_Key, 11, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(27),0}, + { &GUID_Key, 12, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(28),0}, + { NULL, 13, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(5),0}, + + { &GUID_Button,14, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(32),0} +}; + +static const DIDATAFORMAT data_format = { + sizeof(DIDATAFORMAT), + sizeof(DIOBJECTDATAFORMAT), + DIDF_ABSAXIS, + 32, + sizeof(obj_data_format) / sizeof(obj_data_format[0]), + (LPDIOBJECTDATAFORMAT)obj_data_format +}; + +static BOOL CALLBACK enum_callback(LPCDIDEVICEOBJECTINSTANCE oi, LPVOID info) +{ + if (winetest_debug > 1) + trace(" Type:%4x Ofs:%3d Flags:%08x Name:%s\n", + oi->dwType, oi->dwOfs, oi->dwFlags, oi->tszName); + (*(int*)info)++; + return DIENUM_CONTINUE; +} + +static BOOL CALLBACK enum_type_callback(LPCDIDEVICEOBJECTINSTANCE oi, LPVOID info) +{ + DWORD expected = *(DWORD*)info; + ok (expected & DIDFT_GETTYPE(oi->dwType), "EnumObjects() enumerated wrong type for obj %s, expected: %08x got: %08x\n", oi->tszName, expected, oi->dwType); + return DIENUM_CONTINUE; +} + +static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd) +{ + HRESULT hr; + DIPROPDWORD dp; + DIDEVICEOBJECTINSTANCE obj_info; + DWORD obj_types[] = {DIDFT_BUTTON, DIDFT_AXIS, DIDFT_POV}; + int type_index; + int cnt1 = 0; + DWORD cnt = 0; + DIDEVICEOBJECTDATA buffer[5]; + + hr = IDirectInputDevice_EnumObjects(device, enum_callback, &cnt, DIDFT_ALL); + ok(SUCCEEDED(hr), "EnumObjects() failed: %08x\n", hr); + + hr = IDirectInputDevice_SetDataFormat(device, &data_format); + ok(SUCCEEDED(hr), "SetDataFormat() failed: %08x\n", hr); + + hr = IDirectInputDevice_EnumObjects(device, enum_callback, &cnt1, DIDFT_ALL); + ok(SUCCEEDED(hr), "EnumObjects() failed: %08x\n", hr); + if (0) /* fails for joystick only */ + ok(cnt == cnt1, "Enum count changed from %d to %d\n", cnt, cnt1); + + /* Testing EnumObjects with different types of device objects */ + for (type_index=0; type_index < sizeof(obj_types)/sizeof(obj_types[0]); type_index++) + { + hr = IDirectInputDevice_EnumObjects(device, enum_type_callback, &obj_types[type_index], obj_types[type_index]); + ok(SUCCEEDED(hr), "EnumObjects() failed: %08x\n", hr); + } + + /* Test buffered mode */ + memset(&dp, 0, sizeof(dp)); + dp.diph.dwSize = sizeof(DIPROPDWORD); + dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dp.diph.dwHow = DIPH_DEVICE; + dp.diph.dwObj = 0; + dp.dwData = 0; + + hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); + ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); + cnt = 5; + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); + ok(hr == DI_OK && cnt == 5, "GetDeviceData() failed: %08x cnt: %d\n", hr, cnt); + hr = IDirectInputDevice_GetDeviceData(device, sizeof(DIDEVICEOBJECTDATA_DX3), buffer, &cnt, 0); + ok(hr == DIERR_NOTBUFFERED, "GetDeviceData() should have failed: %08x\n", hr); + IDirectInputDevice_Acquire(device); + hr = IDirectInputDevice_GetDeviceData(device, sizeof(DIDEVICEOBJECTDATA_DX3), buffer, &cnt, 0); + ok(hr == DIERR_NOTBUFFERED, "GetDeviceData() should have failed: %08x\n", hr); + IDirectInputDevice_Unacquire(device); + + dp.dwData = 20; + hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); + ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); + cnt = 5; + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); + ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); + hr = IDirectInputDevice_GetDeviceData(device, sizeof(DIDEVICEOBJECTDATA_DX3), buffer, &cnt, 0); + ok(hr == DIERR_NOTACQUIRED, "GetDeviceData() should have failed: %08x\n", hr); + hr = IDirectInputDevice_Acquire(device); + ok(hr == DI_OK, "Acquire() failed: %08x\n", hr); + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); + ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); + hr = IDirectInputDevice_Unacquire(device); + ok(hr == DI_OK, "Unacquire() failed: %08x\n", hr); + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); + ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); + + /* No need to test devices without axis */ + obj_info.dwSize = sizeof(obj_info); + hr = IDirectInputDevice_GetObjectInfo(device, &obj_info, 16, DIPH_BYOFFSET); + if (SUCCEEDED(hr)) + { + /* No device supports per axis relative/absolute mode */ + dp.diph.dwHow = DIPH_BYOFFSET; + dp.diph.dwObj = 16; + dp.dwData = DIPROPAXISMODE_ABS; + hr = IDirectInputDevice_SetProperty(device, DIPROP_AXISMODE, &dp.diph); + ok(hr == DIERR_UNSUPPORTED, "SetProperty() returned: %08x\n", hr); + dp.diph.dwHow = DIPH_DEVICE; + hr = IDirectInputDevice_SetProperty(device, DIPROP_AXISMODE, &dp.diph); + ok(hr == DIERR_INVALIDPARAM, "SetProperty() returned: %08x\n", hr); + dp.diph.dwObj = 0; + hr = IDirectInputDevice_SetProperty(device, DIPROP_AXISMODE, &dp.diph); + ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); + + /* Cannot change mode while acquired */ + hr = IDirectInputDevice_Acquire(device); + ok(hr == DI_OK, "Acquire() failed: %08x\n", hr); + + hr = IDirectInputDevice_SetProperty(device, DIPROP_AXISMODE, &dp.diph); + ok(hr == DIERR_ACQUIRED, "SetProperty() returned: %08x\n", hr); + hr = IDirectInputDevice_Unacquire(device); + ok(hr == DI_OK, "Unacquire() failed: %08x\n", hr); + } +} + +struct enum_data +{ + LPDIRECTINPUT pDI; + HWND hwnd; +}; + +static BOOL CALLBACK enum_devices(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef) +{ + struct enum_data *data = pvRef; + LPDIRECTINPUTDEVICE device, obj = NULL; + HRESULT hr; + + hr = IDirectInput_GetDeviceStatus(data->pDI, &lpddi->guidInstance); + ok(hr == DI_OK, "IDirectInput_GetDeviceStatus() failed: %08x\n", hr); + + if (hr == DI_OK) + { + hr = IDirectInput_CreateDevice(data->pDI, &lpddi->guidInstance, &device, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + trace("Testing device %p \"%s\"\n", device, lpddi->tszInstanceName); + + hr = IUnknown_QueryInterface(device, &IID_IDirectInputDevice2A, (LPVOID*)&obj); + ok(SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputDevice7A) failed: %08x\n", hr); + test_object_info(obj, data->hwnd); + if (obj) IUnknown_Release(obj); + obj = NULL; + + hr = IUnknown_QueryInterface(device, &IID_IDirectInputDevice2W, (LPVOID*)&obj); + ok(SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputDevice7W) failed: %08x\n", hr); + test_object_info(obj, data->hwnd); + if (obj) IUnknown_Release(obj); + + IUnknown_Release(device); + } + return DIENUM_CONTINUE; +} + +static void device_tests(void) +{ + HRESULT hr; + LPDIRECTINPUT pDI = NULL, obj = NULL; + HINSTANCE hInstance = GetModuleHandle(NULL); + HWND hwnd; + struct enum_data data; + + hr = CoCreateInstance(&CLSID_DirectInput, 0, 1, &IID_IDirectInput2A, (LPVOID*)&pDI); + if (hr == DIERR_OLDDIRECTINPUTVERSION || hr == DIERR_DEVICENOTREG) + { + skip("Tests require a newer dinput version\n"); + return; + } + ok(SUCCEEDED(hr), "DirectInputCreate() failed: %08x\n", hr); + if (FAILED(hr)) return; + + hr = IDirectInput_Initialize(pDI, hInstance, DIRECTINPUT_VERSION); + ok(SUCCEEDED(hr), "Initialize() failed: %08x\n", hr); + if (FAILED(hr)) return; + + hr = IUnknown_QueryInterface(pDI, &IID_IDirectInput2W, (LPVOID*)&obj); + ok(SUCCEEDED(hr), "QueryInterface(IDirectInput7W) failed: %08x\n", hr); + + hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, + 10, 10, 200, 200, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "err: %d\n", GetLastError()); + if (hwnd) + { + ShowWindow(hwnd, SW_SHOW); + + data.pDI = pDI; + data.hwnd = hwnd; + hr = IDirectInput_EnumDevices(pDI, 0, enum_devices, &data, DIEDFL_ALLDEVICES); + ok(SUCCEEDED(hr), "IDirectInput_EnumDevices() failed: %08x\n", hr); + + + /* If GetDeviceStatus returns DI_OK the device must exist */ + hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Joystick); + if (hr == DI_OK) + { + LPDIRECTINPUTDEVICE device = NULL; + + hr = IDirectInput_CreateDevice(pDI, &GUID_Joystick, &device, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + if (device) IUnknown_Release(device); + } + + DestroyWindow(hwnd); + } + if (obj) IUnknown_Release(obj); + if (pDI) IUnknown_Release(pDI); +} + +START_TEST(device) +{ + CoInitialize(NULL); + + device_tests(); + + CoUninitialize(); +} Propchange: trunk/rostests/winetests/dinput/device.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/dinput/dinput.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/dinput.c… ============================================================================== --- trunk/rostests/winetests/dinput/dinput.c (added) +++ trunk/rostests/winetests/dinput/dinput.c [iso-8859-1] Mon Apr 15 19:31:42 2013 @@ -1,0 +1,632 @@ +/* + * Copyright (c) 2011 Andrew Nguyen + * + * 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 WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define DIRECTINPUT_VERSION 0x0700 + +#define COBJMACROS + +#include <wine/test.h> + +#include <initguid.h> +//#include <windows.h> +#include <dinput.h> +#include <dinputd.h> + +HINSTANCE hInstance; + +enum directinput_versions +{ + DIRECTINPUT_VERSION_300 = 0x0300, + DIRECTINPUT_VERSION_500 = 0x0500, + DIRECTINPUT_VERSION_50A = 0x050A, + DIRECTINPUT_VERSION_5B2 = 0x05B2, + DIRECTINPUT_VERSION_602 = 0x0602, + DIRECTINPUT_VERSION_61A = 0x061A, + DIRECTINPUT_VERSION_700 = 0x0700, +}; + +static const DWORD directinput_version_list[] = +{ + DIRECTINPUT_VERSION_300, + DIRECTINPUT_VERSION_500, + DIRECTINPUT_VERSION_50A, + DIRECTINPUT_VERSION_5B2, + DIRECTINPUT_VERSION_602, + DIRECTINPUT_VERSION_61A, + DIRECTINPUT_VERSION_700, +}; + +static HRESULT (WINAPI *pDirectInputCreateEx)(HINSTANCE, DWORD, REFIID, LPVOID *, LPUNKNOWN); + +static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *context) +{ + ok(0, "Callback was invoked with parameters (%p, %p)\n", instance, context); + return DIENUM_STOP; +} + +static void test_preinitialization(void) +{ + static const struct + { + REFGUID rguid; + BOOL pdev; + HRESULT expected_hr; + } create_device_tests[] = + { + {NULL, FALSE, E_POINTER}, + {NULL, TRUE, E_POINTER}, + {&GUID_Unknown, FALSE, E_POINTER}, + {&GUID_Unknown, TRUE, DIERR_NOTINITIALIZED}, + {&GUID_SysMouse, FALSE, E_POINTER}, + {&GUID_SysMouse, TRUE, DIERR_NOTINITIALIZED}, + }; + + static const struct + { + DWORD dwDevType; + LPDIENUMDEVICESCALLBACKA lpCallback; + DWORD dwFlags; + HRESULT expected_hr; + int todo; + } enum_devices_tests[] = + { + {0, NULL, 0, DIERR_INVALIDPARAM}, + {0, NULL, ~0u, DIERR_INVALIDPARAM}, + {0, dummy_callback, 0, DIERR_NOTINITIALIZED}, + {0, dummy_callback, ~0u, DIERR_INVALIDPARAM}, + {0xdeadbeef, NULL, 0, DIERR_INVALIDPARAM}, + {0xdeadbeef, NULL, ~0u, DIERR_INVALIDPARAM}, + {0xdeadbeef, dummy_callback, 0, DIERR_INVALIDPARAM}, + {0xdeadbeef, dummy_callback, ~0u, DIERR_INVALIDPARAM}, + }; + + IDirectInputA *pDI; + HRESULT hr; + int i; + IDirectInputDeviceA *pDID; + + hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&pDI); + if (FAILED(hr)) + { + skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); + return; + } + + for (i = 0; i < sizeof(create_device_tests)/sizeof(create_device_tests[0]); i++) + { + if (create_device_tests[i].pdev) pDID = (void *)0xdeadbeef; + hr = IDirectInput_CreateDevice(pDI, create_device_tests[i].rguid, + create_device_tests[i].pdev ? &pDID : NULL, + NULL); + ok(hr == create_device_tests[i].expected_hr, "[%d] IDirectInput_CreateDevice returned 0x%08x\n", i, hr); + if (create_device_tests[i].pdev) + ok(pDID == NULL, "[%d] Output interface pointer is %p\n", i, pDID); + } + + for (i = 0; i < sizeof(enum_devices_tests)/sizeof(enum_devices_tests[0]); i++) + { + hr = IDirectInput_EnumDevices(pDI, enum_devices_tests[i].dwDevType, + enum_devices_tests[i].lpCallback, + NULL, + enum_devices_tests[i].dwFlags); + if (enum_devices_tests[i].todo) + { + todo_wine + ok(hr == enum_devices_tests[i].expected_hr, "[%d] IDirectInput_EnumDevice returned 0x%08x\n", i, hr); + } + else + ok(hr == enum_devices_tests[i].expected_hr, "[%d] IDirectInput_EnumDevice returned 0x%08x\n", i, hr); + } + + hr = IDirectInput_GetDeviceStatus(pDI, NULL); + ok(hr == E_POINTER, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr); + + hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Unknown); + ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr); + + hr = IDirectInput_GetDeviceStatus(pDI, &GUID_SysMouse); + ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr); + + hr = IDirectInput_RunControlPanel(pDI, NULL, 0); + ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + + hr = IDirectInput_RunControlPanel(pDI, NULL, ~0u); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + + hr = IDirectInput_RunControlPanel(pDI, (HWND)0xdeadbeef, 0); + ok(hr == E_HANDLE, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + + hr = IDirectInput_RunControlPanel(pDI, (HWND)0xdeadbeef, ~0u); + ok(hr == E_HANDLE, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + + IDirectInput_Release(pDI); +} + +static void test_DirectInputCreateEx(void) +{ + static const struct + { + BOOL hinst; + DWORD dwVersion; + REFIID riid; + BOOL ppdi; + HRESULT expected_hr; + IUnknown *expected_ppdi; + } invalid_param_list[] = + { + {FALSE, 0, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, + {FALSE, 0, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, + {FALSE, 0, &IID_IDirectInputA, FALSE, E_POINTER}, + {FALSE, 0, &IID_IDirectInputA, TRUE, DIERR_INVALIDPARAM, NULL}, + {FALSE, DIRECTINPUT_VERSION, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, + {FALSE, DIRECTINPUT_VERSION, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, + {FALSE, DIRECTINPUT_VERSION, &IID_IDirectInputA, FALSE, E_POINTER}, + {FALSE, DIRECTINPUT_VERSION, &IID_IDirectInputA, TRUE, DIERR_INVALIDPARAM, NULL}, + {FALSE, DIRECTINPUT_VERSION - 1, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, + {FALSE, DIRECTINPUT_VERSION - 1, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, + {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, FALSE, E_POINTER}, + {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, TRUE, DIERR_INVALIDPARAM, NULL}, + {FALSE, DIRECTINPUT_VERSION + 1, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, + {FALSE, DIRECTINPUT_VERSION + 1, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, + {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, FALSE, E_POINTER}, + {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, TRUE, DIERR_INVALIDPARAM, NULL}, + {TRUE, 0, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, + {TRUE, 0, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, + {TRUE, 0, &IID_IDirectInputA, FALSE, E_POINTER}, + {TRUE, 0, &IID_IDirectInputA, TRUE, DIERR_NOTINITIALIZED, NULL}, + {TRUE, DIRECTINPUT_VERSION, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, + {TRUE, DIRECTINPUT_VERSION, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, + {TRUE, DIRECTINPUT_VERSION, &IID_IDirectInputA, FALSE, E_POINTER}, + {TRUE, DIRECTINPUT_VERSION - 1, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, + {TRUE, DIRECTINPUT_VERSION - 1, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, + {TRUE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, FALSE, E_POINTER}, + {TRUE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, TRUE, DIERR_BETADIRECTINPUTVERSION, NULL}, + {TRUE, DIRECTINPUT_VERSION + 1, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, + {TRUE, DIRECTINPUT_VERSION + 1, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, + {TRUE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, FALSE, E_POINTER}, + {TRUE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, TRUE, DIERR_OLDDIRECTINPUTVERSION, NULL}, + }; + + static REFIID no_interface_list[] = {&IID_IUnknown, &IID_IDirectInput8A, + &IID_IDirectInput8W, &IID_IDirectInputDeviceA, + &IID_IDirectInputDeviceW, &IID_IDirectInputDevice2A, + &IID_IDirectInputDevice2W, &IID_IDirectInputDevice7A, + &IID_IDirectInputDevice7W, &IID_IDirectInputDevice8A, + &IID_IDirectInputDevice8W, &IID_IDirectInputEffect}; + + static REFIID iid_list[] = {&IID_IDirectInputA, &IID_IDirectInputW, + &IID_IDirectInput2A, &IID_IDirectInput2W, + &IID_IDirectInput7A, &IID_IDirectInput7W}; + + int i, j; + IUnknown *pUnk; + HRESULT hr; + + if (!pDirectInputCreateEx) + { + win_skip("DirectInputCreateEx is not available\n"); + return; + } + + for (i = 0; i < sizeof(invalid_param_list)/sizeof(invalid_param_list[0]); i++) + { + if (invalid_param_list[i].ppdi) pUnk = (void *)0xdeadbeef; + hr = pDirectInputCreateEx(invalid_param_list[i].hinst ? hInstance : NULL, + invalid_param_list[i].dwVersion, + invalid_param_list[i].riid, + invalid_param_list[i].ppdi ? (void **)&pUnk : NULL, + NULL); + ok(hr == invalid_param_list[i].expected_hr, "[%d] DirectInputCreateEx returned 0x%08x\n", i, hr); + if (invalid_param_list[i].ppdi) + ok(pUnk == invalid_param_list[i].expected_ppdi, "[%d] Output interface pointer is %p\n", i, pUnk); + } + + for (i = 0; i < sizeof(no_interface_list)/sizeof(no_interface_list[0]); i++) + { + pUnk = (void *)0xdeadbeef; + hr = pDirectInputCreateEx(hInstance, DIRECTINPUT_VERSION, no_interface_list[i], (void **)&pUnk, NULL); + ok(hr == DIERR_NOINTERFACE, "[%d] DirectInputCreateEx returned 0x%08x\n", i, hr); + ok(pUnk == (void *)0xdeadbeef, "[%d] Output interface pointer is %p\n", i, pUnk); + } + + for (i = 0; i < sizeof(iid_list)/sizeof(iid_list[0]); i++) + { + pUnk = NULL; + hr = pDirectInputCreateEx(hInstance, DIRECTINPUT_VERSION, iid_list[i], (void **)&pUnk, NULL); + ok(hr == DI_OK, "[%d] DirectInputCreateEx returned 0x%08x\n", i, hr); + ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i); + if (pUnk) + IUnknown_Release(pUnk); + } + + /* Examine combinations of requested interfaces and version numbers. */ + for (i = 0; i < sizeof(directinput_version_list)/sizeof(directinput_version_list[0]); i++) + { + for (j = 0; j < sizeof(iid_list)/sizeof(iid_list[0]); j++) + { + pUnk = NULL; + hr = pDirectInputCreateEx(hInstance, directinput_version_list[i], iid_list[j], (void **)&pUnk, NULL); + ok(hr == DI_OK, "[%d/%d] DirectInputCreateEx returned 0x%08x\n", i, j, hr); + ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i); + if (pUnk) + IUnknown_Release(pUnk); + } + } +} + +static void test_QueryInterface(void) +{ + static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInputA, &IID_IDirectInputW, + &IID_IDirectInput2A, &IID_IDirectInput2W, + &IID_IDirectInput7A, &IID_IDirectInput7W}; + + static const struct + { + REFIID riid; + int test_todo; + } no_interface_list[] = + { + {&IID_IDirectInput8A, 1}, + {&IID_IDirectInput8W, 1}, + {&IID_IDirectInputDeviceA}, + {&IID_IDirectInputDeviceW}, + {&IID_IDirectInputDevice2A}, + {&IID_IDirectInputDevice2W}, + {&IID_IDirectInputDevice7A}, + {&IID_IDirectInputDevice7W}, + {&IID_IDirectInputDevice8A}, + {&IID_IDirectInputDevice8W}, + {&IID_IDirectInputEffect}, + }; + + IDirectInputA *pDI; + HRESULT hr; + IUnknown *pUnk; + int i; + + hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); + if (FAILED(hr)) + { + win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); + return; + } + + hr = IDirectInput_QueryInterface(pDI, NULL, NULL); + ok(hr == E_POINTER, "IDirectInput_QueryInterface returned 0x%08x\n", hr); + + pUnk = (void *)0xdeadbeef; + hr = IDirectInput_QueryInterface(pDI, NULL, (void **)&pUnk); + ok(hr == E_POINTER, "IDirectInput_QueryInterface returned 0x%08x\n", hr); + ok(pUnk == (void *)0xdeadbeef, "Output interface pointer is %p\n", pUnk); + + hr = IDirectInput_QueryInterface(pDI, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "IDirectInput_QueryInterface returned 0x%08x\n", hr); + + for (i = 0; i < sizeof(iid_list)/sizeof(iid_list[0]); i++) + { + pUnk = NULL; + hr = IDirectInput_QueryInterface(pDI, iid_list[i], (void **)&pUnk); + ok(hr == S_OK, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); + ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i); + if (pUnk) IUnknown_Release(pUnk); + } + + for (i = 0; i < sizeof(no_interface_list)/sizeof(no_interface_list[0]); i++) + { + pUnk = (void *)0xdeadbeef; + hr = IDirectInput_QueryInterface(pDI, no_interface_list[i].riid, (void **)&pUnk); + if (no_interface_list[i].test_todo) + { + todo_wine + ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); + todo_wine + ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); + + if (pUnk) IUnknown_Release(pUnk); + } + else + { + ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); + ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); + } + } + + IDirectInput_Release(pDI); +} + +static void test_CreateDevice(void) +{ + IDirectInputA *pDI; + HRESULT hr; + IDirectInputDeviceA *pDID; + + hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); + if (FAILED(hr)) + { + win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); + return; + } + + hr = IDirectInput_CreateDevice(pDI, NULL, NULL, NULL); + ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr); + + pDID = (void *)0xdeadbeef; + hr = IDirectInput_CreateDevice(pDI, NULL, &pDID, NULL); + ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr); + ok(pDID == NULL, "Output interface pointer is %p\n", pDID); + + hr = IDirectInput_CreateDevice(pDI, &GUID_Unknown, NULL, NULL); + ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr); + + pDID = (void *)0xdeadbeef; + hr = IDirectInput_CreateDevice(pDI, &GUID_Unknown, &pDID, NULL); + ok(hr == DIERR_DEVICENOTREG, "IDirectInput_CreateDevice returned 0x%08x\n", hr); + ok(pDID == NULL, "Output interface pointer is %p\n", pDID); + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, NULL, NULL); + ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr); + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pDID, NULL); + ok(hr == DI_OK, "IDirectInput_CreateDevice returned 0x%08x\n", hr); + + IDirectInputDevice_Release(pDID); + IDirectInput_Release(pDI); +} + +struct enum_devices_test +{ + unsigned int device_count; + BOOL return_value; +}; + +static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, void *context) +{ + struct enum_devices_test *enum_test = context; + + enum_test->device_count++; + return enum_test->return_value; +} + +static void test_EnumDevices(void) +{ + IDirectInputA *pDI; + HRESULT hr; + struct enum_devices_test enum_test, enum_test_return; + + hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); + if (FAILED(hr)) + { + win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); + return; + } + + hr = IDirectInput_EnumDevices(pDI, 0, NULL, NULL, 0); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + + hr = IDirectInput_EnumDevices(pDI, 0, NULL, NULL, ~0u); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + + /* Test crashes on Wine. */ + if (0) + { + hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, NULL, ~0u); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + } + + hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, NULL, NULL, 0); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + + hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, NULL, NULL, ~0u); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + + hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, enum_devices_callback, NULL, 0); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + + hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, enum_devices_callback, NULL, ~0u); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + + enum_test.device_count = 0; + enum_test.return_value = DIENUM_CONTINUE; + hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, &enum_test, 0); + ok(hr == DI_OK, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + ok(enum_test.device_count != 0, "Device count is %u\n", enum_test.device_count); + + /* Enumeration only stops with an explicit DIENUM_STOP. */ + enum_test_return.device_count = 0; + enum_test_return.return_value = 42; + hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, &enum_test_return, 0); + ok(hr == DI_OK, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + ok(enum_test_return.device_count == enum_test.device_count, + "Device count is %u vs. %u\n", enum_test_return.device_count, enum_test.device_count); + + enum_test.device_count = 0; + enum_test.return_value = DIENUM_STOP; + hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, &enum_test, 0); + ok(hr == DI_OK, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + ok(enum_test.device_count == 1, "Device count is %u\n", enum_test.device_count); + + IDirectInput_Release(pDI); +} + +static void test_GetDeviceStatus(void) +{ + IDirectInputA *pDI; + HRESULT hr; + + hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); + if (FAILED(hr)) + { + win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); + return; + } + + hr = IDirectInput_GetDeviceStatus(pDI, NULL); + ok(hr == E_POINTER, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr); + + hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Unknown); + todo_wine + ok(hr == DIERR_DEVICENOTREG, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr); + + hr = IDirectInput_GetDeviceStatus(pDI, &GUID_SysMouse); + ok(hr == DI_OK, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr); + + IDirectInput_Release(pDI); +} + +static void test_Initialize(void) +{ + IDirectInputA *pDI; + HRESULT hr; + int i; + + hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&pDI); + if (FAILED(hr)) + { + win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); + return; + } + + hr = IDirectInput_Initialize(pDI, NULL, 0); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_Initialize returned 0x%08x\n", hr); + + hr = IDirectInput_Initialize(pDI, NULL, DIRECTINPUT_VERSION); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_Initialize returned 0x%08x\n", hr); + + hr = IDirectInput_Initialize(pDI, hInstance, 0); + ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_Initialize returned 0x%08x\n", hr); + + /* Invalid DirectInput versions less than 0x0700 yield DIERR_BETADIRECTINPUTVERSION. */ + hr = IDirectInput_Initialize(pDI, hInstance, 0x0123); + ok(hr == DIERR_BETADIRECTINPUTVERSION, "IDirectInput_Initialize returned 0x%08x\n", hr); + + /* Invalid DirectInput versions greater than 0x0700 yield DIERR_BETADIRECTINPUTVERSION. */ + hr = IDirectInput_Initialize(pDI, hInstance, 0xcafe); + ok(hr == DIERR_OLDDIRECTINPUTVERSION, "IDirectInput_Initialize returned 0x%08x\n", hr); + + for (i = 0; i < sizeof(directinput_version_list)/sizeof(directinput_version_list[0]); i++) + { + hr = IDirectInput_Initialize(pDI, hInstance, directinput_version_list[i]); + ok(hr == DI_OK, "IDirectInput_Initialize returned 0x%08x\n", hr); + } + + /* Parameters are still validated after successful initialization. */ + hr = IDirectInput_Initialize(pDI, hInstance, 0); + ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_Initialize returned 0x%08x\n", hr); + + IDirectInput_Release(pDI); +} + +static void test_RunControlPanel(void) +{ + IDirectInputA *pDI; + HRESULT hr; + + hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); + if (FAILED(hr)) + { + win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); + return; + } + + if (winetest_interactive) + { + hr = IDirectInput_RunControlPanel(pDI, NULL, 0); + ok(hr == S_OK, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + + hr = IDirectInput_RunControlPanel(pDI, GetDesktopWindow(), 0); + ok(hr == S_OK, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + } + + hr = IDirectInput_RunControlPanel(pDI, NULL, ~0u); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + + hr = IDirectInput_RunControlPanel(pDI, (HWND)0xdeadbeef, 0); + ok(hr == E_HANDLE, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + + hr = IDirectInput_RunControlPanel(pDI, (HWND)0xdeadbeef, ~0u); + ok(hr == E_HANDLE, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + + IDirectInput_Release(pDI); +} + +static void test_DirectInputJoyConfig8(void) +{ + IDirectInputA *pDI; + IDirectInputDeviceA *pDID; + IDirectInputJoyConfig8 *pDIJC; + DIJOYCONFIG info; + HRESULT hr; + int i; + + hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); + if (FAILED(hr)) + { + win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); + return; + } + + hr = IDirectInput_QueryInterface(pDI, &IID_IDirectInputJoyConfig8, (void **)&pDIJC); + if (FAILED(hr)) + { + win_skip("Failed to instantiate a IDirectInputJoyConfig8 instance: 0x%08x\n", hr); + return; + } + + info.dwSize = sizeof(info); + hr = DI_OK; + i = 0; + + /* Enumerate all connected joystick GUIDs and try to create the respective devices */ + for (i = 0; SUCCEEDED(hr); i++) + { + hr = IDirectInputJoyConfig8_GetConfig(pDIJC, i, &info, DIJC_GUIDINSTANCE); + + ok (hr == DI_OK || hr == DIERR_NOMOREITEMS, + "IDirectInputJoyConfig8_GetConfig returned 0x%08x\n", hr); + + if (SUCCEEDED(hr)) + ok (SUCCEEDED(IDirectInput_CreateDevice(pDI, &info.guidInstance, &pDID, NULL)), + "IDirectInput_CreateDevice failed with guid from GetConfig hr = 0x%08x\n", hr); + } + +} + +START_TEST(dinput) +{ + HMODULE dinput_mod = GetModuleHandleA("dinput.dll"); + + hInstance = GetModuleHandleA(NULL); + + pDirectInputCreateEx = (void *)GetProcAddress(dinput_mod, "DirectInputCreateEx"); + + CoInitialize(NULL); + test_preinitialization(); + test_DirectInputCreateEx(); + test_QueryInterface(); + test_CreateDevice(); + test_EnumDevices(); + test_GetDeviceStatus(); + test_Initialize(); + test_RunControlPanel(); + test_DirectInputJoyConfig8(); + CoUninitialize(); +} Propchange: trunk/rostests/winetests/dinput/dinput.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/dinput/joystick.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/joystick… ============================================================================== --- trunk/rostests/winetests/dinput/joystick.c (added) +++ trunk/rostests/winetests/dinput/joystick.c [iso-8859-1] Mon Apr 15 19:31:42 2013 @@ -1,0 +1,689 @@ +/* + * Copyright (c) 2004-2005 Robert Reif + * + * 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 WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define DIRECTINPUT_VERSION 0x0700 + +#define COBJMACROS +//#include <windows.h> + +//#include <math.h> +#include <stdio.h> +//#include <stdlib.h> + +#include <wine/test.h> +//#include "windef.h" +//#include "wingdi.h" +#include <winnls.h> +#include <dinput.h> + +#define numObjects(x) (sizeof(x) / sizeof(x[0])) + +typedef struct tagUserData { + LPDIRECTINPUT pDI; + DWORD version; +} UserData; + +static const DIOBJECTDATAFORMAT dfDIJoystickTest[] = { + { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_ZAxis,DIJOFS_Z,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_RxAxis,DIJOFS_RX,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_RyAxis,DIJOFS_RY,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_RzAxis,DIJOFS_RZ,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_Button,DIJOFS_BUTTON(0),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0}, + { &GUID_Button,DIJOFS_BUTTON(1),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0}, + { &GUID_Button,DIJOFS_BUTTON(2),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0}, + { &GUID_Button,DIJOFS_BUTTON(3),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0}, + { &GUID_Button,DIJOFS_BUTTON(4),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0}, + { &GUID_Button,DIJOFS_BUTTON(5),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0}, + { &GUID_Button,DIJOFS_BUTTON(6),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0}, + { &GUID_Button,DIJOFS_BUTTON(7),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0}, + { &GUID_Button,DIJOFS_BUTTON(8),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0}, + { &GUID_Button,DIJOFS_BUTTON(9),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0}, + { &GUID_Button,DIJOFS_BUTTON(10),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0}, +}; + +static const DIDATAFORMAT c_dfDIJoystickTest = { + sizeof(DIDATAFORMAT), + sizeof(DIOBJECTDATAFORMAT), + DIDF_ABSAXIS, + sizeof(DIJOYSTATE2), + numObjects(dfDIJoystickTest), + (LPDIOBJECTDATAFORMAT)dfDIJoystickTest +}; + +static HWND get_hwnd(void) +{ + HWND hwnd=GetForegroundWindow(); + if (!hwnd) + hwnd=GetDesktopWindow(); + return hwnd; +} + +typedef struct tagJoystickInfo +{ + LPDIRECTINPUTDEVICE pJoystick; + DWORD axis; + DWORD pov; + DWORD button; + LONG lMin, lMax; + DWORD dZone; +} JoystickInfo; + +static int get_refcount(IUnknown *object) +{ + IUnknown_AddRef( object ); + return IUnknown_Release( object ); +} + +static BOOL CALLBACK EnumAxes( + const DIDEVICEOBJECTINSTANCE* pdidoi, + VOID* pContext) +{ + HRESULT hr; + JoystickInfo * info = pContext; + + if (IsEqualIID(&pdidoi->guidType, &GUID_XAxis) || + IsEqualIID(&pdidoi->guidType, &GUID_YAxis) || + IsEqualIID(&pdidoi->guidType, &GUID_ZAxis) || + IsEqualIID(&pdidoi->guidType, &GUID_RxAxis) || + IsEqualIID(&pdidoi->guidType, &GUID_RyAxis) || + IsEqualIID(&pdidoi->guidType, &GUID_RzAxis) || + IsEqualIID(&pdidoi->guidType, &GUID_Slider)) + { + DIPROPRANGE diprg; + DIPROPDWORD dipdw; + + diprg.diph.dwSize = sizeof(DIPROPRANGE); + diprg.diph.dwHeaderSize = sizeof(DIPROPHEADER); + diprg.diph.dwHow = DIPH_BYID; + diprg.diph.dwObj = pdidoi->dwType; + + dipdw.diph.dwSize = sizeof(dipdw); + dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dipdw.diph.dwHow = DIPH_BYID; + dipdw.diph.dwObj = pdidoi->dwType; + + hr = IDirectInputDevice_GetProperty(info->pJoystick, DIPROP_RANGE, &diprg.diph); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetProperty() failed: %08x\n", hr); + ok(info->lMin == diprg.lMin && info->lMax == diprg.lMax, "Min/Max range invalid: " + "expected %d..%d got %d..%d\n", info->lMin, info->lMax, diprg.lMin, diprg.lMax); + + diprg.lMin = -2000; + diprg.lMax = +2000; + + hr = IDirectInputDevice_SetProperty(info->pJoystick, DIPROP_RANGE, NULL); + ok(hr==E_INVALIDARG,"IDirectInputDevice_SetProperty() should have returned " + "E_INVALIDARG, returned: %08x\n", hr); + + hr = IDirectInputDevice_SetProperty(info->pJoystick, DIPROP_RANGE, &diprg.diph); + ok(hr==DI_OK,"IDirectInputDevice_SetProperty() failed: %08x\n", hr); + + /* dead zone */ + hr = IDirectInputDevice_GetProperty(info->pJoystick, DIPROP_DEADZONE, &dipdw.diph); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetProperty() failed: %08x\n", hr); + ok(info->dZone == dipdw.dwData, "deadzone invalid: expected %d got %d\n", + info->dZone, dipdw.dwData); + + dipdw.dwData = 123; + + hr = IDirectInputDevice_SetProperty(info->pJoystick, DIPROP_DEADZONE, &dipdw.diph); + ok(hr==DI_OK,"IDirectInputDevice_SetProperty() failed: %08x\n", hr); + + info->axis++; + } else if (IsEqualIID(&pdidoi->guidType, &GUID_POV)) + info->pov++; + else if (IsEqualIID(&pdidoi->guidType, &GUID_Button)) + info->button++; + + return DIENUM_CONTINUE; +} + +static const HRESULT SetCoop_null_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, S_OK, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + +static const HRESULT SetCoop_real_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, S_OK, S_OK, E_INVALIDARG, + E_INVALIDARG, S_OK, S_OK, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + +static BOOL CALLBACK EnumJoysticks( + LPCDIDEVICEINSTANCE lpddi, + LPVOID pvRef) +{ + HRESULT hr; + UserData * data = pvRef; + LPDIRECTINPUTDEVICE pJoystick; + DIDATAFORMAT format; + DIDEVCAPS caps; + DIJOYSTATE2 js; + JoystickInfo info; + int i, count; + ULONG ref; + DIDEVICEINSTANCE inst; + DIDEVICEINSTANCE_DX3 inst3; + DIPROPDWORD dipw; + DIPROPSTRING dps; + DIPROPGUIDANDPATH dpg; + WCHAR nameBuffer[MAX_PATH]; + HWND hWnd = get_hwnd(); + char oldstate[248], curstate[248]; + + ok(data->version > 0x0300, "Joysticks not supported in version 0x%04x\n", data->version); + + hr = IDirectInput_CreateDevice(data->pDI, &lpddi->guidInstance, NULL, NULL); + ok(hr==E_POINTER,"IDirectInput_CreateDevice() should have returned " + "E_POINTER, returned: %08x\n", hr); + + hr = IDirectInput_CreateDevice(data->pDI, NULL, &pJoystick, NULL); + ok(hr==E_POINTER,"IDirectInput_CreateDevice() should have returned " + "E_POINTER, returned: %08x\n", hr); + + hr = IDirectInput_CreateDevice(data->pDI, NULL, NULL, NULL); + ok(hr==E_POINTER,"IDirectInput_CreateDevice() should have returned " + "E_POINTER, returned: %08x\n", hr); + + hr = IDirectInput_CreateDevice(data->pDI, &lpddi->guidInstance, + &pJoystick, NULL); + ok(hr==DI_OK,"IDirectInput_CreateDevice() failed: %08x\n", hr); + if (hr!=DI_OK) + goto DONE; + + trace("---- %s ----\n", lpddi->tszProductName); + + /* Test for joystick ID property */ + ZeroMemory(&dipw, sizeof(dipw)); + dipw.diph.dwSize = sizeof(DIPROPDWORD); + dipw.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dipw.diph.dwObj = 0; + dipw.diph.dwHow = DIPH_DEVICE; + + hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_JOYSTICKID, &dipw.diph); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetProperty() for DIPROP_JOYSTICKID failed\n"); + + /* Test for INSTANCENAME property */ + memset(&dps, 0, sizeof(dps)); + dps.diph.dwSize = sizeof(DIPROPSTRING); + dps.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dps.diph.dwHow = DIPH_DEVICE; + + hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_INSTANCENAME, &dps.diph); + ok(SUCCEEDED(hr), "IDirectInput_GetProperty() for DIPROP_INSTANCENAME failed: %08x\n", hr); + + /* Test if instance name is the same as present in DIDEVICEINSTANCE */ + MultiByteToWideChar(CP_ACP, 0, lpddi->tszInstanceName, -1, nameBuffer, MAX_PATH); + ok(!lstrcmpW(nameBuffer, dps.wsz), "DIPROP_INSTANCENAME returned is wrong. Expected: %s Got: %s\n", + wine_dbgstr_w(nameBuffer), wine_dbgstr_w(dps.wsz)); + + /* Test for GUIDPATH properties */ + memset(&dpg, 0, sizeof(dpg)); + dpg.diph.dwSize = sizeof(DIPROPGUIDANDPATH); + dpg.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dpg.diph.dwHow = DIPH_DEVICE; + + hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_GUIDANDPATH, &dpg.diph); + todo_wine ok(SUCCEEDED(hr), "IDirectInput_GetProperty() for DIPROP_GUIDANDPATH failed: %08x\n", hr); + + hr = IDirectInputDevice_SetDataFormat(pJoystick, NULL); + ok(hr==E_POINTER,"IDirectInputDevice_SetDataFormat() should have returned " + "E_POINTER, returned: %08x\n", hr); + + ZeroMemory(&format, sizeof(format)); + hr = IDirectInputDevice_SetDataFormat(pJoystick, &format); + ok(hr==DIERR_INVALIDPARAM,"IDirectInputDevice_SetDataFormat() should have " + "returned DIERR_INVALIDPARAM, returned: %08x\n", hr); + + /* try the default formats */ + hr = IDirectInputDevice_SetDataFormat(pJoystick, &c_dfDIJoystick); + ok(hr==DI_OK,"IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); + + hr = IDirectInputDevice_SetDataFormat(pJoystick, &c_dfDIJoystick2); + ok(hr==DI_OK,"IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); + + /* try an alternate format */ + hr = IDirectInputDevice_SetDataFormat(pJoystick, &c_dfDIJoystickTest); + ok(hr==DI_OK,"IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); + + hr = IDirectInputDevice_SetDataFormat(pJoystick, &c_dfDIJoystick2); + ok(hr==DI_OK,"IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); + if (hr != DI_OK) + goto RELEASE; + + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pJoystick, NULL, i); + ok(hr == SetCoop_null_window[i], "SetCooperativeLevel(NULL, %d): %08x\n", i, hr); + } + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pJoystick, hWnd, i); + ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %08x\n", i, hr); + } + + hr = IDirectInputDevice_SetCooperativeLevel(pJoystick, hWnd, + DISCL_NONEXCLUSIVE | DISCL_BACKGROUND); + ok(hr==DI_OK,"IDirectInputDevice_SetCooperativeLevel() failed: %08x\n", hr); + + /* get capabilities */ + hr = IDirectInputDevice_GetCapabilities(pJoystick, NULL); + ok(hr==E_POINTER,"IDirectInputDevice_GetCapabilities() " + "should have returned E_POINTER, returned: %08x\n", hr); + + ZeroMemory(&caps, sizeof(caps)); + hr = IDirectInputDevice_GetCapabilities(pJoystick, &caps); + ok(hr==DIERR_INVALIDPARAM,"IDirectInputDevice_GetCapabilities() " + "should have returned DIERR_INVALIDPARAM, returned: %08x\n", hr); + + caps.dwSize = sizeof(caps); + hr = IDirectInputDevice_GetCapabilities(pJoystick, &caps); + ok(hr==DI_OK,"IDirectInputDevice_GetCapabilities() failed: %08x\n", hr); + + ZeroMemory(&info, sizeof(info)); + info.pJoystick = pJoystick; + + /* default min/max limits */ + info.lMin = 0; + info.lMax = 0xffff; + /* enumerate objects */ + hr = IDirectInputDevice_EnumObjects(pJoystick, EnumAxes, &info, DIDFT_ALL); + ok(hr==DI_OK,"IDirectInputDevice_EnumObjects() failed: %08x\n", hr); + + ok(caps.dwAxes == info.axis, "Number of enumerated axes (%d) doesn't match capabilities (%d)\n", info.axis, caps.dwAxes); + ok(caps.dwButtons == info.button, "Number of enumerated buttons (%d) doesn't match capabilities (%d)\n", info.button, caps.dwButtons); + ok(caps.dwPOVs == info.pov, "Number of enumerated POVs (%d) doesn't match capabilities (%d)\n", info.pov, caps.dwPOVs); + + /* Set format and check limits again */ + hr = IDirectInputDevice_SetDataFormat(pJoystick, &c_dfDIJoystick2); + ok(hr==DI_OK,"IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); + info.lMin = -2000; + info.lMax = +2000; + info.dZone= 123; + hr = IDirectInputDevice_EnumObjects(pJoystick, EnumAxes, &info, DIDFT_ALL); + ok(hr==DI_OK,"IDirectInputDevice_EnumObjects() failed: %08x\n", hr); + + hr = IDirectInputDevice_GetDeviceInfo(pJoystick, 0); + ok(hr==E_POINTER, "IDirectInputDevice_GetDeviceInfo() " + "should have returned E_POINTER, returned: %08x\n", hr); + + ZeroMemory(&inst, sizeof(inst)); + ZeroMemory(&inst3, sizeof(inst3)); + + hr = IDirectInputDevice_GetDeviceInfo(pJoystick, &inst); + ok(hr==DIERR_INVALIDPARAM, "IDirectInputDevice_GetDeviceInfo() " + "should have returned DIERR_INVALIDPARAM, returned: %08x\n", hr); + + inst.dwSize = sizeof(inst); + hr = IDirectInputDevice_GetDeviceInfo(pJoystick, &inst); + ok(hr==DI_OK,"IDirectInputDevice_GetDeviceInfo() failed: %08x\n", hr); + + inst3.dwSize = sizeof(inst3); + hr = IDirectInputDevice_GetDeviceInfo(pJoystick, (LPDIDEVICEINSTANCE)&inst3); + ok(hr==DI_OK,"IDirectInputDevice_GetDeviceInfo() failed: %08x\n", hr); + + hr = IDirectInputDevice_Unacquire(pJoystick); + ok(hr == S_FALSE, "IDirectInputDevice_Unacquire() should have returned S_FALSE, got: %08x\n", hr); + + hr = IDirectInputDevice_Acquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Acquire() failed: %08x\n", hr); + if (hr != DI_OK) + goto RELEASE; + + hr = IDirectInputDevice_Acquire(pJoystick); + ok(hr == S_FALSE, "IDirectInputDevice_Acquire() should have returned S_FALSE, got: %08x\n", hr); + + if (info.pov < 4) + { + hr = IDirectInputDevice_GetDeviceState(pJoystick, sizeof(DIJOYSTATE2), &js); + ok(hr == DI_OK, "IDirectInputDevice_GetDeviceState() failed: %08x\n", hr); + ok(js.rgdwPOV[3] == -1, "Default for unassigned POV should be -1 not: %d\n", js.rgdwPOV[3]); + } + + if (caps.dwFlags & DIDC_FORCEFEEDBACK) + { + DWORD axes[2] = {DIJOFS_X, DIJOFS_Y}; + LONG direction[2] = {0, 0}; + DICONSTANTFORCE force = {0}; + DIEFFECT eff; + LPDIRECTINPUTEFFECT effect = NULL; + LONG cnt1, cnt2; + HWND real_hWnd; + HINSTANCE hInstance = GetModuleHandle(NULL); + DIPROPDWORD dip_gain_set, dip_gain_get; + + trace("Testing force-feedback\n"); + memset(&eff, 0, sizeof(eff)); + eff.dwSize = sizeof(eff); + eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS; + eff.dwDuration = INFINITE; + eff.dwGain = DI_FFNOMINALMAX; + eff.dwTriggerButton = DIEB_NOTRIGGER; + eff.cAxes = sizeof(axes) / sizeof(axes[0]); + eff.rgdwAxes = axes; + eff.rglDirection = direction; + eff.cbTypeSpecificParams = sizeof(force); + eff.lpvTypeSpecificParams = &force; + + /* Sending effects to joystick requires + * calling IDirectInputEffect_Initialize, which requires + * having exclusive access to the device, which requires + * - not having acquired the joystick when calling + * IDirectInputDevice_SetCooperativeLevel + * - a visible window + */ + real_hWnd = CreateWindowEx(0, "EDIT", "Test text", 0, 10, 10, 300, + 300, NULL, NULL, hInstance, NULL); + ok(real_hWnd!=0,"CreateWindowEx failed: %p\n", real_hWnd); + ShowWindow(real_hWnd, SW_SHOW); + hr = IDirectInputDevice_Unacquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Unacquire() failed: %08x\n", hr); + hr = IDirectInputDevice_SetCooperativeLevel(pJoystick, real_hWnd, + DISCL_EXCLUSIVE | DISCL_FOREGROUND); + ok(hr==DI_OK,"IDirectInputDevice_SetCooperativeLevel() failed: %08x\n", hr); + hr = IDirectInputDevice_Acquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Acquire() failed: %08x\n", hr); + + cnt1 = get_refcount((IUnknown*)pJoystick); + + hr = IDirectInputDevice2_CreateEffect((LPDIRECTINPUTDEVICE2)pJoystick, &GUID_ConstantForce, + &eff, &effect, NULL); + ok(hr == DI_OK, "IDirectInputDevice_CreateEffect() failed: %08x\n", hr); + cnt2 = get_refcount((IUnknown*)pJoystick); + ok(cnt1 == cnt2, "Ref count is wrong %d != %d\n", cnt1, cnt2); + + if (effect) + { + DWORD effect_status; + struct DIPROPDWORD diprop_word; + GUID guid = {0}; + + hr = IDirectInputEffect_Initialize(effect, hInstance, data->version, + &GUID_ConstantForce); + ok(hr==DI_OK,"IDirectInputEffect_Initialize failed: %08x\n", hr); + hr = IDirectInputEffect_SetParameters(effect, &eff, DIEP_AXES | DIEP_DIRECTION | + DIEP_TYPESPECIFICPARAMS); + ok(hr==DI_OK,"IDirectInputEffect_SetParameters failed: %08x\n", hr); + if (hr==DI_OK) { + /* Test that upload, unacquire, acquire still permits updating + * uploaded effect. */ + hr = IDirectInputDevice_Unacquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Unacquire() failed: %08x\n", hr); + hr = IDirectInputDevice_Acquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Acquire() failed: %08x\n", hr); + hr = IDirectInputEffect_SetParameters(effect, &eff, DIEP_GAIN); + ok(hr==DI_OK,"IDirectInputEffect_SetParameters failed: %08x\n", hr); + } + + /* Check effect status. + * State: initially stopped + * start + * State: started + * unacquire, acquire, download + * State: stopped + * start + * State: started + * + * Shows that: + * - effects are stopped after Unacquire + Acquire + * - effects are preserved (Download + Start doesn't complain + * about incomplete effect) + */ + hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); + ok(effect_status==0,"IDirectInputEffect_GetEffectStatus() reported effect as started\n"); + hr = IDirectInputEffect_SetParameters(effect, &eff, DIEP_START); + ok(hr==DI_OK,"IDirectInputEffect_SetParameters failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); + todo_wine ok(effect_status!=0,"IDirectInputEffect_GetEffectStatus() reported effect as stopped\n"); + hr = IDirectInputDevice_Unacquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Unacquire() failed: %08x\n", hr); + hr = IDirectInputDevice_Acquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Acquire() failed: %08x\n", hr); + hr = IDirectInputEffect_Download(effect); + ok(hr==DI_OK,"IDirectInputEffect_Download() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); + ok(effect_status==0,"IDirectInputEffect_GetEffectStatus() reported effect as started\n"); + hr = IDirectInputEffect_Start(effect, 1, 0); + ok(hr==DI_OK,"IDirectInputEffect_Start() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); + todo_wine ok(effect_status!=0,"IDirectInputEffect_GetEffectStatus() reported effect as stopped\n"); + hr = IDirectInputEffect_GetEffectGuid(effect, &guid); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectGuid() failed: %08x\n", hr); + ok(IsEqualGUID(&GUID_ConstantForce, &guid), "Wrong guid returned\n"); + + /* Check autocenter status + * State: initially stopped + * enable + * State: enabled + * acquire + * State: enabled + * unacquire + * State: enabled + * + * IDirectInputDevice2_SetProperty(DIPROP_AUTOCENTER) can only be + * executed when the device is released. + * + * If Executed interactively, user can feel that autocenter is + * only disabled when the joystick is acquired. + */ + diprop_word.diph.dwSize = sizeof(diprop_word); + diprop_word.diph.dwHeaderSize = sizeof(diprop_word.diph); + diprop_word.diph.dwObj = 0; + diprop_word.diph.dwHow = DIPH_DEVICE; + hr = IDirectInputDevice_Unacquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Unacquire() failed: %08x\n", hr); + hr = IDirectInputDevice2_GetProperty(pJoystick, DIPROP_AUTOCENTER, &diprop_word.diph); + ok(hr==DI_OK,"IDirectInputDevice2_GetProperty() failed: %08x\n", hr); + ok(diprop_word.dwData==DIPROPAUTOCENTER_ON,"IDirectInputDevice2_GetProperty() reported autocenter as disabled\n"); + diprop_word.dwData = DIPROPAUTOCENTER_OFF; + hr = IDirectInputDevice2_SetProperty(pJoystick, DIPROP_AUTOCENTER, &diprop_word.diph); + ok(hr==DI_OK,"IDirectInputDevice2_SetProperty() failed: %08x\n", hr); + hr = IDirectInputDevice2_GetProperty(pJoystick, DIPROP_AUTOCENTER, &diprop_word.diph); + ok(hr==DI_OK,"IDirectInputDevice2_GetProperty() failed: %08x\n", hr); + ok(diprop_word.dwData==DIPROPAUTOCENTER_OFF,"IDirectInputDevice2_GetProperty() reported autocenter as enabled\n"); + if (winetest_interactive) { + trace("Acquiring in 2s, autocenter will be disabled.\n"); + Sleep(2000); + } + hr = IDirectInputDevice_Acquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Acquire() failed: %08x\n", hr); + if (winetest_interactive) + trace("Acquired.\n"); + hr = IDirectInputDevice2_GetProperty(pJoystick, DIPROP_AUTOCENTER, &diprop_word.diph); + ok(hr==DI_OK,"IDirectInputDevice2_GetProperty() failed: %08x\n", hr); + ok(diprop_word.dwData==DIPROPAUTOCENTER_OFF,"IDirectInputDevice2_GetProperty() reported autocenter as enabled\n"); + if (winetest_interactive) { + trace("Releasing in 2s, autocenter will be re-enabled.\n"); + Sleep(2000); + } + hr = IDirectInputDevice_Unacquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Unacquire() failed: %08x\n", hr); + if (winetest_interactive) + trace("Released\n"); + hr = IDirectInputDevice2_GetProperty(pJoystick, DIPROP_AUTOCENTER, &diprop_word.diph); + ok(hr==DI_OK,"IDirectInputDevice2_GetProperty() failed: %08x\n", hr); + ok(diprop_word.dwData==DIPROPAUTOCENTER_OFF,"IDirectInputDevice2_GetProperty() reported autocenter as enabled\n"); + hr = IDirectInputDevice_Acquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Acquire() failed: %08x\n", hr); + hr = IDirectInputDevice2_GetProperty(pJoystick, DIPROP_AUTOCENTER, &diprop_word.diph); + ok(hr==DI_OK,"IDirectInputDevice2_GetProperty() failed: %08x\n", hr); + + /* Device gain (DIPROP_FFGAIN). + * From MSDN: + * 0..10000 range, otherwise DIERR_INVALIDPARAM. + * Can be changed even if device is acquired. + * Difference found by tests: + * <0 is refused, >10000 is accepted + */ + dip_gain_set.diph.dwSize = sizeof(DIPROPDWORD); + dip_gain_set.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dip_gain_set.diph.dwObj = 0; + dip_gain_set.diph.dwHow = DIPH_DEVICE; + dip_gain_set.dwData = 10000; + dip_gain_get.diph.dwSize = sizeof(DIPROPDWORD); + dip_gain_get.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dip_gain_get.diph.dwObj = 0; + dip_gain_get.diph.dwHow = DIPH_DEVICE; + dip_gain_get.dwData = 0; + + /* Test device is acquisition (non)impact. */ + hr = IDirectInputDevice_Unacquire(pJoystick); + ok(hr == DI_OK, "IDirectInputDevice_Unacquire() should have returned S_FALSE, got: %08x\n", hr); + dip_gain_set.dwData = 1; + hr = IDirectInputDevice_SetProperty(pJoystick, DIPROP_FFGAIN, &dip_gain_set.diph); + ok(hr==DI_OK, "IDirectInputDevice_SetProperty() failed: %08x\n", hr); + hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_FFGAIN, &dip_gain_get.diph); + ok(hr==DI_OK, "IDirectInputDevice_GetProperty() failed: %08x\n", hr); + ok(dip_gain_get.dwData==dip_gain_set.dwData, "Gain not udated: %i\n", dip_gain_get.dwData); + hr = IDirectInputDevice_Acquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Acquire() failed: %08x\n", hr); + dip_gain_set.dwData = 2; + hr = IDirectInputDevice_SetProperty(pJoystick, DIPROP_FFGAIN, &dip_gain_set.diph); + ok(hr==DI_OK, "IDirectInputDevice_SetProperty() failed: %08x\n", hr); + hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_FFGAIN, &dip_gain_get.diph); + ok(hr==DI_OK, "IDirectInputDevice_GetProperty() failed: %08x\n", hr); + ok(dip_gain_get.dwData==dip_gain_set.dwData, "Gain not udated: %i\n", dip_gain_get.dwData); + /* Test range and internal clamping. */ + dip_gain_set.dwData = -1; + hr = IDirectInputDevice_SetProperty(pJoystick, DIPROP_FFGAIN, &dip_gain_set.diph); + todo_wine ok(hr==DIERR_INVALIDPARAM, "IDirectInputDevice_SetProperty() should have returned %08x: %08x\n", DIERR_INVALIDPARAM, hr); + dip_gain_set.dwData = 0; + hr = IDirectInputDevice_SetProperty(pJoystick, DIPROP_FFGAIN, &dip_gain_set.diph); + ok(hr==DI_OK, "IDirectInputDevice_SetProperty() failed: %08x\n", hr); + hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_FFGAIN, &dip_gain_get.diph); + ok(hr==DI_OK, "IDirectInputDevice_GetProperty() failed: %08x\n", hr); + ok(dip_gain_get.dwData==dip_gain_set.dwData, "Gain not updated: %i\n", dip_gain_get.dwData); + dip_gain_set.dwData = 10000; + hr = IDirectInputDevice_SetProperty(pJoystick, DIPROP_FFGAIN, &dip_gain_set.diph); + ok(hr==DI_OK, "IDirectInputDevice_SetProperty() failed: %08x\n", hr); + hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_FFGAIN, &dip_gain_get.diph); + ok(hr==DI_OK, "IDirectInputDevice_GetProperty() failed: %08x\n", hr); + ok(dip_gain_get.dwData==dip_gain_set.dwData, "Gain not updated: %i\n", dip_gain_get.dwData); + /* WARNING: This call succeeds, on the contrary of what is stated on MSDN. */ + dip_gain_set.dwData = 10001; + hr = IDirectInputDevice_SetProperty(pJoystick, DIPROP_FFGAIN, &dip_gain_set.diph); + ok(hr==DI_OK, "IDirectInputDevice_SetProperty() failed: %08x\n", hr); + hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_FFGAIN, &dip_gain_get.diph); + ok(hr==DI_OK, "IDirectInputDevice_GetProperty() failed: %08x\n", hr); + ok(dip_gain_get.dwData==dip_gain_set.dwData, "Gain not updated: %i\n", dip_gain_get.dwData); + + ref = IUnknown_Release(effect); + ok(ref == 0, "IDirectInputDevice_Release() reference count = %d\n", ref); + } + cnt1 = get_refcount((IUnknown*)pJoystick); + ok(cnt1 == cnt2, "Ref count is wrong %d != %d\n", cnt1, cnt2); + + /* Before destroying the window, release joystick to revert to + * non-exclusive, background cooperative level. */ + hr = IDirectInputDevice_Unacquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Unacquire() failed: %08x\n", hr); + hr = IDirectInputDevice_SetCooperativeLevel(pJoystick, hWnd, + DISCL_NONEXCLUSIVE | DISCL_BACKGROUND); + ok(hr==DI_OK,"IDirectInputDevice_SetCooperativeLevel() failed: %08x\n", hr); + DestroyWindow (real_hWnd); + hr = IDirectInputDevice_Acquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Acquire() failed: %08x\n", hr); + } + + if (winetest_interactive) { + trace("You have 30 seconds to test all axes, sliders, POVs and buttons\n"); + count = 300; + } else + count = 1; + + trace("\n"); + oldstate[0]='\0'; + for (i = 0; i < count; i++) { + hr = IDirectInputDevice_GetDeviceState(pJoystick, sizeof(DIJOYSTATE2), &js); + ok(hr==DI_OK,"IDirectInputDevice_GetDeviceState() failed: %08x\n", hr); + if (hr != DI_OK) + break; + sprintf(curstate, "X%5d Y%5d Z%5d Rx%5d Ry%5d Rz%5d " + "S0%5d S1%5d POV0%5d POV1%5d POV2%5d POV3%5d " + "B %d %d %d %d %d %d %d %d %d %d %d %d\n", + js.lX, js.lY, js.lZ, js.lRx, js.lRy, js.lRz, + js.rglSlider[0], js.rglSlider[1], + js.rgdwPOV[0], js.rgdwPOV[1], js.rgdwPOV[2], js.rgdwPOV[3], + js.rgbButtons[0]>>7, js.rgbButtons[1]>>7, js.rgbButtons[2]>>7, + js.rgbButtons[3]>>7, js.rgbButtons[4]>>7, js.rgbButtons[5]>>7, + js.rgbButtons[6]>>7, js.rgbButtons[7]>>7, js.rgbButtons[8]>>7, + js.rgbButtons[9]>>7, js.rgbButtons[10]>>7, js.rgbButtons[11]>>7); + if (strcmp(oldstate, curstate) != 0) + { + trace("%s\n", curstate); + strcpy(oldstate, curstate); + } + Sleep(100); + } + trace("\n"); + + hr = IDirectInputDevice_Unacquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Unacquire() failed: %08x\n", hr); + +RELEASE: + ref = IDirectInputDevice_Release(pJoystick); + ok(ref==0,"IDirectInputDevice_Release() reference count = %d\n", ref); + +DONE: + return DIENUM_CONTINUE; +} + +static void joystick_tests(DWORD version) +{ + HRESULT hr; + LPDIRECTINPUT pDI; + ULONG ref; + HINSTANCE hInstance = GetModuleHandle(NULL); + + trace("-- Testing Direct Input Version 0x%04x --\n", version); + hr = DirectInputCreate(hInstance, version, &pDI, NULL); + ok(hr==DI_OK||hr==DIERR_OLDDIRECTINPUTVERSION, + "DirectInputCreate() failed: %08x\n", hr); + if (hr==DI_OK && pDI!=0) { + UserData data; + data.pDI = pDI; + data.version = version; + hr = IDirectInput_EnumDevices(pDI, DIDEVTYPE_JOYSTICK, EnumJoysticks, + &data, DIEDFL_ALLDEVICES); + ok(hr==DI_OK,"IDirectInput_EnumDevices() failed: %08x\n", hr); + ref = IDirectInput_Release(pDI); + ok(ref==0,"IDirectInput_Release() reference count = %d\n", ref); + } else if (hr==DIERR_OLDDIRECTINPUTVERSION) + trace(" Version Not Supported\n"); +} + +START_TEST(joystick) +{ + CoInitialize(NULL); + + joystick_tests(0x0700); + joystick_tests(0x0500); + joystick_tests(0x0300); + + CoUninitialize(); +} Propchange: trunk/rostests/winetests/dinput/joystick.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/dinput/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/keyboard… ============================================================================== --- trunk/rostests/winetests/dinput/keyboard.c (added) +++ trunk/rostests/winetests/dinput/keyboard.c [iso-8859-1] Mon Apr 15 19:31:42 2013 @@ -1,0 +1,241 @@ +/* + * Copyright (c) 2005 Robert Reif + * + * 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 WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define DIRECTINPUT_VERSION 0x0700 + +#define COBJMACROS +//#include <windows.h> + +//#include <math.h> +//#include <stdio.h> +//#include <stdlib.h> + +#include <wine/test.h> +//#include "windef.h" +//#include "wingdi.h" +#include <dinput.h> + +static void acquire_tests(LPDIRECTINPUT pDI, HWND hwnd) +{ + HRESULT hr; + LPDIRECTINPUTDEVICE pKeyboard; + BYTE kbd_state[256]; + LONG custom_state[6]; + int i; + DIOBJECTDATAFORMAT dodf[] = + { + { &GUID_Key, sizeof(LONG) * 0, DIDFT_MAKEINSTANCE(DIK_Q)|DIDFT_BUTTON, 0 }, + { &GUID_Key, sizeof(LONG) * 1, DIDFT_MAKEINSTANCE(DIK_W)|DIDFT_BUTTON, 0 }, + { &GUID_Key, sizeof(LONG) * 2, DIDFT_MAKEINSTANCE(DIK_E)|DIDFT_BUTTON, 0 }, + { &GUID_Key, sizeof(LONG) * 4, DIDFT_MAKEINSTANCE(DIK_R)|DIDFT_BUTTON, 0 }, + }; + + DIDATAFORMAT df; + df.dwSize = sizeof( df ); + df.dwObjSize = sizeof( DIOBJECTDATAFORMAT ); + df.dwFlags = DIDF_RELAXIS; + df.dwDataSize = sizeof( custom_state ); + df.dwNumObjs = sizeof( dodf )/sizeof( dodf[0] ); + df.rgodf = dodf; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + if (FAILED(hr)) return; + + hr = IDirectInputDevice_SetDataFormat(pKeyboard, &c_dfDIKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); + hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, NULL, DISCL_NONEXCLUSIVE | DISCL_BACKGROUND); + ok(SUCCEEDED(hr), "IDirectInputDevice_SetCooperativeLevel() failed: %08x\n", hr); + hr = IDirectInputDevice_GetDeviceState(pKeyboard, 10, kbd_state); + ok(hr == DIERR_NOTACQUIRED, "IDirectInputDevice_GetDeviceState(10,) should have failed: %08x\n", hr); + hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(kbd_state), kbd_state); + ok(hr == DIERR_NOTACQUIRED, "IDirectInputDevice_GetDeviceState() should have failed: %08x\n", hr); + hr = IDirectInputDevice_Unacquire(pKeyboard); + ok(hr == S_FALSE, "IDirectInputDevice_Unacquire() should have failed: %08x\n", hr); + hr = IDirectInputDevice_Acquire(pKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); + hr = IDirectInputDevice_Acquire(pKeyboard); + ok(hr == S_FALSE, "IDirectInputDevice_Acquire() should have failed: %08x\n", hr); + hr = IDirectInputDevice_GetDeviceState(pKeyboard, 10, kbd_state); + ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetDeviceState(10,) should have failed: %08x\n", hr); + hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(kbd_state), kbd_state); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState() failed: %08x\n", hr); + hr = IDirectInputDevice_Unacquire(pKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice_Uncquire() failed: %08x\n", hr); + hr = IDirectInputDevice_SetDataFormat( pKeyboard , &df ); + ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); + hr = IDirectInputDevice_Acquire(pKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); + hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(custom_state), custom_state); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState(4,) failed: %08x\n", hr); + hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(kbd_state), kbd_state); + ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetDeviceState(256,) should have failed: %08x\n", hr); + + memset(custom_state, 0x56, sizeof(custom_state)); + IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(custom_state), custom_state); + for (i = 0; i < sizeof(custom_state) / sizeof(custom_state[0]); i++) + ok(custom_state[i] == 0, "Should be zeroed, got 0x%08x\n", custom_state[i]); + + if (pKeyboard) IUnknown_Release(pKeyboard); +} + +static const HRESULT SetCoop_null_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, S_OK, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + +static const HRESULT SetCoop_real_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, S_OK, S_OK, E_INVALIDARG, + E_INVALIDARG, E_NOTIMPL, S_OK, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + +static const HRESULT SetCoop_child_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + +static void test_set_coop(LPDIRECTINPUT pDI, HWND hwnd) +{ + HRESULT hr; + LPDIRECTINPUTDEVICE pKeyboard = NULL; + int i; + HWND child; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + if (FAILED(hr)) return; + + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, NULL, i); + ok(hr == SetCoop_null_window[i], "SetCooperativeLevel(NULL, %d): %08x\n", i, hr); + } + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, hwnd, i); + ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %08x\n", i, hr); + } + + child = CreateWindow("static", "Title", WS_CHILD | WS_VISIBLE, + 10, 10, 50, 50, hwnd, NULL, NULL, NULL); + ok(child != NULL, "err: %d\n", GetLastError()); + + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, child, i); + ok(hr == SetCoop_child_window[i], "SetCooperativeLevel(child, %d): %08x\n", i, hr); + } + + DestroyWindow(child); + if (pKeyboard) IUnknown_Release(pKeyboard); +} + +static void test_get_prop(LPDIRECTINPUT pDI, HWND hwnd) +{ + HRESULT hr; + LPDIRECTINPUTDEVICE pKeyboard = NULL; + DIPROPRANGE diprg; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + if (FAILED(hr)) return; + + memset(&diprg, 0, sizeof(diprg)); + diprg.diph.dwSize = sizeof(DIPROPRANGE); + diprg.diph.dwHeaderSize = sizeof(DIPROPHEADER); + diprg.diph.dwHow = DIPH_DEVICE; + diprg.diph.dwObj = 0; + + hr = IDirectInputDevice_GetProperty(pKeyboard, DIPROP_RANGE, &diprg.diph); + ok(hr == DIERR_UNSUPPORTED, "IDirectInputDevice_GetProperty() did not return DIPROP_RANGE but: %08x\n", hr); + + if (pKeyboard) IUnknown_Release(pKeyboard); +} + +static void test_capabilities(LPDIRECTINPUT pDI, HWND hwnd) +{ + HRESULT hr; + LPDIRECTINPUTDEVICE pKeyboard = NULL; + DIDEVCAPS caps; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + if (FAILED(hr)) return; + + caps.dwSize = sizeof(caps); + hr = IDirectInputDevice_GetCapabilities(pKeyboard, &caps); + + ok (SUCCEEDED(hr), "GetCapabilities failed: 0x%08x\n", hr); + ok (caps.dwFlags & DIDC_ATTACHED, "GetCapabilities dwFlags: 0x%08x\n", caps.dwFlags); + ok (LOWORD(LOBYTE(caps.dwDevType)) == DIDEVTYPE_KEYBOARD, + "GetCapabilities invalid device type for dwDevType: 0x%08x\n", caps.dwDevType); + ok (LOWORD(HIBYTE(caps.dwDevType)) != DIDEVTYPEKEYBOARD_UNKNOWN, + "GetCapabilities invalid device subtype for dwDevType: 0x%08x\n", caps.dwDevType); + + IUnknown_Release(pKeyboard); +} + +static void keyboard_tests(DWORD version) +{ + HRESULT hr; + LPDIRECTINPUT pDI = NULL; + HINSTANCE hInstance = GetModuleHandle(NULL); + HWND hwnd; + ULONG ref = 0; + + hr = DirectInputCreate(hInstance, version, &pDI, NULL); + if (hr == DIERR_OLDDIRECTINPUTVERSION) + { + skip("Tests require a newer dinput version\n"); + return; + } + ok(SUCCEEDED(hr), "DirectInputCreate() failed: %08x\n", hr); + if (FAILED(hr)) return; + + hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 10, 10, 200, 200, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "err: %d\n", GetLastError()); + + if (hwnd) + { + acquire_tests(pDI, hwnd); + test_set_coop(pDI, hwnd); + test_get_prop(pDI, hwnd); + test_capabilities(pDI, hwnd); + } + + DestroyWindow(hwnd); + if (pDI) ref = IUnknown_Release(pDI); + ok(!ref, "IDirectInput_Release() reference count = %d\n", ref); +} + +START_TEST(keyboard) +{ + CoInitialize(NULL); + + keyboard_tests(0x0700); + + CoUninitialize(); +} Propchange: trunk/rostests/winetests/dinput/keyboard.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/dinput/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/mouse.c?… ============================================================================== --- trunk/rostests/winetests/dinput/mouse.c (added) +++ trunk/rostests/winetests/dinput/mouse.c [iso-8859-1] Mon Apr 15 19:31:42 2013 @@ -1,0 +1,225 @@ +/* + * Copyright (c) 2005 Robert Reif + * Copyright (c) 2006 Vitaliy Margolen + * + * 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 WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define DIRECTINPUT_VERSION 0x0700 + +#define COBJMACROS +//#include <windows.h> + +//#include <math.h> +//#include <stdlib.h> + +#include <wine/test.h> +//#include "windef.h" +//#include "wingdi.h" +#include <dinput.h> + +static const HRESULT SetCoop_null_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, S_OK, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + +static const HRESULT SetCoop_real_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, S_OK, S_OK, E_INVALIDARG, + E_INVALIDARG, E_NOTIMPL, S_OK, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + +static const HRESULT SetCoop_child_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + +static void test_set_coop(LPDIRECTINPUT pDI, HWND hwnd) +{ + HRESULT hr; + LPDIRECTINPUTDEVICE pMouse = NULL; + int i; + HWND child; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + if (FAILED(hr)) return; + + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pMouse, NULL, i); + ok(hr == SetCoop_null_window[i], "SetCooperativeLevel(NULL, %d): %08x\n", i, hr); + } + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pMouse, hwnd, i); + ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %08x\n", i, hr); + } + + child = CreateWindow("static", "Title", WS_CHILD | WS_VISIBLE, + 10, 10, 50, 50, hwnd, NULL, NULL, NULL); + ok(child != NULL, "err: %d\n", GetLastError()); + + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pMouse, child, i); + ok(hr == SetCoop_child_window[i], "SetCooperativeLevel(child, %d): %08x\n", i, hr); + } + + DestroyWindow(child); + if (pMouse) IUnknown_Release(pMouse); +} + +static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) +{ + HRESULT hr; + LPDIRECTINPUTDEVICE pMouse = NULL; + DIMOUSESTATE m_state; + HWND hwnd2; + DIPROPDWORD di_op; + DIDEVICEOBJECTDATA mouse_state; + DWORD cnt; + int i; + + if (! SetForegroundWindow(hwnd)) + { + skip("Not running as foreground app, skipping acquire tests\n"); + return; + } + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + if (FAILED(hr)) return; + + hr = IDirectInputDevice_SetCooperativeLevel(pMouse, hwnd, DISCL_NONEXCLUSIVE | DISCL_FOREGROUND); + ok(hr == S_OK, "SetCooperativeLevel: %08x\n", hr); + + memset(&di_op, 0, sizeof(di_op)); + di_op.dwData = 5; + di_op.diph.dwHow = DIPH_DEVICE; + di_op.diph.dwSize = sizeof(DIPROPDWORD); + di_op.diph.dwHeaderSize = sizeof(DIPROPHEADER); + hr = IDirectInputDevice_SetProperty(pMouse, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&di_op); + ok(hr == S_OK, "SetProperty() failed: %08x\n", hr); + + hr = IDirectInputDevice_SetDataFormat(pMouse, &c_dfDIMouse); + ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); + hr = IDirectInputDevice_Unacquire(pMouse); + ok(hr == S_FALSE, "IDirectInputDevice_Unacquire() should have failed: %08x\n", hr); + hr = IDirectInputDevice_Acquire(pMouse); + ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); + hr = IDirectInputDevice_Acquire(pMouse); + ok(hr == S_FALSE, "IDirectInputDevice_Acquire() should have failed: %08x\n", hr); + + /* Foreground coop level requires window to have focus */ + /* Create a temporary window, this should make dinput + * loose mouse input */ + hwnd2 = CreateWindow("static", "Temporary", WS_VISIBLE, + 10, 210, 200, 200, NULL, NULL, NULL, NULL); + + hr = IDirectInputDevice_GetDeviceState(pMouse, sizeof(m_state), &m_state); + ok(hr == DIERR_NOTACQUIRED, "GetDeviceState() should have failed: %08x\n", hr); + /* Workaround so we can test other things. Remove when Wine is fixed */ + IDirectInputDevice_Unacquire(pMouse); + + hr = IDirectInputDevice_Acquire(pMouse); + ok(hr == DIERR_OTHERAPPHASPRIO, "Acquire() should have failed: %08x\n", hr); + + SetActiveWindow( hwnd ); + hr = IDirectInputDevice_Acquire(pMouse); + ok(hr == S_OK, "Acquire() failed: %08x\n", hr); + + mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); + ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + + mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); + IDirectInputDevice_Unacquire(pMouse); + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); + ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + + IDirectInputDevice_Acquire(pMouse); + mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); + IDirectInputDevice_Unacquire(pMouse); + IDirectInputDevice_Acquire(pMouse); + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); + ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + + /* Check for buffer owerflow */ + for (i = 0; i < 6; i++) + mouse_event(MOUSEEVENTF_MOVE, 10 + i, 10 + i, 0, 0); + + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); + ok(hr == DI_OK, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); + ok(hr == DI_OK && cnt == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + + if (pMouse) IUnknown_Release(pMouse); + + DestroyWindow( hwnd2 ); +} + +static void mouse_tests(void) +{ + HRESULT hr; + LPDIRECTINPUT pDI = NULL; + HINSTANCE hInstance = GetModuleHandle(NULL); + HWND hwnd; + ULONG ref = 0; + + hr = DirectInputCreate(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); + if (hr == DIERR_OLDDIRECTINPUTVERSION) + { + skip("Tests require a newer dinput version\n"); + return; + } + ok(SUCCEEDED(hr), "DirectInputCreate() failed: %08x\n", hr); + if (FAILED(hr)) return; + + hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, + 10, 10, 200, 200, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "err: %d\n", GetLastError()); + if (hwnd) + { + ShowWindow(hwnd, SW_SHOW); + + test_set_coop(pDI, hwnd); + test_acquire(pDI, hwnd); + + DestroyWindow(hwnd); + } + if (pDI) ref = IUnknown_Release(pDI); + ok(!ref, "IDirectInput_Release() reference count = %d\n", ref); +} + +START_TEST(mouse) +{ + CoInitialize(NULL); + + mouse_tests(); + + CoUninitialize(); +} Propchange: trunk/rostests/winetests/dinput/mouse.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/dinput/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/testlist… ============================================================================== --- trunk/rostests/winetests/dinput/testlist.c (added) +++ trunk/rostests/winetests/dinput/testlist.c [iso-8859-1] Mon Apr 15 19:31:42 2013 @@ -1,0 +1,20 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_device(void); +extern void func_dinput(void); +extern void func_joystick(void); +extern void func_keyboard(void); +extern void func_mouse(void); + +const struct test winetest_testlist[] = +{ + { "device", func_device }, + { "dinput", func_dinput }, + { "joystick", func_joystick }, + { "keyboard", func_keyboard }, + { "mouse", func_mouse }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/dinput/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 8 months

[akhaldi] 58768: [DINPUT] * Sync with Wine 1.5.26.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Apr 15 18:54:35 2013 New Revision: 58768 URL: http://svn.reactos.org/svn/reactos?rev=58768&view=rev Log: [DINPUT] * Sync with Wine 1.5.26. Added: trunk/reactos/dll/directx/dinput/config.c (with props) trunk/reactos/dll/directx/dinput/dinput.rc (with props) trunk/reactos/dll/directx/dinput/dinput_classes.idl (with props) trunk/reactos/dll/directx/dinput/dinput_classes.rgs (with props) trunk/reactos/dll/directx/dinput/joystick.c (with props) trunk/reactos/dll/directx/dinput/joystick_osx.c (with props) trunk/reactos/dll/directx/dinput/joystick_private.h (with props) trunk/reactos/dll/directx/dinput/resource.h (with props) trunk/reactos/include/psdk/dinputd.h (with props) Removed: trunk/reactos/dll/directx/dinput/regsvr.c trunk/reactos/dll/directx/dinput/version.rc Modified: trunk/reactos/dll/directx/dinput/CMakeLists.txt trunk/reactos/dll/directx/dinput/device.c trunk/reactos/dll/directx/dinput/device_private.h trunk/reactos/dll/directx/dinput/dinput_main.c trunk/reactos/dll/directx/dinput/dinput_private.h trunk/reactos/dll/directx/dinput/effect_linuxinput.c trunk/reactos/dll/directx/dinput/joystick_linux.c trunk/reactos/dll/directx/dinput/joystick_linuxinput.c trunk/reactos/dll/directx/dinput/keyboard.c trunk/reactos/dll/directx/dinput/mouse.c trunk/reactos/include/psdk/dinput.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/dinput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/CMakeLi… Added: trunk/reactos/dll/directx/dinput/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/config.… Modified: trunk/reactos/dll/directx/dinput/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/device.… Modified: trunk/reactos/dll/directx/dinput/device_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/device_… Added: trunk/reactos/dll/directx/dinput/dinput.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/dinput.… Added: trunk/reactos/dll/directx/dinput/dinput_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/dinput_… Added: trunk/reactos/dll/directx/dinput/dinput_classes.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/dinput_… Modified: trunk/reactos/dll/directx/dinput/dinput_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/dinput_… Modified: trunk/reactos/dll/directx/dinput/dinput_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/dinput_… Modified: trunk/reactos/dll/directx/dinput/effect_linuxinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/effect_… Added: trunk/reactos/dll/directx/dinput/joystick.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/joystic… Modified: trunk/reactos/dll/directx/dinput/joystick_linux.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/joystic… Modified: trunk/reactos/dll/directx/dinput/joystick_linuxinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/joystic… Added: trunk/reactos/dll/directx/dinput/joystick_osx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/joystic… Added: trunk/reactos/dll/directx/dinput/joystick_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/joystic… Modified: trunk/reactos/dll/directx/dinput/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/keyboar… Modified: trunk/reactos/dll/directx/dinput/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/mouse.c… Removed: trunk/reactos/dll/directx/dinput/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/regsvr.… Added: trunk/reactos/dll/directx/dinput/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/resourc… Removed: trunk/reactos/dll/directx/dinput/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/version… Modified: trunk/reactos/include/psdk/dinput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dinput.h?rev=… Added: trunk/reactos/include/psdk/dinputd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dinputd.h?rev… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

11 years, 8 months

[akhaldi] 58767: [CMAKE] * Use PSEH2 again for TestBE (reverts 58603 and 58604).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Apr 15 12:59:35 2013 New Revision: 58767 URL: http://svn.reactos.org/svn/reactos?rev=58767&view=rev Log: [CMAKE] * Use PSEH2 again for TestBE (reverts 58603 and 58604). Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=58767&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Apr 15 12:59:35 2013 @@ -91,12 +91,6 @@ add_compile_flags("-mpreferred-stack-boundary=4") endif() -# PSEH -if(GCC_VERSION VERSION_GREATER 4.7) - set(USE_PSEH3 1) - add_definitions(-D_USE_PSEH3=1) -endif() - # Other if(ARCH STREQUAL "amd64") add_definitions(-U_X86_ -UWIN32)

11 years, 8 months

← Newer
1
...
10
11
12
13
14
15
16
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2013