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

setupapi/tests: Remove workarounds in testDeviceRegistryPropertyA(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2018-11-22 23:39:28 -06:00 committed by Alexandre Julliard
parent af1362c8c8
commit 1b032c2b12
1 changed files with 80 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
dlls/setupapi/tests/devinst.c
View File

@ -43,11 +43,8 @@ static BOOL (WINAPI *pSetupDiGetINFClassA)(PCSTR, LPGUID, PSTR, DWORD, PDWOR
static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID);
static BOOL (WINAPI *pSetupDiCreateDeviceInfoA)(HDEVINFO, PCSTR, GUID *, PCSTR, HWND, DWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiCreateDeviceInfoA)(HDEVINFO, PCSTR, GUID *, PCSTR, HWND, DWORD, PSP_DEVINFO_DATA);
static BOOL (WINAPI *pSetupDiCreateDeviceInfoW)(HDEVINFO, PCWSTR, GUID *, PCWSTR, HWND, DWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiCreateDeviceInfoW)(HDEVINFO, PCWSTR, GUID *, PCWSTR, HWND, DWORD, PSP_DEVINFO_DATA);
static HDEVINFO (WINAPI *pSetupDiGetClassDevsA)(const GUID *, LPCSTR, HWND, DWORD);
static HDEVINFO (WINAPI *pSetupDiGetClassDevsW)(const GUID *, LPCWSTR, HWND, DWORD); static HDEVINFO (WINAPI *pSetupDiGetClassDevsW)(const GUID *, LPCWSTR, HWND, DWORD);
static BOOL (WINAPI *pSetupDiSetDeviceRegistryPropertyA)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD);
static BOOL (WINAPI *pSetupDiSetDeviceRegistryPropertyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD); static BOOL (WINAPI *pSetupDiSetDeviceRegistryPropertyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD);
static BOOL (WINAPI *pSetupDiGetDeviceRegistryPropertyA)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD);
static BOOL (WINAPI *pSetupDiGetDeviceRegistryPropertyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD); static BOOL (WINAPI *pSetupDiGetDeviceRegistryPropertyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD);
static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
@ -66,12 +63,9 @@ static void init_function_pointers(void)
pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList");
pSetupDiCallClassInstaller = (void *)GetProcAddress(hSetupAPI, "SetupDiCallClassInstaller"); pSetupDiCallClassInstaller = (void *)GetProcAddress(hSetupAPI, "SetupDiCallClassInstaller");
pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA");
pSetupDiGetClassDevsA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetClassDevsA");
pSetupDiGetClassDevsW = (void *)GetProcAddress(hSetupAPI, "SetupDiGetClassDevsW"); pSetupDiGetClassDevsW = (void *)GetProcAddress(hSetupAPI, "SetupDiGetClassDevsW");
pSetupDiGetINFClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetINFClassA"); pSetupDiGetINFClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetINFClassA");
pSetupDiSetDeviceRegistryPropertyA = (void *)GetProcAddress(hSetupAPI, "SetupDiSetDeviceRegistryPropertyA");
pSetupDiSetDeviceRegistryPropertyW = (void *)GetProcAddress(hSetupAPI, "SetupDiSetDeviceRegistryPropertyW"); pSetupDiSetDeviceRegistryPropertyW = (void *)GetProcAddress(hSetupAPI, "SetupDiSetDeviceRegistryPropertyW");
pSetupDiGetDeviceRegistryPropertyA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceRegistryPropertyA");
pSetupDiGetDeviceRegistryPropertyW = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceRegistryPropertyW"); pSetupDiGetDeviceRegistryPropertyW = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceRegistryPropertyW");
pIsWow64Process = (void *)GetProcAddress(hKernel32, "IsWow64Process"); pIsWow64Process = (void *)GetProcAddress(hKernel32, "IsWow64Process");
} }
@ -960,105 +954,105 @@ todo_wine
devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus);
} }
static void testDeviceRegistryPropertyA(void) static void test_registry_property_a(void)
{ {
HDEVINFO set; static const CHAR bogus[] = "System\\CurrentControlSet\\Enum\\Root\\LEGACY_BOGUS";
SP_DEVINFO_DATA devInfo = { sizeof(SP_DEVINFO_DATA), { 0 } }; SP_DEVINFO_DATA device = {sizeof(device)};
CHAR devName[] = "LEGACY_BOGUS";
CHAR friendlyName[] = "Bogus";
CHAR buf[6] = ""; CHAR buf[6] = "";
DWORD buflen = 6; DWORD size, type;
DWORD size; HDEVINFO set;
DWORD regType;
BOOL ret; BOOL ret;
LONG res; LONG res;
HKEY key; HKEY key;
static const CHAR bogus[] =
"System\\CurrentControlSet\\Enum\\Root\\LEGACY_BOGUS"; set = SetupDiGetClassDevsA(&guid, NULL, 0, DIGCF_DEVICEINTERFACE);
ok(set != INVALID_HANDLE_VALUE, "Failed to get device list, error %#x.\n", GetLastError());
ret = SetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, NULL, NULL, DICD_GENERATE_ID, &device);
ok(ret, "Failed to create device, error %#x.\n", GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
set = pSetupDiGetClassDevsA(&guid, NULL, 0, DIGCF_DEVICEINTERFACE); ret = SetupDiSetDeviceRegistryPropertyA(NULL, NULL, -1, NULL, 0);
ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsA failed: %08x\n", ok(!ret, "Expected failure.\n");
GetLastError()); ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pSetupDiCreateDeviceInfoA(set, devName, &guid, NULL, NULL, ret = SetupDiSetDeviceRegistryPropertyA(set, NULL, -1, NULL, 0);
DICD_GENERATE_ID, &devInfo); ok(!ret, "Expected failure.\n");
ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pSetupDiSetDeviceRegistryPropertyA(NULL, NULL, -1, NULL, 0); ret = SetupDiSetDeviceRegistryPropertyA(set, &device, -1, NULL, 0);
ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, ok(!ret, "Expected failure.\n");
"Expected ERROR_INVALID_HANDLE, got %08x\n", GetLastError()); todo_wine
SetLastError(0xdeadbeef); ok(GetLastError() == ERROR_INVALID_REG_PROPERTY, "Got unexpected error %#x.\n", GetLastError());
ret = pSetupDiSetDeviceRegistryPropertyA(set, NULL, -1, NULL, 0);
ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, ret = SetupDiSetDeviceRegistryPropertyA(set, &device, SPDRP_FRIENDLYNAME, NULL, 0);
"Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError());
SetLastError(0xdeadbeef);
ret = pSetupDiSetDeviceRegistryPropertyA(set, &devInfo, -1, NULL, 0);
todo_wine todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_REG_PROPERTY, ok(!ret, "Expected failure.\n");
"Expected ERROR_INVALID_REG_PROPERTY, got %08x\n", GetLastError());
/* GetLastError() returns nonsense in win2k3 */ /* GetLastError() returns nonsense in win2k3 */
ret = pSetupDiSetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME,
NULL, 0); SetLastError(0xdeadbeef);
todo_wine ret = SetupDiSetDeviceRegistryPropertyA(set, &device, SPDRP_FRIENDLYNAME, (BYTE *)"Bogus", sizeof("Bogus"));
ok(ret, "Failed to set property, error %#x.\n", GetLastError());
SetLastError(0xdeadbeef);
ret = SetupDiGetDeviceRegistryPropertyA(NULL, NULL, -1, NULL, NULL, 0, NULL);
ok(!ret, "Expected failure.\n");
ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError());
SetLastError(0xdeadbeef);
ret = SetupDiGetDeviceRegistryPropertyA(set, NULL, -1, NULL, NULL, 0, NULL);
ok(!ret, "Expected failure.\n");
ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError());
SetLastError(0xdeadbeef);
ret = SetupDiGetDeviceRegistryPropertyA(set, &device, -1, NULL, NULL, 0, NULL);
ok(!ret, "Expected failure.\n");
todo_wine
ok(GetLastError() == ERROR_INVALID_REG_PROPERTY, "Got unexpected error %#x.\n", GetLastError());
ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_FRIENDLYNAME, NULL, NULL, sizeof("Bogus"), NULL);
ok(!ret, "Expected failure, got %d\n", ret); ok(!ret, "Expected failure, got %d\n", ret);
SetLastError(0xdeadbeef);
ret = pSetupDiSetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME,
(PBYTE)friendlyName, buflen);
ok(ret, "SetupDiSetDeviceRegistryPropertyA failed: %08x\n", GetLastError());
SetLastError(0xdeadbeef);
ret = pSetupDiGetDeviceRegistryPropertyA(NULL, NULL, -1, NULL, NULL, 0, NULL);
ok(!ret && GetLastError() == ERROR_INVALID_HANDLE,
"Expected ERROR_INVALID_HANDLE, got %08x\n", GetLastError());
SetLastError(0xdeadbeef);
ret = pSetupDiGetDeviceRegistryPropertyA(set, NULL, -1, NULL, NULL, 0, NULL);
ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError());
SetLastError(0xdeadbeef);
ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, -1, NULL, NULL, 0, NULL);
todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_REG_PROPERTY,
"Expected ERROR_INVALID_REG_PROPERTY, got %08x\n", GetLastError());
/* GetLastError() returns nonsense in win2k3 */ /* GetLastError() returns nonsense in win2k3 */
ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME,
NULL, NULL, buflen, NULL);
ok(!ret, "Expected failure, got %d\n", ret);
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME, ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_FRIENDLYNAME, NULL, NULL, 0, &size);
NULL, NULL, 0, &size); ok(!ret, "Expected failure.\n");
ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got unexpected error %#x.\n", GetLastError());
"Expected ERROR_INSUFFICIENT_BUFFER, got %08x\n", GetLastError()); ok(size == sizeof("Bogus"), "Got unexpected size %d.\n", size);
ok(buflen == size, "Unexpected size: %d\n", size);
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME, ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_FRIENDLYNAME, NULL, (BYTE *)buf, sizeof(buf), NULL);
NULL, (PBYTE)buf, buflen, NULL); ok(ret, "Failed to get property, error %#x.\n", GetLastError());
ok(ret, "SetupDiGetDeviceRegistryPropertyA failed: %08x\n", GetLastError()); ok(!strcmp(buf, "Bogus"), "Got unexpected property %s.\n", buf);
ok(!lstrcmpiA(friendlyName, buf), "Unexpected property\n");
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME, ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_FRIENDLYNAME, &type, (BYTE *)buf, sizeof(buf), NULL);
&regType, (PBYTE)buf, buflen, NULL); ok(ret, "Failed to get property, error %#x.\n", GetLastError());
ok(ret, "SetupDiGetDeviceRegistryPropertyA failed: %08x\n", GetLastError()); ok(!strcmp(buf, "Bogus"), "Got unexpected property %s.\n", buf);
ok(!lstrcmpiA(friendlyName, buf), "Unexpected value of property\n"); ok(type == REG_SZ, "Got unexpected type %d.\n", type);
ok(regType == REG_SZ, "Unexpected type of property: %d\n", regType);
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pSetupDiSetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME, ret = SetupDiSetDeviceRegistryPropertyA(set, &device, SPDRP_FRIENDLYNAME, NULL, 0);
NULL, 0); ok(ret, "Failed to set property, error %#x.\n", GetLastError());
ok(ret, "SetupDiSetDeviceRegistryPropertyA failed: %08x\n", GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME, ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_FRIENDLYNAME, NULL, (BYTE *)buf, sizeof(buf), &size);
NULL, (PBYTE)buf, buflen, &size); todo_wine {
todo_wine ok(!ret, "Expected failure.\n");
ok(!ret && GetLastError() == ERROR_INVALID_DATA, ok(GetLastError() == ERROR_INVALID_DATA, "Got unexpected error %#x.\n", GetLastError());
"Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); }
ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, SPDRP_HARDWAREID,
NULL, NULL, 0, &size); ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_HARDWAREID, NULL, NULL, 0, &size);
ok(!ret && GetLastError() == ERROR_INVALID_DATA, ok(!ret, "Expected failure.\n");
"Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); ok(GetLastError() == ERROR_INVALID_DATA, "Got unexpected error %#x.\n", GetLastError());
pSetupDiDestroyDeviceInfoList(set);
SetupDiDestroyDeviceInfoList(set);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, bogus, &key); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, bogus, &key);
if(!is_wow64) todo_wine
todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Expected key to not exist\n"); ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n");
/* FIXME: Remove when Wine is fixed */ /* FIXME: Remove when Wine is fixed */
if (res == ERROR_SUCCESS) if (res == ERROR_SUCCESS)
{ {
@ -1460,7 +1454,7 @@ START_TEST(devinst)
test_device_iface_detail(); test_device_iface_detail();
test_device_key(); test_device_key();
test_register_device_iface(); test_register_device_iface();
testDeviceRegistryPropertyA(); test_registry_property_a();
testDeviceRegistryPropertyW(); testDeviceRegistryPropertyW();
testSetupDiGetINFClassA(); testSetupDiGetINFClassA();
test_devnode(); test_devnode();