system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-22 19:44:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

user32: Merge rawinput.c into input.c.

Browse source
This commit is contained in:
Zebediah Figura 2022-05-15 18:30:25 -05:00 committed by Alexandre Julliard
parent 0a93089019
commit ff166bac15
3 changed files with 49 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/user32/Makefile.in
View file

@ -34,7 +34,6 @@ C_SRCS = \
nonclient.c \
painting.c \
property.c \
rawinput.c \
resource.c \
scroll.c \
static.c \

49
dlls/user32/input.c
View file

@ -6,6 +6,8 @@
* Copyright 1997 David Faure
* Copyright 1998 Morten Welinder
* Copyright 1998 Ulrich Weigand
* Copyright 2012 Henri Verbeet
* Copyright 2018 Zebediah Figura for CodeWeavers
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -623,3 +625,50 @@ BOOL WINAPI UnregisterDeviceNotification( HDEVNOTIFY handle )
return I_ScUnregisterDeviceNotification( handle );
}
/***********************************************************************
* GetRawInputDeviceInfoA (USER32.@)
*/
UINT WINAPI GetRawInputDeviceInfoA( HANDLE device, UINT command, void *data, UINT *size )
{
TRACE( "device %p, command %#x, data %p, size %p.\n", device, command, data, size );
/* RIDI_DEVICENAME size is in chars, not bytes */
if (command == RIDI_DEVICENAME)
{
WCHAR *nameW;
UINT ret, sizeW;
if (!size) return ~0U;
sizeW = *size;
if (data && sizeW > 0)
nameW = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR) * sizeW );
else
nameW = NULL;
ret = NtUserGetRawInputDeviceInfo( device, command, nameW, &sizeW );
if (ret && ret != ~0U)
WideCharToMultiByte( CP_ACP, 0, nameW, -1, data, *size, NULL, NULL );
*size = sizeW;
HeapFree( GetProcessHeap(), 0, nameW );
return ret;
}
return NtUserGetRawInputDeviceInfo( device, command, data, size );
}
/***********************************************************************
* DefRawInputProc (USER32.@)
*/
LRESULT WINAPI DefRawInputProc( RAWINPUT **data, INT data_count, UINT header_size )
{
FIXME( "data %p, data_count %d, header_size %u stub!\n", data, data_count, header_size );
return 0;
}

88
dlls/user32/rawinput.c
View file

@ -1,88 +0,0 @@
/*
* Raw Input
*
* Copyright 2012 Henri Verbeet
* Copyright 2018 Zebediah Figura for CodeWeavers
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
#include "ntstatus.h"
#define WIN32_NO_STATUS
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winioctl.h"
#include "winnls.h"
#include "winreg.h"
#include "winuser.h"
#include "ddk/hidclass.h"
#include "wine/debug.h"
#include "wine/server.h"
#include "wine/hid.h"
#include "user_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(rawinput);
/***********************************************************************
* GetRawInputDeviceInfoA (USER32.@)
*/
UINT WINAPI GetRawInputDeviceInfoA(HANDLE device, UINT command, void *data, UINT *data_size)
{
TRACE("device %p, command %#x, data %p, data_size %p.\n",
device, command, data, data_size);
/* RIDI_DEVICENAME data_size is in chars, not bytes */
if (command == RIDI_DEVICENAME)
{
WCHAR *nameW;
UINT ret, nameW_sz;
if (!data_size) return ~0U;
nameW_sz = *data_size;
if (data && nameW_sz > 0)
nameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * nameW_sz);
else
nameW = NULL;
ret = NtUserGetRawInputDeviceInfo( device, command, nameW, &nameW_sz );
if (ret && ret != ~0U)
WideCharToMultiByte(CP_ACP, 0, nameW, -1, data, *data_size, NULL, NULL);
*data_size = nameW_sz;
HeapFree(GetProcessHeap(), 0, nameW);
return ret;
}
return NtUserGetRawInputDeviceInfo( device, command, data, data_size );
}
/***********************************************************************
* DefRawInputProc (USER32.@)
*/
LRESULT WINAPI DefRawInputProc(RAWINPUT **data, INT data_count, UINT header_size)
{
FIXME("data %p, data_count %d, header_size %u stub!\n", data, data_count, header_size);
return 0;
}