[DINPUT_WINETEST]

[reactos.git] / rostests / winetests / dinput / device.c

diff --git a/rostests/winetests/dinput/device.c b/rostests/winetests/dinput/device.c
index 7696008..20d211d 100644 (file)
--- a/rostests/winetests/dinput/device.c
+++ b/rostests/winetests/dinput/device.c
@@ -59,7 +59,7 @@ static const DIDATAFORMAT data_format = {
     (LPDIOBJECTDATAFORMAT)obj_data_format
 };
 
-static BOOL CALLBACK enum_callback(LPCDIDEVICEOBJECTINSTANCE oi, LPVOID info)
+static BOOL CALLBACK enum_callback(const DIDEVICEOBJECTINSTANCEA *oi, void *info)
 {
     if (winetest_debug > 1)
         trace(" Type:%4x Ofs:%3d Flags:%08x Name:%s\n",
@@ -68,18 +68,18 @@ static BOOL CALLBACK enum_callback(LPCDIDEVICEOBJECTINSTANCE oi, LPVOID info)
     return DIENUM_CONTINUE;
 }
 
-static BOOL CALLBACK enum_type_callback(LPCDIDEVICEOBJECTINSTANCE oi, LPVOID info)
+static BOOL CALLBACK enum_type_callback(const DIDEVICEOBJECTINSTANCEA *oi, void *info)
 {
     DWORD expected = *(DWORD*)info;
     ok (expected & DIDFT_GETTYPE(oi->dwType), "EnumObjects() enumerated wrong type for obj %s, expected: %08x got: %08x\n", oi->tszName, expected, oi->dwType);
     return DIENUM_CONTINUE;
 }
 
-static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd)
+static void test_object_info(IDirectInputDeviceA *device, HWND hwnd)
 {
     HRESULT hr;
     DIPROPDWORD dp;
-    DIDEVICEOBJECTINSTANCE obj_info;
+    DIDEVICEOBJECTINSTANCEA obj_info;
     DWORD obj_types[] = {DIDFT_BUTTON, DIDFT_AXIS, DIDFT_POV};
     int type_index;
     int cnt1 = 0;
@@ -174,14 +174,14 @@ static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd)
 
 struct enum_data
 {
-    LPDIRECTINPUT pDI;
+    IDirectInputA *pDI;
     HWND hwnd;
 };
 
-static BOOL CALLBACK enum_devices(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef)
+static BOOL CALLBACK enum_devices(const DIDEVICEINSTANCEA *lpddi, void *pvRef)
 {
     struct enum_data *data = pvRef;
-    LPDIRECTINPUTDEVICE device, obj = NULL;
+    IDirectInputDeviceA *device, *obj = NULL;
     HRESULT hr;
 
     hr = IDirectInput_GetDeviceStatus(data->pDI, &lpddi->guidInstance);
@@ -212,8 +212,8 @@ static BOOL CALLBACK enum_devices(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef)
 static void device_tests(void)
 {
     HRESULT hr;
-    LPDIRECTINPUT pDI = NULL, obj = NULL;
-    HINSTANCE hInstance = GetModuleHandle(NULL);
+    IDirectInputA *pDI = NULL, *obj = NULL;
+    HINSTANCE hInstance = GetModuleHandleW(NULL);
     HWND hwnd;
     struct enum_data data;
 
@@ -223,7 +223,7 @@ static void device_tests(void)
         skip("Tests require a newer dinput version\n");
         return;
     }
-    ok(SUCCEEDED(hr), "DirectInputCreate() failed: %08x\n", hr);
+    ok(SUCCEEDED(hr), "DirectInputCreateA() failed: %08x\n", hr);
     if (FAILED(hr)) return;
 
     hr = IDirectInput_Initialize(pDI, hInstance, DIRECTINPUT_VERSION);
@@ -233,8 +233,8 @@ static void device_tests(void)
     hr = IUnknown_QueryInterface(pDI, &IID_IDirectInput2W, (LPVOID*)&obj);
     ok(SUCCEEDED(hr), "QueryInterface(IDirectInput7W) failed: %08x\n", hr);
 
-    hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW,
-                        10, 10, 200, 200, NULL, NULL, NULL, NULL);
+    hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL,
+                         NULL, NULL);
     ok(hwnd != NULL, "err: %d\n", GetLastError());
     if (hwnd)
     {
@@ -250,7 +250,7 @@ static void device_tests(void)
         hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Joystick);
         if (hr == DI_OK)
         {
-            LPDIRECTINPUTDEVICE device = NULL;
+            IDirectInputDeviceA *device = NULL;
 
             hr = IDirectInput_CreateDevice(pDI, &GUID_Joystick, &device, NULL);
             ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr);