Skip to content

W
wine-winehq
Commit dcfd15ff authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard
Browse files
Options

dinput/tests: Remove now unused HID test driver.

Signed-off-by: 's avatarRémi Bernon <rbernon@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 2644f636
Expand all Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 54 deletions
dlls/dinput/tests/Makefile.in
View file @ dcfd15ff
TESTDLL = dinput.dll TESTDLL = dinput.dll
IMPORTS = dinput dinput8 ole32 version user32 advapi32 hid uuid crypt32 newdev setupapi wintrust winmm IMPORTS = dinput dinput8 ole32 version user32 advapi32 hid uuid crypt32 newdev setupapi wintrust winmm
driver_IMPORTS = winecrt0 ntoskrnl hal hidclass
driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
driver_bus_IMPORTS = winecrt0 ntoskrnl hal driver_bus_IMPORTS = winecrt0 ntoskrnl hal
driver_bus_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver_bus_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass
...@@ -14,8 +12,6 @@ SOURCES = \ ...@@ -14,8 +12,6 @@ SOURCES = \
device.c \ device.c \
device8.c \ device8.c \
dinput.c \ dinput.c \
driver.c \
driver.spec \
driver_bus.c \ driver_bus.c \
driver_bus.spec \ driver_bus.spec \
driver_hid.c \ driver_hid.c \
......
dlls/dinput/tests/hid.c
View file @ dcfd15ff
...@@ -325,17 +325,10 @@ static const char inf_text[] = ...@@ -325,17 +325,10 @@ static const char inf_text[] =
"Wine=mfg_section,NT" EXT "\n" "Wine=mfg_section,NT" EXT "\n"
"[mfg_section.NT" EXT "]\n" "[mfg_section.NT" EXT "]\n"
"Wine test root driver=device_section,test_hardware_id\n"
"Wine Test Bus Device=bus_section,WINETEST\\BUS\n" "Wine Test Bus Device=bus_section,WINETEST\\BUS\n"
"Wine Test HID Device=hid_section,WINETEST\\WINE_COMP_HID\n" "Wine Test HID Device=hid_section,WINETEST\\WINE_COMP_HID\n"
"Wine Test HID Polled Device=hid_poll_section,WINETEST\\WINE_COMP_POLLHID\n" "Wine Test HID Polled Device=hid_poll_section,WINETEST\\WINE_COMP_POLLHID\n"
"[device_section.NT" EXT "]\n"
"CopyFiles=file_section\n"
"[device_section.NT" EXT ".Services]\n"
"AddService=winetest,0x2,svc_section\n"
"[bus_section.NT" EXT "]\n" "[bus_section.NT" EXT "]\n"
"CopyFiles=file_section\n" "CopyFiles=file_section\n"
...@@ -355,19 +348,16 @@ static const char inf_text[] = ...@@ -355,19 +348,16 @@ static const char inf_text[] =
"AddService=winetest_hid_poll,0x2,hid_poll_service\n" "AddService=winetest_hid_poll,0x2,hid_poll_service\n"
"[file_section]\n" "[file_section]\n"
"winetest.sys\n"
"winetest_bus.sys\n" "winetest_bus.sys\n"
"winetest_hid.sys\n" "winetest_hid.sys\n"
"winetest_hid_poll.sys\n" "winetest_hid_poll.sys\n"
"[SourceDisksFiles]\n" "[SourceDisksFiles]\n"
"winetest.sys=1\n"
"winetest_bus.sys=1\n" "winetest_bus.sys=1\n"
"winetest_hid.sys=1\n" "winetest_hid.sys=1\n"
"winetest_hid_poll.sys=1\n" "winetest_hid_poll.sys=1\n"
"[SourceDisksNames]\n" "[SourceDisksNames]\n"
"1=,winetest.sys\n"
"1=,winetest_bus.sys\n" "1=,winetest_bus.sys\n"
"1=,winetest_hid.sys\n" "1=,winetest_hid.sys\n"
"1=,winetest_hid_poll.sys\n" "1=,winetest_hid_poll.sys\n"
...@@ -375,14 +365,6 @@ static const char inf_text[] = ...@@ -375,14 +365,6 @@ static const char inf_text[] =
"[DestinationDirs]\n" "[DestinationDirs]\n"
"DefaultDestDir=12\n" "DefaultDestDir=12\n"
"[svc_section]\n"
"ServiceBinary=%12%\\winetest.sys\n"
"ServiceType=1\n"
"StartType=3\n"
"ErrorControl=1\n"
"LoadOrderGroup=WinePlugPlay\n"
"DisplayName=\"winetest bus driver\"\n"
"[bus_service]\n" "[bus_service]\n"
"ServiceBinary=%12%\\winetest_bus.sys\n" "ServiceBinary=%12%\\winetest_bus.sys\n"
"ServiceType=1\n" "ServiceType=1\n"
...@@ -481,11 +463,11 @@ static void unload_driver( SC_HANDLE service ) ...@@ -481,11 +463,11 @@ static void unload_driver( SC_HANDLE service )
CloseServiceHandle( service ); CloseServiceHandle( service );
} }
static void pnp_driver_stop( BOOL bus ) void bus_device_stop(void)
{ {
const WCHAR *service_name = bus ? L"winetest_bus" : L"winetest";
SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)};
WCHAR path[MAX_PATH], dest[MAX_PATH], *filepart; WCHAR path[MAX_PATH], dest[MAX_PATH], *filepart;
const WCHAR *service_name = L"winetest_bus";
SC_HANDLE manager, service; SC_HANDLE manager, service;
char buffer[512]; char buffer[512];
HDEVINFO set; HDEVINFO set;
...@@ -548,8 +530,6 @@ static void pnp_driver_stop( BOOL bus ) ...@@ -548,8 +530,6 @@ static void pnp_driver_stop( BOOL bus )
ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); ok( ret, "Failed to delete file, error %lu\n", GetLastError() );
ret = DeleteFileW( L"winetest.inf" ); ret = DeleteFileW( L"winetest.inf" );
ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); ok( ret, "Failed to delete file, error %lu\n", GetLastError() );
ret = DeleteFileW( L"winetest.sys" );
ok( ret, "Failed to delete file, error %lu\n", GetLastError() );
ret = DeleteFileW( L"winetest_bus.sys" ); ret = DeleteFileW( L"winetest_bus.sys" );
ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); ok( ret, "Failed to delete file, error %lu\n", GetLastError() );
ret = DeleteFileW( L"winetest_hid.sys" ); ret = DeleteFileW( L"winetest_hid.sys" );
...@@ -557,8 +537,6 @@ static void pnp_driver_stop( BOOL bus ) ...@@ -557,8 +537,6 @@ static void pnp_driver_stop( BOOL bus )
ret = DeleteFileW( L"winetest_hid_poll.sys" ); ret = DeleteFileW( L"winetest_hid_poll.sys" );
ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); ok( ret, "Failed to delete file, error %lu\n", GetLastError() );
/* Windows 10 apparently deletes the image in SetupUninstallOEMInf(). */ /* Windows 10 apparently deletes the image in SetupUninstallOEMInf(). */
ret = DeleteFileW( L"C:/windows/system32/drivers/winetest.sys" );
ok( ret || GetLastError() == ERROR_FILE_NOT_FOUND, "Failed to delete file, error %lu\n", GetLastError() );
ret = DeleteFileW( L"C:/windows/system32/drivers/winetest_bus.sys" ); ret = DeleteFileW( L"C:/windows/system32/drivers/winetest_bus.sys" );
ok( ret || GetLastError() == ERROR_FILE_NOT_FOUND, "Failed to delete file, error %lu\n", GetLastError() ); ok( ret || GetLastError() == ERROR_FILE_NOT_FOUND, "Failed to delete file, error %lu\n", GetLastError() );
ret = DeleteFileW( L"C:/windows/system32/drivers/winetest_hid.sys" ); ret = DeleteFileW( L"C:/windows/system32/drivers/winetest_hid.sys" );
...@@ -608,12 +586,11 @@ static BOOL find_hid_device_path( WCHAR *device_path ) ...@@ -608,12 +586,11 @@ static BOOL find_hid_device_path( WCHAR *device_path )
return ret; return ret;
} }
static BOOL pnp_driver_start( BOOL bus ) BOOL bus_device_start(void)
{ {
static const WCHAR hardware_id[] = L"test_hardware_id\0";
static const WCHAR bus_hardware_id[] = L"WINETEST\\BUS"; static const WCHAR bus_hardware_id[] = L"WINETEST\\BUS";
const WCHAR *service_name = bus ? L"winetest_bus" : L"winetest";
SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)};
const WCHAR *service_name = L"winetest_bus";
WCHAR path[MAX_PATH], filename[MAX_PATH]; WCHAR path[MAX_PATH], filename[MAX_PATH];
SC_HANDLE manager, service; SC_HANDLE manager, service;
const CERT_CONTEXT *cert; const CERT_CONTEXT *cert;
...@@ -626,10 +603,6 @@ static BOOL pnp_driver_start( BOOL bus ) ...@@ -626,10 +603,6 @@ static BOOL pnp_driver_start( BOOL bus )
old_mute_threshold = winetest_mute_threshold; old_mute_threshold = winetest_mute_threshold;
winetest_mute_threshold = 1; winetest_mute_threshold = 1;
load_resource( L"driver.dll", filename );
ret = MoveFileExW( filename, L"winetest.sys", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING );
ok( ret, "failed to move file, error %lu\n", GetLastError() );
load_resource( L"driver_bus.dll", filename ); load_resource( L"driver_bus.dll", filename );
ret = MoveFileExW( filename, L"winetest_bus.sys", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING ); ret = MoveFileExW( filename, L"winetest_bus.sys", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING );
ok( ret, "failed to move file, error %lu\n", GetLastError() ); ok( ret, "failed to move file, error %lu\n", GetLastError() );
...@@ -652,7 +625,6 @@ static BOOL pnp_driver_start( BOOL bus ) ...@@ -652,7 +625,6 @@ static BOOL pnp_driver_start( BOOL bus )
catalog = CryptCATOpen( (WCHAR *)L"winetest.cat", CRYPTCAT_OPEN_CREATENEW, 0, CRYPTCAT_VERSION_1, 0 ); catalog = CryptCATOpen( (WCHAR *)L"winetest.cat", CRYPTCAT_OPEN_CREATENEW, 0, CRYPTCAT_VERSION_1, 0 );
ok( catalog != INVALID_HANDLE_VALUE, "Failed to create catalog, error %lu\n", GetLastError() ); ok( catalog != INVALID_HANDLE_VALUE, "Failed to create catalog, error %lu\n", GetLastError() );
add_file_to_catalog( catalog, L"winetest.sys" );
add_file_to_catalog( catalog, L"winetest_bus.sys" ); add_file_to_catalog( catalog, L"winetest_bus.sys" );
add_file_to_catalog( catalog, L"winetest_hid.sys" ); add_file_to_catalog( catalog, L"winetest_hid.sys" );
add_file_to_catalog( catalog, L"winetest_hid_poll.sys" ); add_file_to_catalog( catalog, L"winetest_hid_poll.sys" );
...@@ -677,8 +649,6 @@ static BOOL pnp_driver_start( BOOL bus ) ...@@ -677,8 +649,6 @@ static BOOL pnp_driver_start( BOOL bus )
ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); ok( ret, "Failed to delete file, error %lu\n", GetLastError() );
ret = DeleteFileW( L"winetest_hid_poll.sys" ); ret = DeleteFileW( L"winetest_hid_poll.sys" );
ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); ok( ret, "Failed to delete file, error %lu\n", GetLastError() );
ret = DeleteFileW( L"winetest.sys" );
ok( ret, "Failed to delete file, error %lu\n", GetLastError() );
winetest_mute_threshold = old_mute_threshold; winetest_mute_threshold = old_mute_threshold;
return FALSE; return FALSE;
} }
...@@ -691,9 +661,7 @@ static BOOL pnp_driver_start( BOOL bus ) ...@@ -691,9 +661,7 @@ static BOOL pnp_driver_start( BOOL bus )
ret = SetupDiCreateDeviceInfoW( set, L"root\\winetest\\0", &GUID_NULL, NULL, NULL, 0, &device ); ret = SetupDiCreateDeviceInfoW( set, L"root\\winetest\\0", &GUID_NULL, NULL, NULL, 0, &device );
ok( ret, "failed to create device, error %#lx\n", GetLastError() ); ok( ret, "failed to create device, error %#lx\n", GetLastError() );
ret = SetupDiSetDeviceRegistryPropertyW( set, &device, SPDRP_HARDWAREID, ret = SetupDiSetDeviceRegistryPropertyW( set, &device, SPDRP_HARDWAREID, (const BYTE *)bus_hardware_id, sizeof(bus_hardware_id) );
bus ? (const BYTE *)bus_hardware_id : (const BYTE *)hardware_id,
bus ? sizeof(bus_hardware_id) : sizeof(hardware_id) );
ok( ret, "failed to create set hardware ID, error %lu\n", GetLastError() ); ok( ret, "failed to create set hardware ID, error %lu\n", GetLastError() );
ret = SetupDiCallClassInstaller( DIF_REGISTERDEVICE, set, &device ); ret = SetupDiCallClassInstaller( DIF_REGISTERDEVICE, set, &device );
...@@ -704,8 +672,7 @@ static BOOL pnp_driver_start( BOOL bus ) ...@@ -704,8 +672,7 @@ static BOOL pnp_driver_start( BOOL bus )
GetFullPathNameW( L"winetest.inf", ARRAY_SIZE(path), path, NULL ); GetFullPathNameW( L"winetest.inf", ARRAY_SIZE(path), path, NULL );
ret = UpdateDriverForPlugAndPlayDevicesW( NULL, bus ? bus_hardware_id : hardware_id, path, ret = UpdateDriverForPlugAndPlayDevicesW( NULL, bus_hardware_id, path, INSTALLFLAG_FORCE, &need_reboot );
INSTALLFLAG_FORCE, &need_reboot );
ok( ret, "failed to install device, error %lu\n", GetLastError() ); ok( ret, "failed to install device, error %lu\n", GetLastError() );
ok( !need_reboot, "expected no reboot necessary\n" ); ok( !need_reboot, "expected no reboot necessary\n" );
...@@ -772,16 +739,6 @@ BOOL hid_device_start( struct hid_device_desc *desc ) ...@@ -772,16 +739,6 @@ BOOL hid_device_start( struct hid_device_desc *desc )
return TRUE; return TRUE;
} }
void bus_device_stop(void)
{
pnp_driver_stop( TRUE );
}
BOOL bus_device_start(void)
{
return pnp_driver_start( TRUE );
}
#define check_hidp_caps( a, b ) check_hidp_caps_( __LINE__, a, b ) #define check_hidp_caps( a, b ) check_hidp_caps_( __LINE__, a, b )
static inline void check_hidp_caps_( int line, HIDP_CAPS *caps, const HIDP_CAPS *exp ) static inline void check_hidp_caps_( int line, HIDP_CAPS *caps, const HIDP_CAPS *exp )
{ {
......
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