September 2007 - Wine-Commits

Juan Lang : setupapi: Add stubs for SetupDiCreateDeviceInterfaceRegKeyA/W.
by Alexandre Julliard Sept. 24, 2007

Sept. 24, 2007

Module: wine Branch: master Commit: e9b55346c2e991858c1cea3494bea7a1c682551a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9b55346c2e991858c1cea349… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 17:05:48 2007 -0700 setupapi: Add stubs for SetupDiCreateDeviceInterfaceRegKeyA/W. --- dlls/setupapi/devinst.c | 32 ++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 2 ++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 2236896..cb1605f 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2161,6 +2161,38 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceW( } /*********************************************************************** + * SetupDiCreateDeviceInterfaceRegKeyA (SETUPAPI.@) + */ +HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyA( + HDEVINFO DeviceInfoSet, + PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, + DWORD Reserved, + REGSAM samDesired, + HINF InfHandle, + PCSTR InfSectionName) +{ + FIXME("%p %p %d %08x %p %p\n", DeviceInfoSet, DeviceInterfaceData, Reserved, + samDesired, InfHandle, InfSectionName); + return INVALID_HANDLE_VALUE; +} + +/*********************************************************************** + * SetupDiCreateDeviceInterfaceRegKeyW (SETUPAPI.@) + */ +HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW( + HDEVINFO DeviceInfoSet, + PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, + DWORD Reserved, + REGSAM samDesired, + HINF InfHandle, + PCWSTR InfSectionName) +{ + FIXME("%p %p %d %08x %p %p\n", DeviceInfoSet, DeviceInterfaceData, Reserved, + samDesired, InfHandle, InfSectionName); + return INVALID_HANDLE_VALUE; +} + +/*********************************************************************** * SetupDiEnumDeviceInterfaces (SETUPAPI.@) * * PARAMS diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 439c95c..5ba940e 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -290,6 +290,8 @@ @ stdcall SetupDiCreateDeviceInfoW(long wstr ptr wstr long long ptr) @ stdcall SetupDiCreateDeviceInterfaceA(ptr ptr ptr str long ptr) @ stdcall SetupDiCreateDeviceInterfaceW(ptr ptr ptr wstr long ptr) +@ stdcall SetupDiCreateDeviceInterfaceRegKeyA(ptr ptr long long ptr ptr) +@ stdcall SetupDiCreateDeviceInterfaceRegKeyW(ptr ptr long long ptr ptr) @ stub SetupDiDeleteDevRegKey @ stub SetupDiDeleteDeviceInfo @ stub SetupDiDeleteDeviceInterfaceData

1 0

Juan Lang : setupapi: Implement SetupDiGetDeviceInterfaceDetailA/W.
by Alexandre Julliard Sept. 24, 2007

Sept. 24, 2007

Module: wine Branch: master Commit: a63c9356a4fcaeea42eb31752c6ac0323b75daf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a63c9356a4fcaeea42eb31752… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 11:38:55 2007 -0700 setupapi: Implement SetupDiGetDeviceInterfaceDetailA/W. --- dlls/setupapi/devinst.c | 107 +++++++++++++++++++++++++++++++++++++++-- dlls/setupapi/tests/devinst.c | 6 -- 2 files changed, 103 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 0fd13fc..c71d17f 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2308,13 +2308,63 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA( PDWORD RequiredSize, PSP_DEVINFO_DATA DeviceInfoData) { + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct InterfaceInfo *info; + DWORD bytesNeeded = offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath) + + 1; BOOL ret = FALSE; - FIXME("(%p, %p, %p, %d, %p, %p)\n", DeviceInfoSet, + TRACE("(%p, %p, %p, %d, %p, %p)\n", DeviceInfoSet, DeviceInterfaceData, DeviceInterfaceDetailData, DeviceInterfaceDetailDataSize, RequiredSize, DeviceInfoData); - SetLastError(ERROR_INVALID_HANDLE); + if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE || + set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!DeviceInterfaceData || + DeviceInterfaceData->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA) || + !DeviceInterfaceData->Reserved) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (DeviceInterfaceDetailData && (DeviceInterfaceDetailData->cbSize < + offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath) + sizeof(char) || + DeviceInterfaceDetailData->cbSize > sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_A))) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + if (!DeviceInterfaceDetailData && DeviceInterfaceDetailDataSize) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + info = (struct InterfaceInfo *)DeviceInterfaceData->Reserved; + if (info->symbolicLink) + bytesNeeded += WideCharToMultiByte(CP_ACP, 0, info->symbolicLink, -1, + NULL, 0, NULL, NULL); + if (DeviceInterfaceDetailDataSize >= bytesNeeded) + { + if (info->symbolicLink) + WideCharToMultiByte(CP_ACP, 0, info->symbolicLink, -1, + DeviceInterfaceDetailData->DevicePath, + DeviceInterfaceDetailDataSize - + offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath), + NULL, NULL); + else + DeviceInterfaceDetailData->DevicePath[0] = '\0'; + ret = TRUE; + } + else + { + if (RequiredSize) + *RequiredSize = bytesNeeded; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + } return ret; } @@ -2329,10 +2379,59 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW( PDWORD RequiredSize, PSP_DEVINFO_DATA DeviceInfoData) { - FIXME("(%p, %p, %p, %d, %p, %p): stub\n", DeviceInfoSet, + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct InterfaceInfo *info; + DWORD bytesNeeded = offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath) + + sizeof(WCHAR); /* include NULL terminator */ + BOOL ret = FALSE; + + TRACE("(%p, %p, %p, %d, %p, %p)\n", DeviceInfoSet, DeviceInterfaceData, DeviceInterfaceDetailData, DeviceInterfaceDetailDataSize, RequiredSize, DeviceInfoData); - return FALSE; + + if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE || + set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!DeviceInterfaceData || + DeviceInterfaceData->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA) || + !DeviceInterfaceData->Reserved) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (DeviceInterfaceDetailData && (DeviceInterfaceDetailData->cbSize < + offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath) + sizeof(WCHAR) || + DeviceInterfaceDetailData->cbSize > sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W))) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + if (!DeviceInterfaceDetailData && DeviceInterfaceDetailDataSize) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + info = (struct InterfaceInfo *)DeviceInterfaceData->Reserved; + if (info->symbolicLink) + bytesNeeded += lstrlenW(info->symbolicLink); + if (DeviceInterfaceDetailDataSize >= bytesNeeded) + { + if (info->symbolicLink) + lstrcpyW(DeviceInterfaceDetailData->DevicePath, info->symbolicLink); + else + DeviceInterfaceDetailData->DevicePath[0] = '\0'; + ret = TRUE; + } + else + { + if (RequiredSize) + *RequiredSize = bytesNeeded; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + } + return ret; } struct PropertyMapEntry diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index d6d1cfc..1a9614a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -440,7 +440,6 @@ static void testGetDeviceInterfaceDetail(void) SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInterfaceDetailA(set, NULL, NULL, 0, NULL, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); ret = pSetupDiCreateDeviceInfoA(set, "ROOT\\LEGACY_BOGUS\\0000", &guid, @@ -453,19 +452,16 @@ static void testGetDeviceInterfaceDetail(void) SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, NULL, 0, NULL, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, NULL, 100, NULL, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_USER_BUFFER, "Expected ERROR_INVALID_USER_BUFFER, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, NULL, 0, &size, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) @@ -478,7 +474,6 @@ static void testGetDeviceInterfaceDetail(void) SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, detail, size, &size, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_USER_BUFFER, "Expected ERROR_INVALID_USER_BUFFER, got %08x\n", GetLastError()); detail->cbSize = size; @@ -491,7 +486,6 @@ static void testGetDeviceInterfaceDetail(void) detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_A); ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, detail, size, &size, NULL); - todo_wine ok(ret, "SetupDiGetDeviceInterfaceDetailA failed: %d\n", GetLastError()); HeapFree(GetProcessHeap(), 0, buf);

1 0

Juan Lang : setupapi: Add tests for SetupDiGetDeviceInterfaceDetail.
by Alexandre Julliard Sept. 24, 2007

Sept. 24, 2007

Module: wine Branch: master Commit: 6bd4ed73cb04c67614baad9e74c0cfb8db82bd12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd4ed73cb04c67614baad9e7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 11:38:33 2007 -0700 setupapi: Add tests for SetupDiGetDeviceInterfaceDetail. --- dlls/setupapi/tests/devinst.c | 93 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index cecd231..d6d1cfc 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -42,6 +42,7 @@ static BOOL (WINAPI *pSetupDiEnumDeviceInterfaces)(HDEVINFO, PSP_DEVINFO_DAT 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 *pSetupDiGetDeviceInstanceIdA)(HDEVINFO, PSP_DEVINFO_DATA, PSTR, DWORD, PDWORD); +static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailA)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiRegisterDeviceInfo)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PSP_DETSIG_CMPPROC, PVOID, PSP_DEVINFO_DATA); static void init_function_pointers(void) @@ -56,6 +57,7 @@ static void init_function_pointers(void) pSetupDiEnumDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiEnumDeviceInfo"); pSetupDiEnumDeviceInterfaces = (void *)GetProcAddress(hSetupAPI, "SetupDiEnumDeviceInterfaces"); pSetupDiGetDeviceInstanceIdA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInstanceIdA"); + pSetupDiGetDeviceInterfaceDetailA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInterfaceDetailA"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); pSetupDiRegisterDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiRegisterDeviceInfo"); } @@ -408,6 +410,96 @@ static void testCreateDeviceInterface(void) } } +static void testGetDeviceInterfaceDetail(void) +{ + BOOL ret; + GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, + 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; + HDEVINFO set; + + if (!pSetupDiCreateDeviceInfoList || !pSetupDiDestroyDeviceInfoList || + !pSetupDiCreateDeviceInfoA || !pSetupDiCreateDeviceInterfaceA || + !pSetupDiGetDeviceInterfaceDetailA) + { + skip("No SetupDiGetDeviceInterfaceDetailA\n"); + return; + } + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInterfaceDetailA(NULL, NULL, NULL, 0, NULL, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + set = pSetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != NULL, "SetupDiCreateDeviceInfoList failed: %d\n", GetLastError()); + if (set) + { + SP_DEVINFO_DATA devInfo = { sizeof(devInfo), { 0 } }; + SP_DEVICE_INTERFACE_DATA interfaceData = { sizeof(interfaceData), + { 0 } }; + DWORD size = 0; + + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInterfaceDetailA(set, NULL, NULL, 0, NULL, + NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ret = pSetupDiCreateDeviceInfoA(set, "ROOT\\LEGACY_BOGUS\\0000", &guid, + NULL, NULL, 0, &devInfo); + ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiCreateDeviceInterfaceA(set, &devInfo, &guid, NULL, 0, + &interfaceData); + ok(ret, "SetupDiCreateDeviceInterfaceA failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, NULL, + 0, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, NULL, + 100, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_USER_BUFFER, + "Expected ERROR_INVALID_USER_BUFFER, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, NULL, + 0, &size, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + LPBYTE buf = HeapAlloc(GetProcessHeap(), 0, size); + SP_DEVICE_INTERFACE_DETAIL_DATA_A *detail = + (SP_DEVICE_INTERFACE_DETAIL_DATA_A *)buf; + + detail->cbSize = 0; + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, detail, + size, &size, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_USER_BUFFER, + "Expected ERROR_INVALID_USER_BUFFER, got %08x\n", GetLastError()); + detail->cbSize = size; + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, detail, + size, &size, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_USER_BUFFER, + "Expected ERROR_INVALID_USER_BUFFER, got %08x\n", GetLastError()); + detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_A); + ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, detail, + size, &size, NULL); + todo_wine + ok(ret, "SetupDiGetDeviceInterfaceDetailA failed: %d\n", + GetLastError()); + HeapFree(GetProcessHeap(), 0, buf); + } + pSetupDiDestroyDeviceInfoList(set); + } +} + START_TEST(devinst) { init_function_pointers(); @@ -425,4 +517,5 @@ START_TEST(devinst) testGetDeviceInstanceId(); testRegisterDeviceInfo(); testCreateDeviceInterface(); + testGetDeviceInterfaceDetail(); }

