Release 980201
Sun Feb 1 13:24:54 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [files/drive.c]
Added Device= parameter to drive configuration.
* [if1632/relay.c]
Throw() and Catch() now use the correct CATCHBUF layout (untested).
* [tools/build.c] [include/stackframe.h] [loader/task.c]
Moved 16-bit stack pointer into thread database.
Save current %fs while running 16-bit code.
Fri Jan 30 09:25:49 1998 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [graphics/mapping.c]
Made DPtoLP32 and LPtoDP32 respect world transforms.
* [graphics/path.c] [graphics/painting.c] [if1632/gdi.spec]
[include/path.h]
More path support.
* [include/gdi.h] [include/windows.h] [objects/dc.c]
[relay/gdi32.spec]
Support for Get/SetArcDirection and Get/SetWorldTransform
* [windows/hook.c]
Fixed a bug in HOOK_Map16To32Common.
Thu Jan 29 23:43:18 1998 Douglas Ridgway <ridgway@taiga.gmcl.com>
* [graphics/metafiledrv/init.c] [objects/metafile.c]
Documentation for metafile related API calls. Fixed a bug to avoid
documenting it.
* [include/windows.h]
Declaration for LoadImage.
Thu Jan 29 21:44:45 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/win16drv/*]
Changes to printing code to enable use of printer fonts with the
win3.1 postscript driver. Remember to add printer=on to [wine]
section of wine.conf . You will also need to disable truetype
fonts from control panel. Winword 6.0 and Write seem to be happy
with this...
* [include/bitmap.h]
Fix Widthbytes for 15bpp displays.
Tue Jan 27 20:54:08 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [tsx11/*] [include/ts*] [tools/make_X11wrappers]
Implemented thread-safe X11 wrappers.
Tue Jan 27 13:54:09 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [windows/queue.c]
Forgot to convert thdb to thread_id.
* [misc/registry.c]
Sped up Windows 95 registry reading. Changed code to traverse
registry as a tree rather than read in all possible keys
(including dead ones).
Tue Jan 27 12:46:09 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_image.c][Makefile.in][scheduler/thread.c]
[libtest/hello5.c]
Don't exit() on failed to load referenced dlls.
Fixed static tls allocation for multiple threads.
WINELIB should now be able to load PE dlls. A sample
winelib program, that dynamically loads a internal dll
is included.
* [graphics/ddraw.c][include/ddraw.h][include/d3d.h]
Cleaned up and enhanced further. Added several DirectX5
interface definitions and DirectSurface3 implementation.
Stubs for D3D (NOT coming soon, just there so it fails safely).
* [multimedia/dsound.c][include/dsound.h]
Actually works now for a lot of cases. Some DirectX5 stuff
added. Still lacking several features.
* [windows/dinput.c][include/dinput.h]
Started implementing DirectInput. Doesn't work yet, don't
know why.
* [if1632/thunk.c][misc/callbacks.c]
[win32/kernel.c][include/callbacks.h]
Added WOWCallback16Ex, WOWHandle32.
* [misc/cpu.c]
Fixed GetSystemInfo, IsProcessorFeaturePresent.
* [multimedia/joystick.c][multimedia/time.c]
Several fixes. Small hack to get timerevents in timeGetTime() loops.
Tue Jan 20 11:26:27 1998 Slaven Rezic <eserte@cs.tu-berlin.de>
* [configure.in]
Fixed check for union semun on FreeBSD systems.
Sun Jan 18 23:05:04 1998 Karl Backström <karl_b@geocities.com>
* [misc/ole2nls.c] [programs/progman/Sw.rc] [programs/winhelp/Sw.rc]
[resources/sysres_Sw.rc]
Added/updated Swedish language support.
Sun Jan 18 18:49:01 1998 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [misc/winsock.c] [misc/winsock_dns.c] [windows/event.c]
[windows/win.c] [windows/dce.c] [windows/winpos.c]
Bug fixes.
Sun Jan 18 12:45:23 1997 Andreas Mohr <100.30936@germany.net>
* [msdos/int25.c] [msdos/int26.c]
Implemented "native" absolute disk read/write access.
* [msdos/int13.c] [msdos/ioports.c]
Enhanced GET DRIVE PARAMETERS (int13 AH=08).
* [graphics/win16drv/prtdrv.c] [if1632/gdi.spec]
Fixed typos, implemented dmEnumDFonts,
Started implementation of dmRealizeObject.
* [if1632/compobj.spec] [ole/compobj.c] [relay32/ole32.spec]
Stubs CoCreateInstance, CoFreeUnusedLibraries, implemented
CoFileTimeNow.
* [if1632/kernel.spec] [include/windows.h] [memory/global.c]
[memory/string.c] [misc/kernel.c] [misc/Makefile.in]
[misc/toolhelp.c] [msdos/int21.c]
Implemented GlobalHandleNoRIP, GetFreeMemInfo, DebugFillBuffer,
stubs GetSetKernelDOSProc, DiagQuery, DiagOutput, ToolHelpHook
(Undocumented Windows).
* [if1632/user.spec] [if1632/win32s16.spec] [misc/win32s16.c]
Misc stubs.
* [if1632/winaspi.spec] [misc/aspi.c]
Implemented GetASPIDLLVersion.
* [if1632/wprocs.spec] [msdos/int20.c] [msdos/Makefile.in]
Added handler for Int 0x20 (terminate program, _very_ old-fashioned).
* [misc/w32scomb.c]
Implemented Get16DLLAddress() partially
(big thanks to Marcus and Alexandre).
* [relay32/Makefile.in] [relay32/builtin32.c] [relay32/dplay.spec]
Added built-in DPLAY.DLL.
* [relay32/winmm.spec] [multimedia/joystick.c]
Added joySetThreshold.
* [misc/windebug.c]
Added WinNotify.
* [win32/console.c]
Stubs CreateConsoleScreenBuffer, SetConsoleActiveScreenBuffer,
WriteConsoleOutput32A.
* [windows/user.c]
Stub SetEventHook.
Sat Jan 17 19:30:35 1998 Matthew Toseland <Paul.Toseland@btinternet.com>
* [windows/painting.c]
Fixed broken restore-to-maximized.
Mon Jan 12 21:25:32 1998 Perceval - Marc Huguet Puig <mhp@tinet.fut.es>
* [documentation/wine.man] [include/options.h]
[misc/main.c] [ole/ole2nls.c] [resources/sysres.c]
[resources/sysres_Ca.rc] [resources/Makefile.in]
Added language catalan. (Afegit l'idioma català).
1998-02-01 19:33:27 +01:00
|
|
|
/* DirectInput
|
|
|
|
*
|
|
|
|
* Copyright 1998 Marcus Meissner
|
1999-02-09 15:18:21 +01:00
|
|
|
* Copyright 1998,1999 Lionel Ulmer
|
2002-06-14 02:39:44 +02:00
|
|
|
* Copyright 2000-2002 TransGaming Technologies Inc.
|
2007-07-12 06:51:32 +02:00
|
|
|
* Copyright 2007 Vitaliy Margolen
|
1998-11-06 18:28:22 +01:00
|
|
|
*
|
2002-03-10 00:29:33 +01:00
|
|
|
*
|
|
|
|
* 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
|
2006-05-18 14:49:52 +02:00
|
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
Release 980201
Sun Feb 1 13:24:54 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [files/drive.c]
Added Device= parameter to drive configuration.
* [if1632/relay.c]
Throw() and Catch() now use the correct CATCHBUF layout (untested).
* [tools/build.c] [include/stackframe.h] [loader/task.c]
Moved 16-bit stack pointer into thread database.
Save current %fs while running 16-bit code.
Fri Jan 30 09:25:49 1998 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [graphics/mapping.c]
Made DPtoLP32 and LPtoDP32 respect world transforms.
* [graphics/path.c] [graphics/painting.c] [if1632/gdi.spec]
[include/path.h]
More path support.
* [include/gdi.h] [include/windows.h] [objects/dc.c]
[relay/gdi32.spec]
Support for Get/SetArcDirection and Get/SetWorldTransform
* [windows/hook.c]
Fixed a bug in HOOK_Map16To32Common.
Thu Jan 29 23:43:18 1998 Douglas Ridgway <ridgway@taiga.gmcl.com>
* [graphics/metafiledrv/init.c] [objects/metafile.c]
Documentation for metafile related API calls. Fixed a bug to avoid
documenting it.
* [include/windows.h]
Declaration for LoadImage.
Thu Jan 29 21:44:45 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/win16drv/*]
Changes to printing code to enable use of printer fonts with the
win3.1 postscript driver. Remember to add printer=on to [wine]
section of wine.conf . You will also need to disable truetype
fonts from control panel. Winword 6.0 and Write seem to be happy
with this...
* [include/bitmap.h]
Fix Widthbytes for 15bpp displays.
Tue Jan 27 20:54:08 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [tsx11/*] [include/ts*] [tools/make_X11wrappers]
Implemented thread-safe X11 wrappers.
Tue Jan 27 13:54:09 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [windows/queue.c]
Forgot to convert thdb to thread_id.
* [misc/registry.c]
Sped up Windows 95 registry reading. Changed code to traverse
registry as a tree rather than read in all possible keys
(including dead ones).
Tue Jan 27 12:46:09 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_image.c][Makefile.in][scheduler/thread.c]
[libtest/hello5.c]
Don't exit() on failed to load referenced dlls.
Fixed static tls allocation for multiple threads.
WINELIB should now be able to load PE dlls. A sample
winelib program, that dynamically loads a internal dll
is included.
* [graphics/ddraw.c][include/ddraw.h][include/d3d.h]
Cleaned up and enhanced further. Added several DirectX5
interface definitions and DirectSurface3 implementation.
Stubs for D3D (NOT coming soon, just there so it fails safely).
* [multimedia/dsound.c][include/dsound.h]
Actually works now for a lot of cases. Some DirectX5 stuff
added. Still lacking several features.
* [windows/dinput.c][include/dinput.h]
Started implementing DirectInput. Doesn't work yet, don't
know why.
* [if1632/thunk.c][misc/callbacks.c]
[win32/kernel.c][include/callbacks.h]
Added WOWCallback16Ex, WOWHandle32.
* [misc/cpu.c]
Fixed GetSystemInfo, IsProcessorFeaturePresent.
* [multimedia/joystick.c][multimedia/time.c]
Several fixes. Small hack to get timerevents in timeGetTime() loops.
Tue Jan 20 11:26:27 1998 Slaven Rezic <eserte@cs.tu-berlin.de>
* [configure.in]
Fixed check for union semun on FreeBSD systems.
Sun Jan 18 23:05:04 1998 Karl Backström <karl_b@geocities.com>
* [misc/ole2nls.c] [programs/progman/Sw.rc] [programs/winhelp/Sw.rc]
[resources/sysres_Sw.rc]
Added/updated Swedish language support.
Sun Jan 18 18:49:01 1998 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [misc/winsock.c] [misc/winsock_dns.c] [windows/event.c]
[windows/win.c] [windows/dce.c] [windows/winpos.c]
Bug fixes.
Sun Jan 18 12:45:23 1997 Andreas Mohr <100.30936@germany.net>
* [msdos/int25.c] [msdos/int26.c]
Implemented "native" absolute disk read/write access.
* [msdos/int13.c] [msdos/ioports.c]
Enhanced GET DRIVE PARAMETERS (int13 AH=08).
* [graphics/win16drv/prtdrv.c] [if1632/gdi.spec]
Fixed typos, implemented dmEnumDFonts,
Started implementation of dmRealizeObject.
* [if1632/compobj.spec] [ole/compobj.c] [relay32/ole32.spec]
Stubs CoCreateInstance, CoFreeUnusedLibraries, implemented
CoFileTimeNow.
* [if1632/kernel.spec] [include/windows.h] [memory/global.c]
[memory/string.c] [misc/kernel.c] [misc/Makefile.in]
[misc/toolhelp.c] [msdos/int21.c]
Implemented GlobalHandleNoRIP, GetFreeMemInfo, DebugFillBuffer,
stubs GetSetKernelDOSProc, DiagQuery, DiagOutput, ToolHelpHook
(Undocumented Windows).
* [if1632/user.spec] [if1632/win32s16.spec] [misc/win32s16.c]
Misc stubs.
* [if1632/winaspi.spec] [misc/aspi.c]
Implemented GetASPIDLLVersion.
* [if1632/wprocs.spec] [msdos/int20.c] [msdos/Makefile.in]
Added handler for Int 0x20 (terminate program, _very_ old-fashioned).
* [misc/w32scomb.c]
Implemented Get16DLLAddress() partially
(big thanks to Marcus and Alexandre).
* [relay32/Makefile.in] [relay32/builtin32.c] [relay32/dplay.spec]
Added built-in DPLAY.DLL.
* [relay32/winmm.spec] [multimedia/joystick.c]
Added joySetThreshold.
* [misc/windebug.c]
Added WinNotify.
* [win32/console.c]
Stubs CreateConsoleScreenBuffer, SetConsoleActiveScreenBuffer,
WriteConsoleOutput32A.
* [windows/user.c]
Stub SetEventHook.
Sat Jan 17 19:30:35 1998 Matthew Toseland <Paul.Toseland@btinternet.com>
* [windows/painting.c]
Fixed broken restore-to-maximized.
Mon Jan 12 21:25:32 1998 Perceval - Marc Huguet Puig <mhp@tinet.fut.es>
* [documentation/wine.man] [include/options.h]
[misc/main.c] [ole/ole2nls.c] [resources/sysres.c]
[resources/sysres_Ca.rc] [resources/Makefile.in]
Added language catalan. (Afegit l'idioma català).
1998-02-01 19:33:27 +01:00
|
|
|
*/
|
|
|
|
/* Status:
|
|
|
|
*
|
|
|
|
* - Tomb Raider 2 Demo:
|
Release 980301
Sun Mar 1 10:45:23 1998 Andreas Mohr <100.30936@germany.net>
* [loader/ne_image.c]
Fixed problem with weird DLLs (NE_FFLAGS_SINGLEDATA && DGROUP = 0).
* [msdos/dosmem.c]
Export address for __0000H, too.
* [msdos/dpmi.c]
Changed MemAlloc functions to return less fragmented addresses.
Sat Feb 28 18:50:12 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [scheduler/process.c] [scheduler/sysdeps.c]
Don't use %fs register before threading initialization.
Sat Feb 28 14:04:56 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [configure.in] [include/acconfig.h]
Autoconf macro to check for non-reentrant X libraries.
* [windows/winpos.c]
In SetWindowPos32(), do not cause WM_SIZE messages when the
SWP_NOSIZE flag is specified. This fixes the division-by-zero in
Borland C++ 4.0 "Open Project" menu item.
Sat Feb 28 13:11:26 1998 James Moody <013263m@dragon.acadiau.ca>
* [ole/ole2nls.c]
Changed "English" values from German to English.
* [files/dos_fs.c]
Fixed off-by-one month bug.
Fri Feb 27 22:12:01 1998 Douglas Ridgway <ridgway@winehq.com>
* [windows/win.c]
Fix winelib class menu loading bug.
* [include/module.h] [loader/module.c]
LoadModule32 should be implemented in terms of CreateProcess.
* [programs/view/*]
Metafile viewer sample program.
* [documentation/wine.texinfo] [documentation/Makefile.in]
Improvements and additions, HTML target.
Fri Feb 27 04:27:48 1998 Dimitrie O. Paun <dimi@cs.toronto.edu>
* [*/*]
Switched to the new debug messages interface. For more information
please refer to documentation/debug-msgs. Because the new scheme
introduces a new semantic level, I had to manually do through
about 530 dprintf_xxx! The rest of about 2400 where transformed
via a script. Because of the large number of changes that I had
to do, some may have not come out as nicely as I wanted them. If
this is the case, please let me know. There is a lot of work left
to do: -- a few hundred printf's to be converted -- about 2300
fprintf's to be converted -- about 600 FIXME's to be transformed
The problem is that in the above mentioned cases, a lot of manual
intervention is required because a lot of the information is
missing. There are also a lot of other things to be done to the
interface and so forth. I have now ideas for a at least a month
worth of full time work :) I will proceed with many changes in the
next few releases, so please do not start modifing things because
there will be a hell of a lot of conflicts. If you have ideas that
you want to integrate or you want to work on different things,
please coordinate with me.
Thu Feb 26 13:04:29 1998 David Lee Lambert <lamber45@egr.msu.edu>
* [ole/ole2nls.c] [include/windows.h]
First try at OLE date- and time-formatting functions.
Wed Feb 25 11:20:35 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [files/*.c]
Changed dos device handling, added 'CON' devicehandling.
* [graphics/ddraw.c]
Bug fixes, some additions.
* [if1632/builtin.c][loader/module.c][library/winestub.c]
Small hack so we don't need a dummy BUILTIN_LoadModule
in winestub.c.
* [ole/*][relay32/ole32.spec][if1632/storage.spec]
storage.dll started. winword loads documents (saving
doesn't work yet, dunno why).
Several ole additions, some cleanups and bugfixes.
IMalloc16 implemented.
* [loader/pe_image.c]
Added some comments, fixed circular dll references,
fixed modref ordering, fixed tls allocation.
* [memory/global.c]
Added validity checks before every GET_ARENA_PTR.
(several functions rely on Global* return values
on invalid handles, like IsTask).
Implemented GlobalUnlockFree16.
* [memory/virtual.c]
Replaced dprintf_virtual by fprintf, so we can
do 'info map' again in the debugger. Increase read
linesize for Linux2.1 cases.
* [misc/cpu.c][misc/registry.c]
Moved cpu registry initialization to misc/cpu.c.
* [multimedia/dsound.c]
Enhanced, replaced GETOSPACE bufferingcheck by SETFRAGMENT.
* [relay32/crtdll.spec][relay32/ntdll.spec]
Replaced some ptr by respective 'str' and 'wstr' arguments
for libc functions.
* [scheduler/thread.c]
Added some sanity checks to stackallocation, tlshandling fixed.
* [tools/build.c]
Fixed cdecl argumenttype order (was reversed).
* [win32/ordinals.c]
Implemented KERNEL_449.
* [windows/dinput.c]
Some fixes, needs much more work. Tomb Raider2 works with keyboard ;)
Tue Feb 24 20:46:37 1998 James Juran <jrj120@psu.edu>
* [windows/win.c]
Fixed USER32 ordinal numbers in documentation.
Sat Feb 21 12:30:38 1998 John Richardson <jrichard@zko.dec.com>
* [files/file.c] [include/k32obj.h] [memory/virtual.c]
[scheduler/critsection.c] [scheduler/event.c] [scheduler/handle.c]
[scheduler/k32obj.c] [scheduler/mutex.c] [scheduler/process.c]
[scheduler/semaphore.c] [scheduler/thread.c]
Added generic k32obj read and write routines for k32objs that
support I/O.
* [documentation/console]
Updated console docs.
* [win32/console.c]
Make console work like a k32obj that supports I/O.
* [include/windows.h]
Make WriteFile and ReadFile take HANDLE32 for handle.
Sun Feb 15 14:07:07 1998 Dimitrie O. Paun <dimi@mail.cs.toronto.edu>
* [controls/menu.c] [misc/ver.c] [multimedia/dsound.c]
[multimedia/joystick.c] [windows/dialog.c]
Modified some dprintf_xxx's to prepare them for a new
dprintf_ scheme. Basically, I changed the dprintf's that
outputed a line with many dprintf calls to do just one
dprintf call.
1998-03-01 21:05:02 +01:00
|
|
|
* Playable using keyboard only.
|
Release 980201
Sun Feb 1 13:24:54 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [files/drive.c]
Added Device= parameter to drive configuration.
* [if1632/relay.c]
Throw() and Catch() now use the correct CATCHBUF layout (untested).
* [tools/build.c] [include/stackframe.h] [loader/task.c]
Moved 16-bit stack pointer into thread database.
Save current %fs while running 16-bit code.
Fri Jan 30 09:25:49 1998 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [graphics/mapping.c]
Made DPtoLP32 and LPtoDP32 respect world transforms.
* [graphics/path.c] [graphics/painting.c] [if1632/gdi.spec]
[include/path.h]
More path support.
* [include/gdi.h] [include/windows.h] [objects/dc.c]
[relay/gdi32.spec]
Support for Get/SetArcDirection and Get/SetWorldTransform
* [windows/hook.c]
Fixed a bug in HOOK_Map16To32Common.
Thu Jan 29 23:43:18 1998 Douglas Ridgway <ridgway@taiga.gmcl.com>
* [graphics/metafiledrv/init.c] [objects/metafile.c]
Documentation for metafile related API calls. Fixed a bug to avoid
documenting it.
* [include/windows.h]
Declaration for LoadImage.
Thu Jan 29 21:44:45 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/win16drv/*]
Changes to printing code to enable use of printer fonts with the
win3.1 postscript driver. Remember to add printer=on to [wine]
section of wine.conf . You will also need to disable truetype
fonts from control panel. Winword 6.0 and Write seem to be happy
with this...
* [include/bitmap.h]
Fix Widthbytes for 15bpp displays.
Tue Jan 27 20:54:08 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [tsx11/*] [include/ts*] [tools/make_X11wrappers]
Implemented thread-safe X11 wrappers.
Tue Jan 27 13:54:09 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [windows/queue.c]
Forgot to convert thdb to thread_id.
* [misc/registry.c]
Sped up Windows 95 registry reading. Changed code to traverse
registry as a tree rather than read in all possible keys
(including dead ones).
Tue Jan 27 12:46:09 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_image.c][Makefile.in][scheduler/thread.c]
[libtest/hello5.c]
Don't exit() on failed to load referenced dlls.
Fixed static tls allocation for multiple threads.
WINELIB should now be able to load PE dlls. A sample
winelib program, that dynamically loads a internal dll
is included.
* [graphics/ddraw.c][include/ddraw.h][include/d3d.h]
Cleaned up and enhanced further. Added several DirectX5
interface definitions and DirectSurface3 implementation.
Stubs for D3D (NOT coming soon, just there so it fails safely).
* [multimedia/dsound.c][include/dsound.h]
Actually works now for a lot of cases. Some DirectX5 stuff
added. Still lacking several features.
* [windows/dinput.c][include/dinput.h]
Started implementing DirectInput. Doesn't work yet, don't
know why.
* [if1632/thunk.c][misc/callbacks.c]
[win32/kernel.c][include/callbacks.h]
Added WOWCallback16Ex, WOWHandle32.
* [misc/cpu.c]
Fixed GetSystemInfo, IsProcessorFeaturePresent.
* [multimedia/joystick.c][multimedia/time.c]
Several fixes. Small hack to get timerevents in timeGetTime() loops.
Tue Jan 20 11:26:27 1998 Slaven Rezic <eserte@cs.tu-berlin.de>
* [configure.in]
Fixed check for union semun on FreeBSD systems.
Sun Jan 18 23:05:04 1998 Karl Backström <karl_b@geocities.com>
* [misc/ole2nls.c] [programs/progman/Sw.rc] [programs/winhelp/Sw.rc]
[resources/sysres_Sw.rc]
Added/updated Swedish language support.
Sun Jan 18 18:49:01 1998 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [misc/winsock.c] [misc/winsock_dns.c] [windows/event.c]
[windows/win.c] [windows/dce.c] [windows/winpos.c]
Bug fixes.
Sun Jan 18 12:45:23 1997 Andreas Mohr <100.30936@germany.net>
* [msdos/int25.c] [msdos/int26.c]
Implemented "native" absolute disk read/write access.
* [msdos/int13.c] [msdos/ioports.c]
Enhanced GET DRIVE PARAMETERS (int13 AH=08).
* [graphics/win16drv/prtdrv.c] [if1632/gdi.spec]
Fixed typos, implemented dmEnumDFonts,
Started implementation of dmRealizeObject.
* [if1632/compobj.spec] [ole/compobj.c] [relay32/ole32.spec]
Stubs CoCreateInstance, CoFreeUnusedLibraries, implemented
CoFileTimeNow.
* [if1632/kernel.spec] [include/windows.h] [memory/global.c]
[memory/string.c] [misc/kernel.c] [misc/Makefile.in]
[misc/toolhelp.c] [msdos/int21.c]
Implemented GlobalHandleNoRIP, GetFreeMemInfo, DebugFillBuffer,
stubs GetSetKernelDOSProc, DiagQuery, DiagOutput, ToolHelpHook
(Undocumented Windows).
* [if1632/user.spec] [if1632/win32s16.spec] [misc/win32s16.c]
Misc stubs.
* [if1632/winaspi.spec] [misc/aspi.c]
Implemented GetASPIDLLVersion.
* [if1632/wprocs.spec] [msdos/int20.c] [msdos/Makefile.in]
Added handler for Int 0x20 (terminate program, _very_ old-fashioned).
* [misc/w32scomb.c]
Implemented Get16DLLAddress() partially
(big thanks to Marcus and Alexandre).
* [relay32/Makefile.in] [relay32/builtin32.c] [relay32/dplay.spec]
Added built-in DPLAY.DLL.
* [relay32/winmm.spec] [multimedia/joystick.c]
Added joySetThreshold.
* [misc/windebug.c]
Added WinNotify.
* [win32/console.c]
Stubs CreateConsoleScreenBuffer, SetConsoleActiveScreenBuffer,
WriteConsoleOutput32A.
* [windows/user.c]
Stub SetEventHook.
Sat Jan 17 19:30:35 1998 Matthew Toseland <Paul.Toseland@btinternet.com>
* [windows/painting.c]
Fixed broken restore-to-maximized.
Mon Jan 12 21:25:32 1998 Perceval - Marc Huguet Puig <mhp@tinet.fut.es>
* [documentation/wine.man] [include/options.h]
[misc/main.c] [ole/ole2nls.c] [resources/sysres.c]
[resources/sysres_Ca.rc] [resources/Makefile.in]
Added language catalan. (Afegit l'idioma català).
1998-02-01 19:33:27 +01:00
|
|
|
* - WingCommander Prophecy Demo:
|
Release 980301
Sun Mar 1 10:45:23 1998 Andreas Mohr <100.30936@germany.net>
* [loader/ne_image.c]
Fixed problem with weird DLLs (NE_FFLAGS_SINGLEDATA && DGROUP = 0).
* [msdos/dosmem.c]
Export address for __0000H, too.
* [msdos/dpmi.c]
Changed MemAlloc functions to return less fragmented addresses.
Sat Feb 28 18:50:12 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [scheduler/process.c] [scheduler/sysdeps.c]
Don't use %fs register before threading initialization.
Sat Feb 28 14:04:56 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [configure.in] [include/acconfig.h]
Autoconf macro to check for non-reentrant X libraries.
* [windows/winpos.c]
In SetWindowPos32(), do not cause WM_SIZE messages when the
SWP_NOSIZE flag is specified. This fixes the division-by-zero in
Borland C++ 4.0 "Open Project" menu item.
Sat Feb 28 13:11:26 1998 James Moody <013263m@dragon.acadiau.ca>
* [ole/ole2nls.c]
Changed "English" values from German to English.
* [files/dos_fs.c]
Fixed off-by-one month bug.
Fri Feb 27 22:12:01 1998 Douglas Ridgway <ridgway@winehq.com>
* [windows/win.c]
Fix winelib class menu loading bug.
* [include/module.h] [loader/module.c]
LoadModule32 should be implemented in terms of CreateProcess.
* [programs/view/*]
Metafile viewer sample program.
* [documentation/wine.texinfo] [documentation/Makefile.in]
Improvements and additions, HTML target.
Fri Feb 27 04:27:48 1998 Dimitrie O. Paun <dimi@cs.toronto.edu>
* [*/*]
Switched to the new debug messages interface. For more information
please refer to documentation/debug-msgs. Because the new scheme
introduces a new semantic level, I had to manually do through
about 530 dprintf_xxx! The rest of about 2400 where transformed
via a script. Because of the large number of changes that I had
to do, some may have not come out as nicely as I wanted them. If
this is the case, please let me know. There is a lot of work left
to do: -- a few hundred printf's to be converted -- about 2300
fprintf's to be converted -- about 600 FIXME's to be transformed
The problem is that in the above mentioned cases, a lot of manual
intervention is required because a lot of the information is
missing. There are also a lot of other things to be done to the
interface and so forth. I have now ideas for a at least a month
worth of full time work :) I will proceed with many changes in the
next few releases, so please do not start modifing things because
there will be a hell of a lot of conflicts. If you have ideas that
you want to integrate or you want to work on different things,
please coordinate with me.
Thu Feb 26 13:04:29 1998 David Lee Lambert <lamber45@egr.msu.edu>
* [ole/ole2nls.c] [include/windows.h]
First try at OLE date- and time-formatting functions.
Wed Feb 25 11:20:35 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [files/*.c]
Changed dos device handling, added 'CON' devicehandling.
* [graphics/ddraw.c]
Bug fixes, some additions.
* [if1632/builtin.c][loader/module.c][library/winestub.c]
Small hack so we don't need a dummy BUILTIN_LoadModule
in winestub.c.
* [ole/*][relay32/ole32.spec][if1632/storage.spec]
storage.dll started. winword loads documents (saving
doesn't work yet, dunno why).
Several ole additions, some cleanups and bugfixes.
IMalloc16 implemented.
* [loader/pe_image.c]
Added some comments, fixed circular dll references,
fixed modref ordering, fixed tls allocation.
* [memory/global.c]
Added validity checks before every GET_ARENA_PTR.
(several functions rely on Global* return values
on invalid handles, like IsTask).
Implemented GlobalUnlockFree16.
* [memory/virtual.c]
Replaced dprintf_virtual by fprintf, so we can
do 'info map' again in the debugger. Increase read
linesize for Linux2.1 cases.
* [misc/cpu.c][misc/registry.c]
Moved cpu registry initialization to misc/cpu.c.
* [multimedia/dsound.c]
Enhanced, replaced GETOSPACE bufferingcheck by SETFRAGMENT.
* [relay32/crtdll.spec][relay32/ntdll.spec]
Replaced some ptr by respective 'str' and 'wstr' arguments
for libc functions.
* [scheduler/thread.c]
Added some sanity checks to stackallocation, tlshandling fixed.
* [tools/build.c]
Fixed cdecl argumenttype order (was reversed).
* [win32/ordinals.c]
Implemented KERNEL_449.
* [windows/dinput.c]
Some fixes, needs much more work. Tomb Raider2 works with keyboard ;)
Tue Feb 24 20:46:37 1998 James Juran <jrj120@psu.edu>
* [windows/win.c]
Fixed USER32 ordinal numbers in documentation.
Sat Feb 21 12:30:38 1998 John Richardson <jrichard@zko.dec.com>
* [files/file.c] [include/k32obj.h] [memory/virtual.c]
[scheduler/critsection.c] [scheduler/event.c] [scheduler/handle.c]
[scheduler/k32obj.c] [scheduler/mutex.c] [scheduler/process.c]
[scheduler/semaphore.c] [scheduler/thread.c]
Added generic k32obj read and write routines for k32objs that
support I/O.
* [documentation/console]
Updated console docs.
* [win32/console.c]
Make console work like a k32obj that supports I/O.
* [include/windows.h]
Make WriteFile and ReadFile take HANDLE32 for handle.
Sun Feb 15 14:07:07 1998 Dimitrie O. Paun <dimi@mail.cs.toronto.edu>
* [controls/menu.c] [misc/ver.c] [multimedia/dsound.c]
[multimedia/joystick.c] [windows/dialog.c]
Modified some dprintf_xxx's to prepare them for a new
dprintf_ scheme. Basically, I changed the dprintf's that
outputed a line with many dprintf calls to do just one
dprintf call.
1998-03-01 21:05:02 +01:00
|
|
|
* Doesn't get Input Focus.
|
2002-06-01 01:06:46 +02:00
|
|
|
*
|
1998-11-06 18:28:22 +01:00
|
|
|
* - Fallout : works great in X and DGA mode
|
Release 980201
Sun Feb 1 13:24:54 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [files/drive.c]
Added Device= parameter to drive configuration.
* [if1632/relay.c]
Throw() and Catch() now use the correct CATCHBUF layout (untested).
* [tools/build.c] [include/stackframe.h] [loader/task.c]
Moved 16-bit stack pointer into thread database.
Save current %fs while running 16-bit code.
Fri Jan 30 09:25:49 1998 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [graphics/mapping.c]
Made DPtoLP32 and LPtoDP32 respect world transforms.
* [graphics/path.c] [graphics/painting.c] [if1632/gdi.spec]
[include/path.h]
More path support.
* [include/gdi.h] [include/windows.h] [objects/dc.c]
[relay/gdi32.spec]
Support for Get/SetArcDirection and Get/SetWorldTransform
* [windows/hook.c]
Fixed a bug in HOOK_Map16To32Common.
Thu Jan 29 23:43:18 1998 Douglas Ridgway <ridgway@taiga.gmcl.com>
* [graphics/metafiledrv/init.c] [objects/metafile.c]
Documentation for metafile related API calls. Fixed a bug to avoid
documenting it.
* [include/windows.h]
Declaration for LoadImage.
Thu Jan 29 21:44:45 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/win16drv/*]
Changes to printing code to enable use of printer fonts with the
win3.1 postscript driver. Remember to add printer=on to [wine]
section of wine.conf . You will also need to disable truetype
fonts from control panel. Winword 6.0 and Write seem to be happy
with this...
* [include/bitmap.h]
Fix Widthbytes for 15bpp displays.
Tue Jan 27 20:54:08 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [tsx11/*] [include/ts*] [tools/make_X11wrappers]
Implemented thread-safe X11 wrappers.
Tue Jan 27 13:54:09 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [windows/queue.c]
Forgot to convert thdb to thread_id.
* [misc/registry.c]
Sped up Windows 95 registry reading. Changed code to traverse
registry as a tree rather than read in all possible keys
(including dead ones).
Tue Jan 27 12:46:09 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_image.c][Makefile.in][scheduler/thread.c]
[libtest/hello5.c]
Don't exit() on failed to load referenced dlls.
Fixed static tls allocation for multiple threads.
WINELIB should now be able to load PE dlls. A sample
winelib program, that dynamically loads a internal dll
is included.
* [graphics/ddraw.c][include/ddraw.h][include/d3d.h]
Cleaned up and enhanced further. Added several DirectX5
interface definitions and DirectSurface3 implementation.
Stubs for D3D (NOT coming soon, just there so it fails safely).
* [multimedia/dsound.c][include/dsound.h]
Actually works now for a lot of cases. Some DirectX5 stuff
added. Still lacking several features.
* [windows/dinput.c][include/dinput.h]
Started implementing DirectInput. Doesn't work yet, don't
know why.
* [if1632/thunk.c][misc/callbacks.c]
[win32/kernel.c][include/callbacks.h]
Added WOWCallback16Ex, WOWHandle32.
* [misc/cpu.c]
Fixed GetSystemInfo, IsProcessorFeaturePresent.
* [multimedia/joystick.c][multimedia/time.c]
Several fixes. Small hack to get timerevents in timeGetTime() loops.
Tue Jan 20 11:26:27 1998 Slaven Rezic <eserte@cs.tu-berlin.de>
* [configure.in]
Fixed check for union semun on FreeBSD systems.
Sun Jan 18 23:05:04 1998 Karl Backström <karl_b@geocities.com>
* [misc/ole2nls.c] [programs/progman/Sw.rc] [programs/winhelp/Sw.rc]
[resources/sysres_Sw.rc]
Added/updated Swedish language support.
Sun Jan 18 18:49:01 1998 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [misc/winsock.c] [misc/winsock_dns.c] [windows/event.c]
[windows/win.c] [windows/dce.c] [windows/winpos.c]
Bug fixes.
Sun Jan 18 12:45:23 1997 Andreas Mohr <100.30936@germany.net>
* [msdos/int25.c] [msdos/int26.c]
Implemented "native" absolute disk read/write access.
* [msdos/int13.c] [msdos/ioports.c]
Enhanced GET DRIVE PARAMETERS (int13 AH=08).
* [graphics/win16drv/prtdrv.c] [if1632/gdi.spec]
Fixed typos, implemented dmEnumDFonts,
Started implementation of dmRealizeObject.
* [if1632/compobj.spec] [ole/compobj.c] [relay32/ole32.spec]
Stubs CoCreateInstance, CoFreeUnusedLibraries, implemented
CoFileTimeNow.
* [if1632/kernel.spec] [include/windows.h] [memory/global.c]
[memory/string.c] [misc/kernel.c] [misc/Makefile.in]
[misc/toolhelp.c] [msdos/int21.c]
Implemented GlobalHandleNoRIP, GetFreeMemInfo, DebugFillBuffer,
stubs GetSetKernelDOSProc, DiagQuery, DiagOutput, ToolHelpHook
(Undocumented Windows).
* [if1632/user.spec] [if1632/win32s16.spec] [misc/win32s16.c]
Misc stubs.
* [if1632/winaspi.spec] [misc/aspi.c]
Implemented GetASPIDLLVersion.
* [if1632/wprocs.spec] [msdos/int20.c] [msdos/Makefile.in]
Added handler for Int 0x20 (terminate program, _very_ old-fashioned).
* [misc/w32scomb.c]
Implemented Get16DLLAddress() partially
(big thanks to Marcus and Alexandre).
* [relay32/Makefile.in] [relay32/builtin32.c] [relay32/dplay.spec]
Added built-in DPLAY.DLL.
* [relay32/winmm.spec] [multimedia/joystick.c]
Added joySetThreshold.
* [misc/windebug.c]
Added WinNotify.
* [win32/console.c]
Stubs CreateConsoleScreenBuffer, SetConsoleActiveScreenBuffer,
WriteConsoleOutput32A.
* [windows/user.c]
Stub SetEventHook.
Sat Jan 17 19:30:35 1998 Matthew Toseland <Paul.Toseland@btinternet.com>
* [windows/painting.c]
Fixed broken restore-to-maximized.
Mon Jan 12 21:25:32 1998 Perceval - Marc Huguet Puig <mhp@tinet.fut.es>
* [documentation/wine.man] [include/options.h]
[misc/main.c] [ole/ole2nls.c] [resources/sysres.c]
[resources/sysres_Ca.rc] [resources/Makefile.in]
Added language catalan. (Afegit l'idioma català).
1998-02-01 19:33:27 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
#include <assert.h>
|
2003-09-06 01:08:26 +02:00
|
|
|
#include <stdarg.h>
|
2001-01-26 21:43:40 +01:00
|
|
|
#include <string.h>
|
2000-08-03 06:22:35 +02:00
|
|
|
|
2004-10-07 05:06:48 +02:00
|
|
|
#define COBJMACROS
|
2008-02-26 09:49:20 +01:00
|
|
|
#define NONAMELESSUNION
|
2004-10-07 05:06:48 +02:00
|
|
|
|
2002-03-10 00:29:33 +01:00
|
|
|
#include "wine/debug.h"
|
2003-06-16 22:22:13 +02:00
|
|
|
#include "wine/unicode.h"
|
2003-09-06 01:08:26 +02:00
|
|
|
#include "windef.h"
|
1999-07-25 13:21:07 +02:00
|
|
|
#include "winbase.h"
|
2002-05-20 00:26:16 +02:00
|
|
|
#include "winuser.h"
|
1999-07-04 15:31:03 +02:00
|
|
|
#include "winerror.h"
|
2010-12-07 12:48:24 +01:00
|
|
|
#include "objbase.h"
|
|
|
|
#include "rpcproxy.h"
|
2011-11-26 18:30:07 +01:00
|
|
|
#include "initguid.h"
|
2000-11-05 21:25:02 +01:00
|
|
|
#include "dinput_private.h"
|
2007-07-07 07:36:09 +02:00
|
|
|
#include "device_private.h"
|
2011-11-26 18:30:07 +01:00
|
|
|
#include "dinputd.h"
|
2000-08-03 06:22:35 +02:00
|
|
|
|
2002-03-10 00:29:33 +01:00
|
|
|
WINE_DEFAULT_DEBUG_CHANNEL(dinput);
|
1999-04-19 16:56:29 +02:00
|
|
|
|
2005-05-30 12:01:08 +02:00
|
|
|
static const IDirectInput7AVtbl ddi7avt;
|
|
|
|
static const IDirectInput7WVtbl ddi7wvt;
|
|
|
|
static const IDirectInput8AVtbl ddi8avt;
|
|
|
|
static const IDirectInput8WVtbl ddi8wvt;
|
2011-11-26 18:30:07 +01:00
|
|
|
static const IDirectInputJoyConfig8Vtbl JoyConfig8vt;
|
1998-11-14 12:22:25 +01:00
|
|
|
|
2010-12-28 20:24:38 +01:00
|
|
|
static inline IDirectInputImpl *impl_from_IDirectInput7A( IDirectInput7A *iface )
|
|
|
|
{
|
|
|
|
return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput7A_iface );
|
|
|
|
}
|
|
|
|
|
2007-07-12 06:51:32 +02:00
|
|
|
static inline IDirectInputImpl *impl_from_IDirectInput7W( IDirectInput7W *iface )
|
|
|
|
{
|
2010-12-28 20:24:38 +01:00
|
|
|
return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput7W_iface );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline IDirectInputImpl *impl_from_IDirectInput8A( IDirectInput8A *iface )
|
|
|
|
{
|
2010-12-28 20:24:38 +01:00
|
|
|
return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput8A_iface );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline IDirectInputImpl *impl_from_IDirectInput8W( IDirectInput8W *iface )
|
|
|
|
{
|
2010-12-28 20:24:38 +01:00
|
|
|
return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput8W_iface );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
2011-01-09 23:44:19 +01:00
|
|
|
static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface)
|
|
|
|
{
|
|
|
|
return CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface);
|
|
|
|
}
|
|
|
|
|
2005-03-15 20:36:15 +01:00
|
|
|
static const struct dinput_device *dinput_devices[] =
|
|
|
|
{
|
|
|
|
&mouse_device,
|
|
|
|
&keyboard_device,
|
|
|
|
&joystick_linuxinput_device,
|
2009-03-10 20:59:20 +01:00
|
|
|
&joystick_linux_device,
|
|
|
|
&joystick_osx_device
|
2005-03-15 20:36:15 +01:00
|
|
|
};
|
1999-02-09 15:18:21 +01:00
|
|
|
|
2008-02-15 14:50:15 +01:00
|
|
|
static HINSTANCE DINPUT_instance = NULL;
|
2002-12-24 02:18:21 +01:00
|
|
|
|
2007-07-07 07:36:18 +02:00
|
|
|
static BOOL check_hook_thread(void);
|
|
|
|
static CRITICAL_SECTION dinput_hook_crit;
|
|
|
|
static struct list direct_input_list = LIST_INIT( direct_input_list );
|
2002-05-20 00:26:16 +02:00
|
|
|
|
2011-07-05 14:19:17 +02:00
|
|
|
static HRESULT initialize_directinput_instance(IDirectInputImpl *This, DWORD dwVersion);
|
|
|
|
static void uninitialize_directinput_instance(IDirectInputImpl *This);
|
|
|
|
|
|
|
|
static HRESULT create_directinput_instance(REFIID riid, LPVOID *ppDI, IDirectInputImpl **out)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectInputImpl) );
|
|
|
|
HRESULT hr;
|
|
|
|
|
|
|
|
if (!This)
|
|
|
|
return E_OUTOFMEMORY;
|
|
|
|
|
|
|
|
This->IDirectInput7A_iface.lpVtbl = &ddi7avt;
|
|
|
|
This->IDirectInput7W_iface.lpVtbl = &ddi7wvt;
|
|
|
|
This->IDirectInput8A_iface.lpVtbl = &ddi8avt;
|
|
|
|
This->IDirectInput8W_iface.lpVtbl = &ddi8wvt;
|
2011-11-26 18:30:07 +01:00
|
|
|
This->IDirectInputJoyConfig8_iface.lpVtbl = &JoyConfig8vt;
|
2011-07-05 14:19:17 +02:00
|
|
|
|
|
|
|
hr = IDirectInput_QueryInterface( &This->IDirectInput7A_iface, riid, ppDI );
|
|
|
|
if (FAILED(hr))
|
|
|
|
{
|
|
|
|
HeapFree( GetProcessHeap(), 0, This );
|
|
|
|
return hr;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (out) *out = This;
|
|
|
|
return DI_OK;
|
|
|
|
}
|
|
|
|
|
2000-10-14 01:07:29 +02:00
|
|
|
/******************************************************************************
|
2001-06-19 20:20:47 +02:00
|
|
|
* DirectInputCreateEx (DINPUT.@)
|
2000-10-14 01:07:29 +02:00
|
|
|
*/
|
|
|
|
HRESULT WINAPI DirectInputCreateEx(
|
|
|
|
HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI,
|
2011-07-05 14:19:17 +02:00
|
|
|
LPUNKNOWN punkOuter)
|
2003-06-16 22:22:13 +02:00
|
|
|
{
|
2011-07-05 14:19:17 +02:00
|
|
|
IDirectInputImpl *This;
|
|
|
|
HRESULT hr;
|
2006-07-31 07:32:30 +02:00
|
|
|
|
2006-10-08 01:55:40 +02:00
|
|
|
TRACE("(%p,%04x,%s,%p,%p)\n", hinst, dwVersion, debugstr_guid(riid), ppDI, punkOuter);
|
2006-07-31 07:32:30 +02:00
|
|
|
|
2011-07-05 14:19:21 +02:00
|
|
|
if (IsEqualGUID( &IID_IDirectInputA, riid ) ||
|
2007-07-12 06:51:32 +02:00
|
|
|
IsEqualGUID( &IID_IDirectInput2A, riid ) ||
|
|
|
|
IsEqualGUID( &IID_IDirectInput7A, riid ) ||
|
|
|
|
IsEqualGUID( &IID_IDirectInputW, riid ) ||
|
|
|
|
IsEqualGUID( &IID_IDirectInput2W, riid ) ||
|
2011-07-05 14:19:21 +02:00
|
|
|
IsEqualGUID( &IID_IDirectInput7W, riid ))
|
2007-07-12 06:51:32 +02:00
|
|
|
{
|
2011-07-05 14:19:17 +02:00
|
|
|
hr = create_directinput_instance(riid, ppDI, &This);
|
|
|
|
if (FAILED(hr))
|
|
|
|
return hr;
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
2007-07-07 07:36:18 +02:00
|
|
|
else
|
2011-07-05 14:19:21 +02:00
|
|
|
return DIERR_NOINTERFACE;
|
2006-07-31 07:32:30 +02:00
|
|
|
|
2011-07-05 14:19:17 +02:00
|
|
|
hr = IDirectInput_Initialize( &This->IDirectInput7A_iface, hinst, dwVersion );
|
|
|
|
if (FAILED(hr))
|
2007-07-07 07:36:18 +02:00
|
|
|
{
|
2011-07-05 14:19:17 +02:00
|
|
|
IDirectInput_Release( &This->IDirectInput7A_iface );
|
|
|
|
*ppDI = NULL;
|
|
|
|
return hr;
|
2006-07-31 07:32:30 +02:00
|
|
|
}
|
2007-07-07 07:36:18 +02:00
|
|
|
|
|
|
|
return DI_OK;
|
2000-10-14 01:07:29 +02:00
|
|
|
}
|
|
|
|
|
Release 980601
Sun May 31 13:40:13 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [if1632/signal.c]
Added display of exception name.
* [loader/task.c]
Yet another attempt at fixing SwitchStackTo/SwitchStackBack.
* [memory/selector.c] [relay32/builtin32.c] [tools/build.c]
[win32/kernel32.c]
Generate an assembly stub for Win32 register functions to make
their names available at link time.
* [programs/*/Makefile.in]
Added hacks to support old resource compiler.
Fri May 29 16:27:14 1998 Marcus Meissner <marcus@jet.franken.de>
* [tools/testrun]
Merge of my testscripts at home into one single perl program
(tested with perl5). Works only on Linux due to 'ps' and 'ipcs'
magic.
* [controls/menu.c]
Added some DefaultMenuItem stubs.
* [debugger/stabs.c]
Fixed stabs loading, now supports (int,int) typeinfo format used
by gcc-2.8 and egcs-1. If it still crashes, please mail me.
* [if1632/][relay32/]
Added msvideo.dll (stubs only)
Replaced some ptr by str for stringcases
Added some new stubs (VxDCall, FindCloseNotif....)
* [misc/network.c]
Some argument fixes.
* [misc/registry.c][misc/cpu.c]
Registry initialization partially rewritten and enhanced.
* [scheduler/*.c]
Some additions so we don't do kill(0,SIGUSR1) (kill processgroup
instead of targeted thread)
Added SetThreadContext.
Thu May 28 23:59:59 1998 Bertho Stultiens <bertho@akhphd.au.dk>
* [tools/wrc/*]
New resource compiler version 1.0.0 (28-May-1998)
* [Make.rules.in] [Makefile.in]
Changed and added rc rules to point to tools/wrc/wrc.
* [configure.in] [include/config.h.in]
Added check for function 'stricmp'.
* [include/resource.h]
Commented out the old resource structure to catch references.
It also includes wrc_rsc.h.
* [include/wrc_rsc.h]
New file. Definitions for the resources generated with wrc.
* [include/windows.h]
Added #ifdef RC_INVOKED to exclude stdarg.h.
Added SS_NOTIFY flag.
* [include/winnls.h]
Added SUBLANG_* definitions and corrected some defaults.
* [loader/libres.c]
Changed the sysres load functions to support wrc generated
resources.
* [resource/sysres_*.rc]
Added #include <windows.h>
* [resource/sysres.c]
Changed declarations to match wrc's output
* [resource/Makefile.in]
Changed rules to work with wrc.
* [tools/makedep.c]
Changed generation of .rc file dependencies to .s target.
Thu May 28 22:28:39 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [files/file.c][include/windows.c][relay32/kernel32.spec]
Implemented GetFileAttributesEx32A/W.
* [misc/imagelist.h][include/commctrl.h][relay32/comctl32.spec]
Added ImageList_Read and ImageList_Write stubs.
Added ImageList_AddIcon function.
Added ImageList_LoadImage. It is the same as ImageList_LoadImage32A.
* [controls/header.c]
Fixed bitmap drawing bug.
Added full bitmap support.
* [include/commctrl.h]
Added missing header macros.
* [controls/toolbar.c][include/toolbar.h][include/commctrl.h]
[controls/commctrl.c] [relay32/comctl32.spec]
First implementation of toolbar control.
Implemented CreateToolbar, CreateToolbarEx and CreateMappedBitmap.
* [controls/progress.c][controls/status.c]
Some code cleanup.
* [controls/commctrl.c][include/commctrl.h][relay32/comctl32.spec]
Removed CreateStatusWindow16 and DrawStatusText16.
CreateStatusWindow is the same as CreateStatusWindow32A.
DrawStatusText is the same as DrawStatusText32A.
Thu May 28 16:01:28 1998 Matthew J. Francis <asbel@dial.pipex.com>
* [objects/bitmap.c] [objects/bitmap.h] [objects/oembitmap.c]
[objects/dc.c] [graphics/x11drv/bitblt.c]
Added partial implementation of CreateDIBSection, with great thanks
to Ulrich Weigand <weigand@informatik.uni-erlangen.de> for
contributing the bulk of the patch.
Wed May 27 19:04:31 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [win32/kernel32.c] [if1632/thunk.c] [include/flatthunk.h]
ThunkConnect16 and related functions moved to emulator.
* [loader/ne/segment.c]
Call DllEntryPoint with correct arguments.
* [relay32/builtin32.c]
Bugfix: Relay debugging did not work for multiple processes.
* [controls/menu.c]
Bugfix: dwItemData was not set for MF_OWNERDRAW menus.
* [if1632/relay.c] [relay32/relay386.c]
Relay messages converted to use DPRINTF.
* [controls/desktop.c] [relay32/user32.spec]
Implemented PaintDesktop.
* [files/profile.c] [if1632/kernel.spec] [misc/network.c]
[misc/printdrv.c] [relay32/winspool.spec]
[win32/ordinals.c] [relay32/kernel32.spec]
Some stubs added.
* [relay32/mpr.spec]
All ordinals were off by one.
Tue May 26 13:32:57 1998 Bill Hawes <whawes@star.net>
* [misc/lstr.c] [include/casemap.h] [tools/unimap.pl]
Added Unicode case conversion routines towupper/towlower,
with mapping tables casemap.h created by tools/unimap.pl.
* [misc/ntdll.c] [include/winnls.h] [relay32/ntdll.spec]
[relay32/advapi.spec]
Minimal implementation of IsTextUnicode, just enough to get
NT4 notepad to open ascii/unicode files.
* [Make.rules.in] [resources/sysres_En.rc]
Added include file dlgs.h for building resource files, so that
resources can refer to defined values (e.g. pshHelp).
* [misc/crtdll.c] [relay32/crtdll.spec]
Use towupper/towlower for 32W case conversions.
* [memory/string.c]
Use towupper for 32W case conversions.
* [ole/ole2nls.c]
Use towupper for 32W case conversions; fix mem leak; minor cleanup
* [controls/edit.c]
Added soft break flag to edit state. Print unknown action values
for WM_VSCROLL (action 190 occurs when running NT4 notepad.)
Mon May 25 22:42:40 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* [files/file.c]
Care for a pathological case in SetFilePointer.
* [graphics/x11drv/xfont.c]
Handle longer Font names in LFD_ComposeLFD and try to catch errors.
* [loader/pe_image.c]
Unload Dummymodule when PE_LoadLibraryEx32A fails with
PE_LoadImage (makes Encarta 98 installer proceed).
* [misc/registry.c]
Move a check for a special case in RegCreateKeyEx32W after the
check for existence.
Tue May 25 20:18:26 1998 Matthew Becker <mbecker@glasscity.net>
* [misc/ntdll.c]
Added some stubs, just guessing at the size of their param lists.
* [misc/registry.c]
Added stubs for RegUnLoadKey, RegSetKeySecurity, RegSaveKey,
RegRestoreKey, and RegReplaceKey
* [programs/regtest/regtest.c]
Updated registry testing program.
Sun May 24 18:11:40 1998 Alex Priem <alexp@sci.kun.nl>
* [file/profile.c]
Added flag 'return_values' to PROFILE_GetSection.
Sun May 24 13:41:10 1998 James Juran <jrj120@psu.edu>
* [misc/shell.c] [files/directory.c]
Documentation/debugging info additions.
* [*/*.c] [include/*.h]
Moved many extern function definitions to appropriate header files.
Cleaned up a few compile warnings.
If #include "debug.h" is present, removed #include <stdio.h>.
debug.h includes stdio.h, so it is not necessary to include both.
* [graphics/*.c] [if1632/signal.c] [ipc/*.c] [scheduler/*.c]
[win32/*.c] [windows/*.c]
Final patch to convert fprintf statements to new debugging interface.
Some fprintfs are still left, especially in the debugger/ directory.
However, IMHO, it's not worth the effort to change the rest.
Fri May 22 21:58:35 1998 Morten Welinder <terra@diku.dk>
* [windows/keyboard.c]
Correct handling of keys "`-=[]\;',./".
Fri May 22 12:06:00 1998 Per Lindström <pelinstr@algonet.se>
* [include/windows.h] [relay32/kernel32.spec] [win32/console.c]
Added stub for ReadConsoleOutputCharacter32A.
Thu May 21 16:45:48 1998 Pascal Cuoq <pcuoq@ens-lyon.fr>
* [ole/ole2nls.c]
Began better implementation of LCMapString32A.
Not very well tested yet, and still need improvements.
* [controls/scroll.c]
Documented functions.
Wed May 20 21:37:56 1998 Peter Hunnisett <hunnise@nortel.ca>
* [include/windows.h][misc/main.c]
Change SystemParameterInfo to support SPI_GETHIGHCONTRAST. Also
include some missing SPI_ definitions.
* [include/dsound.h][multimedia/dsound.c][relay32/dplayx.spec]
Added stubs for DirectPlayLobbyCreate[AW]. Not sure if these
should go into a new files dplayx.c? Anyone care?
* [include/winnls.h]
Added two missing flags for the CompareString32 functions.
1998-06-01 12:44:35 +02:00
|
|
|
/******************************************************************************
|
2001-06-19 20:20:47 +02:00
|
|
|
* DirectInputCreateA (DINPUT.@)
|
Release 980601
Sun May 31 13:40:13 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [if1632/signal.c]
Added display of exception name.
* [loader/task.c]
Yet another attempt at fixing SwitchStackTo/SwitchStackBack.
* [memory/selector.c] [relay32/builtin32.c] [tools/build.c]
[win32/kernel32.c]
Generate an assembly stub for Win32 register functions to make
their names available at link time.
* [programs/*/Makefile.in]
Added hacks to support old resource compiler.
Fri May 29 16:27:14 1998 Marcus Meissner <marcus@jet.franken.de>
* [tools/testrun]
Merge of my testscripts at home into one single perl program
(tested with perl5). Works only on Linux due to 'ps' and 'ipcs'
magic.
* [controls/menu.c]
Added some DefaultMenuItem stubs.
* [debugger/stabs.c]
Fixed stabs loading, now supports (int,int) typeinfo format used
by gcc-2.8 and egcs-1. If it still crashes, please mail me.
* [if1632/][relay32/]
Added msvideo.dll (stubs only)
Replaced some ptr by str for stringcases
Added some new stubs (VxDCall, FindCloseNotif....)
* [misc/network.c]
Some argument fixes.
* [misc/registry.c][misc/cpu.c]
Registry initialization partially rewritten and enhanced.
* [scheduler/*.c]
Some additions so we don't do kill(0,SIGUSR1) (kill processgroup
instead of targeted thread)
Added SetThreadContext.
Thu May 28 23:59:59 1998 Bertho Stultiens <bertho@akhphd.au.dk>
* [tools/wrc/*]
New resource compiler version 1.0.0 (28-May-1998)
* [Make.rules.in] [Makefile.in]
Changed and added rc rules to point to tools/wrc/wrc.
* [configure.in] [include/config.h.in]
Added check for function 'stricmp'.
* [include/resource.h]
Commented out the old resource structure to catch references.
It also includes wrc_rsc.h.
* [include/wrc_rsc.h]
New file. Definitions for the resources generated with wrc.
* [include/windows.h]
Added #ifdef RC_INVOKED to exclude stdarg.h.
Added SS_NOTIFY flag.
* [include/winnls.h]
Added SUBLANG_* definitions and corrected some defaults.
* [loader/libres.c]
Changed the sysres load functions to support wrc generated
resources.
* [resource/sysres_*.rc]
Added #include <windows.h>
* [resource/sysres.c]
Changed declarations to match wrc's output
* [resource/Makefile.in]
Changed rules to work with wrc.
* [tools/makedep.c]
Changed generation of .rc file dependencies to .s target.
Thu May 28 22:28:39 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [files/file.c][include/windows.c][relay32/kernel32.spec]
Implemented GetFileAttributesEx32A/W.
* [misc/imagelist.h][include/commctrl.h][relay32/comctl32.spec]
Added ImageList_Read and ImageList_Write stubs.
Added ImageList_AddIcon function.
Added ImageList_LoadImage. It is the same as ImageList_LoadImage32A.
* [controls/header.c]
Fixed bitmap drawing bug.
Added full bitmap support.
* [include/commctrl.h]
Added missing header macros.
* [controls/toolbar.c][include/toolbar.h][include/commctrl.h]
[controls/commctrl.c] [relay32/comctl32.spec]
First implementation of toolbar control.
Implemented CreateToolbar, CreateToolbarEx and CreateMappedBitmap.
* [controls/progress.c][controls/status.c]
Some code cleanup.
* [controls/commctrl.c][include/commctrl.h][relay32/comctl32.spec]
Removed CreateStatusWindow16 and DrawStatusText16.
CreateStatusWindow is the same as CreateStatusWindow32A.
DrawStatusText is the same as DrawStatusText32A.
Thu May 28 16:01:28 1998 Matthew J. Francis <asbel@dial.pipex.com>
* [objects/bitmap.c] [objects/bitmap.h] [objects/oembitmap.c]
[objects/dc.c] [graphics/x11drv/bitblt.c]
Added partial implementation of CreateDIBSection, with great thanks
to Ulrich Weigand <weigand@informatik.uni-erlangen.de> for
contributing the bulk of the patch.
Wed May 27 19:04:31 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [win32/kernel32.c] [if1632/thunk.c] [include/flatthunk.h]
ThunkConnect16 and related functions moved to emulator.
* [loader/ne/segment.c]
Call DllEntryPoint with correct arguments.
* [relay32/builtin32.c]
Bugfix: Relay debugging did not work for multiple processes.
* [controls/menu.c]
Bugfix: dwItemData was not set for MF_OWNERDRAW menus.
* [if1632/relay.c] [relay32/relay386.c]
Relay messages converted to use DPRINTF.
* [controls/desktop.c] [relay32/user32.spec]
Implemented PaintDesktop.
* [files/profile.c] [if1632/kernel.spec] [misc/network.c]
[misc/printdrv.c] [relay32/winspool.spec]
[win32/ordinals.c] [relay32/kernel32.spec]
Some stubs added.
* [relay32/mpr.spec]
All ordinals were off by one.
Tue May 26 13:32:57 1998 Bill Hawes <whawes@star.net>
* [misc/lstr.c] [include/casemap.h] [tools/unimap.pl]
Added Unicode case conversion routines towupper/towlower,
with mapping tables casemap.h created by tools/unimap.pl.
* [misc/ntdll.c] [include/winnls.h] [relay32/ntdll.spec]
[relay32/advapi.spec]
Minimal implementation of IsTextUnicode, just enough to get
NT4 notepad to open ascii/unicode files.
* [Make.rules.in] [resources/sysres_En.rc]
Added include file dlgs.h for building resource files, so that
resources can refer to defined values (e.g. pshHelp).
* [misc/crtdll.c] [relay32/crtdll.spec]
Use towupper/towlower for 32W case conversions.
* [memory/string.c]
Use towupper for 32W case conversions.
* [ole/ole2nls.c]
Use towupper for 32W case conversions; fix mem leak; minor cleanup
* [controls/edit.c]
Added soft break flag to edit state. Print unknown action values
for WM_VSCROLL (action 190 occurs when running NT4 notepad.)
Mon May 25 22:42:40 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* [files/file.c]
Care for a pathological case in SetFilePointer.
* [graphics/x11drv/xfont.c]
Handle longer Font names in LFD_ComposeLFD and try to catch errors.
* [loader/pe_image.c]
Unload Dummymodule when PE_LoadLibraryEx32A fails with
PE_LoadImage (makes Encarta 98 installer proceed).
* [misc/registry.c]
Move a check for a special case in RegCreateKeyEx32W after the
check for existence.
Tue May 25 20:18:26 1998 Matthew Becker <mbecker@glasscity.net>
* [misc/ntdll.c]
Added some stubs, just guessing at the size of their param lists.
* [misc/registry.c]
Added stubs for RegUnLoadKey, RegSetKeySecurity, RegSaveKey,
RegRestoreKey, and RegReplaceKey
* [programs/regtest/regtest.c]
Updated registry testing program.
Sun May 24 18:11:40 1998 Alex Priem <alexp@sci.kun.nl>
* [file/profile.c]
Added flag 'return_values' to PROFILE_GetSection.
Sun May 24 13:41:10 1998 James Juran <jrj120@psu.edu>
* [misc/shell.c] [files/directory.c]
Documentation/debugging info additions.
* [*/*.c] [include/*.h]
Moved many extern function definitions to appropriate header files.
Cleaned up a few compile warnings.
If #include "debug.h" is present, removed #include <stdio.h>.
debug.h includes stdio.h, so it is not necessary to include both.
* [graphics/*.c] [if1632/signal.c] [ipc/*.c] [scheduler/*.c]
[win32/*.c] [windows/*.c]
Final patch to convert fprintf statements to new debugging interface.
Some fprintfs are still left, especially in the debugger/ directory.
However, IMHO, it's not worth the effort to change the rest.
Fri May 22 21:58:35 1998 Morten Welinder <terra@diku.dk>
* [windows/keyboard.c]
Correct handling of keys "`-=[]\;',./".
Fri May 22 12:06:00 1998 Per Lindström <pelinstr@algonet.se>
* [include/windows.h] [relay32/kernel32.spec] [win32/console.c]
Added stub for ReadConsoleOutputCharacter32A.
Thu May 21 16:45:48 1998 Pascal Cuoq <pcuoq@ens-lyon.fr>
* [ole/ole2nls.c]
Began better implementation of LCMapString32A.
Not very well tested yet, and still need improvements.
* [controls/scroll.c]
Documented functions.
Wed May 20 21:37:56 1998 Peter Hunnisett <hunnise@nortel.ca>
* [include/windows.h][misc/main.c]
Change SystemParameterInfo to support SPI_GETHIGHCONTRAST. Also
include some missing SPI_ definitions.
* [include/dsound.h][multimedia/dsound.c][relay32/dplayx.spec]
Added stubs for DirectPlayLobbyCreate[AW]. Not sure if these
should go into a new files dplayx.c? Anyone care?
* [include/winnls.h]
Added two missing flags for the CompareString32 functions.
1998-06-01 12:44:35 +02:00
|
|
|
*/
|
2009-09-12 14:18:32 +02:00
|
|
|
HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter)
|
1999-02-22 10:52:54 +01:00
|
|
|
{
|
2006-07-31 07:32:30 +02:00
|
|
|
return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7A, (LPVOID *)ppDI, punkOuter);
|
2003-06-16 22:22:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
* DirectInputCreateW (DINPUT.@)
|
|
|
|
*/
|
2009-09-12 14:18:32 +02:00
|
|
|
HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTW *ppDI, LPUNKNOWN punkOuter)
|
2003-06-16 22:22:13 +02:00
|
|
|
{
|
2006-07-31 07:32:30 +02:00
|
|
|
return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7W, (LPVOID *)ppDI, punkOuter);
|
2004-06-04 20:06:37 +02:00
|
|
|
}
|
2002-06-14 02:39:44 +02:00
|
|
|
|
2016-08-14 18:30:53 +02:00
|
|
|
static const char *_dump_DIDEVTYPE_value(DWORD dwDevType, DWORD dwVersion)
|
2012-10-12 23:58:10 +02:00
|
|
|
{
|
2016-08-14 18:30:53 +02:00
|
|
|
if (dwVersion < 0x0800) {
|
|
|
|
switch (dwDevType) {
|
|
|
|
case 0: return "All devices";
|
|
|
|
case DIDEVTYPE_MOUSE: return "DIDEVTYPE_MOUSE";
|
|
|
|
case DIDEVTYPE_KEYBOARD: return "DIDEVTYPE_KEYBOARD";
|
|
|
|
case DIDEVTYPE_JOYSTICK: return "DIDEVTYPE_JOYSTICK";
|
|
|
|
case DIDEVTYPE_DEVICE: return "DIDEVTYPE_DEVICE";
|
|
|
|
default: return "Unknown";
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
switch (dwDevType) {
|
|
|
|
case DI8DEVCLASS_ALL: return "All devices";
|
2016-09-12 21:07:57 +02:00
|
|
|
case DI8DEVCLASS_POINTER: return "DI8DEVCLASS_POINTER";
|
2016-08-14 18:30:53 +02:00
|
|
|
case DI8DEVCLASS_KEYBOARD: return "DI8DEVCLASS_KEYBOARD";
|
|
|
|
case DI8DEVCLASS_DEVICE: return "DI8DEVCLASS_DEVICE";
|
|
|
|
case DI8DEVCLASS_GAMECTRL: return "DI8DEVCLASS_GAMECTRL";
|
|
|
|
default: return "Unknown";
|
|
|
|
}
|
2004-06-04 20:06:37 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-12 23:58:10 +02:00
|
|
|
static void _dump_EnumDevices_dwFlags(DWORD dwFlags)
|
|
|
|
{
|
2004-06-04 20:06:37 +02:00
|
|
|
if (TRACE_ON(dinput)) {
|
2004-09-08 03:23:57 +02:00
|
|
|
unsigned int i;
|
2004-06-04 20:06:37 +02:00
|
|
|
static const struct {
|
|
|
|
DWORD mask;
|
|
|
|
const char *name;
|
|
|
|
} flags[] = {
|
|
|
|
#define FE(x) { x, #x}
|
|
|
|
FE(DIEDFL_ALLDEVICES),
|
|
|
|
FE(DIEDFL_ATTACHEDONLY),
|
|
|
|
FE(DIEDFL_FORCEFEEDBACK),
|
|
|
|
FE(DIEDFL_INCLUDEALIASES),
|
2011-11-26 18:30:16 +01:00
|
|
|
FE(DIEDFL_INCLUDEPHANTOMS),
|
|
|
|
FE(DIEDFL_INCLUDEHIDDEN)
|
2004-06-04 20:06:37 +02:00
|
|
|
#undef FE
|
|
|
|
};
|
2007-12-18 10:01:51 +01:00
|
|
|
TRACE(" flags: ");
|
2004-06-04 20:06:37 +02:00
|
|
|
if (dwFlags == 0) {
|
2009-04-18 14:21:30 +02:00
|
|
|
TRACE("DIEDFL_ALLDEVICES\n");
|
2004-06-04 20:06:37 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++)
|
|
|
|
if (flags[i].mask & dwFlags)
|
2007-12-12 08:48:31 +01:00
|
|
|
TRACE("%s ",flags[i].name);
|
2004-06-04 20:06:37 +02:00
|
|
|
}
|
2007-12-18 10:01:51 +01:00
|
|
|
TRACE("\n");
|
Release 980201
Sun Feb 1 13:24:54 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [files/drive.c]
Added Device= parameter to drive configuration.
* [if1632/relay.c]
Throw() and Catch() now use the correct CATCHBUF layout (untested).
* [tools/build.c] [include/stackframe.h] [loader/task.c]
Moved 16-bit stack pointer into thread database.
Save current %fs while running 16-bit code.
Fri Jan 30 09:25:49 1998 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [graphics/mapping.c]
Made DPtoLP32 and LPtoDP32 respect world transforms.
* [graphics/path.c] [graphics/painting.c] [if1632/gdi.spec]
[include/path.h]
More path support.
* [include/gdi.h] [include/windows.h] [objects/dc.c]
[relay/gdi32.spec]
Support for Get/SetArcDirection and Get/SetWorldTransform
* [windows/hook.c]
Fixed a bug in HOOK_Map16To32Common.
Thu Jan 29 23:43:18 1998 Douglas Ridgway <ridgway@taiga.gmcl.com>
* [graphics/metafiledrv/init.c] [objects/metafile.c]
Documentation for metafile related API calls. Fixed a bug to avoid
documenting it.
* [include/windows.h]
Declaration for LoadImage.
Thu Jan 29 21:44:45 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/win16drv/*]
Changes to printing code to enable use of printer fonts with the
win3.1 postscript driver. Remember to add printer=on to [wine]
section of wine.conf . You will also need to disable truetype
fonts from control panel. Winword 6.0 and Write seem to be happy
with this...
* [include/bitmap.h]
Fix Widthbytes for 15bpp displays.
Tue Jan 27 20:54:08 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [tsx11/*] [include/ts*] [tools/make_X11wrappers]
Implemented thread-safe X11 wrappers.
Tue Jan 27 13:54:09 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [windows/queue.c]
Forgot to convert thdb to thread_id.
* [misc/registry.c]
Sped up Windows 95 registry reading. Changed code to traverse
registry as a tree rather than read in all possible keys
(including dead ones).
Tue Jan 27 12:46:09 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_image.c][Makefile.in][scheduler/thread.c]
[libtest/hello5.c]
Don't exit() on failed to load referenced dlls.
Fixed static tls allocation for multiple threads.
WINELIB should now be able to load PE dlls. A sample
winelib program, that dynamically loads a internal dll
is included.
* [graphics/ddraw.c][include/ddraw.h][include/d3d.h]
Cleaned up and enhanced further. Added several DirectX5
interface definitions and DirectSurface3 implementation.
Stubs for D3D (NOT coming soon, just there so it fails safely).
* [multimedia/dsound.c][include/dsound.h]
Actually works now for a lot of cases. Some DirectX5 stuff
added. Still lacking several features.
* [windows/dinput.c][include/dinput.h]
Started implementing DirectInput. Doesn't work yet, don't
know why.
* [if1632/thunk.c][misc/callbacks.c]
[win32/kernel.c][include/callbacks.h]
Added WOWCallback16Ex, WOWHandle32.
* [misc/cpu.c]
Fixed GetSystemInfo, IsProcessorFeaturePresent.
* [multimedia/joystick.c][multimedia/time.c]
Several fixes. Small hack to get timerevents in timeGetTime() loops.
Tue Jan 20 11:26:27 1998 Slaven Rezic <eserte@cs.tu-berlin.de>
* [configure.in]
Fixed check for union semun on FreeBSD systems.
Sun Jan 18 23:05:04 1998 Karl Backström <karl_b@geocities.com>
* [misc/ole2nls.c] [programs/progman/Sw.rc] [programs/winhelp/Sw.rc]
[resources/sysres_Sw.rc]
Added/updated Swedish language support.
Sun Jan 18 18:49:01 1998 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [misc/winsock.c] [misc/winsock_dns.c] [windows/event.c]
[windows/win.c] [windows/dce.c] [windows/winpos.c]
Bug fixes.
Sun Jan 18 12:45:23 1997 Andreas Mohr <100.30936@germany.net>
* [msdos/int25.c] [msdos/int26.c]
Implemented "native" absolute disk read/write access.
* [msdos/int13.c] [msdos/ioports.c]
Enhanced GET DRIVE PARAMETERS (int13 AH=08).
* [graphics/win16drv/prtdrv.c] [if1632/gdi.spec]
Fixed typos, implemented dmEnumDFonts,
Started implementation of dmRealizeObject.
* [if1632/compobj.spec] [ole/compobj.c] [relay32/ole32.spec]
Stubs CoCreateInstance, CoFreeUnusedLibraries, implemented
CoFileTimeNow.
* [if1632/kernel.spec] [include/windows.h] [memory/global.c]
[memory/string.c] [misc/kernel.c] [misc/Makefile.in]
[misc/toolhelp.c] [msdos/int21.c]
Implemented GlobalHandleNoRIP, GetFreeMemInfo, DebugFillBuffer,
stubs GetSetKernelDOSProc, DiagQuery, DiagOutput, ToolHelpHook
(Undocumented Windows).
* [if1632/user.spec] [if1632/win32s16.spec] [misc/win32s16.c]
Misc stubs.
* [if1632/winaspi.spec] [misc/aspi.c]
Implemented GetASPIDLLVersion.
* [if1632/wprocs.spec] [msdos/int20.c] [msdos/Makefile.in]
Added handler for Int 0x20 (terminate program, _very_ old-fashioned).
* [misc/w32scomb.c]
Implemented Get16DLLAddress() partially
(big thanks to Marcus and Alexandre).
* [relay32/Makefile.in] [relay32/builtin32.c] [relay32/dplay.spec]
Added built-in DPLAY.DLL.
* [relay32/winmm.spec] [multimedia/joystick.c]
Added joySetThreshold.
* [misc/windebug.c]
Added WinNotify.
* [win32/console.c]
Stubs CreateConsoleScreenBuffer, SetConsoleActiveScreenBuffer,
WriteConsoleOutput32A.
* [windows/user.c]
Stub SetEventHook.
Sat Jan 17 19:30:35 1998 Matthew Toseland <Paul.Toseland@btinternet.com>
* [windows/painting.c]
Fixed broken restore-to-maximized.
Mon Jan 12 21:25:32 1998 Perceval - Marc Huguet Puig <mhp@tinet.fut.es>
* [documentation/wine.man] [include/options.h]
[misc/main.c] [ole/ole2nls.c] [resources/sysres.c]
[resources/sysres_Ca.rc] [resources/Makefile.in]
Added language catalan. (Afegit l'idioma català).
1998-02-01 19:33:27 +01:00
|
|
|
}
|
2003-06-16 22:22:13 +02:00
|
|
|
|
2012-10-12 23:58:10 +02:00
|
|
|
static void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat)
|
|
|
|
{
|
2008-09-29 22:28:22 +02:00
|
|
|
unsigned int i;
|
2008-02-15 14:50:15 +01:00
|
|
|
|
2012-10-12 23:58:10 +02:00
|
|
|
TRACE("diaf.dwSize = %d\n", lpdiActionFormat->dwSize);
|
|
|
|
TRACE("diaf.dwActionSize = %d\n", lpdiActionFormat->dwActionSize);
|
|
|
|
TRACE("diaf.dwDataSize = %d\n", lpdiActionFormat->dwDataSize);
|
|
|
|
TRACE("diaf.dwNumActions = %d\n", lpdiActionFormat->dwNumActions);
|
|
|
|
TRACE("diaf.rgoAction = %p\n", lpdiActionFormat->rgoAction);
|
|
|
|
TRACE("diaf.guidActionMap = %s\n", debugstr_guid(&lpdiActionFormat->guidActionMap));
|
|
|
|
TRACE("diaf.dwGenre = 0x%08x\n", lpdiActionFormat->dwGenre);
|
|
|
|
TRACE("diaf.dwBufferSize = %d\n", lpdiActionFormat->dwBufferSize);
|
|
|
|
TRACE("diaf.lAxisMin = %d\n", lpdiActionFormat->lAxisMin);
|
|
|
|
TRACE("diaf.lAxisMax = %d\n", lpdiActionFormat->lAxisMax);
|
|
|
|
TRACE("diaf.hInstString = %p\n", lpdiActionFormat->hInstString);
|
|
|
|
TRACE("diaf.ftTimeStamp ...\n");
|
|
|
|
TRACE("diaf.dwCRC = 0x%x\n", lpdiActionFormat->dwCRC);
|
|
|
|
TRACE("diaf.tszActionMap = %s\n", debugstr_a(lpdiActionFormat->tszActionMap));
|
2009-11-30 05:07:21 +01:00
|
|
|
for (i = 0; i < lpdiActionFormat->dwNumActions; i++)
|
|
|
|
{
|
2012-10-12 23:58:10 +02:00
|
|
|
TRACE("diaf.rgoAction[%u]:\n", i);
|
|
|
|
TRACE("\tuAppData=0x%lx\n", lpdiActionFormat->rgoAction[i].uAppData);
|
|
|
|
TRACE("\tdwSemantic=0x%08x\n", lpdiActionFormat->rgoAction[i].dwSemantic);
|
|
|
|
TRACE("\tdwFlags=0x%x\n", lpdiActionFormat->rgoAction[i].dwFlags);
|
|
|
|
TRACE("\tszActionName=%s\n", debugstr_a(lpdiActionFormat->rgoAction[i].u.lptszActionName));
|
|
|
|
TRACE("\tguidInstance=%s\n", debugstr_guid(&lpdiActionFormat->rgoAction[i].guidInstance));
|
|
|
|
TRACE("\tdwObjID=0x%x\n", lpdiActionFormat->rgoAction[i].dwObjID);
|
|
|
|
TRACE("\tdwHow=0x%x\n", lpdiActionFormat->rgoAction[i].dwHow);
|
2009-11-30 05:07:21 +01:00
|
|
|
}
|
2008-02-15 14:50:15 +01:00
|
|
|
}
|
|
|
|
|
2011-06-28 18:55:24 +02:00
|
|
|
void _copy_diactionformatAtoW(LPDIACTIONFORMATW to, LPDIACTIONFORMATA from)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
to->dwSize = sizeof(DIACTIONFORMATW);
|
|
|
|
to->dwActionSize = sizeof(DIACTIONW);
|
|
|
|
to->dwDataSize = from->dwDataSize;
|
|
|
|
to->dwNumActions = from->dwNumActions;
|
|
|
|
to->guidActionMap = from->guidActionMap;
|
|
|
|
to->dwGenre = from->dwGenre;
|
|
|
|
to->dwBufferSize = from->dwBufferSize;
|
|
|
|
to->lAxisMin = from->lAxisMin;
|
|
|
|
to->lAxisMax = from->lAxisMax;
|
|
|
|
to->dwCRC = from->dwCRC;
|
|
|
|
to->ftTimeStamp = from->ftTimeStamp;
|
|
|
|
|
|
|
|
for (i=0; i < to->dwNumActions; i++)
|
|
|
|
{
|
|
|
|
to->rgoAction[i].uAppData = from->rgoAction[i].uAppData;
|
|
|
|
to->rgoAction[i].dwSemantic = from->rgoAction[i].dwSemantic;
|
|
|
|
to->rgoAction[i].dwFlags = from->rgoAction[i].dwFlags;
|
|
|
|
to->rgoAction[i].guidInstance = from->rgoAction[i].guidInstance;
|
|
|
|
to->rgoAction[i].dwObjID = from->rgoAction[i].dwObjID;
|
|
|
|
to->rgoAction[i].dwHow = from->rgoAction[i].dwHow;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void _copy_diactionformatWtoA(LPDIACTIONFORMATA to, LPDIACTIONFORMATW from)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
to->dwSize = sizeof(DIACTIONFORMATA);
|
|
|
|
to->dwActionSize = sizeof(DIACTIONA);
|
|
|
|
to->dwDataSize = from->dwDataSize;
|
|
|
|
to->dwNumActions = from->dwNumActions;
|
|
|
|
to->guidActionMap = from->guidActionMap;
|
|
|
|
to->dwGenre = from->dwGenre;
|
|
|
|
to->dwBufferSize = from->dwBufferSize;
|
|
|
|
to->lAxisMin = from->lAxisMin;
|
|
|
|
to->lAxisMax = from->lAxisMax;
|
|
|
|
to->dwCRC = from->dwCRC;
|
|
|
|
to->ftTimeStamp = from->ftTimeStamp;
|
|
|
|
|
|
|
|
for (i=0; i < to->dwNumActions; i++)
|
|
|
|
{
|
|
|
|
to->rgoAction[i].uAppData = from->rgoAction[i].uAppData;
|
|
|
|
to->rgoAction[i].dwSemantic = from->rgoAction[i].dwSemantic;
|
|
|
|
to->rgoAction[i].dwFlags = from->rgoAction[i].dwFlags;
|
|
|
|
to->rgoAction[i].guidInstance = from->rgoAction[i].guidInstance;
|
|
|
|
to->rgoAction[i].dwObjID = from->rgoAction[i].dwObjID;
|
|
|
|
to->rgoAction[i].dwHow = from->rgoAction[i].dwHow;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-24 22:47:47 +01:00
|
|
|
/* diactionformat_priority
|
2011-07-21 20:36:00 +02:00
|
|
|
*
|
|
|
|
* Given a DIACTIONFORMAT structure and a DI genre, returns the enumeration
|
|
|
|
* priority. Joysticks should pass the game genre, and mouse or keyboard their
|
|
|
|
* respective DI*_MASK
|
|
|
|
*/
|
2012-03-24 22:47:47 +01:00
|
|
|
static DWORD diactionformat_priorityA(LPDIACTIONFORMATA lpdiaf, DWORD genre)
|
2011-07-21 20:36:00 +02:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
DWORD priorityFlags = 0;
|
|
|
|
|
|
|
|
/* If there's at least one action for the device it's priority 1 */
|
2012-03-24 22:47:47 +01:00
|
|
|
for(i=0; i < lpdiaf->dwNumActions; i++)
|
2011-07-21 20:36:00 +02:00
|
|
|
if ((lpdiaf->rgoAction[i].dwSemantic & genre) == genre)
|
|
|
|
priorityFlags |= DIEDBS_MAPPEDPRI1;
|
|
|
|
|
|
|
|
return priorityFlags;
|
|
|
|
}
|
|
|
|
|
2012-03-24 22:47:47 +01:00
|
|
|
static DWORD diactionformat_priorityW(LPDIACTIONFORMATW lpdiaf, DWORD genre)
|
2011-07-21 20:36:00 +02:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
DWORD priorityFlags = 0;
|
|
|
|
|
|
|
|
/* If there's at least one action for the device it's priority 1 */
|
2012-03-24 22:47:47 +01:00
|
|
|
for(i=0; i < lpdiaf->dwNumActions; i++)
|
2011-07-21 20:36:00 +02:00
|
|
|
if ((lpdiaf->rgoAction[i].dwSemantic & genre) == genre)
|
|
|
|
priorityFlags |= DIEDBS_MAPPEDPRI1;
|
|
|
|
|
|
|
|
return priorityFlags;
|
|
|
|
}
|
|
|
|
|
2015-11-22 17:51:24 +01:00
|
|
|
#if defined __i386__ && defined _MSC_VER
|
|
|
|
__declspec(naked) BOOL enum_callback_wrapper(void *callback, const void *instance, void *ref)
|
|
|
|
{
|
|
|
|
__asm
|
|
|
|
{
|
|
|
|
push ebp
|
|
|
|
mov ebp, esp
|
|
|
|
push [ebp+16]
|
|
|
|
push [ebp+12]
|
|
|
|
call [ebp+8]
|
|
|
|
leave
|
|
|
|
ret
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#elif defined __i386__ && defined __GNUC__
|
2015-11-16 08:25:45 +01:00
|
|
|
extern BOOL enum_callback_wrapper(void *callback, const void *instance, void *ref);
|
|
|
|
__ASM_GLOBAL_FUNC( enum_callback_wrapper,
|
|
|
|
"pushl %ebp\n\t"
|
|
|
|
__ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
|
|
|
|
__ASM_CFI(".cfi_rel_offset %ebp,0\n\t")
|
|
|
|
"movl %esp,%ebp\n\t"
|
|
|
|
__ASM_CFI(".cfi_def_cfa_register %ebp\n\t")
|
|
|
|
"pushl 16(%ebp)\n\t"
|
|
|
|
"pushl 12(%ebp)\n\t"
|
|
|
|
"call *8(%ebp)\n\t"
|
|
|
|
"leave\n\t"
|
|
|
|
__ASM_CFI(".cfi_def_cfa %esp,4\n\t")
|
|
|
|
__ASM_CFI(".cfi_same_value %ebp\n\t")
|
|
|
|
"ret" )
|
|
|
|
#else
|
|
|
|
#define enum_callback_wrapper(callback, instance, ref) (callback)((instance), (ref))
|
|
|
|
#endif
|
|
|
|
|
Release 980201
Sun Feb 1 13:24:54 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [files/drive.c]
Added Device= parameter to drive configuration.
* [if1632/relay.c]
Throw() and Catch() now use the correct CATCHBUF layout (untested).
* [tools/build.c] [include/stackframe.h] [loader/task.c]
Moved 16-bit stack pointer into thread database.
Save current %fs while running 16-bit code.
Fri Jan 30 09:25:49 1998 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [graphics/mapping.c]
Made DPtoLP32 and LPtoDP32 respect world transforms.
* [graphics/path.c] [graphics/painting.c] [if1632/gdi.spec]
[include/path.h]
More path support.
* [include/gdi.h] [include/windows.h] [objects/dc.c]
[relay/gdi32.spec]
Support for Get/SetArcDirection and Get/SetWorldTransform
* [windows/hook.c]
Fixed a bug in HOOK_Map16To32Common.
Thu Jan 29 23:43:18 1998 Douglas Ridgway <ridgway@taiga.gmcl.com>
* [graphics/metafiledrv/init.c] [objects/metafile.c]
Documentation for metafile related API calls. Fixed a bug to avoid
documenting it.
* [include/windows.h]
Declaration for LoadImage.
Thu Jan 29 21:44:45 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/win16drv/*]
Changes to printing code to enable use of printer fonts with the
win3.1 postscript driver. Remember to add printer=on to [wine]
section of wine.conf . You will also need to disable truetype
fonts from control panel. Winword 6.0 and Write seem to be happy
with this...
* [include/bitmap.h]
Fix Widthbytes for 15bpp displays.
Tue Jan 27 20:54:08 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [tsx11/*] [include/ts*] [tools/make_X11wrappers]
Implemented thread-safe X11 wrappers.
Tue Jan 27 13:54:09 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [windows/queue.c]
Forgot to convert thdb to thread_id.
* [misc/registry.c]
Sped up Windows 95 registry reading. Changed code to traverse
registry as a tree rather than read in all possible keys
(including dead ones).
Tue Jan 27 12:46:09 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_image.c][Makefile.in][scheduler/thread.c]
[libtest/hello5.c]
Don't exit() on failed to load referenced dlls.
Fixed static tls allocation for multiple threads.
WINELIB should now be able to load PE dlls. A sample
winelib program, that dynamically loads a internal dll
is included.
* [graphics/ddraw.c][include/ddraw.h][include/d3d.h]
Cleaned up and enhanced further. Added several DirectX5
interface definitions and DirectSurface3 implementation.
Stubs for D3D (NOT coming soon, just there so it fails safely).
* [multimedia/dsound.c][include/dsound.h]
Actually works now for a lot of cases. Some DirectX5 stuff
added. Still lacking several features.
* [windows/dinput.c][include/dinput.h]
Started implementing DirectInput. Doesn't work yet, don't
know why.
* [if1632/thunk.c][misc/callbacks.c]
[win32/kernel.c][include/callbacks.h]
Added WOWCallback16Ex, WOWHandle32.
* [misc/cpu.c]
Fixed GetSystemInfo, IsProcessorFeaturePresent.
* [multimedia/joystick.c][multimedia/time.c]
Several fixes. Small hack to get timerevents in timeGetTime() loops.
Tue Jan 20 11:26:27 1998 Slaven Rezic <eserte@cs.tu-berlin.de>
* [configure.in]
Fixed check for union semun on FreeBSD systems.
Sun Jan 18 23:05:04 1998 Karl Backström <karl_b@geocities.com>
* [misc/ole2nls.c] [programs/progman/Sw.rc] [programs/winhelp/Sw.rc]
[resources/sysres_Sw.rc]
Added/updated Swedish language support.
Sun Jan 18 18:49:01 1998 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [misc/winsock.c] [misc/winsock_dns.c] [windows/event.c]
[windows/win.c] [windows/dce.c] [windows/winpos.c]
Bug fixes.
Sun Jan 18 12:45:23 1997 Andreas Mohr <100.30936@germany.net>
* [msdos/int25.c] [msdos/int26.c]
Implemented "native" absolute disk read/write access.
* [msdos/int13.c] [msdos/ioports.c]
Enhanced GET DRIVE PARAMETERS (int13 AH=08).
* [graphics/win16drv/prtdrv.c] [if1632/gdi.spec]
Fixed typos, implemented dmEnumDFonts,
Started implementation of dmRealizeObject.
* [if1632/compobj.spec] [ole/compobj.c] [relay32/ole32.spec]
Stubs CoCreateInstance, CoFreeUnusedLibraries, implemented
CoFileTimeNow.
* [if1632/kernel.spec] [include/windows.h] [memory/global.c]
[memory/string.c] [misc/kernel.c] [misc/Makefile.in]
[misc/toolhelp.c] [msdos/int21.c]
Implemented GlobalHandleNoRIP, GetFreeMemInfo, DebugFillBuffer,
stubs GetSetKernelDOSProc, DiagQuery, DiagOutput, ToolHelpHook
(Undocumented Windows).
* [if1632/user.spec] [if1632/win32s16.spec] [misc/win32s16.c]
Misc stubs.
* [if1632/winaspi.spec] [misc/aspi.c]
Implemented GetASPIDLLVersion.
* [if1632/wprocs.spec] [msdos/int20.c] [msdos/Makefile.in]
Added handler for Int 0x20 (terminate program, _very_ old-fashioned).
* [misc/w32scomb.c]
Implemented Get16DLLAddress() partially
(big thanks to Marcus and Alexandre).
* [relay32/Makefile.in] [relay32/builtin32.c] [relay32/dplay.spec]
Added built-in DPLAY.DLL.
* [relay32/winmm.spec] [multimedia/joystick.c]
Added joySetThreshold.
* [misc/windebug.c]
Added WinNotify.
* [win32/console.c]
Stubs CreateConsoleScreenBuffer, SetConsoleActiveScreenBuffer,
WriteConsoleOutput32A.
* [windows/user.c]
Stub SetEventHook.
Sat Jan 17 19:30:35 1998 Matthew Toseland <Paul.Toseland@btinternet.com>
* [windows/painting.c]
Fixed broken restore-to-maximized.
Mon Jan 12 21:25:32 1998 Perceval - Marc Huguet Puig <mhp@tinet.fut.es>
* [documentation/wine.man] [include/options.h]
[misc/main.c] [ole/ole2nls.c] [resources/sysres.c]
[resources/sysres_Ca.rc] [resources/Makefile.in]
Added language catalan. (Afegit l'idioma català).
1998-02-01 19:33:27 +01:00
|
|
|
/******************************************************************************
|
Release 980601
Sun May 31 13:40:13 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [if1632/signal.c]
Added display of exception name.
* [loader/task.c]
Yet another attempt at fixing SwitchStackTo/SwitchStackBack.
* [memory/selector.c] [relay32/builtin32.c] [tools/build.c]
[win32/kernel32.c]
Generate an assembly stub for Win32 register functions to make
their names available at link time.
* [programs/*/Makefile.in]
Added hacks to support old resource compiler.
Fri May 29 16:27:14 1998 Marcus Meissner <marcus@jet.franken.de>
* [tools/testrun]
Merge of my testscripts at home into one single perl program
(tested with perl5). Works only on Linux due to 'ps' and 'ipcs'
magic.
* [controls/menu.c]
Added some DefaultMenuItem stubs.
* [debugger/stabs.c]
Fixed stabs loading, now supports (int,int) typeinfo format used
by gcc-2.8 and egcs-1. If it still crashes, please mail me.
* [if1632/][relay32/]
Added msvideo.dll (stubs only)
Replaced some ptr by str for stringcases
Added some new stubs (VxDCall, FindCloseNotif....)
* [misc/network.c]
Some argument fixes.
* [misc/registry.c][misc/cpu.c]
Registry initialization partially rewritten and enhanced.
* [scheduler/*.c]
Some additions so we don't do kill(0,SIGUSR1) (kill processgroup
instead of targeted thread)
Added SetThreadContext.
Thu May 28 23:59:59 1998 Bertho Stultiens <bertho@akhphd.au.dk>
* [tools/wrc/*]
New resource compiler version 1.0.0 (28-May-1998)
* [Make.rules.in] [Makefile.in]
Changed and added rc rules to point to tools/wrc/wrc.
* [configure.in] [include/config.h.in]
Added check for function 'stricmp'.
* [include/resource.h]
Commented out the old resource structure to catch references.
It also includes wrc_rsc.h.
* [include/wrc_rsc.h]
New file. Definitions for the resources generated with wrc.
* [include/windows.h]
Added #ifdef RC_INVOKED to exclude stdarg.h.
Added SS_NOTIFY flag.
* [include/winnls.h]
Added SUBLANG_* definitions and corrected some defaults.
* [loader/libres.c]
Changed the sysres load functions to support wrc generated
resources.
* [resource/sysres_*.rc]
Added #include <windows.h>
* [resource/sysres.c]
Changed declarations to match wrc's output
* [resource/Makefile.in]
Changed rules to work with wrc.
* [tools/makedep.c]
Changed generation of .rc file dependencies to .s target.
Thu May 28 22:28:39 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [files/file.c][include/windows.c][relay32/kernel32.spec]
Implemented GetFileAttributesEx32A/W.
* [misc/imagelist.h][include/commctrl.h][relay32/comctl32.spec]
Added ImageList_Read and ImageList_Write stubs.
Added ImageList_AddIcon function.
Added ImageList_LoadImage. It is the same as ImageList_LoadImage32A.
* [controls/header.c]
Fixed bitmap drawing bug.
Added full bitmap support.
* [include/commctrl.h]
Added missing header macros.
* [controls/toolbar.c][include/toolbar.h][include/commctrl.h]
[controls/commctrl.c] [relay32/comctl32.spec]
First implementation of toolbar control.
Implemented CreateToolbar, CreateToolbarEx and CreateMappedBitmap.
* [controls/progress.c][controls/status.c]
Some code cleanup.
* [controls/commctrl.c][include/commctrl.h][relay32/comctl32.spec]
Removed CreateStatusWindow16 and DrawStatusText16.
CreateStatusWindow is the same as CreateStatusWindow32A.
DrawStatusText is the same as DrawStatusText32A.
Thu May 28 16:01:28 1998 Matthew J. Francis <asbel@dial.pipex.com>
* [objects/bitmap.c] [objects/bitmap.h] [objects/oembitmap.c]
[objects/dc.c] [graphics/x11drv/bitblt.c]
Added partial implementation of CreateDIBSection, with great thanks
to Ulrich Weigand <weigand@informatik.uni-erlangen.de> for
contributing the bulk of the patch.
Wed May 27 19:04:31 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [win32/kernel32.c] [if1632/thunk.c] [include/flatthunk.h]
ThunkConnect16 and related functions moved to emulator.
* [loader/ne/segment.c]
Call DllEntryPoint with correct arguments.
* [relay32/builtin32.c]
Bugfix: Relay debugging did not work for multiple processes.
* [controls/menu.c]
Bugfix: dwItemData was not set for MF_OWNERDRAW menus.
* [if1632/relay.c] [relay32/relay386.c]
Relay messages converted to use DPRINTF.
* [controls/desktop.c] [relay32/user32.spec]
Implemented PaintDesktop.
* [files/profile.c] [if1632/kernel.spec] [misc/network.c]
[misc/printdrv.c] [relay32/winspool.spec]
[win32/ordinals.c] [relay32/kernel32.spec]
Some stubs added.
* [relay32/mpr.spec]
All ordinals were off by one.
Tue May 26 13:32:57 1998 Bill Hawes <whawes@star.net>
* [misc/lstr.c] [include/casemap.h] [tools/unimap.pl]
Added Unicode case conversion routines towupper/towlower,
with mapping tables casemap.h created by tools/unimap.pl.
* [misc/ntdll.c] [include/winnls.h] [relay32/ntdll.spec]
[relay32/advapi.spec]
Minimal implementation of IsTextUnicode, just enough to get
NT4 notepad to open ascii/unicode files.
* [Make.rules.in] [resources/sysres_En.rc]
Added include file dlgs.h for building resource files, so that
resources can refer to defined values (e.g. pshHelp).
* [misc/crtdll.c] [relay32/crtdll.spec]
Use towupper/towlower for 32W case conversions.
* [memory/string.c]
Use towupper for 32W case conversions.
* [ole/ole2nls.c]
Use towupper for 32W case conversions; fix mem leak; minor cleanup
* [controls/edit.c]
Added soft break flag to edit state. Print unknown action values
for WM_VSCROLL (action 190 occurs when running NT4 notepad.)
Mon May 25 22:42:40 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* [files/file.c]
Care for a pathological case in SetFilePointer.
* [graphics/x11drv/xfont.c]
Handle longer Font names in LFD_ComposeLFD and try to catch errors.
* [loader/pe_image.c]
Unload Dummymodule when PE_LoadLibraryEx32A fails with
PE_LoadImage (makes Encarta 98 installer proceed).
* [misc/registry.c]
Move a check for a special case in RegCreateKeyEx32W after the
check for existence.
Tue May 25 20:18:26 1998 Matthew Becker <mbecker@glasscity.net>
* [misc/ntdll.c]
Added some stubs, just guessing at the size of their param lists.
* [misc/registry.c]
Added stubs for RegUnLoadKey, RegSetKeySecurity, RegSaveKey,
RegRestoreKey, and RegReplaceKey
* [programs/regtest/regtest.c]
Updated registry testing program.
Sun May 24 18:11:40 1998 Alex Priem <alexp@sci.kun.nl>
* [file/profile.c]
Added flag 'return_values' to PROFILE_GetSection.
Sun May 24 13:41:10 1998 James Juran <jrj120@psu.edu>
* [misc/shell.c] [files/directory.c]
Documentation/debugging info additions.
* [*/*.c] [include/*.h]
Moved many extern function definitions to appropriate header files.
Cleaned up a few compile warnings.
If #include "debug.h" is present, removed #include <stdio.h>.
debug.h includes stdio.h, so it is not necessary to include both.
* [graphics/*.c] [if1632/signal.c] [ipc/*.c] [scheduler/*.c]
[win32/*.c] [windows/*.c]
Final patch to convert fprintf statements to new debugging interface.
Some fprintfs are still left, especially in the debugger/ directory.
However, IMHO, it's not worth the effort to change the rest.
Fri May 22 21:58:35 1998 Morten Welinder <terra@diku.dk>
* [windows/keyboard.c]
Correct handling of keys "`-=[]\;',./".
Fri May 22 12:06:00 1998 Per Lindström <pelinstr@algonet.se>
* [include/windows.h] [relay32/kernel32.spec] [win32/console.c]
Added stub for ReadConsoleOutputCharacter32A.
Thu May 21 16:45:48 1998 Pascal Cuoq <pcuoq@ens-lyon.fr>
* [ole/ole2nls.c]
Began better implementation of LCMapString32A.
Not very well tested yet, and still need improvements.
* [controls/scroll.c]
Documented functions.
Wed May 20 21:37:56 1998 Peter Hunnisett <hunnise@nortel.ca>
* [include/windows.h][misc/main.c]
Change SystemParameterInfo to support SPI_GETHIGHCONTRAST. Also
include some missing SPI_ definitions.
* [include/dsound.h][multimedia/dsound.c][relay32/dplayx.spec]
Added stubs for DirectPlayLobbyCreate[AW]. Not sure if these
should go into a new files dplayx.c? Anyone care?
* [include/winnls.h]
Added two missing flags for the CompareString32 functions.
1998-06-01 12:44:35 +02:00
|
|
|
* IDirectInputA_EnumDevices
|
Release 980201
Sun Feb 1 13:24:54 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [files/drive.c]
Added Device= parameter to drive configuration.
* [if1632/relay.c]
Throw() and Catch() now use the correct CATCHBUF layout (untested).
* [tools/build.c] [include/stackframe.h] [loader/task.c]
Moved 16-bit stack pointer into thread database.
Save current %fs while running 16-bit code.
Fri Jan 30 09:25:49 1998 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [graphics/mapping.c]
Made DPtoLP32 and LPtoDP32 respect world transforms.
* [graphics/path.c] [graphics/painting.c] [if1632/gdi.spec]
[include/path.h]
More path support.
* [include/gdi.h] [include/windows.h] [objects/dc.c]
[relay/gdi32.spec]
Support for Get/SetArcDirection and Get/SetWorldTransform
* [windows/hook.c]
Fixed a bug in HOOK_Map16To32Common.
Thu Jan 29 23:43:18 1998 Douglas Ridgway <ridgway@taiga.gmcl.com>
* [graphics/metafiledrv/init.c] [objects/metafile.c]
Documentation for metafile related API calls. Fixed a bug to avoid
documenting it.
* [include/windows.h]
Declaration for LoadImage.
Thu Jan 29 21:44:45 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/win16drv/*]
Changes to printing code to enable use of printer fonts with the
win3.1 postscript driver. Remember to add printer=on to [wine]
section of wine.conf . You will also need to disable truetype
fonts from control panel. Winword 6.0 and Write seem to be happy
with this...
* [include/bitmap.h]
Fix Widthbytes for 15bpp displays.
Tue Jan 27 20:54:08 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [tsx11/*] [include/ts*] [tools/make_X11wrappers]
Implemented thread-safe X11 wrappers.
Tue Jan 27 13:54:09 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [windows/queue.c]
Forgot to convert thdb to thread_id.
* [misc/registry.c]
Sped up Windows 95 registry reading. Changed code to traverse
registry as a tree rather than read in all possible keys
(including dead ones).
Tue Jan 27 12:46:09 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_image.c][Makefile.in][scheduler/thread.c]
[libtest/hello5.c]
Don't exit() on failed to load referenced dlls.
Fixed static tls allocation for multiple threads.
WINELIB should now be able to load PE dlls. A sample
winelib program, that dynamically loads a internal dll
is included.
* [graphics/ddraw.c][include/ddraw.h][include/d3d.h]
Cleaned up and enhanced further. Added several DirectX5
interface definitions and DirectSurface3 implementation.
Stubs for D3D (NOT coming soon, just there so it fails safely).
* [multimedia/dsound.c][include/dsound.h]
Actually works now for a lot of cases. Some DirectX5 stuff
added. Still lacking several features.
* [windows/dinput.c][include/dinput.h]
Started implementing DirectInput. Doesn't work yet, don't
know why.
* [if1632/thunk.c][misc/callbacks.c]
[win32/kernel.c][include/callbacks.h]
Added WOWCallback16Ex, WOWHandle32.
* [misc/cpu.c]
Fixed GetSystemInfo, IsProcessorFeaturePresent.
* [multimedia/joystick.c][multimedia/time.c]
Several fixes. Small hack to get timerevents in timeGetTime() loops.
Tue Jan 20 11:26:27 1998 Slaven Rezic <eserte@cs.tu-berlin.de>
* [configure.in]
Fixed check for union semun on FreeBSD systems.
Sun Jan 18 23:05:04 1998 Karl Backström <karl_b@geocities.com>
* [misc/ole2nls.c] [programs/progman/Sw.rc] [programs/winhelp/Sw.rc]
[resources/sysres_Sw.rc]
Added/updated Swedish language support.
Sun Jan 18 18:49:01 1998 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [misc/winsock.c] [misc/winsock_dns.c] [windows/event.c]
[windows/win.c] [windows/dce.c] [windows/winpos.c]
Bug fixes.
Sun Jan 18 12:45:23 1997 Andreas Mohr <100.30936@germany.net>
* [msdos/int25.c] [msdos/int26.c]
Implemented "native" absolute disk read/write access.
* [msdos/int13.c] [msdos/ioports.c]
Enhanced GET DRIVE PARAMETERS (int13 AH=08).
* [graphics/win16drv/prtdrv.c] [if1632/gdi.spec]
Fixed typos, implemented dmEnumDFonts,
Started implementation of dmRealizeObject.
* [if1632/compobj.spec] [ole/compobj.c] [relay32/ole32.spec]
Stubs CoCreateInstance, CoFreeUnusedLibraries, implemented
CoFileTimeNow.
* [if1632/kernel.spec] [include/windows.h] [memory/global.c]
[memory/string.c] [misc/kernel.c] [misc/Makefile.in]
[misc/toolhelp.c] [msdos/int21.c]
Implemented GlobalHandleNoRIP, GetFreeMemInfo, DebugFillBuffer,
stubs GetSetKernelDOSProc, DiagQuery, DiagOutput, ToolHelpHook
(Undocumented Windows).
* [if1632/user.spec] [if1632/win32s16.spec] [misc/win32s16.c]
Misc stubs.
* [if1632/winaspi.spec] [misc/aspi.c]
Implemented GetASPIDLLVersion.
* [if1632/wprocs.spec] [msdos/int20.c] [msdos/Makefile.in]
Added handler for Int 0x20 (terminate program, _very_ old-fashioned).
* [misc/w32scomb.c]
Implemented Get16DLLAddress() partially
(big thanks to Marcus and Alexandre).
* [relay32/Makefile.in] [relay32/builtin32.c] [relay32/dplay.spec]
Added built-in DPLAY.DLL.
* [relay32/winmm.spec] [multimedia/joystick.c]
Added joySetThreshold.
* [misc/windebug.c]
Added WinNotify.
* [win32/console.c]
Stubs CreateConsoleScreenBuffer, SetConsoleActiveScreenBuffer,
WriteConsoleOutput32A.
* [windows/user.c]
Stub SetEventHook.
Sat Jan 17 19:30:35 1998 Matthew Toseland <Paul.Toseland@btinternet.com>
* [windows/painting.c]
Fixed broken restore-to-maximized.
Mon Jan 12 21:25:32 1998 Perceval - Marc Huguet Puig <mhp@tinet.fut.es>
* [documentation/wine.man] [include/options.h]
[misc/main.c] [ole/ole2nls.c] [resources/sysres.c]
[resources/sysres_Ca.rc] [resources/Makefile.in]
Added language catalan. (Afegit l'idioma català).
1998-02-01 19:33:27 +01:00
|
|
|
*/
|
1999-02-22 10:52:54 +01:00
|
|
|
static HRESULT WINAPI IDirectInputAImpl_EnumDevices(
|
2001-01-29 00:14:25 +01:00
|
|
|
LPDIRECTINPUT7A iface, DWORD dwDevType, LPDIENUMDEVICESCALLBACKA lpCallback,
|
2003-06-16 22:22:13 +02:00
|
|
|
LPVOID pvRef, DWORD dwFlags)
|
1999-02-22 10:52:54 +01:00
|
|
|
{
|
2010-12-28 20:24:38 +01:00
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput7A(iface);
|
2004-06-04 20:06:37 +02:00
|
|
|
DIDEVICEINSTANCEA devInstance;
|
2008-09-29 22:28:22 +02:00
|
|
|
unsigned int i;
|
2016-09-13 09:02:36 +02:00
|
|
|
int j;
|
|
|
|
HRESULT r;
|
2008-09-29 22:28:22 +02:00
|
|
|
|
2016-08-14 18:30:53 +02:00
|
|
|
TRACE("(this=%p,0x%04x '%s',%p,%p,0x%04x)\n",
|
|
|
|
This, dwDevType, _dump_DIDEVTYPE_value(dwDevType, This->dwVersion),
|
2004-06-04 20:06:37 +02:00
|
|
|
lpCallback, pvRef, dwFlags);
|
2007-12-18 10:01:51 +01:00
|
|
|
_dump_EnumDevices_dwFlags(dwFlags);
|
2005-05-13 15:57:17 +02:00
|
|
|
|
2011-11-26 18:30:16 +01:00
|
|
|
if (!lpCallback ||
|
|
|
|
dwFlags & ~(DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK | DIEDFL_INCLUDEALIASES | DIEDFL_INCLUDEPHANTOMS | DIEDFL_INCLUDEHIDDEN) ||
|
2011-12-02 05:08:14 +01:00
|
|
|
(dwDevType > DI8DEVCLASS_GAMECTRL && dwDevType < DI8DEVTYPE_DEVICE) || dwDevType > DI8DEVTYPE_SUPPLEMENTAL)
|
2011-07-05 14:19:06 +02:00
|
|
|
return DIERR_INVALIDPARAM;
|
|
|
|
|
2011-07-05 14:19:17 +02:00
|
|
|
if (!This->initialized)
|
|
|
|
return DIERR_NOTINITIALIZED;
|
|
|
|
|
2018-07-05 22:07:16 +02:00
|
|
|
for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) {
|
2005-03-15 20:36:15 +01:00
|
|
|
if (!dinput_devices[i]->enum_deviceA) continue;
|
2013-05-20 21:10:02 +02:00
|
|
|
for (j = 0, r = S_OK; SUCCEEDED(r); j++) {
|
|
|
|
devInstance.dwSize = sizeof(devInstance);
|
|
|
|
TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name);
|
|
|
|
r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->dwVersion, j);
|
|
|
|
if (r == S_OK)
|
2015-11-16 08:25:45 +01:00
|
|
|
if (enum_callback_wrapper(lpCallback, &devInstance, pvRef) == DIENUM_STOP)
|
2013-05-20 21:10:02 +02:00
|
|
|
return S_OK;
|
|
|
|
}
|
2004-06-04 20:06:37 +02:00
|
|
|
}
|
2013-05-20 21:10:02 +02:00
|
|
|
|
|
|
|
return S_OK;
|
Release 980201
Sun Feb 1 13:24:54 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [files/drive.c]
Added Device= parameter to drive configuration.
* [if1632/relay.c]
Throw() and Catch() now use the correct CATCHBUF layout (untested).
* [tools/build.c] [include/stackframe.h] [loader/task.c]
Moved 16-bit stack pointer into thread database.
Save current %fs while running 16-bit code.
Fri Jan 30 09:25:49 1998 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [graphics/mapping.c]
Made DPtoLP32 and LPtoDP32 respect world transforms.
* [graphics/path.c] [graphics/painting.c] [if1632/gdi.spec]
[include/path.h]
More path support.
* [include/gdi.h] [include/windows.h] [objects/dc.c]
[relay/gdi32.spec]
Support for Get/SetArcDirection and Get/SetWorldTransform
* [windows/hook.c]
Fixed a bug in HOOK_Map16To32Common.
Thu Jan 29 23:43:18 1998 Douglas Ridgway <ridgway@taiga.gmcl.com>
* [graphics/metafiledrv/init.c] [objects/metafile.c]
Documentation for metafile related API calls. Fixed a bug to avoid
documenting it.
* [include/windows.h]
Declaration for LoadImage.
Thu Jan 29 21:44:45 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/win16drv/*]
Changes to printing code to enable use of printer fonts with the
win3.1 postscript driver. Remember to add printer=on to [wine]
section of wine.conf . You will also need to disable truetype
fonts from control panel. Winword 6.0 and Write seem to be happy
with this...
* [include/bitmap.h]
Fix Widthbytes for 15bpp displays.
Tue Jan 27 20:54:08 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [tsx11/*] [include/ts*] [tools/make_X11wrappers]
Implemented thread-safe X11 wrappers.
Tue Jan 27 13:54:09 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [windows/queue.c]
Forgot to convert thdb to thread_id.
* [misc/registry.c]
Sped up Windows 95 registry reading. Changed code to traverse
registry as a tree rather than read in all possible keys
(including dead ones).
Tue Jan 27 12:46:09 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_image.c][Makefile.in][scheduler/thread.c]
[libtest/hello5.c]
Don't exit() on failed to load referenced dlls.
Fixed static tls allocation for multiple threads.
WINELIB should now be able to load PE dlls. A sample
winelib program, that dynamically loads a internal dll
is included.
* [graphics/ddraw.c][include/ddraw.h][include/d3d.h]
Cleaned up and enhanced further. Added several DirectX5
interface definitions and DirectSurface3 implementation.
Stubs for D3D (NOT coming soon, just there so it fails safely).
* [multimedia/dsound.c][include/dsound.h]
Actually works now for a lot of cases. Some DirectX5 stuff
added. Still lacking several features.
* [windows/dinput.c][include/dinput.h]
Started implementing DirectInput. Doesn't work yet, don't
know why.
* [if1632/thunk.c][misc/callbacks.c]
[win32/kernel.c][include/callbacks.h]
Added WOWCallback16Ex, WOWHandle32.
* [misc/cpu.c]
Fixed GetSystemInfo, IsProcessorFeaturePresent.
* [multimedia/joystick.c][multimedia/time.c]
Several fixes. Small hack to get timerevents in timeGetTime() loops.
Tue Jan 20 11:26:27 1998 Slaven Rezic <eserte@cs.tu-berlin.de>
* [configure.in]
Fixed check for union semun on FreeBSD systems.
Sun Jan 18 23:05:04 1998 Karl Backström <karl_b@geocities.com>
* [misc/ole2nls.c] [programs/progman/Sw.rc] [programs/winhelp/Sw.rc]
[resources/sysres_Sw.rc]
Added/updated Swedish language support.
Sun Jan 18 18:49:01 1998 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [misc/winsock.c] [misc/winsock_dns.c] [windows/event.c]
[windows/win.c] [windows/dce.c] [windows/winpos.c]
Bug fixes.
Sun Jan 18 12:45:23 1997 Andreas Mohr <100.30936@germany.net>
* [msdos/int25.c] [msdos/int26.c]
Implemented "native" absolute disk read/write access.
* [msdos/int13.c] [msdos/ioports.c]
Enhanced GET DRIVE PARAMETERS (int13 AH=08).
* [graphics/win16drv/prtdrv.c] [if1632/gdi.spec]
Fixed typos, implemented dmEnumDFonts,
Started implementation of dmRealizeObject.
* [if1632/compobj.spec] [ole/compobj.c] [relay32/ole32.spec]
Stubs CoCreateInstance, CoFreeUnusedLibraries, implemented
CoFileTimeNow.
* [if1632/kernel.spec] [include/windows.h] [memory/global.c]
[memory/string.c] [misc/kernel.c] [misc/Makefile.in]
[misc/toolhelp.c] [msdos/int21.c]
Implemented GlobalHandleNoRIP, GetFreeMemInfo, DebugFillBuffer,
stubs GetSetKernelDOSProc, DiagQuery, DiagOutput, ToolHelpHook
(Undocumented Windows).
* [if1632/user.spec] [if1632/win32s16.spec] [misc/win32s16.c]
Misc stubs.
* [if1632/winaspi.spec] [misc/aspi.c]
Implemented GetASPIDLLVersion.
* [if1632/wprocs.spec] [msdos/int20.c] [msdos/Makefile.in]
Added handler for Int 0x20 (terminate program, _very_ old-fashioned).
* [misc/w32scomb.c]
Implemented Get16DLLAddress() partially
(big thanks to Marcus and Alexandre).
* [relay32/Makefile.in] [relay32/builtin32.c] [relay32/dplay.spec]
Added built-in DPLAY.DLL.
* [relay32/winmm.spec] [multimedia/joystick.c]
Added joySetThreshold.
* [misc/windebug.c]
Added WinNotify.
* [win32/console.c]
Stubs CreateConsoleScreenBuffer, SetConsoleActiveScreenBuffer,
WriteConsoleOutput32A.
* [windows/user.c]
Stub SetEventHook.
Sat Jan 17 19:30:35 1998 Matthew Toseland <Paul.Toseland@btinternet.com>
* [windows/painting.c]
Fixed broken restore-to-maximized.
Mon Jan 12 21:25:32 1998 Perceval - Marc Huguet Puig <mhp@tinet.fut.es>
* [documentation/wine.man] [include/options.h]
[misc/main.c] [ole/ole2nls.c] [resources/sysres.c]
[resources/sysres_Ca.rc] [resources/Makefile.in]
Added language catalan. (Afegit l'idioma català).
1998-02-01 19:33:27 +01:00
|
|
|
}
|
2003-06-16 22:22:13 +02:00
|
|
|
/******************************************************************************
|
|
|
|
* IDirectInputW_EnumDevices
|
|
|
|
*/
|
|
|
|
static HRESULT WINAPI IDirectInputWImpl_EnumDevices(
|
|
|
|
LPDIRECTINPUT7W iface, DWORD dwDevType, LPDIENUMDEVICESCALLBACKW lpCallback,
|
|
|
|
LPVOID pvRef, DWORD dwFlags)
|
|
|
|
{
|
2007-07-12 06:51:32 +02:00
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput7W( iface );
|
2004-06-04 20:06:37 +02:00
|
|
|
DIDEVICEINSTANCEW devInstance;
|
2008-09-29 22:28:22 +02:00
|
|
|
unsigned int i;
|
2013-05-20 21:10:02 +02:00
|
|
|
int j;
|
|
|
|
HRESULT r;
|
2008-09-29 22:28:22 +02:00
|
|
|
|
2016-08-14 18:30:53 +02:00
|
|
|
TRACE("(this=%p,0x%04x '%s',%p,%p,0x%04x)\n",
|
|
|
|
This, dwDevType, _dump_DIDEVTYPE_value(dwDevType, This->dwVersion),
|
2004-06-04 20:06:37 +02:00
|
|
|
lpCallback, pvRef, dwFlags);
|
2007-12-18 10:01:51 +01:00
|
|
|
_dump_EnumDevices_dwFlags(dwFlags);
|
2005-05-13 15:57:17 +02:00
|
|
|
|
2011-11-26 18:30:16 +01:00
|
|
|
if (!lpCallback ||
|
|
|
|
dwFlags & ~(DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK | DIEDFL_INCLUDEALIASES | DIEDFL_INCLUDEPHANTOMS | DIEDFL_INCLUDEHIDDEN) ||
|
2011-12-02 05:08:14 +01:00
|
|
|
(dwDevType > DI8DEVCLASS_GAMECTRL && dwDevType < DI8DEVTYPE_DEVICE) || dwDevType > DI8DEVTYPE_SUPPLEMENTAL)
|
2011-07-05 14:19:06 +02:00
|
|
|
return DIERR_INVALIDPARAM;
|
|
|
|
|
2011-07-05 14:19:17 +02:00
|
|
|
if (!This->initialized)
|
|
|
|
return DIERR_NOTINITIALIZED;
|
|
|
|
|
2018-07-05 22:07:16 +02:00
|
|
|
for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) {
|
2005-03-15 20:36:15 +01:00
|
|
|
if (!dinput_devices[i]->enum_deviceW) continue;
|
2013-05-20 21:10:02 +02:00
|
|
|
for (j = 0, r = S_OK; SUCCEEDED(r); j++) {
|
|
|
|
devInstance.dwSize = sizeof(devInstance);
|
|
|
|
TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name);
|
|
|
|
r = dinput_devices[i]->enum_deviceW(dwDevType, dwFlags, &devInstance, This->dwVersion, j);
|
|
|
|
if (r == S_OK)
|
2015-11-16 08:25:45 +01:00
|
|
|
if (enum_callback_wrapper(lpCallback, &devInstance, pvRef) == DIENUM_STOP)
|
2013-05-20 21:10:02 +02:00
|
|
|
return S_OK;
|
|
|
|
}
|
2004-06-04 20:06:37 +02:00
|
|
|
}
|
2013-05-20 21:10:02 +02:00
|
|
|
|
|
|
|
return S_OK;
|
2002-06-14 02:39:44 +02:00
|
|
|
}
|
|
|
|
|
2001-01-29 00:14:25 +01:00
|
|
|
static ULONG WINAPI IDirectInputAImpl_AddRef(LPDIRECTINPUT7A iface)
|
1999-02-22 10:52:54 +01:00
|
|
|
{
|
2010-12-28 20:24:38 +01:00
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput7A( iface );
|
2007-07-12 06:51:32 +02:00
|
|
|
ULONG ref = InterlockedIncrement(&This->ref);
|
|
|
|
|
|
|
|
TRACE( "(%p) incrementing from %d\n", This, ref - 1);
|
|
|
|
return ref;
|
|
|
|
}
|
|
|
|
|
|
|
|
static ULONG WINAPI IDirectInputWImpl_AddRef(LPDIRECTINPUT7W iface)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput7W( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInputAImpl_AddRef( &This->IDirectInput7A_iface );
|
Release 980201
Sun Feb 1 13:24:54 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [files/drive.c]
Added Device= parameter to drive configuration.
* [if1632/relay.c]
Throw() and Catch() now use the correct CATCHBUF layout (untested).
* [tools/build.c] [include/stackframe.h] [loader/task.c]
Moved 16-bit stack pointer into thread database.
Save current %fs while running 16-bit code.
Fri Jan 30 09:25:49 1998 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [graphics/mapping.c]
Made DPtoLP32 and LPtoDP32 respect world transforms.
* [graphics/path.c] [graphics/painting.c] [if1632/gdi.spec]
[include/path.h]
More path support.
* [include/gdi.h] [include/windows.h] [objects/dc.c]
[relay/gdi32.spec]
Support for Get/SetArcDirection and Get/SetWorldTransform
* [windows/hook.c]
Fixed a bug in HOOK_Map16To32Common.
Thu Jan 29 23:43:18 1998 Douglas Ridgway <ridgway@taiga.gmcl.com>
* [graphics/metafiledrv/init.c] [objects/metafile.c]
Documentation for metafile related API calls. Fixed a bug to avoid
documenting it.
* [include/windows.h]
Declaration for LoadImage.
Thu Jan 29 21:44:45 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/win16drv/*]
Changes to printing code to enable use of printer fonts with the
win3.1 postscript driver. Remember to add printer=on to [wine]
section of wine.conf . You will also need to disable truetype
fonts from control panel. Winword 6.0 and Write seem to be happy
with this...
* [include/bitmap.h]
Fix Widthbytes for 15bpp displays.
Tue Jan 27 20:54:08 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [tsx11/*] [include/ts*] [tools/make_X11wrappers]
Implemented thread-safe X11 wrappers.
Tue Jan 27 13:54:09 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [windows/queue.c]
Forgot to convert thdb to thread_id.
* [misc/registry.c]
Sped up Windows 95 registry reading. Changed code to traverse
registry as a tree rather than read in all possible keys
(including dead ones).
Tue Jan 27 12:46:09 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_image.c][Makefile.in][scheduler/thread.c]
[libtest/hello5.c]
Don't exit() on failed to load referenced dlls.
Fixed static tls allocation for multiple threads.
WINELIB should now be able to load PE dlls. A sample
winelib program, that dynamically loads a internal dll
is included.
* [graphics/ddraw.c][include/ddraw.h][include/d3d.h]
Cleaned up and enhanced further. Added several DirectX5
interface definitions and DirectSurface3 implementation.
Stubs for D3D (NOT coming soon, just there so it fails safely).
* [multimedia/dsound.c][include/dsound.h]
Actually works now for a lot of cases. Some DirectX5 stuff
added. Still lacking several features.
* [windows/dinput.c][include/dinput.h]
Started implementing DirectInput. Doesn't work yet, don't
know why.
* [if1632/thunk.c][misc/callbacks.c]
[win32/kernel.c][include/callbacks.h]
Added WOWCallback16Ex, WOWHandle32.
* [misc/cpu.c]
Fixed GetSystemInfo, IsProcessorFeaturePresent.
* [multimedia/joystick.c][multimedia/time.c]
Several fixes. Small hack to get timerevents in timeGetTime() loops.
Tue Jan 20 11:26:27 1998 Slaven Rezic <eserte@cs.tu-berlin.de>
* [configure.in]
Fixed check for union semun on FreeBSD systems.
Sun Jan 18 23:05:04 1998 Karl Backström <karl_b@geocities.com>
* [misc/ole2nls.c] [programs/progman/Sw.rc] [programs/winhelp/Sw.rc]
[resources/sysres_Sw.rc]
Added/updated Swedish language support.
Sun Jan 18 18:49:01 1998 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [misc/winsock.c] [misc/winsock_dns.c] [windows/event.c]
[windows/win.c] [windows/dce.c] [windows/winpos.c]
Bug fixes.
Sun Jan 18 12:45:23 1997 Andreas Mohr <100.30936@germany.net>
* [msdos/int25.c] [msdos/int26.c]
Implemented "native" absolute disk read/write access.
* [msdos/int13.c] [msdos/ioports.c]
Enhanced GET DRIVE PARAMETERS (int13 AH=08).
* [graphics/win16drv/prtdrv.c] [if1632/gdi.spec]
Fixed typos, implemented dmEnumDFonts,
Started implementation of dmRealizeObject.
* [if1632/compobj.spec] [ole/compobj.c] [relay32/ole32.spec]
Stubs CoCreateInstance, CoFreeUnusedLibraries, implemented
CoFileTimeNow.
* [if1632/kernel.spec] [include/windows.h] [memory/global.c]
[memory/string.c] [misc/kernel.c] [misc/Makefile.in]
[misc/toolhelp.c] [msdos/int21.c]
Implemented GlobalHandleNoRIP, GetFreeMemInfo, DebugFillBuffer,
stubs GetSetKernelDOSProc, DiagQuery, DiagOutput, ToolHelpHook
(Undocumented Windows).
* [if1632/user.spec] [if1632/win32s16.spec] [misc/win32s16.c]
Misc stubs.
* [if1632/winaspi.spec] [misc/aspi.c]
Implemented GetASPIDLLVersion.
* [if1632/wprocs.spec] [msdos/int20.c] [msdos/Makefile.in]
Added handler for Int 0x20 (terminate program, _very_ old-fashioned).
* [misc/w32scomb.c]
Implemented Get16DLLAddress() partially
(big thanks to Marcus and Alexandre).
* [relay32/Makefile.in] [relay32/builtin32.c] [relay32/dplay.spec]
Added built-in DPLAY.DLL.
* [relay32/winmm.spec] [multimedia/joystick.c]
Added joySetThreshold.
* [misc/windebug.c]
Added WinNotify.
* [win32/console.c]
Stubs CreateConsoleScreenBuffer, SetConsoleActiveScreenBuffer,
WriteConsoleOutput32A.
* [windows/user.c]
Stub SetEventHook.
Sat Jan 17 19:30:35 1998 Matthew Toseland <Paul.Toseland@btinternet.com>
* [windows/painting.c]
Fixed broken restore-to-maximized.
Mon Jan 12 21:25:32 1998 Perceval - Marc Huguet Puig <mhp@tinet.fut.es>
* [documentation/wine.man] [include/options.h]
[misc/main.c] [ole/ole2nls.c] [resources/sysres.c]
[resources/sysres_Ca.rc] [resources/Makefile.in]
Added language catalan. (Afegit l'idioma català).
1998-02-01 19:33:27 +01:00
|
|
|
}
|
|
|
|
|
2001-01-29 00:14:25 +01:00
|
|
|
static ULONG WINAPI IDirectInputAImpl_Release(LPDIRECTINPUT7A iface)
|
1999-02-22 10:52:54 +01:00
|
|
|
{
|
2010-12-28 20:24:38 +01:00
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput7A( iface );
|
2007-07-12 06:51:32 +02:00
|
|
|
ULONG ref = InterlockedDecrement( &This->ref );
|
|
|
|
|
|
|
|
TRACE( "(%p) releasing from %d\n", This, ref + 1 );
|
2007-07-07 07:36:09 +02:00
|
|
|
|
2011-07-05 14:19:17 +02:00
|
|
|
if (ref == 0)
|
|
|
|
{
|
|
|
|
uninitialize_directinput_instance( This );
|
|
|
|
HeapFree( GetProcessHeap(), 0, This );
|
|
|
|
}
|
2007-07-07 07:36:09 +02:00
|
|
|
|
2011-07-05 14:19:17 +02:00
|
|
|
return ref;
|
Release 980201
Sun Feb 1 13:24:54 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [files/drive.c]
Added Device= parameter to drive configuration.
* [if1632/relay.c]
Throw() and Catch() now use the correct CATCHBUF layout (untested).
* [tools/build.c] [include/stackframe.h] [loader/task.c]
Moved 16-bit stack pointer into thread database.
Save current %fs while running 16-bit code.
Fri Jan 30 09:25:49 1998 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [graphics/mapping.c]
Made DPtoLP32 and LPtoDP32 respect world transforms.
* [graphics/path.c] [graphics/painting.c] [if1632/gdi.spec]
[include/path.h]
More path support.
* [include/gdi.h] [include/windows.h] [objects/dc.c]
[relay/gdi32.spec]
Support for Get/SetArcDirection and Get/SetWorldTransform
* [windows/hook.c]
Fixed a bug in HOOK_Map16To32Common.
Thu Jan 29 23:43:18 1998 Douglas Ridgway <ridgway@taiga.gmcl.com>
* [graphics/metafiledrv/init.c] [objects/metafile.c]
Documentation for metafile related API calls. Fixed a bug to avoid
documenting it.
* [include/windows.h]
Declaration for LoadImage.
Thu Jan 29 21:44:45 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/win16drv/*]
Changes to printing code to enable use of printer fonts with the
win3.1 postscript driver. Remember to add printer=on to [wine]
section of wine.conf . You will also need to disable truetype
fonts from control panel. Winword 6.0 and Write seem to be happy
with this...
* [include/bitmap.h]
Fix Widthbytes for 15bpp displays.
Tue Jan 27 20:54:08 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [tsx11/*] [include/ts*] [tools/make_X11wrappers]
Implemented thread-safe X11 wrappers.
Tue Jan 27 13:54:09 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [windows/queue.c]
Forgot to convert thdb to thread_id.
* [misc/registry.c]
Sped up Windows 95 registry reading. Changed code to traverse
registry as a tree rather than read in all possible keys
(including dead ones).
Tue Jan 27 12:46:09 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_image.c][Makefile.in][scheduler/thread.c]
[libtest/hello5.c]
Don't exit() on failed to load referenced dlls.
Fixed static tls allocation for multiple threads.
WINELIB should now be able to load PE dlls. A sample
winelib program, that dynamically loads a internal dll
is included.
* [graphics/ddraw.c][include/ddraw.h][include/d3d.h]
Cleaned up and enhanced further. Added several DirectX5
interface definitions and DirectSurface3 implementation.
Stubs for D3D (NOT coming soon, just there so it fails safely).
* [multimedia/dsound.c][include/dsound.h]
Actually works now for a lot of cases. Some DirectX5 stuff
added. Still lacking several features.
* [windows/dinput.c][include/dinput.h]
Started implementing DirectInput. Doesn't work yet, don't
know why.
* [if1632/thunk.c][misc/callbacks.c]
[win32/kernel.c][include/callbacks.h]
Added WOWCallback16Ex, WOWHandle32.
* [misc/cpu.c]
Fixed GetSystemInfo, IsProcessorFeaturePresent.
* [multimedia/joystick.c][multimedia/time.c]
Several fixes. Small hack to get timerevents in timeGetTime() loops.
Tue Jan 20 11:26:27 1998 Slaven Rezic <eserte@cs.tu-berlin.de>
* [configure.in]
Fixed check for union semun on FreeBSD systems.
Sun Jan 18 23:05:04 1998 Karl Backström <karl_b@geocities.com>
* [misc/ole2nls.c] [programs/progman/Sw.rc] [programs/winhelp/Sw.rc]
[resources/sysres_Sw.rc]
Added/updated Swedish language support.
Sun Jan 18 18:49:01 1998 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [misc/winsock.c] [misc/winsock_dns.c] [windows/event.c]
[windows/win.c] [windows/dce.c] [windows/winpos.c]
Bug fixes.
Sun Jan 18 12:45:23 1997 Andreas Mohr <100.30936@germany.net>
* [msdos/int25.c] [msdos/int26.c]
Implemented "native" absolute disk read/write access.
* [msdos/int13.c] [msdos/ioports.c]
Enhanced GET DRIVE PARAMETERS (int13 AH=08).
* [graphics/win16drv/prtdrv.c] [if1632/gdi.spec]
Fixed typos, implemented dmEnumDFonts,
Started implementation of dmRealizeObject.
* [if1632/compobj.spec] [ole/compobj.c] [relay32/ole32.spec]
Stubs CoCreateInstance, CoFreeUnusedLibraries, implemented
CoFileTimeNow.
* [if1632/kernel.spec] [include/windows.h] [memory/global.c]
[memory/string.c] [misc/kernel.c] [misc/Makefile.in]
[misc/toolhelp.c] [msdos/int21.c]
Implemented GlobalHandleNoRIP, GetFreeMemInfo, DebugFillBuffer,
stubs GetSetKernelDOSProc, DiagQuery, DiagOutput, ToolHelpHook
(Undocumented Windows).
* [if1632/user.spec] [if1632/win32s16.spec] [misc/win32s16.c]
Misc stubs.
* [if1632/winaspi.spec] [misc/aspi.c]
Implemented GetASPIDLLVersion.
* [if1632/wprocs.spec] [msdos/int20.c] [msdos/Makefile.in]
Added handler for Int 0x20 (terminate program, _very_ old-fashioned).
* [misc/w32scomb.c]
Implemented Get16DLLAddress() partially
(big thanks to Marcus and Alexandre).
* [relay32/Makefile.in] [relay32/builtin32.c] [relay32/dplay.spec]
Added built-in DPLAY.DLL.
* [relay32/winmm.spec] [multimedia/joystick.c]
Added joySetThreshold.
* [misc/windebug.c]
Added WinNotify.
* [win32/console.c]
Stubs CreateConsoleScreenBuffer, SetConsoleActiveScreenBuffer,
WriteConsoleOutput32A.
* [windows/user.c]
Stub SetEventHook.
Sat Jan 17 19:30:35 1998 Matthew Toseland <Paul.Toseland@btinternet.com>
* [windows/painting.c]
Fixed broken restore-to-maximized.
Mon Jan 12 21:25:32 1998 Perceval - Marc Huguet Puig <mhp@tinet.fut.es>
* [documentation/wine.man] [include/options.h]
[misc/main.c] [ole/ole2nls.c] [resources/sysres.c]
[resources/sysres_Ca.rc] [resources/Makefile.in]
Added language catalan. (Afegit l'idioma català).
1998-02-01 19:33:27 +01:00
|
|
|
}
|
|
|
|
|
2007-07-12 06:51:32 +02:00
|
|
|
static ULONG WINAPI IDirectInputWImpl_Release(LPDIRECTINPUT7W iface)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput7W( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInputAImpl_Release( &This->IDirectInput7A_iface );
|
2003-06-16 22:22:13 +02:00
|
|
|
}
|
|
|
|
|
2007-07-12 06:51:32 +02:00
|
|
|
static HRESULT WINAPI IDirectInputAImpl_QueryInterface(LPDIRECTINPUT7A iface, REFIID riid, LPVOID *ppobj)
|
|
|
|
{
|
2010-12-28 20:24:38 +01:00
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput7A( iface );
|
2003-06-16 22:22:13 +02:00
|
|
|
|
2007-07-12 06:51:32 +02:00
|
|
|
TRACE( "(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppobj );
|
|
|
|
|
2011-07-05 14:18:52 +02:00
|
|
|
if (!riid || !ppobj)
|
|
|
|
return E_POINTER;
|
|
|
|
|
2007-07-12 06:51:32 +02:00
|
|
|
if (IsEqualGUID( &IID_IUnknown, riid ) ||
|
|
|
|
IsEqualGUID( &IID_IDirectInputA, riid ) ||
|
|
|
|
IsEqualGUID( &IID_IDirectInput2A, riid ) ||
|
|
|
|
IsEqualGUID( &IID_IDirectInput7A, riid ))
|
|
|
|
{
|
2010-12-28 20:24:38 +01:00
|
|
|
*ppobj = &This->IDirectInput7A_iface;
|
2007-07-12 06:51:32 +02:00
|
|
|
IUnknown_AddRef( (IUnknown*)*ppobj );
|
|
|
|
|
|
|
|
return DI_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (IsEqualGUID( &IID_IDirectInputW, riid ) ||
|
|
|
|
IsEqualGUID( &IID_IDirectInput2W, riid ) ||
|
|
|
|
IsEqualGUID( &IID_IDirectInput7W, riid ))
|
|
|
|
{
|
2010-12-28 20:24:38 +01:00
|
|
|
*ppobj = &This->IDirectInput7W_iface;
|
2007-07-12 06:51:32 +02:00
|
|
|
IUnknown_AddRef( (IUnknown*)*ppobj );
|
|
|
|
|
|
|
|
return DI_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (IsEqualGUID( &IID_IDirectInput8A, riid ))
|
|
|
|
{
|
2010-12-28 20:24:38 +01:00
|
|
|
*ppobj = &This->IDirectInput8A_iface;
|
2007-07-12 06:51:32 +02:00
|
|
|
IUnknown_AddRef( (IUnknown*)*ppobj );
|
|
|
|
|
|
|
|
return DI_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (IsEqualGUID( &IID_IDirectInput8W, riid ))
|
|
|
|
{
|
2010-12-28 20:24:38 +01:00
|
|
|
*ppobj = &This->IDirectInput8W_iface;
|
2007-07-12 06:51:32 +02:00
|
|
|
IUnknown_AddRef( (IUnknown*)*ppobj );
|
|
|
|
|
|
|
|
return DI_OK;
|
|
|
|
}
|
|
|
|
|
2011-11-26 18:30:07 +01:00
|
|
|
if (IsEqualGUID( &IID_IDirectInputJoyConfig8, riid ))
|
|
|
|
{
|
|
|
|
*ppobj = &This->IDirectInputJoyConfig8_iface;
|
|
|
|
IUnknown_AddRef( (IUnknown*)*ppobj );
|
|
|
|
|
|
|
|
return DI_OK;
|
|
|
|
}
|
|
|
|
|
2010-04-27 23:45:43 +02:00
|
|
|
FIXME( "Unsupported interface: %s\n", debugstr_guid(riid));
|
2011-07-05 14:18:52 +02:00
|
|
|
*ppobj = NULL;
|
|
|
|
return E_NOINTERFACE;
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI IDirectInputWImpl_QueryInterface(LPDIRECTINPUT7W iface, REFIID riid, LPVOID *ppobj)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput7W( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInputAImpl_QueryInterface( &This->IDirectInput7A_iface, riid, ppobj );
|
2003-06-16 22:22:13 +02:00
|
|
|
}
|
|
|
|
|
2011-07-05 14:19:17 +02:00
|
|
|
static HRESULT initialize_directinput_instance(IDirectInputImpl *This, DWORD dwVersion)
|
|
|
|
{
|
|
|
|
if (!This->initialized)
|
|
|
|
{
|
|
|
|
This->dwVersion = dwVersion;
|
|
|
|
This->evsequence = 1;
|
|
|
|
|
|
|
|
InitializeCriticalSection( &This->crit );
|
|
|
|
This->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectInputImpl*->crit");
|
|
|
|
|
|
|
|
list_init( &This->devices_list );
|
2017-03-02 19:51:40 +01:00
|
|
|
list_init( &This->device_players );
|
2011-07-05 14:19:17 +02:00
|
|
|
|
|
|
|
/* Add self to the list of the IDirectInputs */
|
|
|
|
EnterCriticalSection( &dinput_hook_crit );
|
|
|
|
list_add_head( &direct_input_list, &This->entry );
|
|
|
|
LeaveCriticalSection( &dinput_hook_crit );
|
|
|
|
|
|
|
|
This->initialized = TRUE;
|
|
|
|
|
|
|
|
if (!check_hook_thread())
|
|
|
|
{
|
|
|
|
uninitialize_directinput_instance( This );
|
|
|
|
return DIERR_GENERIC;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return DI_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void uninitialize_directinput_instance(IDirectInputImpl *This)
|
|
|
|
{
|
|
|
|
if (This->initialized)
|
|
|
|
{
|
2017-03-02 19:51:40 +01:00
|
|
|
struct DevicePlayer *device_player, *device_player2;
|
2011-07-05 14:19:17 +02:00
|
|
|
/* Remove self from the list of the IDirectInputs */
|
|
|
|
EnterCriticalSection( &dinput_hook_crit );
|
|
|
|
list_remove( &This->entry );
|
|
|
|
LeaveCriticalSection( &dinput_hook_crit );
|
|
|
|
|
2017-03-02 19:51:40 +01:00
|
|
|
LIST_FOR_EACH_ENTRY_SAFE( device_player, device_player2,
|
|
|
|
&This->device_players, struct DevicePlayer, entry )
|
|
|
|
HeapFree(GetProcessHeap(), 0, device_player);
|
|
|
|
|
2011-07-05 14:19:17 +02:00
|
|
|
check_hook_thread();
|
|
|
|
|
|
|
|
This->crit.DebugInfo->Spare[0] = 0;
|
|
|
|
DeleteCriticalSection( &This->crit );
|
|
|
|
|
|
|
|
This->initialized = FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-07-05 14:18:57 +02:00
|
|
|
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 HRESULT WINAPI IDirectInputAImpl_Initialize(LPDIRECTINPUT7A iface, HINSTANCE hinst, DWORD version)
|
|
|
|
{
|
2011-07-05 14:19:17 +02:00
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput7A( iface );
|
|
|
|
|
2011-07-05 14:18:57 +02:00
|
|
|
TRACE("(%p)->(%p, 0x%04x)\n", iface, hinst, version);
|
|
|
|
|
|
|
|
if (!hinst)
|
|
|
|
return DIERR_INVALIDPARAM;
|
|
|
|
else if (version == 0)
|
|
|
|
return DIERR_NOTINITIALIZED;
|
2011-07-05 14:19:26 +02:00
|
|
|
else if (version > DIRECTINPUT_VERSION_700)
|
2011-07-05 14:18:57 +02:00
|
|
|
return DIERR_OLDDIRECTINPUTVERSION;
|
|
|
|
else if (version != DIRECTINPUT_VERSION_300 && version != DIRECTINPUT_VERSION_500 &&
|
|
|
|
version != DIRECTINPUT_VERSION_50A && version != DIRECTINPUT_VERSION_5B2 &&
|
|
|
|
version != DIRECTINPUT_VERSION_602 && version != DIRECTINPUT_VERSION_61A &&
|
|
|
|
version != DIRECTINPUT_VERSION_700 && version != DIRECTINPUT_VERSION)
|
|
|
|
return DIERR_BETADIRECTINPUTVERSION;
|
|
|
|
|
2011-07-05 14:19:17 +02:00
|
|
|
return initialize_directinput_instance(This, version);
|
Release 980301
Sun Mar 1 10:45:23 1998 Andreas Mohr <100.30936@germany.net>
* [loader/ne_image.c]
Fixed problem with weird DLLs (NE_FFLAGS_SINGLEDATA && DGROUP = 0).
* [msdos/dosmem.c]
Export address for __0000H, too.
* [msdos/dpmi.c]
Changed MemAlloc functions to return less fragmented addresses.
Sat Feb 28 18:50:12 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [scheduler/process.c] [scheduler/sysdeps.c]
Don't use %fs register before threading initialization.
Sat Feb 28 14:04:56 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [configure.in] [include/acconfig.h]
Autoconf macro to check for non-reentrant X libraries.
* [windows/winpos.c]
In SetWindowPos32(), do not cause WM_SIZE messages when the
SWP_NOSIZE flag is specified. This fixes the division-by-zero in
Borland C++ 4.0 "Open Project" menu item.
Sat Feb 28 13:11:26 1998 James Moody <013263m@dragon.acadiau.ca>
* [ole/ole2nls.c]
Changed "English" values from German to English.
* [files/dos_fs.c]
Fixed off-by-one month bug.
Fri Feb 27 22:12:01 1998 Douglas Ridgway <ridgway@winehq.com>
* [windows/win.c]
Fix winelib class menu loading bug.
* [include/module.h] [loader/module.c]
LoadModule32 should be implemented in terms of CreateProcess.
* [programs/view/*]
Metafile viewer sample program.
* [documentation/wine.texinfo] [documentation/Makefile.in]
Improvements and additions, HTML target.
Fri Feb 27 04:27:48 1998 Dimitrie O. Paun <dimi@cs.toronto.edu>
* [*/*]
Switched to the new debug messages interface. For more information
please refer to documentation/debug-msgs. Because the new scheme
introduces a new semantic level, I had to manually do through
about 530 dprintf_xxx! The rest of about 2400 where transformed
via a script. Because of the large number of changes that I had
to do, some may have not come out as nicely as I wanted them. If
this is the case, please let me know. There is a lot of work left
to do: -- a few hundred printf's to be converted -- about 2300
fprintf's to be converted -- about 600 FIXME's to be transformed
The problem is that in the above mentioned cases, a lot of manual
intervention is required because a lot of the information is
missing. There are also a lot of other things to be done to the
interface and so forth. I have now ideas for a at least a month
worth of full time work :) I will proceed with many changes in the
next few releases, so please do not start modifing things because
there will be a hell of a lot of conflicts. If you have ideas that
you want to integrate or you want to work on different things,
please coordinate with me.
Thu Feb 26 13:04:29 1998 David Lee Lambert <lamber45@egr.msu.edu>
* [ole/ole2nls.c] [include/windows.h]
First try at OLE date- and time-formatting functions.
Wed Feb 25 11:20:35 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [files/*.c]
Changed dos device handling, added 'CON' devicehandling.
* [graphics/ddraw.c]
Bug fixes, some additions.
* [if1632/builtin.c][loader/module.c][library/winestub.c]
Small hack so we don't need a dummy BUILTIN_LoadModule
in winestub.c.
* [ole/*][relay32/ole32.spec][if1632/storage.spec]
storage.dll started. winword loads documents (saving
doesn't work yet, dunno why).
Several ole additions, some cleanups and bugfixes.
IMalloc16 implemented.
* [loader/pe_image.c]
Added some comments, fixed circular dll references,
fixed modref ordering, fixed tls allocation.
* [memory/global.c]
Added validity checks before every GET_ARENA_PTR.
(several functions rely on Global* return values
on invalid handles, like IsTask).
Implemented GlobalUnlockFree16.
* [memory/virtual.c]
Replaced dprintf_virtual by fprintf, so we can
do 'info map' again in the debugger. Increase read
linesize for Linux2.1 cases.
* [misc/cpu.c][misc/registry.c]
Moved cpu registry initialization to misc/cpu.c.
* [multimedia/dsound.c]
Enhanced, replaced GETOSPACE bufferingcheck by SETFRAGMENT.
* [relay32/crtdll.spec][relay32/ntdll.spec]
Replaced some ptr by respective 'str' and 'wstr' arguments
for libc functions.
* [scheduler/thread.c]
Added some sanity checks to stackallocation, tlshandling fixed.
* [tools/build.c]
Fixed cdecl argumenttype order (was reversed).
* [win32/ordinals.c]
Implemented KERNEL_449.
* [windows/dinput.c]
Some fixes, needs much more work. Tomb Raider2 works with keyboard ;)
Tue Feb 24 20:46:37 1998 James Juran <jrj120@psu.edu>
* [windows/win.c]
Fixed USER32 ordinal numbers in documentation.
Sat Feb 21 12:30:38 1998 John Richardson <jrichard@zko.dec.com>
* [files/file.c] [include/k32obj.h] [memory/virtual.c]
[scheduler/critsection.c] [scheduler/event.c] [scheduler/handle.c]
[scheduler/k32obj.c] [scheduler/mutex.c] [scheduler/process.c]
[scheduler/semaphore.c] [scheduler/thread.c]
Added generic k32obj read and write routines for k32objs that
support I/O.
* [documentation/console]
Updated console docs.
* [win32/console.c]
Make console work like a k32obj that supports I/O.
* [include/windows.h]
Make WriteFile and ReadFile take HANDLE32 for handle.
Sun Feb 15 14:07:07 1998 Dimitrie O. Paun <dimi@mail.cs.toronto.edu>
* [controls/menu.c] [misc/ver.c] [multimedia/dsound.c]
[multimedia/joystick.c] [windows/dialog.c]
Modified some dprintf_xxx's to prepare them for a new
dprintf_ scheme. Basically, I changed the dprintf's that
outputed a line with many dprintf calls to do just one
dprintf call.
1998-03-01 21:05:02 +01:00
|
|
|
}
|
|
|
|
|
2007-07-12 06:51:32 +02:00
|
|
|
static HRESULT WINAPI IDirectInputWImpl_Initialize(LPDIRECTINPUT7W iface, HINSTANCE hinst, DWORD x)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput7W( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInputAImpl_Initialize( &This->IDirectInput7A_iface, hinst, x );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI IDirectInputAImpl_GetDeviceStatus(LPDIRECTINPUT7A iface, REFGUID rguid)
|
|
|
|
{
|
2010-12-28 20:24:38 +01:00
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput7A( iface );
|
2008-05-11 21:33:17 +02:00
|
|
|
HRESULT hr;
|
|
|
|
LPDIRECTINPUTDEVICEA device;
|
2007-07-12 06:51:32 +02:00
|
|
|
|
2008-05-11 21:33:17 +02:00
|
|
|
TRACE( "(%p)->(%s)\n", This, debugstr_guid(rguid) );
|
|
|
|
|
2011-11-26 18:30:23 +01:00
|
|
|
if (!rguid) return E_POINTER;
|
2011-07-05 14:19:17 +02:00
|
|
|
if (!This->initialized)
|
|
|
|
return DIERR_NOTINITIALIZED;
|
|
|
|
|
2008-05-11 21:33:17 +02:00
|
|
|
hr = IDirectInput_CreateDevice( iface, rguid, &device, NULL );
|
|
|
|
if (hr != DI_OK) return DI_NOTATTACHED;
|
|
|
|
|
|
|
|
IUnknown_Release( device );
|
2002-06-01 01:06:46 +02:00
|
|
|
|
2007-07-12 06:51:32 +02:00
|
|
|
return DI_OK;
|
|
|
|
}
|
2002-06-01 01:06:46 +02:00
|
|
|
|
2007-07-12 06:51:32 +02:00
|
|
|
static HRESULT WINAPI IDirectInputWImpl_GetDeviceStatus(LPDIRECTINPUT7W iface, REFGUID rguid)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput7W( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInputAImpl_GetDeviceStatus( &This->IDirectInput7A_iface, rguid );
|
1999-02-24 11:53:30 +01:00
|
|
|
}
|
|
|
|
|
2001-01-29 00:14:25 +01:00
|
|
|
static HRESULT WINAPI IDirectInputAImpl_RunControlPanel(LPDIRECTINPUT7A iface,
|
1999-02-26 12:11:13 +01:00
|
|
|
HWND hwndOwner,
|
2007-07-12 06:51:32 +02:00
|
|
|
DWORD dwFlags)
|
|
|
|
{
|
2011-07-05 14:18:40 +02:00
|
|
|
WCHAR control_exeW[] = {'c','o','n','t','r','o','l','.','e','x','e',0};
|
|
|
|
STARTUPINFOW si = {0};
|
|
|
|
PROCESS_INFORMATION pi;
|
|
|
|
|
2010-12-28 20:24:38 +01:00
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput7A( iface );
|
2002-06-01 01:06:46 +02:00
|
|
|
|
2011-07-05 14:18:40 +02:00
|
|
|
TRACE( "(%p)->(%p, %08x)\n", This, hwndOwner, dwFlags );
|
|
|
|
|
|
|
|
if (hwndOwner && !IsWindow(hwndOwner))
|
|
|
|
return E_HANDLE;
|
|
|
|
|
|
|
|
if (dwFlags)
|
|
|
|
return DIERR_INVALIDPARAM;
|
|
|
|
|
2011-07-05 14:19:17 +02:00
|
|
|
if (!This->initialized)
|
|
|
|
return DIERR_NOTINITIALIZED;
|
|
|
|
|
2013-01-14 21:20:06 +01:00
|
|
|
if (!CreateProcessW(NULL, control_exeW, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi))
|
2011-07-05 14:18:40 +02:00
|
|
|
return HRESULT_FROM_WIN32(GetLastError());
|
2007-07-12 06:51:32 +02:00
|
|
|
|
|
|
|
return DI_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI IDirectInputWImpl_RunControlPanel(LPDIRECTINPUT7W iface, HWND hwndOwner, DWORD dwFlags)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput7W( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInputAImpl_RunControlPanel( &This->IDirectInput7A_iface, hwndOwner, dwFlags );
|
1999-02-24 11:53:30 +01:00
|
|
|
}
|
|
|
|
|
2002-06-14 02:39:44 +02:00
|
|
|
static HRESULT WINAPI IDirectInput2AImpl_FindDevice(LPDIRECTINPUT7A iface, REFGUID rguid,
|
2007-07-12 06:51:32 +02:00
|
|
|
LPCSTR pszName, LPGUID pguidInstance)
|
|
|
|
{
|
2010-12-28 20:24:38 +01:00
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput7A( iface );
|
2007-07-12 06:51:32 +02:00
|
|
|
|
|
|
|
FIXME( "(%p)->(%s, %s, %p): stub\n", This, debugstr_guid(rguid), pszName, pguidInstance );
|
2002-06-01 01:06:46 +02:00
|
|
|
|
2007-07-12 06:51:32 +02:00
|
|
|
return DI_OK;
|
2000-11-05 21:25:02 +01:00
|
|
|
}
|
|
|
|
|
2003-06-16 22:22:13 +02:00
|
|
|
static HRESULT WINAPI IDirectInput2WImpl_FindDevice(LPDIRECTINPUT7W iface, REFGUID rguid,
|
2007-07-12 06:51:32 +02:00
|
|
|
LPCWSTR pszName, LPGUID pguidInstance)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput7W( iface );
|
|
|
|
|
|
|
|
FIXME( "(%p)->(%s, %s, %p): stub\n", This, debugstr_guid(rguid), debugstr_w(pszName), pguidInstance );
|
2003-06-16 22:22:13 +02:00
|
|
|
|
2007-07-12 06:51:32 +02:00
|
|
|
return DI_OK;
|
2003-06-16 22:22:13 +02:00
|
|
|
}
|
|
|
|
|
2011-07-05 14:19:01 +02:00
|
|
|
static HRESULT create_device(IDirectInputImpl *This, REFGUID rguid, REFIID riid, LPVOID *pvOut, BOOL unicode)
|
2000-11-05 21:25:02 +01:00
|
|
|
{
|
2011-07-05 14:19:01 +02:00
|
|
|
unsigned int i;
|
2000-11-05 21:25:02 +01:00
|
|
|
|
2011-07-05 14:19:01 +02:00
|
|
|
if (pvOut)
|
|
|
|
*pvOut = NULL;
|
2007-06-27 14:57:57 +02:00
|
|
|
|
2011-07-05 14:19:01 +02:00
|
|
|
if (!rguid || !pvOut)
|
|
|
|
return E_POINTER;
|
2007-07-07 07:36:09 +02:00
|
|
|
|
2011-07-05 14:19:17 +02:00
|
|
|
if (!This->initialized)
|
|
|
|
return DIERR_NOTINITIALIZED;
|
|
|
|
|
2011-07-05 14:19:01 +02:00
|
|
|
/* Loop on all the devices to see if anyone matches the given GUID */
|
2018-07-05 22:07:16 +02:00
|
|
|
for (i = 0; i < ARRAY_SIZE(dinput_devices); i++)
|
2011-07-05 14:19:01 +02:00
|
|
|
{
|
|
|
|
HRESULT ret;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
2011-07-05 14:19:01 +02:00
|
|
|
if (!dinput_devices[i]->create_device) continue;
|
|
|
|
if ((ret = dinput_devices[i]->create_device(This, rguid, riid, pvOut, unicode)) == DI_OK)
|
|
|
|
return DI_OK;
|
|
|
|
}
|
2002-06-01 01:06:46 +02:00
|
|
|
|
2008-01-04 22:34:41 +01:00
|
|
|
WARN("invalid device GUID %s\n", debugstr_guid(rguid));
|
2011-07-05 14:19:01 +02:00
|
|
|
return DIERR_DEVICENOTREG;
|
2000-11-05 21:25:02 +01:00
|
|
|
}
|
|
|
|
|
2011-07-05 14:19:01 +02:00
|
|
|
static HRESULT WINAPI IDirectInput7AImpl_CreateDeviceEx(LPDIRECTINPUT7A iface, REFGUID rguid,
|
|
|
|
REFIID riid, LPVOID* pvOut, LPUNKNOWN lpUnknownOuter)
|
2003-06-16 22:22:13 +02:00
|
|
|
{
|
2011-07-05 14:19:01 +02:00
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput7A( iface );
|
2003-06-16 22:22:13 +02:00
|
|
|
|
2011-07-05 14:19:01 +02:00
|
|
|
TRACE("(%p)->(%s, %s, %p, %p)\n", This, debugstr_guid(rguid), debugstr_guid(riid), pvOut, lpUnknownOuter);
|
2007-06-27 14:57:57 +02:00
|
|
|
|
2011-07-05 14:19:01 +02:00
|
|
|
return create_device(This, rguid, riid, pvOut, FALSE);
|
|
|
|
}
|
2007-07-07 07:36:09 +02:00
|
|
|
|
2011-07-05 14:19:01 +02:00
|
|
|
static HRESULT WINAPI IDirectInput7WImpl_CreateDeviceEx(LPDIRECTINPUT7W iface, REFGUID rguid,
|
|
|
|
REFIID riid, LPVOID* pvOut, LPUNKNOWN lpUnknownOuter)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput7W( iface );
|
2003-06-16 22:22:13 +02:00
|
|
|
|
2011-07-05 14:19:01 +02:00
|
|
|
TRACE("(%p)->(%s, %s, %p, %p)\n", This, debugstr_guid(rguid), debugstr_guid(riid), pvOut, lpUnknownOuter);
|
2003-06-16 22:22:13 +02:00
|
|
|
|
2011-07-05 14:19:01 +02:00
|
|
|
return create_device(This, rguid, riid, pvOut, TRUE);
|
2003-06-16 22:22:13 +02:00
|
|
|
}
|
|
|
|
|
2007-06-27 14:57:57 +02:00
|
|
|
static HRESULT WINAPI IDirectInputAImpl_CreateDevice(LPDIRECTINPUT7A iface, REFGUID rguid,
|
|
|
|
LPDIRECTINPUTDEVICEA* pdev, LPUNKNOWN punk)
|
|
|
|
{
|
|
|
|
return IDirectInput7AImpl_CreateDeviceEx(iface, rguid, NULL, (LPVOID*)pdev, punk);
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI IDirectInputWImpl_CreateDevice(LPDIRECTINPUT7W iface, REFGUID rguid,
|
|
|
|
LPDIRECTINPUTDEVICEW* pdev, LPUNKNOWN punk)
|
|
|
|
{
|
|
|
|
return IDirectInput7WImpl_CreateDeviceEx(iface, rguid, NULL, (LPVOID*)pdev, punk);
|
|
|
|
}
|
|
|
|
|
2007-07-12 06:51:32 +02:00
|
|
|
/*******************************************************************************
|
|
|
|
* DirectInput8
|
|
|
|
*/
|
2002-06-14 02:39:44 +02:00
|
|
|
|
2007-07-12 06:51:32 +02:00
|
|
|
static ULONG WINAPI IDirectInput8AImpl_AddRef(LPDIRECTINPUT8A iface)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8A( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInputAImpl_AddRef( &This->IDirectInput7A_iface );
|
2003-06-16 22:22:13 +02:00
|
|
|
}
|
|
|
|
|
2007-07-12 06:51:32 +02:00
|
|
|
static ULONG WINAPI IDirectInput8WImpl_AddRef(LPDIRECTINPUT8W iface)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8W( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInputAImpl_AddRef( &This->IDirectInput7A_iface );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
2003-06-16 22:22:13 +02:00
|
|
|
|
2007-07-12 06:51:32 +02:00
|
|
|
static HRESULT WINAPI IDirectInput8AImpl_QueryInterface(LPDIRECTINPUT8A iface, REFIID riid, LPVOID *ppobj)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8A( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInputAImpl_QueryInterface( &This->IDirectInput7A_iface, riid, ppobj );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI IDirectInput8WImpl_QueryInterface(LPDIRECTINPUT8W iface, REFIID riid, LPVOID *ppobj)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8W( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInputAImpl_QueryInterface( &This->IDirectInput7A_iface, riid, ppobj );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static ULONG WINAPI IDirectInput8AImpl_Release(LPDIRECTINPUT8A iface)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8A( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInputAImpl_Release( &This->IDirectInput7A_iface );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static ULONG WINAPI IDirectInput8WImpl_Release(LPDIRECTINPUT8W iface)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8W( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInputAImpl_Release( &This->IDirectInput7A_iface );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI IDirectInput8AImpl_CreateDevice(LPDIRECTINPUT8A iface, REFGUID rguid,
|
|
|
|
LPDIRECTINPUTDEVICE8A* pdev, LPUNKNOWN punk)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8A( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInput7AImpl_CreateDeviceEx( &This->IDirectInput7A_iface, rguid, NULL, (LPVOID*)pdev, punk );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI IDirectInput8WImpl_CreateDevice(LPDIRECTINPUT8W iface, REFGUID rguid,
|
|
|
|
LPDIRECTINPUTDEVICE8W* pdev, LPUNKNOWN punk)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8W( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInput7WImpl_CreateDeviceEx( &This->IDirectInput7W_iface, rguid, NULL, (LPVOID*)pdev, punk );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI IDirectInput8AImpl_EnumDevices(LPDIRECTINPUT8A iface, DWORD dwDevType, LPDIENUMDEVICESCALLBACKA lpCallback,
|
|
|
|
LPVOID pvRef, DWORD dwFlags)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8A( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInputAImpl_EnumDevices( &This->IDirectInput7A_iface, dwDevType, lpCallback, pvRef, dwFlags );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI IDirectInput8WImpl_EnumDevices(LPDIRECTINPUT8W iface, DWORD dwDevType, LPDIENUMDEVICESCALLBACKW lpCallback,
|
|
|
|
LPVOID pvRef, DWORD dwFlags)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8W( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInputWImpl_EnumDevices( &This->IDirectInput7W_iface, dwDevType, lpCallback, pvRef, dwFlags );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI IDirectInput8AImpl_GetDeviceStatus(LPDIRECTINPUT8A iface, REFGUID rguid)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8A( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInputAImpl_GetDeviceStatus( &This->IDirectInput7A_iface, rguid );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI IDirectInput8WImpl_GetDeviceStatus(LPDIRECTINPUT8W iface, REFGUID rguid)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8W( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInputAImpl_GetDeviceStatus( &This->IDirectInput7A_iface, rguid );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI IDirectInput8AImpl_RunControlPanel(LPDIRECTINPUT8A iface, HWND hwndOwner, DWORD dwFlags)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8A( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInputAImpl_RunControlPanel( &This->IDirectInput7A_iface, hwndOwner, dwFlags );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI IDirectInput8WImpl_RunControlPanel(LPDIRECTINPUT8W iface, HWND hwndOwner, DWORD dwFlags)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8W( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInputAImpl_RunControlPanel( &This->IDirectInput7A_iface, hwndOwner, dwFlags );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
2011-07-05 14:19:26 +02:00
|
|
|
static HRESULT WINAPI IDirectInput8AImpl_Initialize(LPDIRECTINPUT8A iface, HINSTANCE hinst, DWORD version)
|
2007-07-12 06:51:32 +02:00
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8A( iface );
|
2011-07-05 14:19:26 +02:00
|
|
|
|
|
|
|
TRACE("(%p)->(%p, 0x%04x)\n", iface, hinst, version);
|
|
|
|
|
|
|
|
if (!hinst)
|
|
|
|
return DIERR_INVALIDPARAM;
|
|
|
|
else if (version == 0)
|
|
|
|
return DIERR_NOTINITIALIZED;
|
|
|
|
else if (version < DIRECTINPUT_VERSION)
|
|
|
|
return DIERR_BETADIRECTINPUTVERSION;
|
|
|
|
else if (version > DIRECTINPUT_VERSION)
|
|
|
|
return DIERR_OLDDIRECTINPUTVERSION;
|
|
|
|
|
|
|
|
return initialize_directinput_instance(This, version);
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
2011-07-05 14:19:26 +02:00
|
|
|
static HRESULT WINAPI IDirectInput8WImpl_Initialize(LPDIRECTINPUT8W iface, HINSTANCE hinst, DWORD version)
|
2007-07-12 06:51:32 +02:00
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8W( iface );
|
2011-07-05 14:19:26 +02:00
|
|
|
return IDirectInput8AImpl_Initialize( &This->IDirectInput8A_iface, hinst, version );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI IDirectInput8AImpl_FindDevice(LPDIRECTINPUT8A iface, REFGUID rguid, LPCSTR pszName, LPGUID pguidInstance)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8A( iface );
|
2011-01-09 23:43:03 +01:00
|
|
|
return IDirectInput2AImpl_FindDevice( &This->IDirectInput7A_iface, rguid, pszName, pguidInstance );
|
2007-07-12 06:51:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI IDirectInput8WImpl_FindDevice(LPDIRECTINPUT8W iface, REFGUID rguid, LPCWSTR pszName, LPGUID pguidInstance)
|
|
|
|
{
|
2011-01-09 23:43:03 +01:00
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8W( iface );
|
|
|
|
return IDirectInput2WImpl_FindDevice( &This->IDirectInput7W_iface, rguid, pszName, pguidInstance );
|
2002-06-14 02:39:44 +02:00
|
|
|
}
|
|
|
|
|
2017-03-02 19:51:41 +01:00
|
|
|
static BOOL should_enumerate_device(const WCHAR *username, DWORD dwFlags,
|
|
|
|
struct list *device_players, REFGUID guid)
|
|
|
|
{
|
|
|
|
BOOL should_enumerate = TRUE;
|
|
|
|
struct DevicePlayer *device_player;
|
|
|
|
|
|
|
|
/* Check if user owns this device */
|
|
|
|
if (dwFlags & DIEDBSFL_THISUSER && username && *username)
|
|
|
|
{
|
|
|
|
should_enumerate = FALSE;
|
|
|
|
LIST_FOR_EACH_ENTRY(device_player, device_players, struct DevicePlayer, entry)
|
|
|
|
{
|
|
|
|
if (IsEqualGUID(&device_player->instance_guid, guid))
|
|
|
|
{
|
|
|
|
if (*device_player->username && !lstrcmpW(username, device_player->username))
|
|
|
|
return TRUE; /* Device username matches */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check if this device is not owned by anyone */
|
|
|
|
if (dwFlags & DIEDBSFL_AVAILABLEDEVICES) {
|
|
|
|
BOOL found = FALSE;
|
|
|
|
should_enumerate = FALSE;
|
|
|
|
LIST_FOR_EACH_ENTRY(device_player, device_players, struct DevicePlayer, entry)
|
|
|
|
{
|
|
|
|
if (IsEqualGUID(&device_player->instance_guid, guid))
|
|
|
|
{
|
|
|
|
if (*device_player->username)
|
|
|
|
found = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!found)
|
|
|
|
return TRUE; /* Device does not have a username */
|
|
|
|
}
|
|
|
|
|
|
|
|
return should_enumerate;
|
|
|
|
}
|
|
|
|
|
2002-06-14 02:39:44 +02:00
|
|
|
static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics(
|
|
|
|
LPDIRECTINPUT8A iface, LPCSTR ptszUserName, LPDIACTIONFORMATA lpdiActionFormat,
|
|
|
|
LPDIENUMDEVICESBYSEMANTICSCBA lpCallback,
|
|
|
|
LPVOID pvRef, DWORD dwFlags
|
|
|
|
)
|
|
|
|
{
|
2011-07-26 17:43:09 +02:00
|
|
|
static REFGUID guids[2] = { &GUID_SysKeyboard, &GUID_SysMouse };
|
2011-07-08 20:00:40 +02:00
|
|
|
static const DWORD actionMasks[] = { DIKEYBOARD_MASK, DIMOUSE_MASK };
|
2008-02-15 15:01:03 +01:00
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8A( iface );
|
2011-06-28 18:54:36 +02:00
|
|
|
DIDEVICEINSTANCEA didevi;
|
|
|
|
LPDIRECTINPUTDEVICE8A lpdid;
|
2011-07-12 03:37:36 +02:00
|
|
|
DWORD callbackFlags;
|
2011-07-08 20:00:40 +02:00
|
|
|
int i, j;
|
2017-02-08 21:07:53 +01:00
|
|
|
int device_count = 0;
|
|
|
|
int remain;
|
|
|
|
DIDEVICEINSTANCEA *didevis = 0;
|
2017-03-02 19:51:41 +01:00
|
|
|
WCHAR *username_w = 0;
|
2002-06-14 02:39:44 +02:00
|
|
|
|
2011-09-18 19:44:01 +02:00
|
|
|
FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_a(ptszUserName), lpdiActionFormat,
|
2008-02-15 15:01:03 +01:00
|
|
|
lpCallback, pvRef, dwFlags);
|
|
|
|
#define X(x) if (dwFlags & x) FIXME("\tdwFlags |= "#x"\n");
|
|
|
|
X(DIEDBSFL_ATTACHEDONLY)
|
|
|
|
X(DIEDBSFL_THISUSER)
|
|
|
|
X(DIEDBSFL_FORCEFEEDBACK)
|
|
|
|
X(DIEDBSFL_AVAILABLEDEVICES)
|
|
|
|
X(DIEDBSFL_MULTIMICEKEYBOARDS)
|
|
|
|
X(DIEDBSFL_NONGAMINGDEVICES)
|
|
|
|
#undef X
|
|
|
|
|
|
|
|
_dump_diactionformatA(lpdiActionFormat);
|
|
|
|
|
2011-06-28 18:54:36 +02:00
|
|
|
didevi.dwSize = sizeof(didevi);
|
|
|
|
|
2017-03-02 19:51:41 +01:00
|
|
|
if (ptszUserName)
|
|
|
|
{
|
|
|
|
int len = MultiByteToWideChar(CP_ACP, 0, ptszUserName, -1, 0, 0);
|
|
|
|
|
|
|
|
username_w = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len);
|
|
|
|
MultiByteToWideChar(CP_ACP, 0, ptszUserName, -1, username_w, len);
|
|
|
|
}
|
|
|
|
|
2011-07-12 03:37:36 +02:00
|
|
|
/* Enumerate all the joysticks */
|
2018-07-05 22:07:16 +02:00
|
|
|
for (i = 0; i < ARRAY_SIZE(dinput_devices); i++)
|
2011-07-12 03:37:36 +02:00
|
|
|
{
|
2013-05-20 21:10:02 +02:00
|
|
|
HRESULT enumSuccess;
|
2011-07-12 03:37:36 +02:00
|
|
|
|
|
|
|
if (!dinput_devices[i]->enum_deviceA) continue;
|
|
|
|
|
2013-05-20 21:10:02 +02:00
|
|
|
for (j = 0, enumSuccess = S_OK; SUCCEEDED(enumSuccess); j++)
|
2011-07-12 03:37:36 +02:00
|
|
|
{
|
|
|
|
TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name);
|
|
|
|
|
|
|
|
/* Default behavior is to enumerate attached game controllers */
|
|
|
|
enumSuccess = dinput_devices[i]->enum_deviceA(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j);
|
2017-03-02 19:51:41 +01:00
|
|
|
if (enumSuccess == S_OK &&
|
|
|
|
should_enumerate_device(username_w, dwFlags, &This->device_players, &didevi.guidInstance))
|
2011-07-12 03:37:36 +02:00
|
|
|
{
|
2017-02-08 21:07:53 +01:00
|
|
|
if (device_count++)
|
2017-02-10 16:56:14 +01:00
|
|
|
didevis = HeapReAlloc(GetProcessHeap(), 0, didevis, sizeof(DIDEVICEINSTANCEA)*device_count);
|
2017-02-08 21:07:53 +01:00
|
|
|
else
|
2017-02-10 16:56:14 +01:00
|
|
|
didevis = HeapAlloc(GetProcessHeap(), 0, sizeof(DIDEVICEINSTANCEA)*device_count);
|
2017-02-08 21:07:53 +01:00
|
|
|
didevis[device_count-1] = didevi;
|
2011-07-12 03:37:36 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-08 21:07:53 +01:00
|
|
|
remain = device_count;
|
2017-03-02 19:51:41 +01:00
|
|
|
/* Add keyboard and mouse to remaining device count */
|
2017-02-08 21:07:53 +01:00
|
|
|
if (!(dwFlags & DIEDBSFL_FORCEFEEDBACK))
|
2017-03-02 19:51:41 +01:00
|
|
|
{
|
|
|
|
for (i = 0; i < sizeof(guids) / sizeof(guids[0]); i++)
|
|
|
|
{
|
|
|
|
if (should_enumerate_device(username_w, dwFlags, &This->device_players, guids[i]))
|
|
|
|
remain++;
|
|
|
|
}
|
|
|
|
}
|
2017-02-08 21:07:53 +01:00
|
|
|
|
|
|
|
for (i = 0; i < device_count; i++)
|
|
|
|
{
|
|
|
|
callbackFlags = diactionformat_priorityA(lpdiActionFormat, lpdiActionFormat->dwGenre);
|
|
|
|
IDirectInput_CreateDevice(iface, &didevis[i].guidInstance, &lpdid, NULL);
|
|
|
|
|
|
|
|
if (lpCallback(&didevis[i], lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP)
|
|
|
|
{
|
|
|
|
HeapFree(GetProcessHeap(), 0, didevis);
|
2017-03-02 19:51:41 +01:00
|
|
|
HeapFree(GetProcessHeap(), 0, username_w);
|
2017-02-08 21:07:53 +01:00
|
|
|
return DI_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
HeapFree(GetProcessHeap(), 0, didevis);
|
|
|
|
|
2017-03-02 19:51:41 +01:00
|
|
|
if (dwFlags & DIEDBSFL_FORCEFEEDBACK)
|
|
|
|
{
|
|
|
|
HeapFree(GetProcessHeap(), 0, username_w);
|
|
|
|
return DI_OK;
|
|
|
|
}
|
2011-07-08 20:00:55 +02:00
|
|
|
|
2011-07-08 20:00:40 +02:00
|
|
|
/* Enumerate keyboard and mouse */
|
|
|
|
for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++)
|
|
|
|
{
|
2017-03-02 19:51:41 +01:00
|
|
|
if (should_enumerate_device(username_w, dwFlags, &This->device_players, guids[i]))
|
|
|
|
{
|
|
|
|
callbackFlags = diactionformat_priorityA(lpdiActionFormat, actionMasks[i]);
|
2011-06-28 18:54:36 +02:00
|
|
|
|
2017-03-02 19:51:41 +01:00
|
|
|
IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL);
|
|
|
|
IDirectInputDevice_GetDeviceInfo(lpdid, &didevi);
|
2011-06-28 18:54:36 +02:00
|
|
|
|
2017-03-02 19:51:41 +01:00
|
|
|
if (lpCallback(&didevi, lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP)
|
|
|
|
{
|
|
|
|
HeapFree(GetProcessHeap(), 0, username_w);
|
|
|
|
return DI_OK;
|
|
|
|
}
|
|
|
|
}
|
2011-07-08 20:00:40 +02:00
|
|
|
}
|
2011-06-28 18:54:36 +02:00
|
|
|
|
2017-03-02 19:51:41 +01:00
|
|
|
HeapFree(GetProcessHeap(), 0, username_w);
|
2008-02-15 15:01:03 +01:00
|
|
|
return DI_OK;
|
2002-06-14 02:39:44 +02:00
|
|
|
}
|
|
|
|
|
2003-06-16 22:22:13 +02:00
|
|
|
static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics(
|
|
|
|
LPDIRECTINPUT8W iface, LPCWSTR ptszUserName, LPDIACTIONFORMATW lpdiActionFormat,
|
|
|
|
LPDIENUMDEVICESBYSEMANTICSCBW lpCallback,
|
|
|
|
LPVOID pvRef, DWORD dwFlags
|
|
|
|
)
|
|
|
|
{
|
2011-07-26 17:43:09 +02:00
|
|
|
static REFGUID guids[2] = { &GUID_SysKeyboard, &GUID_SysMouse };
|
2011-07-08 20:00:40 +02:00
|
|
|
static const DWORD actionMasks[] = { DIKEYBOARD_MASK, DIMOUSE_MASK };
|
2011-06-28 18:54:36 +02:00
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8W(iface);
|
|
|
|
DIDEVICEINSTANCEW didevi;
|
|
|
|
LPDIRECTINPUTDEVICE8W lpdid;
|
2011-07-12 03:37:36 +02:00
|
|
|
DWORD callbackFlags;
|
2011-07-08 20:00:40 +02:00
|
|
|
int i, j;
|
2017-02-08 21:07:53 +01:00
|
|
|
int device_count = 0;
|
|
|
|
int remain;
|
|
|
|
DIDEVICEINSTANCEW *didevis = 0;
|
2003-06-16 22:22:13 +02:00
|
|
|
|
2011-06-28 18:54:36 +02:00
|
|
|
FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_w(ptszUserName), lpdiActionFormat,
|
|
|
|
lpCallback, pvRef, dwFlags);
|
|
|
|
|
|
|
|
didevi.dwSize = sizeof(didevi);
|
|
|
|
|
2011-07-12 03:37:36 +02:00
|
|
|
/* Enumerate all the joysticks */
|
2018-07-05 22:07:16 +02:00
|
|
|
for (i = 0; i < ARRAY_SIZE(dinput_devices); i++)
|
2011-07-12 03:37:36 +02:00
|
|
|
{
|
2013-05-20 21:10:02 +02:00
|
|
|
HRESULT enumSuccess;
|
2011-07-12 03:37:36 +02:00
|
|
|
|
|
|
|
if (!dinput_devices[i]->enum_deviceW) continue;
|
|
|
|
|
2013-05-20 21:10:02 +02:00
|
|
|
for (j = 0, enumSuccess = S_OK; SUCCEEDED(enumSuccess); j++)
|
2011-07-12 03:37:36 +02:00
|
|
|
{
|
|
|
|
TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name);
|
|
|
|
|
|
|
|
/* Default behavior is to enumerate attached game controllers */
|
|
|
|
enumSuccess = dinput_devices[i]->enum_deviceW(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j);
|
2017-03-02 19:51:41 +01:00
|
|
|
if (enumSuccess == S_OK &&
|
|
|
|
should_enumerate_device(ptszUserName, dwFlags, &This->device_players, &didevi.guidInstance))
|
2011-07-12 03:37:36 +02:00
|
|
|
{
|
2017-02-08 21:07:53 +01:00
|
|
|
if (device_count++)
|
|
|
|
didevis = HeapReAlloc(GetProcessHeap(), 0, didevis, sizeof(DIDEVICEINSTANCEW)*device_count);
|
|
|
|
else
|
|
|
|
didevis = HeapAlloc(GetProcessHeap(), 0, sizeof(DIDEVICEINSTANCEW)*device_count);
|
|
|
|
didevis[device_count-1] = didevi;
|
2011-07-12 03:37:36 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-08 21:07:53 +01:00
|
|
|
remain = device_count;
|
2017-03-02 19:51:41 +01:00
|
|
|
/* Add keyboard and mouse to remaining device count */
|
2017-02-08 21:07:53 +01:00
|
|
|
if (!(dwFlags & DIEDBSFL_FORCEFEEDBACK))
|
2017-03-02 19:51:41 +01:00
|
|
|
{
|
|
|
|
for (i = 0; i < sizeof(guids) / sizeof(guids[0]); i++)
|
|
|
|
{
|
|
|
|
if (should_enumerate_device(ptszUserName, dwFlags, &This->device_players, guids[i]))
|
|
|
|
remain++;
|
|
|
|
}
|
|
|
|
}
|
2017-02-08 21:07:53 +01:00
|
|
|
|
|
|
|
for (i = 0; i < device_count; i++)
|
|
|
|
{
|
|
|
|
callbackFlags = diactionformat_priorityW(lpdiActionFormat, lpdiActionFormat->dwGenre);
|
|
|
|
IDirectInput_CreateDevice(iface, &didevis[i].guidInstance, &lpdid, NULL);
|
|
|
|
|
|
|
|
if (lpCallback(&didevis[i], lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP)
|
|
|
|
{
|
|
|
|
HeapFree(GetProcessHeap(), 0, didevis);
|
|
|
|
return DI_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
HeapFree(GetProcessHeap(), 0, didevis);
|
|
|
|
|
2011-07-08 20:00:55 +02:00
|
|
|
if (dwFlags & DIEDBSFL_FORCEFEEDBACK) return DI_OK;
|
|
|
|
|
2011-07-08 20:00:40 +02:00
|
|
|
/* Enumerate keyboard and mouse */
|
|
|
|
for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++)
|
|
|
|
{
|
2017-03-02 19:51:41 +01:00
|
|
|
if (should_enumerate_device(ptszUserName, dwFlags, &This->device_players, guids[i]))
|
|
|
|
{
|
|
|
|
callbackFlags = diactionformat_priorityW(lpdiActionFormat, actionMasks[i]);
|
2011-06-28 18:54:36 +02:00
|
|
|
|
2017-03-02 19:51:41 +01:00
|
|
|
IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL);
|
|
|
|
IDirectInputDevice_GetDeviceInfo(lpdid, &didevi);
|
2011-06-28 18:54:36 +02:00
|
|
|
|
2017-03-02 19:51:41 +01:00
|
|
|
if (lpCallback(&didevi, lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP)
|
|
|
|
return DI_OK;
|
|
|
|
}
|
2011-07-08 20:00:40 +02:00
|
|
|
}
|
2011-06-28 18:54:36 +02:00
|
|
|
|
|
|
|
return DI_OK;
|
2003-06-16 22:22:13 +02:00
|
|
|
}
|
|
|
|
|
2011-08-22 03:26:40 +02:00
|
|
|
static HRESULT WINAPI IDirectInput8WImpl_ConfigureDevices(
|
|
|
|
LPDIRECTINPUT8W iface, LPDICONFIGUREDEVICESCALLBACK lpdiCallback,
|
|
|
|
LPDICONFIGUREDEVICESPARAMSW lpdiCDParams, DWORD dwFlags, LPVOID pvRefData
|
2002-06-14 02:39:44 +02:00
|
|
|
)
|
|
|
|
{
|
2011-08-22 03:26:40 +02:00
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8W(iface);
|
2003-06-16 22:22:13 +02:00
|
|
|
|
2011-08-22 03:26:40 +02:00
|
|
|
FIXME("(this=%p,%p,%p,%04x,%p): stub\n", This, lpdiCallback, lpdiCDParams, dwFlags, pvRefData);
|
|
|
|
|
2011-09-01 20:34:35 +02:00
|
|
|
/* Call helper function in config.c to do the real work */
|
|
|
|
return _configure_devices(iface, lpdiCallback, lpdiCDParams, dwFlags, pvRefData);
|
2003-06-16 22:22:13 +02:00
|
|
|
}
|
|
|
|
|
2011-08-22 03:26:40 +02:00
|
|
|
static HRESULT WINAPI IDirectInput8AImpl_ConfigureDevices(
|
|
|
|
LPDIRECTINPUT8A iface, LPDICONFIGUREDEVICESCALLBACK lpdiCallback,
|
|
|
|
LPDICONFIGUREDEVICESPARAMSA lpdiCDParams, DWORD dwFlags, LPVOID pvRefData
|
2003-06-16 22:22:13 +02:00
|
|
|
)
|
|
|
|
{
|
2011-08-22 03:26:40 +02:00
|
|
|
IDirectInputImpl *This = impl_from_IDirectInput8A(iface);
|
|
|
|
DIACTIONFORMATW diafW;
|
|
|
|
DICONFIGUREDEVICESPARAMSW diCDParamsW;
|
|
|
|
HRESULT hr;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
FIXME("(this=%p,%p,%p,%04x,%p): stub\n", This, lpdiCallback, lpdiCDParams, dwFlags, pvRefData);
|
|
|
|
|
|
|
|
/* Copy parameters */
|
|
|
|
diCDParamsW.dwSize = sizeof(DICONFIGUREDEVICESPARAMSW);
|
|
|
|
diCDParamsW.dwcFormats = lpdiCDParams->dwcFormats;
|
|
|
|
diCDParamsW.lprgFormats = &diafW;
|
|
|
|
diCDParamsW.hwnd = lpdiCDParams->hwnd;
|
|
|
|
|
|
|
|
diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiCDParams->lprgFormats->dwNumActions);
|
|
|
|
_copy_diactionformatAtoW(&diafW, lpdiCDParams->lprgFormats);
|
|
|
|
|
|
|
|
/* Copy action names */
|
|
|
|
for (i=0; i < diafW.dwNumActions; i++)
|
|
|
|
{
|
|
|
|
const char* from = lpdiCDParams->lprgFormats->rgoAction[i].u.lptszActionName;
|
|
|
|
int len = MultiByteToWideChar(CP_ACP, 0, from , -1, NULL , 0);
|
|
|
|
WCHAR *to = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len);
|
|
|
|
|
|
|
|
MultiByteToWideChar(CP_ACP, 0, from , -1, to , len);
|
|
|
|
diafW.rgoAction[i].u.lptszActionName = to;
|
|
|
|
}
|
|
|
|
|
|
|
|
hr = IDirectInput8WImpl_ConfigureDevices(&This->IDirectInput8W_iface, lpdiCallback, &diCDParamsW, dwFlags, pvRefData);
|
|
|
|
|
|
|
|
/* Copy back configuration */
|
|
|
|
if (SUCCEEDED(hr))
|
|
|
|
_copy_diactionformatWtoA(lpdiCDParams->lprgFormats, &diafW);
|
|
|
|
|
|
|
|
/* Free memory */
|
|
|
|
for (i=0; i < diafW.dwNumActions; i++)
|
|
|
|
HeapFree(GetProcessHeap(), 0, (void*) diafW.rgoAction[i].u.lptszActionName);
|
|
|
|
|
|
|
|
HeapFree(GetProcessHeap(), 0, diafW.rgoAction);
|
2002-06-14 02:39:44 +02:00
|
|
|
|
2011-08-22 03:26:40 +02:00
|
|
|
return hr;
|
2002-06-14 02:39:44 +02:00
|
|
|
}
|
|
|
|
|
2011-11-26 18:30:07 +01:00
|
|
|
/*****************************************************************************
|
|
|
|
* IDirectInputJoyConfig8 interface
|
|
|
|
*/
|
|
|
|
|
|
|
|
static inline IDirectInputImpl *impl_from_IDirectInputJoyConfig8(IDirectInputJoyConfig8 *iface)
|
|
|
|
{
|
|
|
|
return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInputJoyConfig8_iface );
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI JoyConfig8Impl_QueryInterface(IDirectInputJoyConfig8 *iface, REFIID riid, void** ppobj)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInputJoyConfig8( iface );
|
|
|
|
return IDirectInputAImpl_QueryInterface( &This->IDirectInput7A_iface, riid, ppobj );
|
|
|
|
}
|
|
|
|
|
|
|
|
static ULONG WINAPI JoyConfig8Impl_AddRef(IDirectInputJoyConfig8 *iface)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInputJoyConfig8( iface );
|
|
|
|
return IDirectInputAImpl_AddRef( &This->IDirectInput7A_iface );
|
|
|
|
}
|
|
|
|
|
|
|
|
static ULONG WINAPI JoyConfig8Impl_Release(IDirectInputJoyConfig8 *iface)
|
|
|
|
{
|
|
|
|
IDirectInputImpl *This = impl_from_IDirectInputJoyConfig8( iface );
|
|
|
|
return IDirectInputAImpl_Release( &This->IDirectInput7A_iface );
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI JoyConfig8Impl_Acquire(IDirectInputJoyConfig8 *iface)
|
|
|
|
{
|
|
|
|
FIXME( "(%p): stub!\n", iface );
|
|
|
|
return E_NOTIMPL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI JoyConfig8Impl_Unacquire(IDirectInputJoyConfig8 *iface)
|
|
|
|
{
|
|
|
|
FIXME( "(%p): stub!\n", iface );
|
|
|
|
return E_NOTIMPL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI JoyConfig8Impl_SetCooperativeLevel(IDirectInputJoyConfig8 *iface, HWND hwnd, DWORD flags)
|
|
|
|
{
|
|
|
|
FIXME( "(%p)->(%p, 0x%08x): stub!\n", iface, hwnd, flags );
|
|
|
|
return E_NOTIMPL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI JoyConfig8Impl_SendNotify(IDirectInputJoyConfig8 *iface)
|
|
|
|
{
|
|
|
|
FIXME( "(%p): stub!\n", iface );
|
|
|
|
return E_NOTIMPL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI JoyConfig8Impl_EnumTypes(IDirectInputJoyConfig8 *iface, LPDIJOYTYPECALLBACK cb, void *ref)
|
|
|
|
{
|
|
|
|
FIXME( "(%p)->(%p, %p): stub!\n", iface, cb, ref );
|
|
|
|
return E_NOTIMPL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI JoyConfig8Impl_GetTypeInfo(IDirectInputJoyConfig8 *iface, LPCWSTR name, LPDIJOYTYPEINFO info, DWORD flags)
|
|
|
|
{
|
|
|
|
FIXME( "(%p)->(%s, %p, 0x%08x): stub!\n", iface, debugstr_w(name), info, flags );
|
|
|
|
return E_NOTIMPL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI JoyConfig8Impl_SetTypeInfo(IDirectInputJoyConfig8 *iface, LPCWSTR name, LPCDIJOYTYPEINFO info, DWORD flags,
|
|
|
|
LPWSTR new_name)
|
|
|
|
{
|
|
|
|
FIXME( "(%p)->(%s, %p, 0x%08x, %s): stub!\n", iface, debugstr_w(name), info, flags, debugstr_w(new_name) );
|
|
|
|
return E_NOTIMPL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI JoyConfig8Impl_DeleteType(IDirectInputJoyConfig8 *iface, LPCWSTR name)
|
|
|
|
{
|
|
|
|
FIXME( "(%p)->(%s): stub!\n", iface, debugstr_w(name) );
|
|
|
|
return E_NOTIMPL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI JoyConfig8Impl_GetConfig(IDirectInputJoyConfig8 *iface, UINT id, LPDIJOYCONFIG info, DWORD flags)
|
|
|
|
{
|
2012-08-14 01:36:56 +02:00
|
|
|
IDirectInputImpl *di = impl_from_IDirectInputJoyConfig8(iface);
|
|
|
|
UINT found = 0;
|
2013-05-20 21:10:02 +02:00
|
|
|
int i, j;
|
|
|
|
HRESULT r;
|
2012-08-14 01:36:56 +02:00
|
|
|
|
|
|
|
FIXME("(%p)->(%d, %p, 0x%08x): semi-stub!\n", iface, id, info, flags);
|
|
|
|
|
|
|
|
#define X(x) if (flags & x) FIXME("\tflags |= "#x"\n");
|
|
|
|
X(DIJC_GUIDINSTANCE)
|
|
|
|
X(DIJC_REGHWCONFIGTYPE)
|
|
|
|
X(DIJC_GAIN)
|
|
|
|
X(DIJC_CALLOUT)
|
|
|
|
#undef X
|
|
|
|
|
|
|
|
/* Enumerate all joysticks in order */
|
2018-07-05 22:07:16 +02:00
|
|
|
for (i = 0; i < ARRAY_SIZE(dinput_devices); i++)
|
2012-08-14 01:36:56 +02:00
|
|
|
{
|
|
|
|
if (!dinput_devices[i]->enum_deviceA) continue;
|
|
|
|
|
2013-05-20 21:10:02 +02:00
|
|
|
for (j = 0, r = S_OK; SUCCEEDED(r); j++)
|
2012-08-14 01:36:56 +02:00
|
|
|
{
|
|
|
|
DIDEVICEINSTANCEA dev;
|
|
|
|
dev.dwSize = sizeof(dev);
|
2013-05-20 21:10:02 +02:00
|
|
|
if ((r = dinput_devices[i]->enum_deviceA(DI8DEVCLASS_GAMECTRL, 0, &dev, di->dwVersion, j)) == S_OK)
|
2012-08-14 01:36:56 +02:00
|
|
|
{
|
|
|
|
/* Only take into account the chosen id */
|
|
|
|
if (found == id)
|
|
|
|
{
|
|
|
|
if (flags & DIJC_GUIDINSTANCE)
|
|
|
|
info->guidInstance = dev.guidInstance;
|
|
|
|
|
|
|
|
return DI_OK;
|
|
|
|
}
|
|
|
|
found += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return DIERR_NOMOREITEMS;
|
2011-11-26 18:30:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI JoyConfig8Impl_SetConfig(IDirectInputJoyConfig8 *iface, UINT id, LPCDIJOYCONFIG info, DWORD flags)
|
|
|
|
{
|
|
|
|
FIXME( "(%p)->(%d, %p, 0x%08x): stub!\n", iface, id, info, flags );
|
|
|
|
return E_NOTIMPL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI JoyConfig8Impl_DeleteConfig(IDirectInputJoyConfig8 *iface, UINT id)
|
|
|
|
{
|
|
|
|
FIXME( "(%p)->(%d): stub!\n", iface, id );
|
|
|
|
return E_NOTIMPL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI JoyConfig8Impl_GetUserValues(IDirectInputJoyConfig8 *iface, LPDIJOYUSERVALUES info, DWORD flags)
|
|
|
|
{
|
|
|
|
FIXME( "(%p)->(%p, 0x%08x): stub!\n", iface, info, flags );
|
|
|
|
return E_NOTIMPL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI JoyConfig8Impl_SetUserValues(IDirectInputJoyConfig8 *iface, LPCDIJOYUSERVALUES info, DWORD flags)
|
|
|
|
{
|
|
|
|
FIXME( "(%p)->(%p, 0x%08x): stub!\n", iface, info, flags );
|
|
|
|
return E_NOTIMPL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI JoyConfig8Impl_AddNewHardware(IDirectInputJoyConfig8 *iface, HWND hwnd, REFGUID guid)
|
|
|
|
{
|
|
|
|
FIXME( "(%p)->(%p, %s): stub!\n", iface, hwnd, debugstr_guid(guid) );
|
|
|
|
return E_NOTIMPL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI JoyConfig8Impl_OpenTypeKey(IDirectInputJoyConfig8 *iface, LPCWSTR name, DWORD security, PHKEY key)
|
|
|
|
{
|
|
|
|
FIXME( "(%p)->(%s, 0x%08x, %p): stub!\n", iface, debugstr_w(name), security, key );
|
|
|
|
return E_NOTIMPL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI JoyConfig8Impl_OpenAppStatusKey(IDirectInputJoyConfig8 *iface, PHKEY key)
|
|
|
|
{
|
|
|
|
FIXME( "(%p)->(%p): stub!\n", iface, key );
|
|
|
|
return E_NOTIMPL;
|
|
|
|
}
|
|
|
|
|
2005-05-30 12:01:08 +02:00
|
|
|
static const IDirectInput7AVtbl ddi7avt = {
|
2007-07-12 06:51:32 +02:00
|
|
|
IDirectInputAImpl_QueryInterface,
|
|
|
|
IDirectInputAImpl_AddRef,
|
|
|
|
IDirectInputAImpl_Release,
|
|
|
|
IDirectInputAImpl_CreateDevice,
|
|
|
|
IDirectInputAImpl_EnumDevices,
|
|
|
|
IDirectInputAImpl_GetDeviceStatus,
|
|
|
|
IDirectInputAImpl_RunControlPanel,
|
|
|
|
IDirectInputAImpl_Initialize,
|
|
|
|
IDirectInput2AImpl_FindDevice,
|
|
|
|
IDirectInput7AImpl_CreateDeviceEx
|
2003-06-16 22:22:13 +02:00
|
|
|
};
|
|
|
|
|
2005-05-30 12:01:08 +02:00
|
|
|
static const IDirectInput7WVtbl ddi7wvt = {
|
2007-07-12 06:51:32 +02:00
|
|
|
IDirectInputWImpl_QueryInterface,
|
|
|
|
IDirectInputWImpl_AddRef,
|
|
|
|
IDirectInputWImpl_Release,
|
|
|
|
IDirectInputWImpl_CreateDevice,
|
|
|
|
IDirectInputWImpl_EnumDevices,
|
|
|
|
IDirectInputWImpl_GetDeviceStatus,
|
|
|
|
IDirectInputWImpl_RunControlPanel,
|
|
|
|
IDirectInputWImpl_Initialize,
|
|
|
|
IDirectInput2WImpl_FindDevice,
|
|
|
|
IDirectInput7WImpl_CreateDeviceEx
|
Release 980201
Sun Feb 1 13:24:54 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [files/drive.c]
Added Device= parameter to drive configuration.
* [if1632/relay.c]
Throw() and Catch() now use the correct CATCHBUF layout (untested).
* [tools/build.c] [include/stackframe.h] [loader/task.c]
Moved 16-bit stack pointer into thread database.
Save current %fs while running 16-bit code.
Fri Jan 30 09:25:49 1998 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [graphics/mapping.c]
Made DPtoLP32 and LPtoDP32 respect world transforms.
* [graphics/path.c] [graphics/painting.c] [if1632/gdi.spec]
[include/path.h]
More path support.
* [include/gdi.h] [include/windows.h] [objects/dc.c]
[relay/gdi32.spec]
Support for Get/SetArcDirection and Get/SetWorldTransform
* [windows/hook.c]
Fixed a bug in HOOK_Map16To32Common.
Thu Jan 29 23:43:18 1998 Douglas Ridgway <ridgway@taiga.gmcl.com>
* [graphics/metafiledrv/init.c] [objects/metafile.c]
Documentation for metafile related API calls. Fixed a bug to avoid
documenting it.
* [include/windows.h]
Declaration for LoadImage.
Thu Jan 29 21:44:45 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/win16drv/*]
Changes to printing code to enable use of printer fonts with the
win3.1 postscript driver. Remember to add printer=on to [wine]
section of wine.conf . You will also need to disable truetype
fonts from control panel. Winword 6.0 and Write seem to be happy
with this...
* [include/bitmap.h]
Fix Widthbytes for 15bpp displays.
Tue Jan 27 20:54:08 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [tsx11/*] [include/ts*] [tools/make_X11wrappers]
Implemented thread-safe X11 wrappers.
Tue Jan 27 13:54:09 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [windows/queue.c]
Forgot to convert thdb to thread_id.
* [misc/registry.c]
Sped up Windows 95 registry reading. Changed code to traverse
registry as a tree rather than read in all possible keys
(including dead ones).
Tue Jan 27 12:46:09 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_image.c][Makefile.in][scheduler/thread.c]
[libtest/hello5.c]
Don't exit() on failed to load referenced dlls.
Fixed static tls allocation for multiple threads.
WINELIB should now be able to load PE dlls. A sample
winelib program, that dynamically loads a internal dll
is included.
* [graphics/ddraw.c][include/ddraw.h][include/d3d.h]
Cleaned up and enhanced further. Added several DirectX5
interface definitions and DirectSurface3 implementation.
Stubs for D3D (NOT coming soon, just there so it fails safely).
* [multimedia/dsound.c][include/dsound.h]
Actually works now for a lot of cases. Some DirectX5 stuff
added. Still lacking several features.
* [windows/dinput.c][include/dinput.h]
Started implementing DirectInput. Doesn't work yet, don't
know why.
* [if1632/thunk.c][misc/callbacks.c]
[win32/kernel.c][include/callbacks.h]
Added WOWCallback16Ex, WOWHandle32.
* [misc/cpu.c]
Fixed GetSystemInfo, IsProcessorFeaturePresent.
* [multimedia/joystick.c][multimedia/time.c]
Several fixes. Small hack to get timerevents in timeGetTime() loops.
Tue Jan 20 11:26:27 1998 Slaven Rezic <eserte@cs.tu-berlin.de>
* [configure.in]
Fixed check for union semun on FreeBSD systems.
Sun Jan 18 23:05:04 1998 Karl Backström <karl_b@geocities.com>
* [misc/ole2nls.c] [programs/progman/Sw.rc] [programs/winhelp/Sw.rc]
[resources/sysres_Sw.rc]
Added/updated Swedish language support.
Sun Jan 18 18:49:01 1998 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [misc/winsock.c] [misc/winsock_dns.c] [windows/event.c]
[windows/win.c] [windows/dce.c] [windows/winpos.c]
Bug fixes.
Sun Jan 18 12:45:23 1997 Andreas Mohr <100.30936@germany.net>
* [msdos/int25.c] [msdos/int26.c]
Implemented "native" absolute disk read/write access.
* [msdos/int13.c] [msdos/ioports.c]
Enhanced GET DRIVE PARAMETERS (int13 AH=08).
* [graphics/win16drv/prtdrv.c] [if1632/gdi.spec]
Fixed typos, implemented dmEnumDFonts,
Started implementation of dmRealizeObject.
* [if1632/compobj.spec] [ole/compobj.c] [relay32/ole32.spec]
Stubs CoCreateInstance, CoFreeUnusedLibraries, implemented
CoFileTimeNow.
* [if1632/kernel.spec] [include/windows.h] [memory/global.c]
[memory/string.c] [misc/kernel.c] [misc/Makefile.in]
[misc/toolhelp.c] [msdos/int21.c]
Implemented GlobalHandleNoRIP, GetFreeMemInfo, DebugFillBuffer,
stubs GetSetKernelDOSProc, DiagQuery, DiagOutput, ToolHelpHook
(Undocumented Windows).
* [if1632/user.spec] [if1632/win32s16.spec] [misc/win32s16.c]
Misc stubs.
* [if1632/winaspi.spec] [misc/aspi.c]
Implemented GetASPIDLLVersion.
* [if1632/wprocs.spec] [msdos/int20.c] [msdos/Makefile.in]
Added handler for Int 0x20 (terminate program, _very_ old-fashioned).
* [misc/w32scomb.c]
Implemented Get16DLLAddress() partially
(big thanks to Marcus and Alexandre).
* [relay32/Makefile.in] [relay32/builtin32.c] [relay32/dplay.spec]
Added built-in DPLAY.DLL.
* [relay32/winmm.spec] [multimedia/joystick.c]
Added joySetThreshold.
* [misc/windebug.c]
Added WinNotify.
* [win32/console.c]
Stubs CreateConsoleScreenBuffer, SetConsoleActiveScreenBuffer,
WriteConsoleOutput32A.
* [windows/user.c]
Stub SetEventHook.
Sat Jan 17 19:30:35 1998 Matthew Toseland <Paul.Toseland@btinternet.com>
* [windows/painting.c]
Fixed broken restore-to-maximized.
Mon Jan 12 21:25:32 1998 Perceval - Marc Huguet Puig <mhp@tinet.fut.es>
* [documentation/wine.man] [include/options.h]
[misc/main.c] [ole/ole2nls.c] [resources/sysres.c]
[resources/sysres_Ca.rc] [resources/Makefile.in]
Added language catalan. (Afegit l'idioma català).
1998-02-01 19:33:27 +01:00
|
|
|
};
|
1998-12-10 10:08:48 +01:00
|
|
|
|
2005-05-30 12:01:08 +02:00
|
|
|
static const IDirectInput8AVtbl ddi8avt = {
|
2007-07-12 06:51:32 +02:00
|
|
|
IDirectInput8AImpl_QueryInterface,
|
|
|
|
IDirectInput8AImpl_AddRef,
|
|
|
|
IDirectInput8AImpl_Release,
|
|
|
|
IDirectInput8AImpl_CreateDevice,
|
|
|
|
IDirectInput8AImpl_EnumDevices,
|
|
|
|
IDirectInput8AImpl_GetDeviceStatus,
|
|
|
|
IDirectInput8AImpl_RunControlPanel,
|
|
|
|
IDirectInput8AImpl_Initialize,
|
|
|
|
IDirectInput8AImpl_FindDevice,
|
|
|
|
IDirectInput8AImpl_EnumDevicesBySemantics,
|
|
|
|
IDirectInput8AImpl_ConfigureDevices
|
2003-06-16 22:22:13 +02:00
|
|
|
};
|
|
|
|
|
2005-05-30 12:01:08 +02:00
|
|
|
static const IDirectInput8WVtbl ddi8wvt = {
|
2007-07-12 06:51:32 +02:00
|
|
|
IDirectInput8WImpl_QueryInterface,
|
|
|
|
IDirectInput8WImpl_AddRef,
|
|
|
|
IDirectInput8WImpl_Release,
|
|
|
|
IDirectInput8WImpl_CreateDevice,
|
|
|
|
IDirectInput8WImpl_EnumDevices,
|
|
|
|
IDirectInput8WImpl_GetDeviceStatus,
|
|
|
|
IDirectInput8WImpl_RunControlPanel,
|
|
|
|
IDirectInput8WImpl_Initialize,
|
|
|
|
IDirectInput8WImpl_FindDevice,
|
|
|
|
IDirectInput8WImpl_EnumDevicesBySemantics,
|
|
|
|
IDirectInput8WImpl_ConfigureDevices
|
Release 980201
Sun Feb 1 13:24:54 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [files/drive.c]
Added Device= parameter to drive configuration.
* [if1632/relay.c]
Throw() and Catch() now use the correct CATCHBUF layout (untested).
* [tools/build.c] [include/stackframe.h] [loader/task.c]
Moved 16-bit stack pointer into thread database.
Save current %fs while running 16-bit code.
Fri Jan 30 09:25:49 1998 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [graphics/mapping.c]
Made DPtoLP32 and LPtoDP32 respect world transforms.
* [graphics/path.c] [graphics/painting.c] [if1632/gdi.spec]
[include/path.h]
More path support.
* [include/gdi.h] [include/windows.h] [objects/dc.c]
[relay/gdi32.spec]
Support for Get/SetArcDirection and Get/SetWorldTransform
* [windows/hook.c]
Fixed a bug in HOOK_Map16To32Common.
Thu Jan 29 23:43:18 1998 Douglas Ridgway <ridgway@taiga.gmcl.com>
* [graphics/metafiledrv/init.c] [objects/metafile.c]
Documentation for metafile related API calls. Fixed a bug to avoid
documenting it.
* [include/windows.h]
Declaration for LoadImage.
Thu Jan 29 21:44:45 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/win16drv/*]
Changes to printing code to enable use of printer fonts with the
win3.1 postscript driver. Remember to add printer=on to [wine]
section of wine.conf . You will also need to disable truetype
fonts from control panel. Winword 6.0 and Write seem to be happy
with this...
* [include/bitmap.h]
Fix Widthbytes for 15bpp displays.
Tue Jan 27 20:54:08 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [tsx11/*] [include/ts*] [tools/make_X11wrappers]
Implemented thread-safe X11 wrappers.
Tue Jan 27 13:54:09 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [windows/queue.c]
Forgot to convert thdb to thread_id.
* [misc/registry.c]
Sped up Windows 95 registry reading. Changed code to traverse
registry as a tree rather than read in all possible keys
(including dead ones).
Tue Jan 27 12:46:09 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_image.c][Makefile.in][scheduler/thread.c]
[libtest/hello5.c]
Don't exit() on failed to load referenced dlls.
Fixed static tls allocation for multiple threads.
WINELIB should now be able to load PE dlls. A sample
winelib program, that dynamically loads a internal dll
is included.
* [graphics/ddraw.c][include/ddraw.h][include/d3d.h]
Cleaned up and enhanced further. Added several DirectX5
interface definitions and DirectSurface3 implementation.
Stubs for D3D (NOT coming soon, just there so it fails safely).
* [multimedia/dsound.c][include/dsound.h]
Actually works now for a lot of cases. Some DirectX5 stuff
added. Still lacking several features.
* [windows/dinput.c][include/dinput.h]
Started implementing DirectInput. Doesn't work yet, don't
know why.
* [if1632/thunk.c][misc/callbacks.c]
[win32/kernel.c][include/callbacks.h]
Added WOWCallback16Ex, WOWHandle32.
* [misc/cpu.c]
Fixed GetSystemInfo, IsProcessorFeaturePresent.
* [multimedia/joystick.c][multimedia/time.c]
Several fixes. Small hack to get timerevents in timeGetTime() loops.
Tue Jan 20 11:26:27 1998 Slaven Rezic <eserte@cs.tu-berlin.de>
* [configure.in]
Fixed check for union semun on FreeBSD systems.
Sun Jan 18 23:05:04 1998 Karl Backström <karl_b@geocities.com>
* [misc/ole2nls.c] [programs/progman/Sw.rc] [programs/winhelp/Sw.rc]
[resources/sysres_Sw.rc]
Added/updated Swedish language support.
Sun Jan 18 18:49:01 1998 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [misc/winsock.c] [misc/winsock_dns.c] [windows/event.c]
[windows/win.c] [windows/dce.c] [windows/winpos.c]
Bug fixes.
Sun Jan 18 12:45:23 1997 Andreas Mohr <100.30936@germany.net>
* [msdos/int25.c] [msdos/int26.c]
Implemented "native" absolute disk read/write access.
* [msdos/int13.c] [msdos/ioports.c]
Enhanced GET DRIVE PARAMETERS (int13 AH=08).
* [graphics/win16drv/prtdrv.c] [if1632/gdi.spec]
Fixed typos, implemented dmEnumDFonts,
Started implementation of dmRealizeObject.
* [if1632/compobj.spec] [ole/compobj.c] [relay32/ole32.spec]
Stubs CoCreateInstance, CoFreeUnusedLibraries, implemented
CoFileTimeNow.
* [if1632/kernel.spec] [include/windows.h] [memory/global.c]
[memory/string.c] [misc/kernel.c] [misc/Makefile.in]
[misc/toolhelp.c] [msdos/int21.c]
Implemented GlobalHandleNoRIP, GetFreeMemInfo, DebugFillBuffer,
stubs GetSetKernelDOSProc, DiagQuery, DiagOutput, ToolHelpHook
(Undocumented Windows).
* [if1632/user.spec] [if1632/win32s16.spec] [misc/win32s16.c]
Misc stubs.
* [if1632/winaspi.spec] [misc/aspi.c]
Implemented GetASPIDLLVersion.
* [if1632/wprocs.spec] [msdos/int20.c] [msdos/Makefile.in]
Added handler for Int 0x20 (terminate program, _very_ old-fashioned).
* [misc/w32scomb.c]
Implemented Get16DLLAddress() partially
(big thanks to Marcus and Alexandre).
* [relay32/Makefile.in] [relay32/builtin32.c] [relay32/dplay.spec]
Added built-in DPLAY.DLL.
* [relay32/winmm.spec] [multimedia/joystick.c]
Added joySetThreshold.
* [misc/windebug.c]
Added WinNotify.
* [win32/console.c]
Stubs CreateConsoleScreenBuffer, SetConsoleActiveScreenBuffer,
WriteConsoleOutput32A.
* [windows/user.c]
Stub SetEventHook.
Sat Jan 17 19:30:35 1998 Matthew Toseland <Paul.Toseland@btinternet.com>
* [windows/painting.c]
Fixed broken restore-to-maximized.
Mon Jan 12 21:25:32 1998 Perceval - Marc Huguet Puig <mhp@tinet.fut.es>
* [documentation/wine.man] [include/options.h]
[misc/main.c] [ole/ole2nls.c] [resources/sysres.c]
[resources/sysres_Ca.rc] [resources/Makefile.in]
Added language catalan. (Afegit l'idioma català).
1998-02-01 19:33:27 +01:00
|
|
|
};
|
2000-04-24 20:03:54 +02:00
|
|
|
|
2011-11-26 18:30:07 +01:00
|
|
|
static const IDirectInputJoyConfig8Vtbl JoyConfig8vt =
|
|
|
|
{
|
|
|
|
JoyConfig8Impl_QueryInterface,
|
|
|
|
JoyConfig8Impl_AddRef,
|
|
|
|
JoyConfig8Impl_Release,
|
|
|
|
JoyConfig8Impl_Acquire,
|
|
|
|
JoyConfig8Impl_Unacquire,
|
|
|
|
JoyConfig8Impl_SetCooperativeLevel,
|
|
|
|
JoyConfig8Impl_SendNotify,
|
|
|
|
JoyConfig8Impl_EnumTypes,
|
|
|
|
JoyConfig8Impl_GetTypeInfo,
|
|
|
|
JoyConfig8Impl_SetTypeInfo,
|
|
|
|
JoyConfig8Impl_DeleteType,
|
|
|
|
JoyConfig8Impl_GetConfig,
|
|
|
|
JoyConfig8Impl_SetConfig,
|
|
|
|
JoyConfig8Impl_DeleteConfig,
|
|
|
|
JoyConfig8Impl_GetUserValues,
|
|
|
|
JoyConfig8Impl_SetUserValues,
|
|
|
|
JoyConfig8Impl_AddNewHardware,
|
|
|
|
JoyConfig8Impl_OpenTypeKey,
|
|
|
|
JoyConfig8Impl_OpenAppStatusKey
|
|
|
|
};
|
|
|
|
|
2003-04-30 00:43:48 +02:00
|
|
|
/*******************************************************************************
|
|
|
|
* DirectInput ClassFactory
|
|
|
|
*/
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
/* IUnknown fields */
|
2010-12-05 15:15:18 +01:00
|
|
|
IClassFactory IClassFactory_iface;
|
|
|
|
LONG ref;
|
2003-04-30 00:43:48 +02:00
|
|
|
} IClassFactoryImpl;
|
|
|
|
|
2010-12-05 15:15:18 +01:00
|
|
|
static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface)
|
|
|
|
{
|
|
|
|
return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface);
|
|
|
|
}
|
|
|
|
|
2003-04-30 00:43:48 +02:00
|
|
|
static HRESULT WINAPI DICF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
|
2010-12-05 15:15:18 +01:00
|
|
|
IClassFactoryImpl *This = impl_from_IClassFactory(iface);
|
2003-04-30 00:43:48 +02:00
|
|
|
|
|
|
|
FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj);
|
|
|
|
return E_NOINTERFACE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static ULONG WINAPI DICF_AddRef(LPCLASSFACTORY iface) {
|
2010-12-05 15:15:18 +01:00
|
|
|
IClassFactoryImpl *This = impl_from_IClassFactory(iface);
|
2004-09-17 20:10:41 +02:00
|
|
|
return InterlockedIncrement(&(This->ref));
|
2003-04-30 00:43:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static ULONG WINAPI DICF_Release(LPCLASSFACTORY iface) {
|
2010-12-05 15:15:18 +01:00
|
|
|
IClassFactoryImpl *This = impl_from_IClassFactory(iface);
|
2003-04-30 00:43:48 +02:00
|
|
|
/* static class, won't be freed */
|
2004-09-17 20:10:41 +02:00
|
|
|
return InterlockedDecrement(&(This->ref));
|
2003-04-30 00:43:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI DICF_CreateInstance(
|
|
|
|
LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj
|
|
|
|
) {
|
2010-12-05 15:15:18 +01:00
|
|
|
IClassFactoryImpl *This = impl_from_IClassFactory(iface);
|
2003-04-30 00:43:48 +02:00
|
|
|
|
|
|
|
TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj);
|
2008-09-02 23:17:17 +02:00
|
|
|
if ( IsEqualGUID( &IID_IUnknown, riid ) ||
|
|
|
|
IsEqualGUID( &IID_IDirectInputA, riid ) ||
|
2003-06-16 22:22:13 +02:00
|
|
|
IsEqualGUID( &IID_IDirectInputW, riid ) ||
|
2003-04-30 00:43:48 +02:00
|
|
|
IsEqualGUID( &IID_IDirectInput2A, riid ) ||
|
2003-06-16 22:22:13 +02:00
|
|
|
IsEqualGUID( &IID_IDirectInput2W, riid ) ||
|
2003-04-30 00:43:48 +02:00
|
|
|
IsEqualGUID( &IID_IDirectInput7A, riid ) ||
|
2011-07-05 14:19:26 +02:00
|
|
|
IsEqualGUID( &IID_IDirectInput7W, riid ) ) {
|
2011-07-05 14:19:17 +02:00
|
|
|
return create_directinput_instance(riid, ppobj, NULL);
|
2003-04-30 00:43:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
FIXME("(%p,%p,%s,%p) Interface not found!\n",This,pOuter,debugstr_guid(riid),ppobj);
|
|
|
|
return E_NOINTERFACE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static HRESULT WINAPI DICF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
|
2010-12-05 15:15:18 +01:00
|
|
|
IClassFactoryImpl *This = impl_from_IClassFactory(iface);
|
2003-04-30 00:43:48 +02:00
|
|
|
FIXME("(%p)->(%d),stub!\n",This,dolock);
|
|
|
|
return S_OK;
|
|
|
|
}
|
|
|
|
|
2005-05-30 12:01:08 +02:00
|
|
|
static const IClassFactoryVtbl DICF_Vtbl = {
|
2003-04-30 00:43:48 +02:00
|
|
|
DICF_QueryInterface,
|
|
|
|
DICF_AddRef,
|
|
|
|
DICF_Release,
|
|
|
|
DICF_CreateInstance,
|
|
|
|
DICF_LockServer
|
|
|
|
};
|
2010-12-05 15:15:18 +01:00
|
|
|
static IClassFactoryImpl DINPUT_CF = {{&DICF_Vtbl}, 1 };
|
2003-04-30 00:43:48 +02:00
|
|
|
|
2000-04-24 20:03:54 +02:00
|
|
|
/***********************************************************************
|
|
|
|
* DllCanUnloadNow (DINPUT.@)
|
|
|
|
*/
|
2005-08-08 19:35:28 +02:00
|
|
|
HRESULT WINAPI DllCanUnloadNow(void)
|
2000-04-24 20:03:54 +02:00
|
|
|
{
|
|
|
|
return S_FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* DllGetClassObject (DINPUT.@)
|
|
|
|
*/
|
2005-08-08 19:35:28 +02:00
|
|
|
HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
|
2000-04-24 20:03:54 +02:00
|
|
|
{
|
2004-12-07 15:19:29 +01:00
|
|
|
TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
|
2003-04-30 00:43:48 +02:00
|
|
|
if ( IsEqualCLSID( &IID_IClassFactory, riid ) ) {
|
2009-01-28 10:24:42 +01:00
|
|
|
*ppv = &DINPUT_CF;
|
2003-04-30 00:43:48 +02:00
|
|
|
IClassFactory_AddRef((IClassFactory*)*ppv);
|
|
|
|
return S_OK;
|
|
|
|
}
|
2000-04-24 20:03:54 +02:00
|
|
|
|
2004-12-07 15:19:29 +01:00
|
|
|
FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
|
2000-04-24 20:03:54 +02:00
|
|
|
return CLASS_E_CLASSNOTAVAILABLE;
|
|
|
|
}
|
2006-09-11 00:47:39 +02:00
|
|
|
|
2010-12-07 12:48:24 +01:00
|
|
|
/***********************************************************************
|
|
|
|
* DllRegisterServer (DINPUT.@)
|
|
|
|
*/
|
|
|
|
HRESULT WINAPI DllRegisterServer(void)
|
|
|
|
{
|
2011-08-02 15:51:55 +02:00
|
|
|
return __wine_register_resources( DINPUT_instance );
|
2010-12-07 12:48:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* DllUnregisterServer (DINPUT.@)
|
|
|
|
*/
|
|
|
|
HRESULT WINAPI DllUnregisterServer(void)
|
|
|
|
{
|
2011-08-02 15:51:55 +02:00
|
|
|
return __wine_unregister_resources( DINPUT_instance );
|
2010-12-07 12:48:24 +01:00
|
|
|
}
|
|
|
|
|
2006-09-11 00:47:39 +02:00
|
|
|
/******************************************************************************
|
|
|
|
* DInput hook thread
|
|
|
|
*/
|
|
|
|
|
2007-07-07 07:36:30 +02:00
|
|
|
static LRESULT CALLBACK LL_hook_proc( int code, WPARAM wparam, LPARAM lparam )
|
|
|
|
{
|
|
|
|
IDirectInputImpl *dinput;
|
2009-02-01 21:11:46 +01:00
|
|
|
int skip = 0;
|
2007-07-07 07:36:30 +02:00
|
|
|
|
|
|
|
if (code != HC_ACTION) return CallNextHookEx( 0, code, wparam, lparam );
|
|
|
|
|
|
|
|
EnterCriticalSection( &dinput_hook_crit );
|
|
|
|
LIST_FOR_EACH_ENTRY( dinput, &direct_input_list, IDirectInputImpl, entry )
|
|
|
|
{
|
2011-01-03 15:25:07 +01:00
|
|
|
IDirectInputDeviceImpl *dev;
|
2007-07-07 07:36:30 +02:00
|
|
|
|
|
|
|
EnterCriticalSection( &dinput->crit );
|
2011-01-03 15:25:07 +01:00
|
|
|
LIST_FOR_EACH_ENTRY( dev, &dinput->devices_list, IDirectInputDeviceImpl, entry )
|
2007-07-07 07:36:30 +02:00
|
|
|
if (dev->acquired && dev->event_proc)
|
|
|
|
{
|
|
|
|
TRACE("calling %p->%p (%lx %lx)\n", dev, dev->event_proc, wparam, lparam);
|
2011-01-09 23:44:19 +01:00
|
|
|
skip |= dev->event_proc( &dev->IDirectInputDevice8A_iface, wparam, lparam );
|
2007-07-07 07:36:30 +02:00
|
|
|
}
|
|
|
|
LeaveCriticalSection( &dinput->crit );
|
|
|
|
}
|
|
|
|
LeaveCriticalSection( &dinput_hook_crit );
|
|
|
|
|
2009-02-01 21:11:46 +01:00
|
|
|
return skip ? 1 : CallNextHookEx( 0, code, wparam, lparam );
|
2007-07-07 07:36:30 +02:00
|
|
|
}
|
|
|
|
|
2007-07-15 18:40:00 +02:00
|
|
|
static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam )
|
|
|
|
{
|
|
|
|
CWPSTRUCT *msg = (CWPSTRUCT *)lparam;
|
|
|
|
IDirectInputImpl *dinput;
|
|
|
|
HWND foreground;
|
|
|
|
|
2007-07-23 06:17:09 +02:00
|
|
|
if (code != HC_ACTION || (msg->message != WM_KILLFOCUS &&
|
|
|
|
msg->message != WM_ACTIVATEAPP && msg->message != WM_ACTIVATE))
|
2007-07-15 18:40:00 +02:00
|
|
|
return CallNextHookEx( 0, code, wparam, lparam );
|
|
|
|
|
|
|
|
foreground = GetForegroundWindow();
|
|
|
|
|
|
|
|
EnterCriticalSection( &dinput_hook_crit );
|
|
|
|
|
|
|
|
LIST_FOR_EACH_ENTRY( dinput, &direct_input_list, IDirectInputImpl, entry )
|
|
|
|
{
|
2011-01-03 15:25:07 +01:00
|
|
|
IDirectInputDeviceImpl *dev;
|
2007-07-15 18:40:00 +02:00
|
|
|
|
|
|
|
EnterCriticalSection( &dinput->crit );
|
2011-01-03 15:25:07 +01:00
|
|
|
LIST_FOR_EACH_ENTRY( dev, &dinput->devices_list, IDirectInputDeviceImpl, entry )
|
2007-07-15 18:40:00 +02:00
|
|
|
{
|
|
|
|
if (!dev->acquired) continue;
|
|
|
|
|
|
|
|
if (msg->hwnd == dev->win && msg->hwnd != foreground)
|
|
|
|
{
|
|
|
|
TRACE( "%p window is not foreground - unacquiring %p\n", dev->win, dev );
|
2011-01-09 23:44:19 +01:00
|
|
|
IDirectInputDevice_Unacquire( &dev->IDirectInputDevice8A_iface );
|
2007-07-15 18:40:00 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
LeaveCriticalSection( &dinput->crit );
|
|
|
|
}
|
|
|
|
LeaveCriticalSection( &dinput_hook_crit );
|
|
|
|
|
|
|
|
return CallNextHookEx( 0, code, wparam, lparam );
|
|
|
|
}
|
|
|
|
|
2007-07-15 18:38:05 +02:00
|
|
|
static DWORD WINAPI hook_thread_proc(void *param)
|
2006-09-11 00:47:39 +02:00
|
|
|
{
|
|
|
|
static HHOOK kbd_hook, mouse_hook;
|
2007-07-15 18:38:05 +02:00
|
|
|
MSG msg;
|
|
|
|
|
|
|
|
/* Force creation of the message queue */
|
|
|
|
PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE );
|
|
|
|
SetEvent(*(LPHANDLE)param);
|
2006-09-11 00:47:39 +02:00
|
|
|
|
2007-07-15 18:38:05 +02:00
|
|
|
while (GetMessageW( &msg, 0, 0, 0 ))
|
2006-09-11 00:47:39 +02:00
|
|
|
{
|
2007-07-15 18:38:05 +02:00
|
|
|
UINT kbd_cnt = 0, mice_cnt = 0;
|
|
|
|
|
|
|
|
if (msg.message == WM_USER+0x10)
|
2006-09-11 00:47:39 +02:00
|
|
|
{
|
2007-07-07 07:36:30 +02:00
|
|
|
IDirectInputImpl *dinput;
|
|
|
|
|
2007-07-15 18:38:05 +02:00
|
|
|
TRACE( "Processing hook change notification lp:%ld\n", msg.lParam );
|
|
|
|
|
|
|
|
if (!msg.wParam && !msg.lParam)
|
2006-09-11 00:47:39 +02:00
|
|
|
{
|
2007-07-15 18:38:05 +02:00
|
|
|
if (kbd_hook) UnhookWindowsHookEx( kbd_hook );
|
|
|
|
if (mouse_hook) UnhookWindowsHookEx( mouse_hook );
|
|
|
|
kbd_hook = mouse_hook = NULL;
|
|
|
|
break;
|
2006-09-11 00:47:39 +02:00
|
|
|
}
|
2007-07-07 07:36:30 +02:00
|
|
|
|
|
|
|
EnterCriticalSection( &dinput_hook_crit );
|
|
|
|
|
|
|
|
/* Count acquired keyboards and mice*/
|
|
|
|
LIST_FOR_EACH_ENTRY( dinput, &direct_input_list, IDirectInputImpl, entry )
|
2006-09-11 00:47:39 +02:00
|
|
|
{
|
2011-01-03 15:25:07 +01:00
|
|
|
IDirectInputDeviceImpl *dev;
|
2007-07-07 07:36:30 +02:00
|
|
|
|
|
|
|
EnterCriticalSection( &dinput->crit );
|
2011-01-03 15:25:07 +01:00
|
|
|
LIST_FOR_EACH_ENTRY( dev, &dinput->devices_list, IDirectInputDeviceImpl, entry )
|
2007-07-07 07:36:30 +02:00
|
|
|
{
|
2007-09-10 07:14:27 +02:00
|
|
|
if (!dev->acquired || !dev->event_proc) continue;
|
2007-07-07 07:36:30 +02:00
|
|
|
|
|
|
|
if (IsEqualGUID( &dev->guid, &GUID_SysKeyboard ) ||
|
|
|
|
IsEqualGUID( &dev->guid, &DInput_Wine_Keyboard_GUID ))
|
|
|
|
kbd_cnt++;
|
|
|
|
else
|
|
|
|
if (IsEqualGUID( &dev->guid, &GUID_SysMouse ) ||
|
|
|
|
IsEqualGUID( &dev->guid, &DInput_Wine_Mouse_GUID ))
|
|
|
|
mice_cnt++;
|
|
|
|
}
|
|
|
|
LeaveCriticalSection( &dinput->crit );
|
2006-09-11 00:47:39 +02:00
|
|
|
}
|
2007-07-07 07:36:30 +02:00
|
|
|
LeaveCriticalSection( &dinput_hook_crit );
|
|
|
|
|
|
|
|
if (kbd_cnt && !kbd_hook)
|
|
|
|
kbd_hook = SetWindowsHookExW( WH_KEYBOARD_LL, LL_hook_proc, DINPUT_instance, 0 );
|
|
|
|
else if (!kbd_cnt && kbd_hook)
|
2006-09-11 00:47:39 +02:00
|
|
|
{
|
2007-07-07 07:36:30 +02:00
|
|
|
UnhookWindowsHookEx( kbd_hook );
|
|
|
|
kbd_hook = NULL;
|
2006-09-11 00:47:39 +02:00
|
|
|
}
|
2007-07-07 07:36:30 +02:00
|
|
|
|
|
|
|
if (mice_cnt && !mouse_hook)
|
|
|
|
mouse_hook = SetWindowsHookExW( WH_MOUSE_LL, LL_hook_proc, DINPUT_instance, 0 );
|
|
|
|
else if (!mice_cnt && mouse_hook)
|
2006-09-11 00:47:39 +02:00
|
|
|
{
|
2007-07-07 07:36:30 +02:00
|
|
|
UnhookWindowsHookEx( mouse_hook );
|
2006-09-11 00:47:39 +02:00
|
|
|
mouse_hook = NULL;
|
|
|
|
}
|
|
|
|
}
|
2007-07-15 18:38:05 +02:00
|
|
|
TranslateMessage(&msg);
|
|
|
|
DispatchMessageW(&msg);
|
2006-09-11 00:47:39 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-07-15 18:38:05 +02:00
|
|
|
static DWORD hook_thread_id;
|
|
|
|
|
2006-09-11 00:47:39 +02:00
|
|
|
static CRITICAL_SECTION_DEBUG dinput_critsect_debug =
|
|
|
|
{
|
|
|
|
0, 0, &dinput_hook_crit,
|
|
|
|
{ &dinput_critsect_debug.ProcessLocksList, &dinput_critsect_debug.ProcessLocksList },
|
|
|
|
0, 0, { (DWORD_PTR)(__FILE__ ": dinput_hook_crit") }
|
|
|
|
};
|
|
|
|
static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0, 0 };
|
|
|
|
|
2007-07-07 07:36:18 +02:00
|
|
|
static BOOL check_hook_thread(void)
|
2006-09-11 00:47:39 +02:00
|
|
|
{
|
2007-07-15 18:38:05 +02:00
|
|
|
static HANDLE hook_thread;
|
|
|
|
|
2006-09-11 00:47:39 +02:00
|
|
|
EnterCriticalSection(&dinput_hook_crit);
|
2006-10-05 17:45:45 +02:00
|
|
|
|
2007-07-07 07:36:18 +02:00
|
|
|
TRACE("IDirectInputs left: %d\n", list_count(&direct_input_list));
|
|
|
|
if (!list_empty(&direct_input_list) && !hook_thread)
|
2006-10-05 17:45:45 +02:00
|
|
|
{
|
2007-05-15 03:56:48 +02:00
|
|
|
HANDLE event;
|
|
|
|
|
2006-09-13 08:06:15 +02:00
|
|
|
event = CreateEventW(NULL, FALSE, FALSE, NULL);
|
2007-07-15 18:38:05 +02:00
|
|
|
hook_thread = CreateThread(NULL, 0, hook_thread_proc, &event, 0, &hook_thread_id);
|
2007-05-15 03:56:48 +02:00
|
|
|
if (event && hook_thread)
|
2006-09-11 00:47:39 +02:00
|
|
|
{
|
|
|
|
HANDLE handles[2];
|
2006-09-13 08:06:15 +02:00
|
|
|
handles[0] = event;
|
2007-05-15 03:56:48 +02:00
|
|
|
handles[1] = hook_thread;
|
2006-09-11 00:47:39 +02:00
|
|
|
WaitForMultipleObjects(2, handles, FALSE, INFINITE);
|
|
|
|
}
|
2007-07-15 18:38:05 +02:00
|
|
|
LeaveCriticalSection(&dinput_hook_crit);
|
2006-09-13 08:06:15 +02:00
|
|
|
CloseHandle(event);
|
2006-09-11 00:47:39 +02:00
|
|
|
}
|
2007-07-07 07:36:18 +02:00
|
|
|
else if (list_empty(&direct_input_list) && hook_thread)
|
2006-09-13 08:06:15 +02:00
|
|
|
{
|
2007-07-15 18:38:05 +02:00
|
|
|
DWORD tid = hook_thread_id;
|
|
|
|
|
|
|
|
hook_thread_id = 0;
|
|
|
|
PostThreadMessageW(tid, WM_USER+0x10, 0, 0);
|
|
|
|
LeaveCriticalSection(&dinput_hook_crit);
|
|
|
|
|
2007-05-15 03:56:48 +02:00
|
|
|
/* wait for hook thread to exit */
|
|
|
|
WaitForSingleObject(hook_thread, INFINITE);
|
|
|
|
CloseHandle(hook_thread);
|
2007-07-07 07:36:18 +02:00
|
|
|
hook_thread = NULL;
|
2006-09-13 08:06:15 +02:00
|
|
|
}
|
2007-07-15 18:38:05 +02:00
|
|
|
else
|
|
|
|
LeaveCriticalSection(&dinput_hook_crit);
|
2007-07-07 07:36:18 +02:00
|
|
|
|
2007-07-15 18:38:05 +02:00
|
|
|
return hook_thread_id != 0;
|
2006-09-11 00:47:39 +02:00
|
|
|
}
|
|
|
|
|
2011-01-09 23:43:52 +01:00
|
|
|
void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface)
|
2006-09-11 00:47:39 +02:00
|
|
|
{
|
2007-07-15 18:40:00 +02:00
|
|
|
static HHOOK callwndproc_hook;
|
|
|
|
static ULONG foreground_cnt;
|
2011-01-09 23:44:19 +01:00
|
|
|
IDirectInputDeviceImpl *dev = impl_from_IDirectInputDevice8W(iface);
|
2007-07-15 18:40:00 +02:00
|
|
|
|
2006-09-13 08:06:15 +02:00
|
|
|
EnterCriticalSection(&dinput_hook_crit);
|
2007-07-15 18:40:00 +02:00
|
|
|
|
|
|
|
if (dev->dwCoopLevel & DISCL_FOREGROUND)
|
|
|
|
{
|
|
|
|
if (dev->acquired)
|
|
|
|
foreground_cnt++;
|
|
|
|
else
|
|
|
|
foreground_cnt--;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (foreground_cnt && !callwndproc_hook)
|
|
|
|
callwndproc_hook = SetWindowsHookExW( WH_CALLWNDPROC, callwndproc_proc,
|
|
|
|
DINPUT_instance, GetCurrentThreadId() );
|
|
|
|
else if (!foreground_cnt && callwndproc_hook)
|
|
|
|
{
|
|
|
|
UnhookWindowsHookEx( callwndproc_hook );
|
|
|
|
callwndproc_hook = NULL;
|
|
|
|
}
|
|
|
|
|
2007-07-15 18:38:05 +02:00
|
|
|
PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, 0 );
|
2007-07-15 18:40:00 +02:00
|
|
|
|
2006-09-13 08:06:15 +02:00
|
|
|
LeaveCriticalSection(&dinput_hook_crit);
|
2006-09-11 00:47:39 +02:00
|
|
|
}
|
2011-11-16 16:31:26 +01:00
|
|
|
|
2015-11-05 15:57:29 +01:00
|
|
|
void check_dinput_events(void)
|
|
|
|
{
|
|
|
|
/* Windows does not do that, but our current implementation of winex11
|
|
|
|
* requires periodic event polling to forward events to the wineserver.
|
|
|
|
*
|
|
|
|
* We have to call this function from multiple places, because:
|
|
|
|
* - some games do not explicitly poll for mouse events
|
|
|
|
* (for example Culpa Innata)
|
|
|
|
* - some games only poll the device, and neither keyboard nor mouse
|
|
|
|
* (for example Civilization: Call to Power 2)
|
|
|
|
*/
|
|
|
|
MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_ALLINPUT, 0);
|
|
|
|
}
|
|
|
|
|
2013-05-16 12:53:07 +02:00
|
|
|
BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved)
|
2011-11-16 16:31:26 +01:00
|
|
|
{
|
|
|
|
switch(reason)
|
|
|
|
{
|
|
|
|
case DLL_PROCESS_ATTACH:
|
|
|
|
DisableThreadLibraryCalls(inst);
|
|
|
|
DINPUT_instance = inst;
|
|
|
|
break;
|
|
|
|
case DLL_PROCESS_DETACH:
|
2013-05-16 12:53:07 +02:00
|
|
|
if (reserved) break;
|
2011-11-16 16:31:26 +01:00
|
|
|
DeleteCriticalSection(&dinput_hook_crit);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|