ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dinput: Rename IDirectInputDevice2AImpl into IDirectInputDeviceImpl.

This commit is contained in:
Vitaliy Margolen 2011-01-03 07:25:07 -07:00 committed by Alexandre Julliard
parent 0adc470854
commit 179b862738
6 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dlls/dinput/device.c
View File

@ -535,7 +535,7 @@ int find_property(const DataFormat *df, LPCDIPROPHEADER ph)
void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD time, DWORD seq)
{
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface;
int next_pos, ofs = id_to_offset(&This->data_format, inst_id);
/* Event is being set regardless of the queue state */
@ -568,7 +568,7 @@ void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD tim
HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
{
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface;
HRESULT res;
if (!This->data_format.user_df) return DIERR_INVALIDPARAM;
@ -594,7 +594,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
HRESULT WINAPI IDirectInputDevice2AImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
{
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface;
HRESULT res;
EnterCriticalSection(&This->crit);
@ -614,7 +614,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
HRESULT WINAPI IDirectInputDevice2AImpl_SetDataFormat(
LPDIRECTINPUTDEVICE8A iface, LPCDIDATAFORMAT df)
{
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface;
HRESULT res = DI_OK;
if (!df) return E_POINTER;
@ -641,7 +641,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetDataFormat(
HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel(
LPDIRECTINPUTDEVICE8A iface, HWND hwnd, DWORD dwflags)
{
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface;
TRACE("(%p) %p,0x%08x\n", This, hwnd, dwflags);
_dump_cooperativelevel_DI(dwflags);
@ -679,7 +679,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel(
HRESULT WINAPI IDirectInputDevice2AImpl_SetEventNotification(
LPDIRECTINPUTDEVICE8A iface, HANDLE event)
{
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface;
TRACE("(%p) %p\n", This, event);
@ -691,7 +691,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetEventNotification(
ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE8A iface)
{
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface;
ULONG ref;
ref = InterlockedDecrement(&(This->ref));
@ -725,7 +725,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface(
LPDIRECTINPUTDEVICE8A iface,REFIID riid,LPVOID *ppobj
)
{
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface;
TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
if (IsEqualGUID(&IID_IUnknown,riid)) {
@ -761,7 +761,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(
LPDIRECTINPUTDEVICE8W iface,REFIID riid,LPVOID *ppobj
)
{
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface;
TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
if (IsEqualGUID(&IID_IUnknown,riid)) {
@ -796,14 +796,14 @@ HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(
ULONG WINAPI IDirectInputDevice2AImpl_AddRef(
LPDIRECTINPUTDEVICE8A iface)
{
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface;
return InterlockedIncrement(&(This->ref));
}
HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects(LPDIRECTINPUTDEVICE8A iface,
LPDIENUMDEVICEOBJECTSCALLBACKA lpCallback, LPVOID lpvRef, DWORD dwFlags)
{
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface;
DIDEVICEOBJECTINSTANCEA ddoi;
int i;
@ -833,7 +833,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects(LPDIRECTINPUTDEVICE8A iface,
HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface,
LPDIENUMDEVICEOBJECTSCALLBACKW lpCallback, LPVOID lpvRef, DWORD dwFlags)
{
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface;
DIDEVICEOBJECTINSTANCEW ddoi;
int i;
@ -867,7 +867,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface,
HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty(
LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph)
{
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface;
TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph);
_dump_DIPROPHEADER(pdiph);
@ -901,7 +901,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty(
HRESULT WINAPI IDirectInputDevice2AImpl_SetProperty(
LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPCDIPROPHEADER pdiph)
{
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface;
TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph);
_dump_DIPROPHEADER(pdiph);
@ -995,7 +995,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo(
DWORD dwObj,
DWORD dwHow)
{
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface;
DWORD dwSize;
LPDIOBJECTDATAFORMAT odf;
int idx = -1;
@ -1046,7 +1046,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData(
LPDIRECTINPUTDEVICE8A iface, DWORD dodsize, LPDIDEVICEOBJECTDATA dod,
LPDWORD entries, DWORD flags)
{
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface;
HRESULT ret = DI_OK;
int len;
@ -1217,7 +1217,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Escape(
HRESULT WINAPI IDirectInputDevice2AImpl_Poll(
LPDIRECTINPUTDEVICE8A iface)
{
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface;
if (!This->acquired) return DIERR_NOTACQUIRED;
/* Because wine devices do not need to be polled, just return DI_NOEFFECT */

4
dlls/dinput/device_private.h
View File

@ -48,8 +48,8 @@ typedef struct
} DataFormat;
/* Device implementation */
typedef struct IDirectInputDevice2AImpl IDirectInputDevice2AImpl;
struct IDirectInputDevice2AImpl
typedef struct IDirectInputDeviceImpl IDirectInputDeviceImpl;
struct IDirectInputDeviceImpl
{
const void *lpVtbl;
LONG ref;

18
dlls/dinput/dinput_main.c
View File

@ -504,7 +504,7 @@ static HRESULT WINAPI IDirectInput7AImpl_CreateDeviceEx(LPDIRECTINPUT7A iface, R
if ((ret = dinput_devices[i]->create_deviceA(This, rguid, riid, (LPDIRECTINPUTDEVICEA*) pvOut)) == DI_OK)
{
EnterCriticalSection( &This->crit );
list_add_tail( &This->devices_list, &(*(IDirectInputDevice2AImpl**)pvOut)->entry );
list_add_tail( &This->devices_list, &(*(IDirectInputDeviceImpl**)pvOut)->entry );
LeaveCriticalSection( &This->crit );
return DI_OK;
}
@ -540,7 +540,7 @@ static HRESULT WINAPI IDirectInput7WImpl_CreateDeviceEx(LPDIRECTINPUT7W iface, R
if ((ret = dinput_devices[i]->create_deviceW(This, rguid, riid, (LPDIRECTINPUTDEVICEW*) pvOut)) == DI_OK)
{
EnterCriticalSection( &This->crit );
list_add_tail( &This->devices_list, &(*(IDirectInputDevice2AImpl**)pvOut)->entry );
list_add_tail( &This->devices_list, &(*(IDirectInputDeviceImpl**)pvOut)->entry );
LeaveCriticalSection( &This->crit );
return DI_OK;
}
@ -920,10 +920,10 @@ static LRESULT CALLBACK LL_hook_proc( int code, WPARAM wparam, LPARAM lparam )
EnterCriticalSection( &dinput_hook_crit );
LIST_FOR_EACH_ENTRY( dinput, &direct_input_list, IDirectInputImpl, entry )
{
IDirectInputDevice2AImpl *dev;
IDirectInputDeviceImpl *dev;
EnterCriticalSection( &dinput->crit );
LIST_FOR_EACH_ENTRY( dev, &dinput->devices_list, IDirectInputDevice2AImpl, entry )
LIST_FOR_EACH_ENTRY( dev, &dinput->devices_list, IDirectInputDeviceImpl, entry )
if (dev->acquired && dev->event_proc)
{
TRACE("calling %p->%p (%lx %lx)\n", dev, dev->event_proc, wparam, lparam);
@ -952,10 +952,10 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam
LIST_FOR_EACH_ENTRY( dinput, &direct_input_list, IDirectInputImpl, entry )
{
IDirectInputDevice2AImpl *dev;
IDirectInputDeviceImpl *dev;
EnterCriticalSection( &dinput->crit );
LIST_FOR_EACH_ENTRY( dev, &dinput->devices_list, IDirectInputDevice2AImpl, entry )
LIST_FOR_EACH_ENTRY( dev, &dinput->devices_list, IDirectInputDeviceImpl, entry )
{
if (!dev->acquired) continue;
@ -1004,10 +1004,10 @@ static DWORD WINAPI hook_thread_proc(void *param)
/* Count acquired keyboards and mice*/
LIST_FOR_EACH_ENTRY( dinput, &direct_input_list, IDirectInputImpl, entry )
{
IDirectInputDevice2AImpl *dev;
IDirectInputDeviceImpl *dev;
EnterCriticalSection( &dinput->crit );
LIST_FOR_EACH_ENTRY( dev, &dinput->devices_list, IDirectInputDevice2AImpl, entry )
LIST_FOR_EACH_ENTRY( dev, &dinput->devices_list, IDirectInputDeviceImpl, entry )
{
if (!dev->acquired || !dev->event_proc) continue;
@ -1102,7 +1102,7 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8A iface)
{
static HHOOK callwndproc_hook;
static ULONG foreground_cnt;
IDirectInputDevice2AImpl *dev = (IDirectInputDevice2AImpl *)iface;
IDirectInputDeviceImpl *dev = (IDirectInputDeviceImpl *)iface;
EnterCriticalSection(&dinput_hook_crit);

2
dlls/dinput/joystick_private.h
View File

@ -37,7 +37,7 @@ typedef void joy_polldev_handler(struct JoystickGenericImpl *This);
typedef struct JoystickGenericImpl
{
struct IDirectInputDevice2AImpl base;
struct IDirectInputDeviceImpl base;
ObjProps props[MAX_PROPS];
DIDEVCAPS devcaps;

2
dlls/dinput/keyboard.c
View File

@ -46,7 +46,7 @@ static const IDirectInputDevice8WVtbl SysKeyboardWvt;
typedef struct SysKeyboardImpl SysKeyboardImpl;
struct SysKeyboardImpl
{
struct IDirectInputDevice2AImpl base;
struct IDirectInputDeviceImpl base;
BYTE DInputKeyState[WINE_DINPUT_KEYBOARD_MAX_KEYS];
};

2
dlls/dinput/mouse.c
View File

@ -60,7 +60,7 @@ typedef enum
struct SysMouseImpl
{
struct IDirectInputDevice2AImpl base;
struct IDirectInputDeviceImpl base;
/* SysMouseAImpl */
/* These are used in case of relative -> absolute transitions */