1 0

Juan Lang : setupapi: Add test showing value of path.
by Alexandre Julliard Sept. 24, 2007

Sept. 24, 2007

Module: wine Branch: master Commit: d34ec8b8a121ed05e7859827f55a385727349e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d34ec8b8a121ed05e7859827f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 11:39:27 2007 -0700 setupapi: Add test showing value of path. --- dlls/setupapi/tests/devinst.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 1a9614a..d8a434f 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -466,6 +466,8 @@ static void testGetDeviceInterfaceDetail(void) "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { + static const char path[] = + "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; LPBYTE buf = HeapAlloc(GetProcessHeap(), 0, size); SP_DEVICE_INTERFACE_DETAIL_DATA_A *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_A *)buf; @@ -488,6 +490,9 @@ static void testGetDeviceInterfaceDetail(void) size, &size, NULL); ok(ret, "SetupDiGetDeviceInterfaceDetailA failed: %d\n", GetLastError()); + todo_wine + ok(!lstrcmpiA(path, detail->DevicePath), "Unexpected path %s\n", + detail->DevicePath); HeapFree(GetProcessHeap(), 0, buf); } pSetupDiDestroyDeviceInfoList(set);

1 0

Juan Lang : setupapi: Implement SetupDiCreateDeviceInterfaceW.
by Alexandre Julliard Sept. 24, 2007

