Commit 50948335 authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard

dinput: Get rid of duplicated winetest helpers.

parent e3b2cfed
...@@ -39,8 +39,6 @@ ...@@ -39,8 +39,6 @@
#include "ddk/hidsdi.h" #include "ddk/hidsdi.h"
#include "ddk/hidport.h" #include "ddk/hidport.h"
#include "wine/test.h"
#include "driver_hid.h" #include "driver_hid.h"
#define EXPECT_VIDPID MAKELONG( 0x1209, 0x0001 ) #define EXPECT_VIDPID MAKELONG( 0x1209, 0x0001 )
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "wine/list.h" #include "wine/list.h"
#define WINE_DRIVER_TEST
#include "initguid.h" #include "initguid.h"
#include "driver_hid.h" #include "driver_hid.h"
...@@ -246,8 +247,8 @@ static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_ ...@@ -246,8 +247,8 @@ static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_
tmp = queue->pos; tmp = queue->pos;
while (tmp < queue->end) while (tmp < queue->end)
{ {
if (running_under_wine && !tmp->todo) break; if (winetest_platform_is_wine && !tmp->todo) break;
if (!running_under_wine && !tmp->broken && !tmp->wine_only) break; if (!winetest_platform_is_wine && !tmp->broken && !tmp->wine_only) break;
if (tmp->code == code && tmp->report_id == id && tmp->report_len == len && if (tmp->code == code && tmp->report_id == id && tmp->report_len == len &&
(!compare_buf || RtlCompareMemory( tmp->report_buf, buf, len ) == len)) (!compare_buf || RtlCompareMemory( tmp->report_buf, buf, len ) == len))
break; break;
...@@ -260,7 +261,7 @@ static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_ ...@@ -260,7 +261,7 @@ static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_
while (queue->pos < queue->end) while (queue->pos < queue->end)
{ {
if (running_under_wine || !queue->pos->wine_only) break; if (winetest_platform_is_wine || !queue->pos->wine_only) break;
queue->pos++; queue->pos++;
} }
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "wine/list.h" #include "wine/list.h"
#define WINE_DRIVER_TEST
#include "initguid.h" #include "initguid.h"
#include "driver_hid.h" #include "driver_hid.h"
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "wine/list.h" #include "wine/list.h"
#define WINE_DRIVER_TEST
#include "initguid.h" #include "initguid.h"
#include "driver_hid.h" #include "driver_hid.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment