September 2007 - Wine-commits

Hans Leidekker : msvcrt: Implement _wspawnv{, e, p, pe}.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 1efae756c3e23b43004994436934b1ea4e0347e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1efae756c3e23b43004994436… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Sep 21 15:50:01 2007 +0200 msvcrt: Implement _wspawnv{, e, p, pe}. --- dlls/msvcrt/file.c | 14 ++-- dlls/msvcrt/msvcrt.h | 3 +- dlls/msvcrt/msvcrt.spec | 8 +- dlls/msvcrt/process.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 195 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c46b5c4..4ceae0b 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -283,23 +283,23 @@ static int msvcrt_init_fp(MSVCRT_FILE* file, int fd, unsigned stream_flags) * 04 char file flags (wxflag): repeated for each fd * 4+NBFD HANDLE file handle: repeated for each fd */ -unsigned msvcrt_create_io_inherit_block(STARTUPINFOA* si) +unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block) { int fd; char* wxflag_ptr; HANDLE* handle_ptr; - si->cbReserved2 = sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * MSVCRT_fdend; - si->lpReserved2 = MSVCRT_calloc(si->cbReserved2, 1); - if (!si->lpReserved2) + *size = sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * MSVCRT_fdend; + *block = MSVCRT_calloc(*size, 1); + if (!*block) { - si->cbReserved2 = 0; + *size = 0; return FALSE; } - wxflag_ptr = (char*)si->lpReserved2 + sizeof(unsigned); + wxflag_ptr = (char*)*block + sizeof(unsigned); handle_ptr = (HANDLE*)(wxflag_ptr + MSVCRT_fdend * sizeof(char)); - *(unsigned*)si->lpReserved2 = MSVCRT_fdend; + *(unsigned*)*block = MSVCRT_fdend; for (fd = 0; fd < MSVCRT_fdend; fd++) { /* to be inherited, we need it to be open, and that DONTINHERIT isn't set */ diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index cc3cdd7..204fe9c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -152,7 +152,7 @@ extern void msvcrt_free_args(void); extern void msvcrt_init_signals(void); extern void msvcrt_free_signals(void); -extern unsigned msvcrt_create_io_inherit_block(STARTUPINFOA*); +extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**); /* run-time error codes */ #define _RT_STACK 0 @@ -652,6 +652,7 @@ int MSVCRT__dup(int); int MSVCRT__dup2(int, int); int MSVCRT__pipe(int *, unsigned int, int); MSVCRT_wchar_t* _wgetenv(const MSVCRT_wchar_t*); +void _wsearchenv(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_wchar_t*); #endif #endif /* __WINE_MSVCRT_H */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 74d1fad..5711946 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -559,10 +559,10 @@ @ stub _wspawnle #(long wstr wstr) varargs @ stub _wspawnlp #(long wstr wstr) varargs @ stub _wspawnlpe #(long wstr wstr) varargs -@ stub _wspawnv #(long wstr ptr) -@ stub _wspawnve #(long wstr ptr ptr) -@ stub _wspawnvp #(long wstr ptr) -@ stub _wspawnvpe #(long wstr ptr ptr) +@ stdcall _wspawnv(long wstr ptr) +@ stdcall _wspawnve(long wstr ptr ptr) +@ stdcall _wspawnvp(long wstr ptr) +@ stdcall _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr wstr wstr wstr wstr) @ cdecl _wstat(wstr ptr) MSVCRT__wstat @ cdecl _wstati64(wstr ptr) MSVCRT__wstati64 diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index c6c3a7e..14f8e9a 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -31,6 +31,7 @@ #include "msvcrt.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -48,7 +49,7 @@ static MSVCRT_intptr_t msvcrt_spawn(int flags, const char* exe, char* cmdline, c memset(&si, 0, sizeof(si)); si.cb = sizeof(si); - msvcrt_create_io_inherit_block(&si); + msvcrt_create_io_inherit_block(&si.cbReserved2, &si.lpReserved2); if (!CreateProcessA(exe, cmdline, NULL, NULL, TRUE, flags == MSVCRT__P_DETACH ? DETACHED_PROCESS : 0, env, NULL, &si, &pi)) @@ -81,6 +82,52 @@ static MSVCRT_intptr_t msvcrt_spawn(int flags, const char* exe, char* cmdline, c return -1; /* can't reach here */ } +static MSVCRT_intptr_t msvcrt_spawn_wide(int flags, const MSVCRT_wchar_t* exe, MSVCRT_wchar_t* cmdline, MSVCRT_wchar_t* env) +{ + STARTUPINFOW si; + PROCESS_INFORMATION pi; + + if ((unsigned)flags > MSVCRT__P_DETACH) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + msvcrt_create_io_inherit_block(&si.cbReserved2, &si.lpReserved2); + if (!CreateProcessW(exe, cmdline, NULL, NULL, TRUE, + flags == MSVCRT__P_DETACH ? DETACHED_PROCESS : 0, + env, NULL, &si, &pi)) + { + msvcrt_set_errno(GetLastError()); + MSVCRT_free(si.lpReserved2); + return -1; + } + + MSVCRT_free(si.lpReserved2); + switch(flags) + { + case MSVCRT__P_WAIT: + WaitForSingleObject(pi.hProcess, INFINITE); + GetExitCodeProcess(pi.hProcess,&pi.dwProcessId); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + return pi.dwProcessId; + case MSVCRT__P_DETACH: + CloseHandle(pi.hProcess); + pi.hProcess = 0; + /* fall through */ + case MSVCRT__P_NOWAIT: + case MSVCRT__P_NOWAITO: + CloseHandle(pi.hThread); + return (MSVCRT_intptr_t)pi.hProcess; + case MSVCRT__P_OVERLAY: + MSVCRT__exit(0); + } + return -1; /* can't reach here */ +} + /* INTERNAL: Convert argv list to a single 'delim'-separated string, with an * extra '\0' to terminate it */ @@ -126,6 +173,48 @@ static char* msvcrt_argvtos(const char* const* arg, char delim) return ret; } +static MSVCRT_wchar_t* msvcrt_argvtos_wide(const MSVCRT_wchar_t* const* arg, MSVCRT_wchar_t delim) +{ + const MSVCRT_wchar_t* const* a; + long size; + MSVCRT_wchar_t* p; + MSVCRT_wchar_t* ret; + + if (!arg && !delim) + { + /* Return NULL for an empty environment list */ + return NULL; + } + + /* get length */ + a = arg; + size = 0; + while (*a) + { + size += strlenW(*a) + 1; + a++; + } + + ret = MSVCRT_malloc((size + 1) * sizeof(MSVCRT_wchar_t)); + if (!ret) + return NULL; + + /* fill string */ + a = arg; + p = ret; + while (*a) + { + int len = strlenW(*a); + memcpy(p,*a,len * sizeof(MSVCRT_wchar_t)); + p += len; + *p++ = delim; + a++; + } + if (delim && p > ret) p[-1] = 0; + else *p = 0; + return ret; +} + /* INTERNAL: Convert va_list to a single 'delim'-separated string, with an * extra '\0' to terminate it */ @@ -488,6 +577,63 @@ MSVCRT_intptr_t CDECL _spawnve(int flags, const char* name, const char* const* a } /********************************************************************* + * _wspawnve (MSVCRT.@) + * + * Unicode version of _spawnve + */ +MSVCRT_intptr_t CDECL _wspawnve(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv, + const MSVCRT_wchar_t* const* envv) +{ + MSVCRT_wchar_t * args = msvcrt_argvtos_wide(argv,' '); + MSVCRT_wchar_t * envs = msvcrt_argvtos_wide(envv,0); + MSVCRT_wchar_t fullname[MAX_PATH]; + const MSVCRT_wchar_t *p; + int len; + MSVCRT_intptr_t ret = -1; + + TRACE(":call (%s), params (%s), env (%s)\n",debugstr_w(name),debugstr_w(args), + envs?"Custom":"Null"); + + /* no check for NULL name. + native doesn't do it */ + + p = memchrW(name, '\0', MAX_PATH); + if( !p ) + p = name + MAX_PATH - 1; + len = p - name; + + /* extra-long names are silently truncated. */ + memcpy(fullname, name, len * sizeof(MSVCRT_wchar_t)); + + for( p--; p >= name; p-- ) + { + if( *p == '\\' || *p == '/' || *p == ':' || *p == '.' ) + break; + } + + /* if no extension is given, assume .exe */ + if( (p < name || *p != '.') && len <= MAX_PATH - 5 ) + { + static const MSVCRT_wchar_t dotexe[] = {'.','e','x','e'}; + + FIXME("only trying .exe when no extension given\n"); + memcpy(fullname+len, dotexe, 4 * sizeof(MSVCRT_wchar_t)); + len += 4; + } + + fullname[len] = '\0'; + + if (args) + { + ret = msvcrt_spawn_wide(flags, fullname, args, envs); + MSVCRT_free(args); + } + MSVCRT_free(envs); + + return ret; +} + +/********************************************************************* * _spawnv (MSVCRT.@) * * Like on Windows, this function does not handle arguments with spaces @@ -499,6 +645,16 @@ MSVCRT_intptr_t CDECL _spawnv(int flags, const char* name, const char* const* ar } /********************************************************************* + * _wspawnv (MSVCRT.@) + * + * Unicode version of _spawnv + */ +MSVCRT_intptr_t CDECL _wspawnv(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv) +{ + return _wspawnve(flags, name, argv, NULL); +} + +/********************************************************************* * _spawnvpe (MSVCRT.@) * * Like on Windows, this function does not handle arguments with spaces @@ -513,6 +669,21 @@ MSVCRT_intptr_t CDECL _spawnvpe(int flags, const char* name, const char* const* } /********************************************************************* + * _wspawnvpe (MSVCRT.@) + * + * Unicode version of _spawnvpe + */ +MSVCRT_intptr_t CDECL _wspawnvpe(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv, + const MSVCRT_wchar_t* const* envv) +{ + static const MSVCRT_wchar_t path[] = {'P','A','T','H',0}; + MSVCRT_wchar_t fullname[MAX_PATH]; + + _wsearchenv(name, path, fullname); + return _wspawnve(flags, fullname[0] ? fullname : name, argv, envv); +} + +/********************************************************************* * _spawnvp (MSVCRT.@) * * Like on Windows, this function does not handle arguments with spaces @@ -524,6 +695,16 @@ MSVCRT_intptr_t CDECL _spawnvp(int flags, const char* name, const char* const* a } /********************************************************************* + * _wspawnvp (MSVCRT.@) + * + * Unicode version of _spawnvp + */ +MSVCRT_intptr_t CDECL _wspawnvp(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv) +{ + return _wspawnvpe(flags, name, argv, NULL); +} + +/********************************************************************* * _popen (MSVCRT.@) * FIXME: convert to _wpopen and call that from here instead? But it * would have to convert the command back to ANSI to call msvcrt_spawn,

1 0

Juan Lang : setupapi: Store pointer to an interface' s device in the interface instance.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 5ce7fcae8e6526bdd5e1e5520adb24fd6c8c5c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce7fcae8e6526bdd5e1e5520… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 17:06:18 2007 -0700 setupapi: Store pointer to an interface's device in the interface instance. --- dlls/setupapi/devinst.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index cb1605f..57c142b 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -104,8 +104,9 @@ struct DeviceInfoSet /* Pointed to by SP_DEVICE_INTERFACE_DATA's Reserved member */ struct InterfaceInfo { - LPWSTR referenceString; - LPWSTR symbolicLink; + LPWSTR referenceString; + LPWSTR symbolicLink; + PSP_DEVINFO_DATA device; }; /* A device may have multiple instances of the same interface, so this holds @@ -258,10 +259,11 @@ static LPWSTR SETUPDI_CreateSymbolicLinkPath(LPCWSTR instanceId, * the device, if it doesn't already exist in the device. If iface is not * NULL, returns a pointer to the newly added (or already existing) interface. */ -static BOOL SETUPDI_AddInterfaceInstance(struct DeviceInfo *devInfo, +static BOOL SETUPDI_AddInterfaceInstance(PSP_DEVINFO_DATA DeviceInfoData, const GUID *InterfaceClassGuid, LPCWSTR ReferenceString, SP_DEVICE_INTERFACE_DATA **ifaceData) { + struct DeviceInfo *devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; BOOL newInterface = FALSE, ret; struct InterfaceInstances *iface = NULL; @@ -313,6 +315,7 @@ static BOOL SETUPDI_AddInterfaceInstance(struct DeviceInfo *devInfo, if (ifaceInfo) { ret = TRUE; + ifaceInfo->device = DeviceInfoData; ifaceInfo->symbolicLink = SETUPDI_CreateSymbolicLinkPath( devInfo->instanceId, InterfaceClassGuid, ReferenceString); @@ -1736,7 +1739,6 @@ end: 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; @@ -1751,7 +1753,7 @@ static void SETUPDI_AddDeviceInterfaces(SP_DEVINFO_DATA *dev, HKEY key, SP_DEVICE_INTERFACE_DATA *iface = NULL; /* The subkey name is the reference string, with a '#' prepended */ - SETUPDI_AddInterfaceInstance(devInfo, interface, subKeyName + 1, + SETUPDI_AddInterfaceInstance(dev, interface, subKeyName + 1, &iface); l = RegOpenKeyExW(key, subKeyName, 0, KEY_READ, &subKey); if (!l) @@ -2113,7 +2115,6 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceW( PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) { struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; - struct DeviceInfo *devInfo; SP_DEVICE_INTERFACE_DATA *iface = NULL; BOOL ret; @@ -2142,8 +2143,7 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceW( SetLastError(ERROR_INVALID_USER_BUFFER); return FALSE; } - devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; - if ((ret = SETUPDI_AddInterfaceInstance(devInfo, InterfaceClassGuid, + if ((ret = SETUPDI_AddInterfaceInstance(DeviceInfoData, InterfaceClassGuid, ReferenceString, &iface))) { if (DeviceInterfaceData)

1 0

Juan Lang : setupapi: Return the interface' s device from SetupDiGetDeviceInterfaceDetailA/W.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 443cfda4a6c98a43ad039187448f8835d14ab657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=443cfda4a6c98a43ad0391874… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 17:06:46 2007 -0700 setupapi: Return the interface's device from SetupDiGetDeviceInterfaceDetailA/W. --- dlls/setupapi/devinst.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 57c142b..9593b1c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2401,6 +2401,8 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA( NULL, NULL); else DeviceInterfaceDetailData->DevicePath[0] = '\0'; + if (DeviceInfoData && DeviceInfoData->cbSize == sizeof(SP_DEVINFO_DATA)) + memcpy(DeviceInfoData, info->device, sizeof(SP_DEVINFO_DATA)); ret = TRUE; } else @@ -2467,6 +2469,8 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW( lstrcpyW(DeviceInterfaceDetailData->DevicePath, info->symbolicLink); else DeviceInterfaceDetailData->DevicePath[0] = '\0'; + if (DeviceInfoData && DeviceInfoData->cbSize == sizeof(SP_DEVINFO_DATA)) + memcpy(DeviceInfoData, info->device, sizeof(SP_DEVINFO_DATA)); ret = TRUE; } else

1 0

Juan Lang : setupapi: Implement SetupDiCreateDeviceInterfaceRegKeyA/W.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 21b7e1faf66e9a04473cf97c49a10d4545fa8be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b7e1faf66e9a04473cf97c4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 17:07:16 2007 -0700 setupapi: Implement SetupDiCreateDeviceInterfaceRegKeyA/W. --- dlls/setupapi/devinst.c | 105 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 101 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9593b1c..6d90d15 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2171,9 +2171,27 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyA( HINF InfHandle, PCSTR InfSectionName) { - FIXME("%p %p %d %08x %p %p\n", DeviceInfoSet, DeviceInterfaceData, Reserved, + HKEY key; + PWSTR InfSectionNameW = NULL; + + TRACE("%p %p %d %08x %p %p\n", DeviceInfoSet, DeviceInterfaceData, Reserved, samDesired, InfHandle, InfSectionName); - return INVALID_HANDLE_VALUE; + if (InfHandle) + { + if (!InfSectionName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + InfSectionNameW = MultiByteToUnicode(InfSectionName, CP_ACP); + if (!InfSectionNameW) + return INVALID_HANDLE_VALUE; + } + key = SetupDiCreateDeviceInterfaceRegKeyW(DeviceInfoSet, + DeviceInterfaceData, Reserved, samDesired, InfHandle, + InfSectionNameW); + MyFree(InfSectionNameW); + return key; } /*********************************************************************** @@ -2187,9 +2205,88 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW( HINF InfHandle, PCWSTR InfSectionName) { - FIXME("%p %p %d %08x %p %p\n", DeviceInfoSet, DeviceInterfaceData, Reserved, + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + HKEY key = INVALID_HANDLE_VALUE, interfacesKey; + LONG l; + + TRACE("%p %p %d %08x %p %p\n", DeviceInfoSet, DeviceInterfaceData, Reserved, samDesired, InfHandle, InfSectionName); - return INVALID_HANDLE_VALUE; + + if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE || + set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return INVALID_HANDLE_VALUE; + } + if (!DeviceInterfaceData || + DeviceInterfaceData->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA) || + !DeviceInterfaceData->Reserved) + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + if (InfHandle && !InfSectionName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + if (!(l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, DeviceClasses, 0, NULL, 0, + samDesired, NULL, &interfacesKey, NULL))) + { + HKEY parent; + WCHAR bracedGuidString[39]; + + SETUPDI_GuidToString(&DeviceInterfaceData->InterfaceClassGuid, + bracedGuidString); + if (!(l = RegCreateKeyExW(interfacesKey, bracedGuidString, 0, NULL, 0, + samDesired, NULL, &parent, NULL))) + { + static const WCHAR hash[] = {'#',0}; + struct InterfaceInfo *ifaceInfo = + (struct InterfaceInfo *)DeviceInterfaceData->Reserved; + LPCWSTR instancePath = NULL; + LPWSTR referencePath = NULL; + + if (ifaceInfo->referenceString) + { + referencePath = HeapAlloc(GetProcessHeap(), 0, + (lstrlenW(ifaceInfo->referenceString) + 2) * + sizeof(WCHAR)); + if (referencePath) + { + lstrcpyW(referencePath, hash); + lstrcatW(referencePath, ifaceInfo->referenceString); + instancePath = referencePath; + } + else + SetLastError(ERROR_OUTOFMEMORY); + } + else + instancePath = hash; + if (instancePath) + { + LONG l; + + l = RegCreateKeyExW(parent, instancePath, 0, NULL, 0, + samDesired, NULL, &key, NULL); + if (l) + { + SetLastError(l); + key = INVALID_HANDLE_VALUE; + } + else if (InfHandle) + FIXME("INF section installation unsupported\n"); + } + HeapFree(GetProcessHeap(), 0, referencePath); + RegCloseKey(parent); + } + else + SetLastError(l); + RegCloseKey(interfacesKey); + } + else + SetLastError(l); + return key; } /***********************************************************************

1 0

Juan Lang : setupapi: Store pointer to set in device, and use it to make sure that a device is a member of a set.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: d0a2866a90d420d90cf8f45879206ea944d3aeea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0a2866a90d420d90cf8f4587… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 17:07:37 2007 -0700 setupapi: Store pointer to set in device, and use it to make sure that a device is a member of a set. --- dlls/setupapi/devinst.c | 33 ++++++++++++++++++++++++++------- 1 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 6d90d15..acaa8ae 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -124,10 +124,11 @@ struct InterfaceInstances /* Pointed to by SP_DEVINFO_DATA's Reserved member */ struct DeviceInfo { - HKEY key; - BOOL phantom; - LPWSTR instanceId; - struct list interfaces; + struct DeviceInfoSet *set; + HKEY key; + BOOL phantom; + LPWSTR instanceId; + struct list interfaces; }; static void SETUPDI_GuidToString(const GUID *guid, LPWSTR guidStr) @@ -386,14 +387,15 @@ static BOOL SETUPDI_SetInterfaceSymbolicLink(SP_DEVICE_INTERFACE_DATA *iface, return ret; } -static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(LPCWSTR instanceId, - BOOL phantom) +static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(struct DeviceInfoSet *set, + LPCWSTR instanceId, BOOL phantom) { struct DeviceInfo *devInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DeviceInfo)); if (devInfo) { + devInfo->set = set; devInfo->instanceId = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(instanceId) + 1) * sizeof(WCHAR)); if (devInfo->instanceId) @@ -470,7 +472,7 @@ static BOOL SETUPDI_AddDeviceToSet(struct DeviceInfoSet *set, SP_DEVINFO_DATA **dev) { BOOL ret = FALSE; - struct DeviceInfo *devInfo = SETUPDI_AllocateDeviceInfo(instanceId, + struct DeviceInfo *devInfo = SETUPDI_AllocateDeviceInfo(set, instanceId, phantom); TRACE("%p, %s, %d, %s, %d\n", set, debugstr_guid(guid), devInst, @@ -1364,6 +1366,11 @@ BOOL WINAPI SetupDiRegisterDeviceInfo( return FALSE; } devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + if (devInfo->set != set) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if (devInfo->phantom) { devInfo->phantom = FALSE; @@ -1504,6 +1511,11 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdW( return FALSE; } devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + if (devInfo->set != set) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } TRACE("instance ID: %s\n", debugstr_w(devInfo->instanceId)); if (DeviceInstanceIdSize < lstrlenW(devInfo->instanceId) + 1) { @@ -2115,6 +2127,7 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceW( PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) { struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *devInfo; SP_DEVICE_INTERFACE_DATA *iface = NULL; BOOL ret; @@ -2138,6 +2151,12 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceW( SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + if (devInfo->set != set) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if (!InterfaceClassGuid) { SetLastError(ERROR_INVALID_USER_BUFFER);

1 0

Juan Lang : setupapi: Save interface to registry when creating it.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: e69520ab6e1191308fa98272822e0f13bb0086ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e69520ab6e1191308fa982728… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 17:08:01 2007 -0700 setupapi: Save interface to registry when creating it. --- dlls/setupapi/devinst.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index acaa8ae..a1a060c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -336,6 +336,8 @@ static BOOL SETUPDI_AddInterfaceInstance(PSP_DEVINFO_DATA DeviceInfoData, ifaceInfo->referenceString = NULL; if (ret) { + HKEY key; + iface->cInstances++; instance->cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); @@ -346,7 +348,16 @@ static BOOL SETUPDI_AddInterfaceInstance(PSP_DEVINFO_DATA DeviceInfoData, if (newInterface) memcpy(&iface->guid, InterfaceClassGuid, sizeof(GUID)); - /* FIXME: now create this homeboy in the registry */ + key = SetupDiCreateDeviceInterfaceRegKeyW(devInfo->set, + instance, 0, KEY_WRITE, NULL, NULL); + if (key != INVALID_HANDLE_VALUE) + { + RegSetValueExW(key, SymbolicLink, 0, REG_SZ, + (BYTE *)ifaceInfo->symbolicLink, + lstrlenW(ifaceInfo->symbolicLink) * + sizeof(WCHAR)); + RegCloseKey(key); + } if (ifaceData) *ifaceData = instance; }

1 0

Juan Lang : setupapi: Implement SetupDiDeleteDeviceInterfaceRegKey.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: dadcb201d9bd35fdceccd6d9d6c968cb41617f3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dadcb201d9bd35fdceccd6d9d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 17:08:28 2007 -0700 setupapi: Implement SetupDiDeleteDeviceInterfaceRegKey. --- dlls/setupapi/devinst.c | 99 ++++++++++++++++++++++++++++++++++--------- dlls/setupapi/setupapi.spec | 1 + 2 files changed, 80 insertions(+), 20 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index a1a060c..9fe76e2 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2224,6 +2224,33 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyA( return key; } +static PWSTR SETUPDI_GetInstancePath(struct InterfaceInfo *ifaceInfo) +{ + static const WCHAR hash[] = {'#',0}; + PWSTR instancePath = NULL; + + if (ifaceInfo->referenceString) + { + instancePath = HeapAlloc(GetProcessHeap(), 0, + (lstrlenW(ifaceInfo->referenceString) + 2) * sizeof(WCHAR)); + if (instancePath) + { + lstrcpyW(instancePath, hash); + lstrcatW(instancePath, ifaceInfo->referenceString); + } + else + SetLastError(ERROR_OUTOFMEMORY); + } + else + { + instancePath = HeapAlloc(GetProcessHeap(), 0, + (lstrlenW(hash) + 1) * sizeof(WCHAR)); + if (instancePath) + lstrcpyW(instancePath, hash); + } + return instancePath; +} + /*********************************************************************** * SetupDiCreateDeviceInterfaceRegKeyW (SETUPAPI.@) */ @@ -2271,28 +2298,10 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW( if (!(l = RegCreateKeyExW(interfacesKey, bracedGuidString, 0, NULL, 0, samDesired, NULL, &parent, NULL))) { - static const WCHAR hash[] = {'#',0}; struct InterfaceInfo *ifaceInfo = (struct InterfaceInfo *)DeviceInterfaceData->Reserved; - LPCWSTR instancePath = NULL; - LPWSTR referencePath = NULL; + PWSTR instancePath = SETUPDI_GetInstancePath(ifaceInfo); - if (ifaceInfo->referenceString) - { - referencePath = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(ifaceInfo->referenceString) + 2) * - sizeof(WCHAR)); - if (referencePath) - { - lstrcpyW(referencePath, hash); - lstrcatW(referencePath, ifaceInfo->referenceString); - instancePath = referencePath; - } - else - SetLastError(ERROR_OUTOFMEMORY); - } - else - instancePath = hash; if (instancePath) { LONG l; @@ -2307,7 +2316,7 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW( else if (InfHandle) FIXME("INF section installation unsupported\n"); } - HeapFree(GetProcessHeap(), 0, referencePath); + HeapFree(GetProcessHeap(), 0, instancePath); RegCloseKey(parent); } else @@ -2320,6 +2329,56 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW( } /*********************************************************************** + * SetupDiDeleteDeviceInterfaceRegKey (SETUPAPI.@) + */ +BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey( + HDEVINFO DeviceInfoSet, + PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, + DWORD Reserved) +{ + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + HKEY parent; + BOOL ret = FALSE; + + TRACE("%p %p %d\n", DeviceInfoSet, DeviceInterfaceData, Reserved); + + 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; + } + parent = SetupDiOpenClassRegKeyExW(&DeviceInterfaceData->InterfaceClassGuid, + KEY_ALL_ACCESS, DIOCR_INTERFACE, NULL, NULL); + if (parent != INVALID_HANDLE_VALUE) + { + struct InterfaceInfo *ifaceInfo = + (struct InterfaceInfo *)DeviceInterfaceData->Reserved; + PWSTR instancePath = SETUPDI_GetInstancePath(ifaceInfo); + + if (instancePath) + { + LONG l = RegDeleteKeyW(parent, instancePath); + + if (l) + SetLastError(l); + else + ret = TRUE; + HeapFree(GetProcessHeap(), 0, instancePath); + } + RegCloseKey(parent); + } + return ret; +} + +/*********************************************************************** * SetupDiEnumDeviceInterfaces (SETUPAPI.@) * * PARAMS diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 5ba940e..f9589b1 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -295,6 +295,7 @@ @ stub SetupDiDeleteDevRegKey @ stub SetupDiDeleteDeviceInfo @ stub SetupDiDeleteDeviceInterfaceData +@ stdcall SetupDiDeleteDeviceInterfaceRegKey(ptr ptr long) @ stub SetupDiDeleteDeviceRegKey @ stub SetupDiDestroyClassImageList @ stdcall SetupDiDestroyDeviceInfoList(long)

1 0

Juan Lang : setupapi: Create symbolic link value when interface is created.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: df3cb0630df098cab0aa7f422c40ff813e91bd93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df3cb0630df098cab0aa7f422… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 11:56:45 2007 -0700 setupapi: Create symbolic link value when interface is created. --- dlls/setupapi/devinst.c | 63 ++++++++++++++++++++++++++++++++-------- dlls/setupapi/tests/devinst.c | 2 - 2 files changed, 50 insertions(+), 15 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index c71d17f..08a78f3 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -129,6 +129,18 @@ struct DeviceInfo struct InterfaceInstances *interfaces; }; +static void SETUPDI_GuidToString(const GUID *guid, LPWSTR guidStr) +{ + static const WCHAR fmt[] = {'{','%','0','8','X','-','%','0','4','X','-', + '%','0','4','X','-','%','0','2','X','%','0','2','X','-','%','0','2', + 'X','%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','%', + '0','2','X','}',0}; + + sprintfW(guidStr, fmt, guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); +} + static void SETUPDI_FreeInterfaceInstances(struct InterfaceInstances *instances) { DWORD i; @@ -205,6 +217,41 @@ static BOOL SETUPDI_FindInterfaceInstance( return found; } +static LPWSTR SETUPDI_CreateSymbolicLinkPath(LPCWSTR instanceId, + const GUID *InterfaceClassGuid, LPCWSTR ReferenceString) +{ + static const WCHAR fmt[] = {'\\','\\','?','\\','%','s','#','%','s',0}; + WCHAR guidStr[39]; + DWORD len; + LPWSTR ret; + + SETUPDI_GuidToString(InterfaceClassGuid, guidStr); + /* omit length of format specifiers, but include NULL terminator: */ + len = lstrlenW(fmt) - 4 + 1; + len += lstrlenW(instanceId) + lstrlenW(guidStr); + if (ReferenceString) + { + /* space for a hash between string and reference string: */ + len += lstrlenW(ReferenceString) + 1; + } + ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (ret) + { + int printed = sprintfW(ret, fmt, instanceId, guidStr); + LPWSTR ptr; + + /* replace '\\' with '#' after the "\\\\?\\" beginning */ + for (ptr = strchrW(ret + 4, '\\'); ptr; ptr = strchrW(ptr + 1, '\\')) + *ptr = '#'; + if (ReferenceString) + { + ret[printed - 1] = '\\'; + lstrcpyW(ret + printed, ReferenceString); + } + } + return ret; +} + /* Adds an interface with the given interface class and reference string to * the device, if it doesn't already exist in the device. If iface is not * NULL, returns a pointer to the newly added (or already existing) interface. @@ -285,7 +332,9 @@ static BOOL SETUPDI_AddInterfaceInstance(struct DeviceInfo *devInfo, if (ifaceInfo) { ret = TRUE; - ifaceInfo->symbolicLink = NULL; + ifaceInfo->symbolicLink = SETUPDI_CreateSymbolicLinkPath( + devInfo->instanceId, InterfaceClassGuid, + ReferenceString); if (ReferenceString) { ifaceInfo->referenceString = @@ -425,18 +474,6 @@ static void SETUPDI_FreeDeviceInfo(struct DeviceInfo *devInfo) HeapFree(GetProcessHeap(), 0, devInfo); } -static void SETUPDI_GuidToString(const GUID *guid, LPWSTR guidStr) -{ - static const WCHAR fmt[] = {'{','%','0','8','X','-','%','0','4','X','-', - '%','0','4','X','-','%','0','2','X','%','0','2','X','-','%','0','2', - 'X','%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','%', - '0','2','X','}',0}; - - sprintfW(guidStr, fmt, guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); -} - /* Adds a device with GUID guid and identifer devInst to set. Allocates a * struct DeviceInfo, and points the returned device info's Reserved member * to it. "Phantom" devices are deleted from the registry when closed. diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index d8a434f..0b58e4e 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -482,7 +482,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 = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_A); @@ -490,7 +489,6 @@ 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);

1 0

Juan Lang : setupapi: Fix prototype of SetupDiCreateDeviceInterfaceRegKeyA/ W.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 4bfca01da0b9d36500e09c63b7e00ce6239b5688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bfca01da0b9d36500e09c63b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 17:03:31 2007 -0700 setupapi: Fix prototype of SetupDiCreateDeviceInterfaceRegKeyA/W. --- include/setupapi.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/setupapi.h b/include/setupapi.h index e4a0fc3..d52790d 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1456,8 +1456,8 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO, PCWSTR, CONST GUID*, PCWSTR, BOOL WINAPI SetupDiCreateDeviceInterfaceA(HDEVINFO, PSP_DEVINFO_DATA, const GUID *, PCSTR, DWORD, PSP_DEVICE_INTERFACE_DATA); BOOL WINAPI SetupDiCreateDeviceInterfaceW(HDEVINFO, PSP_DEVINFO_DATA, const GUID *, PCWSTR, DWORD, PSP_DEVICE_INTERFACE_DATA); #define SetupDiCreateDeviceInterface WINELIB_NAME_AW(SetupDiCreateDeviceInterface) -HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyA(HDEVINFO, PSP_DEVINFO_DATA, DWORD, REGSAM, HINF, PCSTR); -HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO, PSP_DEVINFO_DATA, DWORD, REGSAM, HINF, PCWSTR); +HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyA(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, DWORD, REGSAM, HINF, PCSTR); +HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, DWORD, REGSAM, HINF, PCWSTR); #define SetupDiCreateDeviceInterfaceRegKey WINELIB_NAME_AW(SetupDiCreateDeviceInterfaceRegKey) BOOL WINAPI SetupDiCreateDevRegKeyA(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, HINF, PCSTR); BOOL WINAPI SetupDiCreateDevRegKeyW(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, HINF, PCWSTR);

1 0

Juan Lang : setupapi: Convert device's interfaces to a standard list.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 44ac73effe3328da51fdafd3b062b27f5184f2ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=44ac73effe3328da51fdafd3b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 21 17:04:09 2007 -0700 setupapi: Convert device's interfaces to a standard list. --- dlls/setupapi/devinst.c | 107 ++++++++++++++++++----------------------------- 1 files changed, 41 insertions(+), 66 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 08a78f3..2236896 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -33,6 +33,7 @@ #include "winnls.h" #include "setupapi.h" #include "wine/debug.h" +#include "wine/list.h" #include "wine/unicode.h" #include "cfgmgr32.h" #include "initguid.h" @@ -116,17 +117,16 @@ struct InterfaceInstances DWORD cInstances; DWORD cInstancesAllocated; SP_DEVICE_INTERFACE_DATA *instances; + struct list entry; }; /* Pointed to by SP_DEVINFO_DATA's Reserved member */ struct DeviceInfo { - HKEY key; - BOOL phantom; - LPWSTR instanceId; - DWORD cInterfaces; - DWORD cInterfacesAllocated; - struct InterfaceInstances *interfaces; + HKEY key; + BOOL phantom; + LPWSTR instanceId; + struct list interfaces; }; static void SETUPDI_GuidToString(const GUID *guid, LPWSTR guidStr) @@ -157,27 +157,29 @@ static void SETUPDI_FreeInterfaceInstances(struct InterfaceInstances *instances) } /* Finds the interface with interface class InterfaceClassGuid in the device. - * Returns TRUE if found, and updates interfaceIndex to the index of the - * device's interfaces member where the given interface was found. + * Returns TRUE if found, and updates *interface to point to device's + * interfaces member where the given interface was found. * Returns FALSE if not found. */ static BOOL SETUPDI_FindInterface(const struct DeviceInfo *devInfo, - const GUID *InterfaceClassGuid, DWORD *interfaceIndex) + const GUID *InterfaceClassGuid, struct InterfaceInstances **interface) { BOOL found = FALSE; - DWORD i; + struct InterfaceInstances *iface; TRACE("%s\n", debugstr_guid(InterfaceClassGuid)); - for (i = 0; !found && i < devInfo->cInterfaces; i++) + LIST_FOR_EACH_ENTRY(iface, &devInfo->interfaces, struct InterfaceInstances, + entry) { - if (IsEqualGUID(&devInfo->interfaces[i].guid, InterfaceClassGuid)) + if (IsEqualGUID(&iface->guid, InterfaceClassGuid)) { - *interfaceIndex = i; + *interface = iface; found = TRUE; + break; } } - TRACE("returning %d (%d)\n", found, found ? *interfaceIndex : 0); + TRACE("returning %d (%p)\n", found, found ? *interface : NULL); return found; } @@ -261,42 +263,21 @@ static BOOL SETUPDI_AddInterfaceInstance(struct DeviceInfo *devInfo, SP_DEVICE_INTERFACE_DATA **ifaceData) { BOOL newInterface = FALSE, ret; - DWORD interfaceIndex = 0; struct InterfaceInstances *iface = NULL; TRACE("%p %s %s %p\n", devInfo, debugstr_guid(InterfaceClassGuid), debugstr_w(ReferenceString), iface); - if (!(ret = SETUPDI_FindInterface(devInfo, InterfaceClassGuid, - &interfaceIndex))) + if (!(ret = SETUPDI_FindInterface(devInfo, InterfaceClassGuid, &iface))) { - if (!devInfo->cInterfacesAllocated) - { - devInfo->interfaces = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(struct InterfaceInstances)); - if (devInfo->interfaces) - { - iface = &devInfo->interfaces[devInfo->cInterfacesAllocated++]; - newInterface = TRUE; - } - } - else if (devInfo->cInterfaces == devInfo->cInterfacesAllocated) + iface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(struct InterfaceInstances)); + if (iface) { - devInfo->interfaces = HeapReAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, devInfo->interfaces, - (devInfo->cInterfacesAllocated + 1) * - sizeof(struct InterfaceInstances)); - if (devInfo->interfaces) - { - iface = &devInfo->interfaces[devInfo->cInterfacesAllocated++]; - newInterface = TRUE; - } + list_add_tail(&devInfo->interfaces, &iface->entry); + newInterface = TRUE; } - else - iface = &devInfo->interfaces[devInfo->cInterfaces]; } - else - iface = &devInfo->interfaces[interfaceIndex]; if (iface) { DWORD instanceIndex = 0; @@ -359,11 +340,8 @@ static BOOL SETUPDI_AddInterfaceInstance(struct DeviceInfo *devInfo, instance->Flags = SPINT_ACTIVE; /* FIXME */ instance->Reserved = (ULONG_PTR)ifaceInfo; if (newInterface) - { memcpy(&iface->guid, InterfaceClassGuid, sizeof(GUID)); - devInfo->cInterfaces++; - } /* FIXME: now create this homeboy in the registry */ if (ifaceData) *ifaceData = instance; @@ -376,8 +354,7 @@ static BOOL SETUPDI_AddInterfaceInstance(struct DeviceInfo *devInfo, else { if (ifaceData) - *ifaceData = - &devInfo->interfaces[interfaceIndex].instances[instanceIndex]; + *ifaceData = &iface->instances[instanceIndex]; } } else @@ -436,8 +413,7 @@ static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(LPCWSTR instanceId, (LPBYTE)&phantom, sizeof(phantom)); RegCloseKey(enumKey); } - devInfo->cInterfaces = devInfo->cInterfacesAllocated = 0; - devInfo->interfaces = NULL; + list_init(&devInfo->interfaces); } else { @@ -450,7 +426,7 @@ static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(LPCWSTR instanceId, static void SETUPDI_FreeDeviceInfo(struct DeviceInfo *devInfo) { - DWORD i; + struct InterfaceInstances *iface, *next; if (devInfo->key != INVALID_HANDLE_VALUE) RegCloseKey(devInfo->key); @@ -468,9 +444,13 @@ static void SETUPDI_FreeDeviceInfo(struct DeviceInfo *devInfo) } } HeapFree(GetProcessHeap(), 0, devInfo->instanceId); - for (i = 0; i < devInfo->cInterfaces; i++) - SETUPDI_FreeInterfaceInstances(&devInfo->interfaces[i]); - HeapFree(GetProcessHeap(), 0, devInfo->interfaces); + LIST_FOR_EACH_ENTRY_SAFE(iface, next, &devInfo->interfaces, + struct InterfaceInstances, entry) + { + list_remove(&iface->entry); + SETUPDI_FreeInterfaceInstances(iface); + HeapFree(GetProcessHeap(), 0, iface); + } HeapFree(GetProcessHeap(), 0, devInfo); } @@ -2238,13 +2218,12 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces( { struct DeviceInfo *devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; - DWORD i; + struct InterfaceInstances *iface; - if ((ret = SETUPDI_FindInterface(devInfo, InterfaceClassGuid, &i))) + if ((ret = SETUPDI_FindInterface(devInfo, InterfaceClassGuid, &iface))) { - if (MemberIndex < devInfo->interfaces[i].cInstances) - memcpy(DeviceInterfaceData, - &devInfo->interfaces[i].instances[MemberIndex], + if (MemberIndex < iface->cInstances) + memcpy(DeviceInterfaceData, &iface->instances[MemberIndex], sizeof(SP_DEVICE_INTERFACE_DATA)); else { @@ -2265,22 +2244,18 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces( { struct DeviceInfo *devInfo = (struct DeviceInfo *)set->devices[i].Reserved; - DWORD interfaceIndex; + struct InterfaceInstances *iface; - if (SETUPDI_FindInterface(devInfo, InterfaceClassGuid, - &interfaceIndex)) + if (SETUPDI_FindInterface(devInfo, InterfaceClassGuid, &iface)) { - struct InterfaceInstances *interface = - &devInfo->interfaces[interfaceIndex]; - - if (cEnumerated + interface->cInstances < MemberIndex + 1) - cEnumerated += interface->cInstances; + if (cEnumerated + iface->cInstances < MemberIndex + 1) + cEnumerated += iface->cInstances; else { DWORD instanceIndex = MemberIndex - cEnumerated; memcpy(DeviceInterfaceData, - &interface->instances[instanceIndex], + &iface->instances[instanceIndex], sizeof(SP_DEVICE_INTERFACE_DATA)); cEnumerated += instanceIndex + 1; found = TRUE;

1 0