Sept. 24, 2007

Module: wine Branch: master Commit: 69b0b424550c35d5f74508975f47907ed56b1686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b0b424550c35d5f74508975… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 11:36:12 2007 -0700 setupapi: Implement SetupDiCreateDeviceInterfaceW. --- dlls/setupapi/devinst.c | 259 ++++++++++++++++++++++++++++++++++++++++- dlls/setupapi/tests/devinst.c | 3 - 2 files changed, 253 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69b0b424550c35d5f7450…

1 0

Juan Lang : setupapi: When enumerating an interface, add the interface to its device.
by Alexandre Julliard Sept. 24, 2007

Sept. 24, 2007

Module: wine Branch: master Commit: 50a4039037b0b3c7a01da3462c5791e9e0a129d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a4039037b0b3c7a01da3462… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 11:37:09 2007 -0700 setupapi: When enumerating an interface, add the interface to its device. --- dlls/setupapi/devinst.c | 71 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 66 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index c249d14..0fd13fc 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -85,6 +85,7 @@ static const WCHAR UINumber[] = {'U','I','N','u','m','b','e','r',0}; static const WCHAR UpperFilters[] = {'U','p','p','e','r','F','i','l','t','e','r','s',0}; static const WCHAR LowerFilters[] = {'L','o','w','e','r','F','i','l','t','e','r','s',0}; static const WCHAR Phantom[] = {'P','h','a','n','t','o','m',0}; +static const WCHAR SymbolicLink[] = {'S','y','m','b','o','l','i','c','L','i','n','k',0}; /* is used to identify if a DeviceInfoSet pointer is valid or not */ @@ -103,6 +104,7 @@ struct DeviceInfoSet struct InterfaceInfo { LPWSTR referenceString; + LPWSTR symbolicLink; }; /* A device may have multiple instances of the same interface, so this holds @@ -137,6 +139,7 @@ static void SETUPDI_FreeInterfaceInstances(struct InterfaceInstances *instances) (struct InterfaceInfo *)instances->instances[i].Reserved; HeapFree(GetProcessHeap(), 0, ifaceInfo->referenceString); + HeapFree(GetProcessHeap(), 0, ifaceInfo->symbolicLink); } HeapFree(GetProcessHeap(), 0, instances->instances); } @@ -282,6 +285,7 @@ static BOOL SETUPDI_AddInterfaceInstance(struct DeviceInfo *devInfo, if (ifaceInfo) { ret = TRUE; + ifaceInfo->symbolicLink = NULL; if (ReferenceString) { ifaceInfo->referenceString = @@ -333,6 +337,26 @@ static BOOL SETUPDI_AddInterfaceInstance(struct DeviceInfo *devInfo, return ret; } +static BOOL SETUPDI_SetInterfaceSymbolicLink(SP_DEVICE_INTERFACE_DATA *iface, + LPCWSTR symbolicLink) +{ + struct InterfaceInfo *info = (struct InterfaceInfo *)iface->Reserved; + BOOL ret = FALSE; + + if (info) + { + HeapFree(GetProcessHeap(), 0, info->symbolicLink); + info->symbolicLink = HeapAlloc(GetProcessHeap(), 0, + (lstrlenW(symbolicLink) + 1) * sizeof(WCHAR)); + if (info->symbolicLink) + { + lstrcpyW(info->symbolicLink, symbolicLink); + ret = TRUE; + } + } + return ret; +} + static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(LPCWSTR instanceId, BOOL phantom) { @@ -1692,6 +1716,44 @@ end: return ret; } +static void SETUPDI_AddDeviceInterfaces(SP_DEVINFO_DATA *dev, HKEY key, + const GUID *interface) +{ + struct DeviceInfo *devInfo = (struct DeviceInfo *)dev->Reserved; + DWORD i, len; + WCHAR subKeyName[MAX_PATH]; + LONG l = ERROR_SUCCESS; + + for (i = 0; !l; i++) + { + len = sizeof(subKeyName) / sizeof(subKeyName[0]); + l = RegEnumKeyExW(key, i, subKeyName, &len, NULL, NULL, NULL, NULL); + if (!l) + { + HKEY subKey; + SP_DEVICE_INTERFACE_DATA *iface = NULL; + + /* The subkey name is the reference string, with a '#' prepended */ + SETUPDI_AddInterfaceInstance(devInfo, interface, subKeyName + 1, + &iface); + l = RegOpenKeyExW(key, subKeyName, 0, KEY_READ, &subKey); + if (!l) + { + WCHAR symbolicLink[MAX_PATH]; + DWORD dataType; + + len = sizeof(symbolicLink); + l = RegQueryValueExW(subKey, SymbolicLink, NULL, &dataType, + (BYTE *)symbolicLink, &len); + if (!l && dataType == REG_SZ) + SETUPDI_SetInterfaceSymbolicLink(iface, symbolicLink); + RegCloseKey(subKey); + } + } + } + /* FIXME: find and add all the device's interfaces to the device */ +} + static void SETUPDI_EnumerateMatchingInterfaces(HDEVINFO DeviceInfoSet, HKEY key, const GUID *interface, LPCWSTR enumstr) { @@ -1748,12 +1810,11 @@ static void SETUPDI_EnumerateMatchingInterfaces(HDEVINFO DeviceInfoSet, deviceClassStr[37] = 0; UuidFromStringW(&deviceClassStr[1], &deviceClass); - SETUPDI_AddDeviceToSet(set, &deviceClass, + if (SETUPDI_AddDeviceToSet(set, &deviceClass, 0 /* FIXME: DevInst */, deviceInst, - FALSE, &dev); - /* FIXME: add this interface, and all the - * device's interfaces, to the device - */ + FALSE, &dev)) + SETUPDI_AddDeviceInterfaces(dev, subKey, + interface); } RegCloseKey(deviceKey); }

