Vitaliy Margolen : dinput: Remove DIEnumDevicesCallbackAtoW.
Alexandre Julliard
julliard at winehq.org
Sat Dec 20 06:35:08 CST 2008
Module: wine
Branch: master
Commit: 6e07c7bc14b7e4d3864bfb4a1fdf5568c60f5d0e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e07c7bc14b7e4d3864bfb4a1fdf5568c60f5d0e
Author: Vitaliy Margolen <wine-patches at kievinfo.com>
Date: Fri Dec 19 11:06:49 2008 -0700
dinput: Remove DIEnumDevicesCallbackAtoW.
It's no longer used.
---
dlls/dinput/device.c | 34 ----------------------------------
dlls/dinput/device_private.h | 11 -----------
2 files changed, 0 insertions(+), 45 deletions(-)
diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index aaf5577..ebc87eb 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -532,40 +532,6 @@ int find_property(const DataFormat *df, LPCDIPROPHEADER ph)
return -1;
}
-
-BOOL DIEnumDevicesCallbackAtoW(LPCDIDEVICEOBJECTINSTANCEA lpddi, LPVOID lpvRef) {
- DIDEVICEOBJECTINSTANCEW ddtmp;
- device_enumobjects_AtoWcb_data* data;
-
- data = (device_enumobjects_AtoWcb_data*) lpvRef;
-
- memset(&ddtmp, 0, sizeof(ddtmp));
-
- ddtmp.dwSize = sizeof(DIDEVICEINSTANCEW);
- ddtmp.guidType = lpddi->guidType;
- ddtmp.dwOfs = lpddi->dwOfs;
- ddtmp.dwType = lpddi->dwType;
- ddtmp.dwFlags = lpddi->dwFlags;
- MultiByteToWideChar(CP_ACP, 0, lpddi->tszName, -1, ddtmp.tszName, MAX_PATH);
-
- if (lpddi->dwSize == sizeof(DIDEVICEINSTANCEA)) {
- /**
- * if dwSize < sizeof(DIDEVICEINSTANCEA of DInput version >= 5)
- * force feedback and other newer data aren't available
- */
- ddtmp.dwFFMaxForce = lpddi->dwFFMaxForce;
- ddtmp.dwFFForceResolution = lpddi->dwFFForceResolution;
- ddtmp.wCollectionNumber = lpddi->wCollectionNumber;
- ddtmp.wDesignatorIndex = lpddi->wDesignatorIndex;
- ddtmp.wUsagePage = lpddi->wUsagePage;
- ddtmp.wUsage = lpddi->wUsage;
- ddtmp.dwDimension = lpddi->dwDimension;
- ddtmp.wExponent = lpddi->wExponent;
- ddtmp.wReserved = lpddi->wReserved;
- }
- return data->lpCallBack(&ddtmp, data->lpvRef);
-}
-
/******************************************************************************
* queue_event - add new event to the ring queue
*/
diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h
index dd06a4b..3463382 100644
--- a/dlls/dinput/device_private.h
+++ b/dlls/dinput/device_private.h
@@ -104,17 +104,6 @@ typedef struct
LPDIRECTINPUTEFFECT ref;
} effect_list_item;
-/**
- * Callback Data used by specific callback
- * for EnumObject on 'W' interfaces
- */
-typedef struct {
- LPDIENUMDEVICEOBJECTSCALLBACKW lpCallBack;
- LPVOID lpvRef;
-} device_enumobjects_AtoWcb_data;
-
-extern BOOL DIEnumDevicesCallbackAtoW(LPCDIDEVICEOBJECTINSTANCEA, LPVOID);
-
extern const GUID DInput_Wine_Keyboard_GUID;
extern const GUID DInput_Wine_Mouse_GUID;
More information about the wine-cvs
mailing list