1 0

Juan Lang : setupapi: Implement SetupDiEnumDeviceInterfaces.
by Alexandre Julliard Sept. 24, 2007

Sept. 24, 2007

Module: wine Branch: master Commit: be863b07ff157556beed1d3a66a60942d86a9cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=be863b07ff157556beed1d3a6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 11:36:37 2007 -0700 setupapi: Implement SetupDiEnumDeviceInterfaces. --- dlls/setupapi/devinst.c | 102 +++++++++++++++++++++++++++++++++++++--- dlls/setupapi/tests/devinst.c | 9 +++- 2 files changed, 102 insertions(+), 9 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index b00e901..c249d14 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2084,29 +2084,115 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceW( /*********************************************************************** * SetupDiEnumDeviceInterfaces (SETUPAPI.@) + * + * PARAMS + * DeviceInfoSet [I] Set of devices from which to enumerate + * interfaces + * DeviceInfoData [I] (Optional) If specified, a specific device + * instance from which to enumerate interfaces. + * If it isn't specified, all interfaces for all + * devices in the set are enumerated. + * InterfaceClassGuid [I] The interface class to enumerate. + * MemberIndex [I] An index of the interface instance to enumerate. + * A caller should start with MemberIndex set to 0, + * and continue until the function fails with + * ERROR_NO_MORE_ITEMS. + * DeviceInterfaceData [I/O] Returns an enumerated interface. Its cbSize + * member must be set to + * sizeof(SP_DEVICE_INTERFACE_DATA). + * + * RETURNS + * Success: non-zero value. + * Failure: FALSE. Call GetLastError() for more info. */ BOOL WINAPI SetupDiEnumDeviceInterfaces( - HDEVINFO devinfo, + HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, CONST GUID * InterfaceClassGuid, DWORD MemberIndex, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) { + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; BOOL ret = FALSE; - FIXME("%p, %p, %s, 0x%08x, %p\n", devinfo, DeviceInfoData, + TRACE("%p, %p, %s, %d, %p\n", DeviceInfoSet, DeviceInfoData, debugstr_guid(InterfaceClassGuid), MemberIndex, DeviceInterfaceData); - if (devinfo && devinfo != (HDEVINFO)INVALID_HANDLE_VALUE) + if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE || + set->magic != SETUP_DEVICE_INFO_SET_MAGIC) { - struct DeviceInfoSet *list = (struct DeviceInfoSet *)devinfo; - if (list->magic == SETUP_DEVICE_INFO_SET_MAGIC) - SetLastError(ERROR_NO_MORE_ITEMS); + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (DeviceInfoData && (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) || + !DeviceInfoData->Reserved)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (!DeviceInterfaceData || + DeviceInterfaceData->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (DeviceInfoData) + { + struct DeviceInfo *devInfo = + (struct DeviceInfo *)DeviceInfoData->Reserved; + DWORD i; + + if ((ret = SETUPDI_FindInterface(devInfo, InterfaceClassGuid, &i))) + { + if (MemberIndex < devInfo->interfaces[i].cInstances) + memcpy(DeviceInterfaceData, + &devInfo->interfaces[i].instances[MemberIndex], + sizeof(SP_DEVICE_INTERFACE_DATA)); + else + { + SetLastError(ERROR_NO_MORE_ITEMS); + ret = FALSE; + } + } else - SetLastError(ERROR_INVALID_HANDLE); + SetLastError(ERROR_NO_MORE_ITEMS); } else - SetLastError(ERROR_INVALID_HANDLE); + { + DWORD i, cEnumerated = 0; + BOOL found = FALSE; + + for (i = 0; !found && cEnumerated < MemberIndex + 1 && + i < set->cDevices; i++) + { + struct DeviceInfo *devInfo = + (struct DeviceInfo *)set->devices[i].Reserved; + DWORD interfaceIndex; + + if (SETUPDI_FindInterface(devInfo, InterfaceClassGuid, + &interfaceIndex)) + { + struct InterfaceInstances *interface = + &devInfo->interfaces[interfaceIndex]; + + if (cEnumerated + interface->cInstances < MemberIndex + 1) + cEnumerated += interface->cInstances; + else + { + DWORD instanceIndex = MemberIndex - cEnumerated; + + memcpy(DeviceInterfaceData, + &interface->instances[instanceIndex], + sizeof(SP_DEVICE_INTERFACE_DATA)); + cEnumerated += instanceIndex + 1; + found = TRUE; + ret = TRUE; + } + } + } + if (!found) + SetLastError(ERROR_NO_MORE_ITEMS); + } return ret; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 54a4b77..cecd231 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -364,6 +364,7 @@ static void testCreateDeviceInterface(void) SP_DEVINFO_DATA devInfo = { 0 }; SP_DEVICE_INTERFACE_DATA interfaceData = { sizeof(interfaceData), { 0 } }; + DWORD i; SetLastError(0xdeadbeef); ret = pSetupDiCreateDeviceInterfaceA(set, NULL, NULL, NULL, 0, NULL); @@ -395,8 +396,14 @@ static void testCreateDeviceInterface(void) ok(ret, "SetupDiCreateDeviceInterfaceA failed: %08x\n", GetLastError()); ret = pSetupDiEnumDeviceInterfaces(set, &devInfo, &guid, 0, &interfaceData); - todo_wine ok(ret, "SetupDiEnumDeviceInterfaces failed: %d\n", GetLastError()); + i = 0; + while (pSetupDiEnumDeviceInterfaces(set, &devInfo, &guid, i, + &interfaceData)) + i++; + ok(i == 2, "expected 2 interfaces, got %d\n", i); + ok(GetLastError() == ERROR_NO_MORE_ITEMS, + "SetupDiEnumDeviceInterfaces failed: %08x\n", GetLastError()); pSetupDiDestroyDeviceInfoList(set); } }

1 0

Juan Lang : setupapi: Set last error on invalid input.
by Alexandre Julliard Sept. 24, 2007

Sept. 24, 2007

Module: wine Branch: master Commit: 707fca6cbce5d9e387112738339e54a4f2697712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=707fca6cbce5d9e3871127383… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 11:35:46 2007 -0700 setupapi: Set last error on invalid input. --- dlls/setupapi/devinst.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index d7cd0c8..43254f7 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1108,7 +1108,10 @@ BOOL WINAPI SetupDiEnumDeviceInfo( TRACE("%p %d %p\n", devinfo, index, info); if(info==NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; + } if (devinfo && devinfo != (HDEVINFO)INVALID_HANDLE_VALUE) { struct DeviceInfoSet *list = (struct DeviceInfoSet *)devinfo;

1 0

Juan Lang : setupapi: Implement SetupDiCreateDeviceInterfaceA on top of SetupDiCreateInterfaceW.
by Alexandre Julliard Sept. 24, 2007

Sept. 24, 2007

Module: wine Branch: master Commit: aa2b23cab5aeabc893d9d635848f7357064614e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa2b23cab5aeabc893d9d6358… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 11:34:30 2007 -0700 setupapi: Implement SetupDiCreateDeviceInterfaceA on top of SetupDiCreateInterfaceW. --- dlls/setupapi/devinst.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 35d2b78..2129296 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1767,12 +1767,26 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceA( DWORD CreationFlags, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) { + BOOL ret; + LPWSTR ReferenceStringW = NULL; + TRACE("%p %p %s %s %08x %p\n", DeviceInfoSet, DeviceInfoData, debugstr_guid(InterfaceClassGuid), debugstr_a(ReferenceString), CreationFlags, DeviceInterfaceData); - FIXME("stub\n"); - return FALSE; + if (ReferenceString) + { + ReferenceStringW = MultiByteToUnicode(ReferenceString, CP_ACP); + if (ReferenceStringW == NULL) return FALSE; + } + + ret = SetupDiCreateDeviceInterfaceW(DeviceInfoSet, DeviceInfoData, + InterfaceClassGuid, ReferenceStringW, CreationFlags, + DeviceInterfaceData); + + MyFree(ReferenceStringW); + + return ret; } /***********************************************************************

1 0

Juan Lang : setupapi: Add error checking to SetupDiCreateDeviceInterfaceW stub.
by Alexandre Julliard Sept. 24, 2007

Sept. 24, 2007

Module: wine Branch: master Commit: 66820122091fa678804fabd75daec4deb10316ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=66820122091fa678804fabd75… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 11:34:53 2007 -0700 setupapi: Add error checking to SetupDiCreateDeviceInterfaceW stub. --- dlls/setupapi/devinst.c | 26 ++++++++++++++++++++++++++ dlls/setupapi/tests/devinst.c | 5 ----- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 2129296..f316c72 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1800,10 +1800,36 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceW( DWORD CreationFlags, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) { + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *devInfo; + TRACE("%p %p %s %s %08x %p\n", DeviceInfoSet, DeviceInfoData, debugstr_guid(InterfaceClassGuid), debugstr_w(ReferenceString), CreationFlags, DeviceInterfaceData); + if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) + || !DeviceInfoData->Reserved) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (!InterfaceClassGuid) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + FIXME("stub\n"); return FALSE; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index cdeb429..8bf3a25 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -351,12 +351,10 @@ static void testCreateDeviceInterface(void) } SetLastError(0xdeadbeef); ret = pSetupDiCreateDeviceInterfaceA(NULL, NULL, NULL, NULL, 0, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetupDiCreateDeviceInterfaceA(NULL, NULL, &guid, NULL, 0, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); set = pSetupDiCreateDeviceInfoList(&guid, NULL); @@ -369,13 +367,11 @@ static void testCreateDeviceInterface(void) SetLastError(0xdeadbeef); ret = pSetupDiCreateDeviceInterfaceA(set, NULL, NULL, NULL, 0, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetupDiCreateDeviceInterfaceA(set, &devInfo, NULL, NULL, 0, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); devInfo.cbSize = sizeof(devInfo); @@ -385,7 +381,6 @@ static void testCreateDeviceInterface(void) SetLastError(0xdeadbeef); ret = pSetupDiCreateDeviceInterfaceA(set, &devInfo, NULL, NULL, 0, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_USER_BUFFER, "Expected ERROR_INVALID_USER_BUFFER, got %08x\n", GetLastError()); ret = pSetupDiCreateDeviceInterfaceA(set, &devInfo, &guid, NULL, 0,

1 0