Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[hpoussin] 16631: Implement SetupDiGetDeviceRegistryPropertyA/W

by hpoussin＠svn.reactos.com

Implement SetupDiGetDeviceRegistryPropertyA/W Change the way devices are enumerated in SetupDiGetClassDevsExW. Now, it enumerates subkeys of HKLM\SYSTEM\CurrentControlSet\Enum instead of HLKM\SYSTEM\CurrentControlSet\Control\Class ones. Free the temp buffer in SetupDiGetDeviceRegistryPropertyA only when it is no more usefull Replace RegOpenKeyEx by RegOpenKeyExW Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-07-18 03:13:11 UTC (rev 16630) +++ trunk/reactos/lib/setupapi/devinst.c 2005-07-18 07:17:53 UTC (rev 16631) @@ -85,7 +85,7 @@ struct { GUID ClassGuid; - WCHAR RegistryKey[0]; /* "0000", "0001"... */ + WCHAR InstancePath[0]; /* "ACPI\PNP0501\4&2658d0a0&0" */ } Device; struct { @@ -723,7 +723,12 @@ &DevInfo->Device.ClassGuid, sizeof(GUID)); DeviceInfoData->DevInst = 0; /* FIXME */ - DeviceInfoData->Reserved = (ULONG_PTR)0; + /* Note: this appears to be dangerous, passing a private + * pointer a heap-allocated datum to the caller. However, the + * expected lifetime of the device data is the same as the + * HDEVINFO; once that is closed, the data are no longer valid. + */ + DeviceInfoData->Reserved = (ULONG_PTR)DevInfo; ret = TRUE; } else @@ -1082,62 +1087,219 @@ return ret; } -static LONG SETUP_CreateDevListFromClass( - DeviceInfoList *list, - PCWSTR MachineName, - LPGUID class, - PCWSTR Enumerator) +static LONG SETUP_CreateDevListFromEnumerator( + DeviceInfoList* list, + LPCGUID pClassGuid OPTIONAL, + LPCWSTR pClassGuidW OPTIONAL, /* pClassGuid in string form */ + LPCWSTR Enumerator, + HKEY hEnumeratorKey) /* handle to Enumerator registry key */ { - HKEY KeyClass; - LONG rc; - DWORD subKeys = 0, maxSubKey; + HKEY hDeviceIdKey, hInstanceIdKey; + WCHAR KeyBuffer[MAX_PATH]; + WCHAR InstancePath[MAX_PATH]; + LPWSTR pEndOfInstancePath; /* Pointer into InstancePath buffer */ DeviceInfo* deviceInfo; + DWORD i = 0, j; + DWORD dwLength, dwRegType; + DWORD rc; + + /* Enumerate device IDs (subkeys of hEnumeratorKey) */ + while (TRUE) + { + dwLength = sizeof(KeyBuffer) / sizeof(KeyBuffer[0]); + rc = RegEnumKeyExW(hEnumeratorKey, i, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); + if (rc == ERROR_NO_MORE_ITEMS) + break; + if (rc != ERROR_SUCCESS) + return rc; + i++; + + /* Open device id sub key */ + rc = RegOpenKeyExW(hEnumeratorKey, KeyBuffer, 0, KEY_ENUMERATE_SUB_KEYS, &hDeviceIdKey); + if (rc != ERROR_SUCCESS) + return rc; + wcscpy(InstancePath, Enumerator); + wcscat(InstancePath, L"\\"); + wcscat(InstancePath, KeyBuffer); + wcscat(InstancePath, L"\\"); + pEndOfInstancePath = &InstancePath[wcslen(InstancePath)]; + + /* Enumerate instance IDs (subkeys of hDeviceIdKey) */ + j = 0; + while (TRUE) + { + dwLength = sizeof(KeyBuffer) / sizeof(KeyBuffer[0]); + rc = RegEnumKeyExW(hDeviceIdKey, j, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); + if (rc == ERROR_NO_MORE_ITEMS) + break; + if (rc != ERROR_SUCCESS) + { + RegCloseKey(hDeviceIdKey); + return rc; + } + j++; + + /* Open instance id sub key */ + rc = RegOpenKeyExW(hDeviceIdKey, KeyBuffer, 0, KEY_QUERY_VALUE, &hInstanceIdKey); + if (rc != ERROR_SUCCESS) + { + RegCloseKey(hDeviceIdKey); + return rc; + } + *pEndOfInstancePath = UNICODE_NULL; + wcscat(InstancePath, KeyBuffer); + + /* Read ClassGUID value */ + dwLength = sizeof(KeyBuffer) - sizeof(UNICODE_NULL); + rc = RegQueryValueExW(hInstanceIdKey, ClassGUID, NULL, &dwRegType, (LPBYTE)KeyBuffer, &dwLength); + RegCloseKey(hInstanceIdKey); + if (rc == ERROR_FILE_NOT_FOUND) + { + if (pClassGuidW) + /* Skip this bad entry as we can't verify it */ + continue; + } + else if (rc != ERROR_SUCCESS) + { + RegCloseKey(hDeviceIdKey); + return rc; + } + else if (dwRegType != REG_SZ) + { + RegCloseKey(hDeviceIdKey); + return ERROR_GEN_FAILURE; + } + else if (pClassGuidW) + { + if (wcsicmp(KeyBuffer, pClassGuidW) != 0) + /* Skip this entry as it is not the right device class */ + continue; + } + + /* Add the entry to the list */ + deviceInfo = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DeviceInfo, Device.InstancePath) + wcslen(InstancePath) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!deviceInfo) + { + RegCloseKey(hDeviceIdKey); + return ERROR_NO_SYSTEM_RESOURCES; + } + deviceInfo->IsDevice = TRUE; + memcpy(&deviceInfo->Device.ClassGuid, pClassGuid, sizeof(GUID)); + wcscpy(deviceInfo->Device.InstancePath, InstancePath); + InsertTailList(&list->ListHead, &deviceInfo->ItemEntry); + list->numberOfEntries++; + } + RegCloseKey(hDeviceIdKey); + } + + return ERROR_SUCCESS; +} + +static LONG SETUP_CreateDevList( + DeviceInfoList* list, + PCWSTR MachineName OPTIONAL, + LPGUID class OPTIONAL, + PCWSTR Enumerator OPTIONAL) +{ + HKEY HKLM, hEnumKey, hEnumeratorKey; + WCHAR szGuidString[MAX_GUID_STRING_LEN + 3]; + WCHAR KeyBuffer[MAX_PATH]; DWORD i; + DWORD dwLength; + DWORD rc; - KeyClass = SetupDiOpenClassRegKeyExW(class, KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, DIOCR_INSTALLER, MachineName, NULL); - if (KeyClass == INVALID_HANDLE_VALUE) - return GetLastError(); + /* Create szGuidString */ + if (class && !IsEqualIID(&class, &GUID_NULL)) + { + LPWSTR lpGuidString; + if (UuidToStringW((UUID *)class, &lpGuidString) != RPC_S_OK) + return ERROR_GEN_FAILURE; + wcscpy(szGuidString, L"{"); + wcscat(szGuidString, lpGuidString); + wcscat(szGuidString, L"}"); + RpcStringFreeW(&lpGuidString); + } + else + { + class = NULL; + szGuidString[0] = UNICODE_NULL; + } - if (Enumerator) - FIXME("Enumerator parameter ignored\n"); + /* Open Enum key */ + if (MachineName != NULL) + { + rc = RegConnectRegistryW(MachineName, HKEY_LOCAL_MACHINE, &HKLM); + if (rc != ERROR_SUCCESS) + return rc; + } + else + HKLM = HKEY_LOCAL_MACHINE; - rc = RegQueryInfoKeyW( - KeyClass, - NULL, NULL, - NULL, - &subKeys, - &maxSubKey, - NULL, NULL, NULL, NULL, NULL, NULL); + rc = RegOpenKeyExW(HKLM, + EnumKeyName, + 0, + KEY_ENUMERATE_SUB_KEYS, + &hEnumKey); + if (MachineName != NULL) RegCloseKey(HKLM); if (rc != ERROR_SUCCESS) + return rc; + + /* If enumerator is provided, call directly SETUP_CreateDevListFromEnumerator. + * Else, enumerate all enumerators all call SETUP_CreateDevListFromEnumerator + * for each one. + */ + if (Enumerator) { - RegCloseKey(KeyClass); + rc = RegOpenKeyExW( + hEnumKey, + Enumerator, + 0, + KEY_ENUMERATE_SUB_KEYS, + &hEnumeratorKey); + RegCloseKey(hEnumKey); + if (rc != ERROR_SUCCESS) + return rc; + rc = SETUP_CreateDevListFromEnumerator(list, class, *szGuidString ? szGuidString : NULL, Enumerator, hEnumeratorKey); + RegCloseKey(hEnumeratorKey); return rc; } - - for (i = 0; i < subKeys; i++) + else { - deviceInfo = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DeviceInfo, Device.RegistryKey) + maxSubKey * sizeof(WCHAR)); - if (!deviceInfo) + /* Enumerate enumerators */ + i = 0; + while (TRUE) { - RegCloseKey(KeyClass); - return ERROR_NO_SYSTEM_RESOURCES; + dwLength = sizeof(KeyBuffer) / sizeof(KeyBuffer[0]); + rc = RegEnumKeyExW(hEnumKey, i, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); + if (rc == ERROR_NO_MORE_ITEMS) + break; + if (rc != ERROR_SUCCESS) + { + RegCloseKey(hEnumKey); + return rc; + } + i++; + + /* Open sub key */ + rc = RegOpenKeyExW(hEnumKey, KeyBuffer, 0, KEY_ENUMERATE_SUB_KEYS, &hEnumeratorKey); + if (rc != ERROR_SUCCESS) + { + RegCloseKey(hEnumKey); + return rc; + } + + /* Call SETUP_CreateDevListFromEnumerator */ + rc = SETUP_CreateDevListFromEnumerator(list, class, *szGuidString ? szGuidString : NULL, KeyBuffer, hEnumeratorKey); + RegCloseKey(hEnumeratorKey); + if (rc != ERROR_SUCCESS) + { + RegCloseKey(hEnumKey); + return rc; + } } - rc = RegEnumKeyW(KeyClass, i, &deviceInfo->Device.RegistryKey[0], maxSubKey); - if (rc == ERROR_NO_MORE_ITEMS) - break; - if (rc != ERROR_SUCCESS) - { - RegCloseKey(KeyClass); - return rc; - } - deviceInfo->IsDevice = TRUE; - memcpy(&deviceInfo->Device.ClassGuid, class, sizeof(GUID)); - InsertTailList(&list->ListHead, &deviceInfo->ItemEntry); - list->numberOfEntries++; + RegCloseKey(hEnumKey); + return ERROR_SUCCESS; } - - RegCloseKey(KeyClass); - return ERROR_SUCCESS; } #ifdef __WINE__ @@ -1255,7 +1417,7 @@ i++; /* Open sub key */ - rc = RegOpenKeyEx(hInterfaceKey, KeyBuffer, 0, KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, &hDeviceInstanceKey); + rc = RegOpenKeyExW(hInterfaceKey, KeyBuffer, 0, KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, &hDeviceInstanceKey); if (rc != ERROR_SUCCESS) { RegCloseKey(hInterfaceKey); @@ -1306,7 +1468,7 @@ } /* Find class GUID associated to the device instance */ - rc = RegOpenKeyEx( + rc = RegOpenKeyExW( HKEY_LOCAL_MACHINE, EnumKeyName, 0, /* Options */ @@ -1319,7 +1481,7 @@ RegCloseKey(hInterfaceKey); return rc; } - rc = RegOpenKeyEx( + rc = RegOpenKeyExW( hEnumKey, InstancePath, 0, /* Options */ @@ -1383,7 +1545,7 @@ continue; /* Open sub key */ - rc = RegOpenKeyEx(hDeviceInstanceKey, KeyBuffer, 0, KEY_QUERY_VALUE, &hReferenceKey); + rc = RegOpenKeyExW(hDeviceInstanceKey, KeyBuffer, 0, KEY_QUERY_VALUE, &hReferenceKey); if (rc != ERROR_SUCCESS) { RegCloseKey(hDeviceInstanceKey); @@ -1462,9 +1624,6 @@ HDEVINFO hDeviceInfo = INVALID_HANDLE_VALUE; DeviceInfoList *list; LPGUID pClassGuid; - LPGUID ClassGuidList; - DWORD RequiredSize; - LONG i; LONG rc; TRACE("%s %s %p 0x%08lx %p %s %p\n", debugstr_guid(class), debugstr_w(enumstr), @@ -1503,47 +1662,14 @@ if (flags & DIGCF_ALLCLASSES) { - /* Get list of device classes */ - SetupDiBuildClassInfoList(0, NULL, 0, &RequiredSize); - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + rc = SETUP_CreateDevList(list, machine, pClassGuid, enumstr); + if (rc != ERROR_SUCCESS) { + SetLastError(rc); if (!deviceset) SetupDiDestroyDeviceInfoList(hDeviceInfo); return INVALID_HANDLE_VALUE; } - ClassGuidList = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(GUID)); - if (!ClassGuidList) - { - if (!deviceset) - SetupDiDestroyDeviceInfoList(hDeviceInfo); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return INVALID_HANDLE_VALUE; - } - if (!SetupDiBuildClassInfoListExW(0, ClassGuidList, RequiredSize, &RequiredSize, machine, NULL)) - { - HeapFree(GetProcessHeap(), 0, ClassGuidList); - if (!deviceset) - SetupDiDestroyDeviceInfoList(hDeviceInfo); - return INVALID_HANDLE_VALUE; - } - - /* Enumerate devices in each device class */ - for (i = 0; i < RequiredSize; i++) - { - if (pClassGuid == NULL || IsEqualIID(pClassGuid, &ClassGuidList[i])) - { - rc = SETUP_CreateDevListFromClass(list, machine, &ClassGuidList[i], enumstr); - if (rc != ERROR_SUCCESS) - { - HeapFree(GetProcessHeap(), 0, ClassGuidList); - SetLastError(rc); - if (!deviceset) - SetupDiDestroyDeviceInfoList(hDeviceInfo); - return INVALID_HANDLE_VALUE; - } - } - } - HeapFree(GetProcessHeap(), 0, ClassGuidList); return hDeviceInfo; } else if (flags & DIGCF_DEVICEINTERFACE) @@ -1581,7 +1707,7 @@ } else { - rc = SETUP_CreateDevListFromClass(list, machine, (LPGUID)class, enumstr); + rc = SETUP_CreateDevList(list, machine, (LPGUID)class, enumstr); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -1630,7 +1756,11 @@ ItemList = ItemList->Flink; DevInfo = (DeviceInfo *)ItemList; - if (!DevInfo->IsDevice) + if (DevInfo->IsDevice) + SetLastError(ERROR_INVALID_PARAMETER); + else if (!IsEqualIID(&DevInfo->Interface.InterfaceGuid, InterfaceClassGuid)) + SetLastError(ERROR_INVALID_PARAMETER); + else { memcpy(&DeviceInterfaceData->InterfaceClassGuid, &DevInfo->Interface.InterfaceGuid, @@ -1644,10 +1774,6 @@ DeviceInterfaceData->Reserved = (ULONG_PTR)DevInfo; ret = TRUE; } - else - { - SetLastError(ERROR_INVALID_PARAMETER); - } } } else @@ -1816,7 +1942,12 @@ &deviceInfo->Interface.ClassGuid, sizeof(GUID)); DeviceInfoData->DevInst = 0; /* FIXME */ - DeviceInfoData->Reserved = (ULONG_PTR)0; + /* Note: this appears to be dangerous, passing a private + * pointer a heap-allocated datum to the caller. However, the + * expected lifetime of the device data is the same as the + * HDEVINFO; once that is closed, the data are no longer valid. + */ + DeviceInfoData->Reserved = (ULONG_PTR)deviceInfo; } ret = TRUE; } @@ -1861,12 +1992,13 @@ PropertyBufferSizeW, &RequiredSizeW); - HeapFree(GetProcessHeap(), 0, PropertyBufferW); - if (!bResult) + { + HeapFree(GetProcessHeap(), 0, PropertyBufferW); return bResult; + } - bIsStringProperty = (RegType == REG_SZ || RegType == REG_MULTI_SZ); + bIsStringProperty = (RegType == REG_SZ || RegType == REG_MULTI_SZ || RegType == REG_EXPAND_SZ); if (bIsStringProperty) RequiredSizeA = RequiredSizeW / sizeof(WCHAR); @@ -1892,6 +2024,7 @@ bResult = FALSE; } + HeapFree(GetProcessHeap(), 0, PropertyBufferW); if (PropertyRegDataType) *PropertyRegDataType = RegType; if (RequiredSize) @@ -1903,7 +2036,7 @@ * SetupDiGetDeviceRegistryPropertyW (SETUPAPI.@) */ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( - HDEVINFO devinfo, + HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD Property, PDWORD PropertyRegDataType, @@ -1911,11 +2044,181 @@ DWORD PropertyBufferSize, PDWORD RequiredSize) { - FIXME("%04lx %p %ld %p %p %ld %p\n", (DWORD)devinfo, DeviceInfoData, + HKEY hEnumKey, hKey; + DWORD rc; + BOOL ret = FALSE; + + TRACE("%p %p %ld %p %p %ld %p\n", DeviceInfoSet, DeviceInfoData, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize); - SetLastError(ERROR_GEN_FAILURE); - return FALSE; + + if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + SetLastError(ERROR_INVALID_HANDLE); + else if (((DeviceInfoList *)DeviceInfoSet)->magic != SETUP_DEV_INFO_LIST_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (!DeviceInfoData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (Property >= SPDRP_MAXIMUM_PROPERTY) + SetLastError(ERROR_INVALID_PARAMETER); + else if (!((DeviceInfo *)DeviceInfoData->Reserved)->IsDevice) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + DeviceInfoList *list = (DeviceInfoList *)DeviceInfoSet; + DeviceInfo* DevInfo = (DeviceInfo *)DeviceInfoData->Reserved; + + switch (Property) + { + LPCWSTR RegistryPropertyName; + DWORD BufferSize; + + case SPDRP_CAPABILITIES: + case SPDRP_CLASS: + case SPDRP_CLASSGUID: + case SPDRP_COMPATIBLEIDS: + case SPDRP_CONFIGFLAGS: + case SPDRP_DEVICEDESC: + case SPDRP_DRIVER: + case SPDRP_FRIENDLYNAME: + case SPDRP_HARDWAREID: + case SPDRP_LOCATION_INFORMATION: + case SPDRP_LOWERFILTERS: + case SPDRP_MFG: + case SPDRP_SECURITY: + case SPDRP_SERVICE: + case SPDRP_UI_NUMBER: + case SPDRP_UPPERFILTERS: + { + switch (Property) + { + case SPDRP_CAPABILITIES: + RegistryPropertyName = L"Capabilities"; break; + case SPDRP_CLASS: + RegistryPropertyName = L"Class"; break; + case SPDRP_CLASSGUID: + RegistryPropertyName = L"ClassGUID"; break; + case SPDRP_COMPATIBLEIDS: + RegistryPropertyName = L"CompatibleIDs"; break; + case SPDRP_CONFIGFLAGS: + RegistryPropertyName = L"ConfigFlags"; break; + case SPDRP_DEVICEDESC: + RegistryPropertyName = L"DeviceDesc"; break; + case SPDRP_DRIVER: + RegistryPropertyName = L"Driver"; break; + case SPDRP_FRIENDLYNAME: + RegistryPropertyName = L"FriendlyName"; break; + case SPDRP_HARDWAREID: + RegistryPropertyName = L"HardwareID"; break; + case SPDRP_LOCATION_INFORMATION: + RegistryPropertyName = L"LocationInformation"; break; + case SPDRP_LOWERFILTERS: + RegistryPropertyName = L"LowerFilters"; break; + case SPDRP_MFG: + RegistryPropertyName = L"Mfg"; break; + case SPDRP_SECURITY: + RegistryPropertyName = L"Security"; break; + case SPDRP_SERVICE: + RegistryPropertyName = L"Service"; break; + case SPDRP_UI_NUMBER: + RegistryPropertyName = L"UINumber"; break; + case SPDRP_UPPERFILTERS: + RegistryPropertyName = L"UpperFilters"; break; + default: + /* Should not happen */ + break; + } + + /* Open registry key name */ + rc = RegOpenKeyExW( + list->HKLM, + EnumKeyName, + 0, /* Options */ + KEY_ENUMERATE_SUB_KEYS, + &hEnumKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + break; + } + rc = RegOpenKeyExW( + hEnumKey, + DevInfo->Device.InstancePath, + 0, /* Options */ + KEY_QUERY_VALUE, + &hKey); + RegCloseKey(hEnumKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + break; + } + /* Read registry entry */ + BufferSize = PropertyBufferSize; + rc = RegQueryValueExW( + hKey, + RegistryPropertyName, + NULL, /* Reserved */ + PropertyRegDataType, + PropertyBuffer, + &BufferSize); + if (RequiredSize) + *RequiredSize = BufferSize; + if (rc == ERROR_SUCCESS) + ret = TRUE; + else + SetLastError(rc); + RegCloseKey(hKey); + break; + } + + case SPDRP_PHYSICAL_DEVICE_OBJECT_NAME: + { + DWORD required = wcslen(DevInfo->Device.InstancePath) * sizeof(WCHAR) + sizeof(UNICODE_NULL); + + if (PropertyRegDataType) + *PropertyRegDataType = REG_SZ; + if (RequiredSize) + *RequiredSize = required; + if (PropertyBufferSize >= required) + { + wcscpy((LPWSTR)PropertyBuffer, DevInfo->Device.InstancePath); + ret = TRUE; + } + else + SetLastError(ERROR_INSUFFICIENT_BUFFER); + break; + } + + /*case SPDRP_BUSTYPEGUID: + case SPDRP_LEGACYBUSTYPE: + case SPDRP_BUSNUMBER: + case SPDRP_ENUMERATOR_NAME: + case SPDRP_SECURITY_SDS: + case SPDRP_DEVTYPE: + case SPDRP_EXCLUSIVE: + case SPDRP_CHARACTERISTICS: + case SPDRP_ADDRESS: + case SPDRP_UI_NUMBER_DESC_FORMAT: + case SPDRP_DEVICE_POWER_DATA:*/ +#if (WINVER >= 0x501) + /*case SPDRP_REMOVAL_POLICY: + case SPDRP_REMOVAL_POLICY_HW_DEFAULT: + case SPDRP_REMOVAL_POLICY_OVERRIDE: + case SPDRP_INSTALL_STATE:*/ +#endif + + default: + { + FIXME("Property 0x%lx not implemented\n", Property); + SetLastError(ERROR_NOT_SUPPORTED); + } + } + } + + TRACE("Returning %d\n", ret); + return ret; }

19 years, 3 months

[jimtabor] 16630: Implement ShowOwnedPopups and ArrangeIconicWindows. Based on Wine. More work is needed on both.

by jimtabor＠svn.reactos.com

Implement ShowOwnedPopups and ArrangeIconicWindows. Based on Wine. More work is needed on both. Modified: trunk/reactos/lib/user32/windows/defwnd.c Modified: trunk/reactos/lib/user32/windows/window.c Modified: trunk/reactos/lib/user32/windows/winpos.c _____ Modified: trunk/reactos/lib/user32/windows/defwnd.c --- trunk/reactos/lib/user32/windows/defwnd.c 2005-07-18 03:12:01 UTC (rev 16629) +++ trunk/reactos/lib/user32/windows/defwnd.c 2005-07-18 03:13:11 UTC (rev 16630) @@ -1269,14 +1269,15 @@ if (!lParam) return 0; Style = GetWindowLongW(hWnd, GWL_STYLE); - if (!(Style & WS_POPUP)) - return 0; +// if (!(Style & WS_POPUP)) +// return 0; if ((Style & WS_VISIBLE) && wParam) return 0; if (!(Style & WS_VISIBLE) && !wParam) return 0; if (!GetWindow(hWnd, GW_OWNER)) return 0; + NtUserCallTwoParam((DWORD) hWnd, (DWORD) wParam, TWOPARAM_ROUTINE_ROS_SHOWWINDOW); ShowWindow(hWnd, wParam ? SW_SHOWNA : SW_HIDE); break; } _____ Modified: trunk/reactos/lib/user32/windows/window.c --- trunk/reactos/lib/user32/windows/window.c 2005-07-18 03:12:01 UTC (rev 16629) +++ trunk/reactos/lib/user32/windows/window.c 2005-07-18 03:13:11 UTC (rev 16630) @@ -51,17 +51,6 @@ /* * @unimplemented */ -UINT STDCALL -ArrangeIconicWindows(HWND hWnd) -{ - UNIMPLEMENTED; - return 0; -} - - -/* - * @unimplemented - */ HDWP STDCALL BeginDeferWindowPos(int nNumWindows) { @@ -1084,15 +1073,15 @@ BOOL visible; visible = IsWindowVisible(hwnd); -// if(!IsWindow(hwnd) || -// (visible && !(dwFlags & AW_HIDE)) || -// (!visible && (dwFlags & AW_HIDE))) + if(!IsWindow(hwnd) || + (visible && !(dwFlags & AW_HIDE)) || + (!visible && (dwFlags & AW_HIDE))) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } -// ShowWindow(hwnd, (dwFlags & AW_HIDE) ? SW_HIDE : ((dwFlags & AW_ACTIVATE) ? SW_SHOW : SW_SHOWNA)); + ShowWindow(hwnd, (dwFlags & AW_HIDE) ? SW_HIDE : ((dwFlags & AW_ACTIVATE) ? SW_SHOW : SW_SHOWNA)); return TRUE; } @@ -1273,14 +1262,13 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL ShowOwnedPopups(HWND hWnd, BOOL fShow) { - UNIMPLEMENTED; - return FALSE; + return (BOOL)NtUserCallTwoParam((DWORD)hWnd, fShow, TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS); } _____ Modified: trunk/reactos/lib/user32/windows/winpos.c --- trunk/reactos/lib/user32/windows/winpos.c 2005-07-18 03:12:01 UTC (rev 16629) +++ trunk/reactos/lib/user32/windows/winpos.c 2005-07-18 03:13:11 UTC (rev 16630) @@ -55,3 +55,11 @@ return(NtUserSetActiveWindow(hWnd)); } +/* + * @unimplemented + */ +UINT STDCALL +ArrangeIconicWindows(HWND hWnd) +{ + return NtUserCallHwndLock( hWnd, HWNDLOCK_ROUTINE_ARRANGEICONICWINDOWS); +}

19 years, 3 months

[jimtabor] 16629: Implement ShowOwnedPopups and ArrangeIconicWindows. Based on Wine.

by jimtabor＠svn.reactos.com

Implement ShowOwnedPopups and ArrangeIconicWindows. Based on Wine. Modified: trunk/reactos/subsys/win32k/include/window.h Modified: trunk/reactos/subsys/win32k/include/winpos.h Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c _____ Modified: trunk/reactos/subsys/win32k/include/window.h --- trunk/reactos/subsys/win32k/include/window.h 2005-07-17 19:20:12 UTC (rev 16628) +++ trunk/reactos/subsys/win32k/include/window.h 2005-07-18 03:12:01 UTC (rev 16629) @@ -228,6 +228,9 @@ DWORD IntRemoveProcessWndProcHandles(HANDLE ProcessID); DWORD IntAddWndProcHandle(WNDPROC WindowProc, BOOL IsUnicode); +BOOL FASTCALL +IntShowOwnedPopups( HWND owner, BOOL fShow ); + #endif /* _WIN32K_WINDOW_H */ /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/include/winpos.h --- trunk/reactos/subsys/win32k/include/winpos.h 2005-07-17 19:20:12 UTC (rev 16628) +++ trunk/reactos/subsys/win32k/include/winpos.h 2005-07-18 03:12:01 UTC (rev 16629) @@ -14,6 +14,8 @@ NtGdiPtInRegion((WndObject)->WindowRegion, (INT)((x) - (WndObject)->WindowRect.left), \ (INT)((y) - (WndObject)->WindowRect.top)))) +UINT +FASTCALL WinPosArrangeIconicWindows(PWINDOW_OBJECT parent); BOOL FASTCALL IntGetClientOrigin(HWND hWnd, LPPOINT Point); LRESULT FASTCALL _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-07-17 19:20:12 UTC (rev 16628) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-07-18 03:12:01 UTC (rev 16629) @@ -11,7 +11,7 @@ #include <w32k.h> -#define NDEBUG +#define DEBUG #include <debug.h> /* registered Logon process */ @@ -453,9 +453,32 @@ return 0; case TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS: - UNIMPLEMENTED - return 0; + return (DWORD)IntShowOwnedPopups((HWND) Param1, (BOOL) Param2); + case TWOPARAM_ROUTINE_ROS_SHOWWINDOW: + { +#define WIN_NEEDS_SHOW_OWNEDPOPUP (0x00000040) + PWINDOW_OBJECT Window = IntGetWindowObject((HWND)Param1); + DPRINT1("ROS_SHOWWINDOW\n"); + if (Window == 0) + { + SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); + return FALSE; + } + if (Param2) + { + if (!(Window->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP)) + { + IntReleaseWindowObject(Window); + return TRUE; + } + Window->Flags &= ~WIN_NEEDS_SHOW_OWNEDPOPUP; + } + else Window->Flags |= WIN_NEEDS_SHOW_OWNEDPOPUP; + DPRINT1("ROS_SHOWWINDOW ---> 0x%x\n",Window->Flags); + IntReleaseWindowObject(Window); + return TRUE; + } case TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW: UNIMPLEMENTED return 0; @@ -570,6 +593,8 @@ ExFreePool(Buffer); } + + return Ret; } @@ -619,7 +644,6 @@ ExFreePool(Buffer.Pointer); } - return Ret; } @@ -630,6 +654,7 @@ return 0; } + /* * @unimplemented */ @@ -653,7 +678,7 @@ switch (Routine) { case HWNDLOCK_ROUTINE_ARRANGEICONICWINDOWS: - /* FIXME */ + WinPosArrangeIconicWindows(Window); break; case HWNDLOCK_ROUTINE_DRAWMENUBAR: _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-07-17 19:20:12 UTC (rev 16628) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-07-18 03:12:01 UTC (rev 16629) @@ -4314,4 +4314,65 @@ return TRUE; } +#define WIN_NEEDS_SHOW_OWNEDPOPUP (0x00000040) + +BOOL +FASTCALL +IntShowOwnedPopups( HWND owner, BOOL fShow ) +{ + int count = 0; + PWINDOW_OBJECT Window, pWnd; + HWND *win_array; + + if(!(Window = IntGetWindowObject(owner))) + { + SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); + return FALSE; + } + + win_array = IntWinListChildren( Window); + IntReleaseWindowObject(Window); + + if (!win_array) return TRUE; + + while (win_array[count]) count++; + while (--count >= 0) + { + if (NtUserGetWindow( win_array[count], GW_OWNER ) != owner) continue; + if (!(pWnd = IntGetWindowObject( win_array[count] ))) continue; +// if (pWnd == WND_OTHER_PROCESS) continue; + + if (fShow) + { + if (pWnd->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP) + { + IntReleaseWindowObject( pWnd ); + /* In Windows, ShowOwnedPopups(TRUE) generates + * WM_SHOWWINDOW messages with SW_PARENTOPENING, + * regardless of the state of the owner + */ + IntSendMessage(win_array[count], WM_SHOWWINDOW, SW_SHOWNORMAL, SW_PARENTOPENING); + continue; + } + } + else + { + if (pWnd->Style & WS_VISIBLE) + { + IntReleaseWindowObject( pWnd ); + /* In Windows, ShowOwnedPopups(FALSE) generates + * WM_SHOWWINDOW messages with SW_PARENTCLOSING, + * regardless of the state of the owner + */ + IntSendMessage(win_array[count], WM_SHOWWINDOW, SW_HIDE, SW_PARENTCLOSING); + continue; + } + } + IntReleaseWindowObject( pWnd ); + } + ExFreePool( win_array ); + return TRUE; +} + + /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-07-17 19:20:12 UTC (rev 16628) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-07-18 03:12:01 UTC (rev 16629) @@ -165,6 +165,47 @@ IntReleaseWindowObject(Wnd); } + +UINT +FASTCALL +WinPosArrangeIconicWindows(PWINDOW_OBJECT parent) +{ + RECT rectParent; + HWND hwndChild; + INT i, x, y, xspacing, yspacing; + HWND *List = IntWinListChildren(parent); + + IntGetClientRect( parent, &rectParent ); + x = rectParent.left; + y = rectParent.bottom; + + xspacing = NtUserGetSystemMetrics(SM_CXMINSPACING); + yspacing = NtUserGetSystemMetrics(SM_CYMINSPACING); + + DPRINT("X:%d Y:%d XS:%d YS:%d\n",x,y,xspacing,yspacing); + + for( i = 0; List[i]; i++) + { + hwndChild = List[i]; + + if((NtUserGetWindowLong( hwndChild, GWL_STYLE, FALSE) & WS_MINIMIZE) != 0 ) + { + WinPosSetWindowPos( hwndChild, 0, x + NtUserGetSystemMetrics(SM_CXBORDER), + y - yspacing - NtUserGetSystemMetrics(SM_CYBORDER) + , 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); + if (x <= rectParent.right - xspacing) x += xspacing; + else + { + x = rectParent.left; + y -= yspacing; + } + } + } + ExFreePool(List); + return yspacing; +} + + VOID STATIC FASTCALL WinPosFindIconPos(PWINDOW_OBJECT Window, POINT *Pos) { @@ -1210,8 +1251,9 @@ ObmDereferenceObject(Window); return(FALSE); } - Swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | - SWP_NOZORDER; + Swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE; + if (Window->Self != NtUserGetActiveWindow()) + Swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; }

19 years, 3 months

[weiden] 16628: fixed signed/unsigned comparison warning

by weiden＠svn.reactos.com

fixed signed/unsigned comparison warning Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c _____ Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c --- trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-07-17 18:36:01 UTC (rev 16627) +++ trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-07-17 19:20:12 UTC (rev 16628) @@ -188,7 +188,7 @@ */ result = GetInterfaceInfo(pIfTable, &dwOutBufLen); if (result == NO_ERROR) { - UINT i; + INT i; _tprintf(_T("GetInterfaceInfo() returned with %ld adaptor entries\n"), pIfTable->NumAdapters); for (i = 0; i < pIfTable->NumAdapters; i++) { wprintf(L"[%d] %s\n", i + 1, pIfTable->Adapter[i].Name);

19 years, 3 months

[hbirr] 16627: If the user mode is intercepted by an interrupt, we must deliver user mode apc's.

by hbirr＠svn.reactos.com

If the user mode is intercepted by an interrupt, we must deliver user mode apc's. Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c --- trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-07-17 18:34:23 UTC (rev 16626) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-07-17 18:36:01 UTC (rev 16627) @@ -306,12 +306,12 @@ */ Ke386DisableInterrupts(); - HalEndSystemInterrupt (old_level, 0); - if (old_level==PASSIVE_LEVEL && Trapframe->Cs != KERNEL_CS) { + HalEndSystemInterrupt (APC_LEVEL, 0); + CurrentThread = KeGetCurrentThread(); - if (CurrentThread!=NULL && CurrentThread->Alerted[1]) + if (CurrentThread!=NULL && CurrentThread->ApcState.UserApcPending) { DPRINT("PID: %d, TID: %d CS %04x/%04x\n", ((PETHREAD)CurrentThread)->ThreadsProcess->UniqueProcessId, @@ -325,8 +325,8 @@ CurrentThread->TrapFrame = &KernelTrapFrame; } - Ke386EnableInterrupts(); - KiDeliverApc(KernelMode, NULL, NULL); + Ke386EnableInterrupts(); + KiDeliverApc(UserMode, NULL, NULL); Ke386DisableInterrupts(); ASSERT(KeGetCurrentThread() == CurrentThread); @@ -336,7 +336,13 @@ CurrentThread->TrapFrame = OldTrapFrame; } } + KeLowerIrql(PASSIVE_LEVEL); } + else + { + HalEndSystemInterrupt (old_level, 0); + } + } static VOID

19 years, 3 months

[hbirr] 16626: - PsKillMostProcesses must be running in the context of the system process.

by hbirr＠svn.reactos.com

- PsKillMostProcesses must be running in the context of the system process. - The thread terminating apc is a special user mode apc. Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-07-17 18:27:46 UTC (rev 16625) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-07-17 18:34:23 UTC (rev 16626) @@ -84,6 +84,8 @@ PLIST_ENTRY current_entry; PEPROCESS current; + ASSERT(PsGetCurrentProcessId() == PsInitialSystemProcess->UniqueProcessId); + /* Acquire the Active Process Lock */ ExAcquireFastMutex(&PspActiveProcessMutex); @@ -94,8 +96,7 @@ current = CONTAINING_RECORD(current_entry, EPROCESS, ActiveProcessLinks); current_entry = current_entry->Flink; - if (current->UniqueProcessId != PsInitialSystemProcess->UniqueProcessId && - current->UniqueProcessId != PsGetCurrentProcessId()) + if (current->UniqueProcessId != PsInitialSystemProcess->UniqueProcessId) { /* Terminate all the Threads in this Process */ PspTerminateProcessThreads(current, STATUS_SUCCESS); @@ -211,6 +212,7 @@ PEPROCESS CurrentProcess; PTERMINATION_PORT TerminationPort; PTEB Teb; + KIRQL oldIrql; DPRINT("PspExitThread(ExitStatus %x), Current: 0x%x\n", ExitStatus, PsGetCurrentThread()); @@ -321,9 +323,11 @@ /* If the Processor Control Block's NpxThread points to the current thread * unset it. */ + KeRaiseIrql(DISPATCH_LEVEL, &oldIrql); InterlockedCompareExchangePointer(&KeGetCurrentPrcb()->NpxThread, NULL, (PKPROCESS)CurrentThread); + KeLowerIrql(oldIrql); /* Rundown Mutexes */ KeRundownThread(); @@ -398,14 +402,14 @@ /* Allocate the APC */ Apc = ExAllocatePoolWithTag(NonPagedPool, sizeof(KAPC), TAG_TERMINATE_APC); - /* Initialize a Kernel Mode APC to Kill the Thread */ + /* Initialize a User Mode APC to Kill the Thread */ KeInitializeApc(Apc, &Thread->Tcb, OriginalApcEnvironment, PsExitSpecialApc, NULL, PspExitNormalApc, - KernelMode, + UserMode, (PVOID)ExitStatus); /* Insert it into the APC Queue */

19 years, 3 months

[hbirr] 16625: Request the APC_INTERRUPT for the correct processor on smp machines.

by hbirr＠svn.reactos.com

Request the APC_INTERRUPT for the correct processor on smp machines. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/ipi.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-07-17 18:11:08 UTC (rev 16624) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-07-17 18:27:46 UTC (rev 16625) @@ -110,7 +110,7 @@ IN struct _KEXCEPTION_FRAME* ExceptionFrame); VOID -KiIpiSendRequest(ULONG TargetSet, +KiIpiSendRequest(KAFFINITY TargetSet, ULONG IpiRequest); VOID _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-07-17 18:11:08 UTC (rev 16624) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-07-17 18:27:46 UTC (rev 16625) @@ -315,9 +315,39 @@ /* Check the Thread State */ if (Thread->State == Running) { - /* FIXME: Use IPI */ +#ifdef CONFIG_SMP + PKPRCB Prcb, CurrentPrcb; + LONG i; + KIRQL oldIrql; +#endif + DPRINT ("Requesting APC Interrupt for Running Thread \n"); + +#ifdef CONFIG_SMP + oldIrql = KeRaiseIrqlToDpcLevel(); + CurrentPrcb = KeGetCurrentPrcb(); + if (CurrentPrcb->CurrentThread == Thread) + { + HalRequestSoftwareInterrupt(APC_LEVEL); + } + else + { + for (i = 0; i < KeNumberProcessors; i++) + { + Prcb = ((PKPCR)(KPCR_BASE + i * PAGE_SIZE))->Prcb; + if (Prcb->CurrentThread == Thread) + { + ASSERT (CurrentPrcb != Prcb); + KiIpiSendRequest(Prcb->SetMember, IPI_REQUEST_APC); + break; + } + } + ASSERT (i < KeNumberProcessors); + } + KeLowerIrql(oldIrql); +#else HalRequestSoftwareInterrupt(APC_LEVEL); +#endif } else if ((Thread->State == Waiting) && (Thread->WaitIrql == PASSIVE_LEVEL) && ((Apc->NormalRoutine == NULL) || _____ Modified: trunk/reactos/ntoskrnl/ke/ipi.c --- trunk/reactos/ntoskrnl/ke/ipi.c 2005-07-17 18:11:08 UTC (rev 16624) +++ trunk/reactos/ntoskrnl/ke/ipi.c 2005-07-17 18:27:46 UTC (rev 16625) @@ -22,14 +22,15 @@ /* FUNCTIONS *****************************************************************/ VOID -KiIpiSendRequest(ULONG TargetSet, ULONG IpiRequest) +KiIpiSendRequest(KAFFINITY TargetSet, ULONG IpiRequest) { LONG i; PKPCR Pcr; + KAFFINITY Current; - for (i = 0; i < KeNumberProcessors; i++) + for (i = 0, Current = 1; i < KeNumberProcessors; i++, Current <<= 1) { - if (TargetSet & (1 << i)) + if (TargetSet & Current) { Pcr = (PKPCR)(KPCR_BASE + i * PAGE_SIZE); Ke386TestAndSetBit(IpiRequest, &Pcr->Prcb->IpiFrozen); @@ -116,9 +117,9 @@ VOID STDCALL -KiIpiSendPacket(ULONG TargetSet, VOID (STDCALL*WorkerRoutine)(PVOID), PVOID Argument, ULONG Count, BOOLEAN Synchronize) +KiIpiSendPacket(KAFFINITY TargetSet, VOID (STDCALL*WorkerRoutine)(PVOID), PVOID Argument, ULONG Count, BOOLEAN Synchronize) { - ULONG Processor, CurrentProcessor; + KAFFINITY Processor; LONG i; PKPRCB Prcb, CurrentPrcb; KIRQL oldIrql; @@ -133,8 +134,6 @@ InterlockedExchangeUL(&CurrentPrcb->CurrentPacket[1], Count); InterlockedExchangeUL(&CurrentPrcb->CurrentPacket[2], Synchronize ? 1 : 0); - CurrentProcessor = 1 << KeGetCurrentProcessorNumber(); - for (i = 0, Processor = 1; i < KeNumberProcessors; i++, Processor <<= 1) { if (TargetSet & Processor) @@ -142,13 +141,13 @@ Prcb = ((PKPCR)(KPCR_BASE + i * PAGE_SIZE))->Prcb; while(0 != InterlockedCompareExchangeUL(&Prcb->SignalDone, (LONG)CurrentPrcb, 0)); Ke386TestAndSetBit(IPI_REQUEST_FUNCTIONCALL, &Prcb->IpiFrozen); - if (Processor != CurrentProcessor) + if (Processor != CurrentPrcb->SetMember) { HalRequestIpi(i); } } } - if (TargetSet & CurrentProcessor) + if (TargetSet & CurrentPrcb->SetMember) { KeRaiseIrql(IPI_LEVEL, &oldIrql); KiIpiServiceRoutine(NULL, NULL); @@ -160,7 +159,7 @@ KeIpiGenericCall(VOID (STDCALL *Function)(PVOID), PVOID Argument) { KIRQL oldIrql; - ULONG TargetSet; + KAFFINITY TargetSet; DPRINT("KeIpiGenericCall on CPU%d\n", KeGetCurrentProcessorNumber());

19 years, 3 months

[hbirr] 16624: Initialized SetMember as mask of the current processor.

by hbirr＠svn.reactos.com

Initialized SetMember as mask of the current processor. Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-07-17 18:08:19 UTC (rev 16623) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-07-17 18:11:08 UTC (rev 16624) @@ -182,11 +182,13 @@ */ memset(Pcr, 0, PAGE_SIZE); Pcr->Number = Id; + Pcr->SetMember = 1 << Id; Pcr->Tib.Self = &Pcr->Tib; Pcr->Self = (PKPCR)Pcr; Pcr->Prcb = &Pcr->PrcbData; Pcr->Irql = SYNCH_LEVEL; + Pcr->PrcbData.SetMember = 1 << Id; Pcr->PrcbData.MHz = BootPcr->PrcbData.MHz; Pcr->StallScaleFactor = BootPcr->StallScaleFactor; @@ -284,6 +286,8 @@ KPCR->IDT = (PUSHORT)KiIdt; KPCR->TSS = &KiBootTss; KPCR->Number = 0; + KPCR->SetMember = 1 << 0; + KPCR->PrcbData.SetMember = 1 << 0; KiPcrInitDone = 1; PcrsAllocated++;

19 years, 3 months

[hbirr] 16623: Changed the type of SetMember within KPRCB structure.

by hbirr＠svn.reactos.com

Changed the type of SetMember within KPRCB structure. Modified: trunk/reactos/include/ndk/i386/ketypes.h _____ Modified: trunk/reactos/include/ndk/i386/ketypes.h --- trunk/reactos/include/ndk/i386/ketypes.h 2005-07-17 15:57:41 UTC (rev 16622) +++ trunk/reactos/include/ndk/i386/ketypes.h 2005-07-17 18:08:19 UTC (rev 16623) @@ -262,7 +262,7 @@ UCHAR Number; UCHAR Reserved; USHORT BuildType; - ULONG SetMember; + KAFFINITY SetMember; UCHAR CpuType; UCHAR CpuID; USHORT CpuStep;

19 years, 3 months

[hpoussin] 16622: Implement SetupDiGetDeviceInterfaceDetailA/W

by hpoussin＠svn.reactos.com

Implement SetupDiGetDeviceInterfaceDetailA/W Modified: trunk/reactos/include/wine/setupapi.h Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/include/wine/setupapi.h --- trunk/reactos/include/wine/setupapi.h 2005-07-17 15:10:03 UTC (rev 16621) +++ trunk/reactos/include/wine/setupapi.h 2005-07-17 15:57:41 UTC (rev 16622) @@ -20,6 +20,7 @@ #define _INC_SETUPAPI #include <commctrl.h> +#include <pshpack1.h> /* setupapi doesn't use the normal convention, it adds an underscore before A/W */ #ifdef __WINESRC__ @@ -859,4 +860,5 @@ #undef DECL_WINELIB_SETUPAPI_TYPE_AW +#include <poppack.h> #endif /* _INC_SETUPAPI */ _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-07-17 15:10:03 UTC (rev 16621) +++ trunk/reactos/lib/setupapi/devinst.c 2005-07-17 15:57:41 UTC (rev 16622) @@ -56,6 +56,7 @@ static const WCHAR NoUseClass[] = {'N','o','U','s','e','C','l','a','s','s',0}; static const WCHAR NtExtension[] = {'.','N','T',0}; static const WCHAR NtPlatformExtension[] = {'.','N','T','x','8','6',0}; +static const WCHAR SymbolicLink[] = {'S','y','m','b','o','l','i','c','L','i','n','k',0}; static const WCHAR Version[] = {'V','e','r','s','i','o','n',0}; static const WCHAR WinExtension[] = {'.','W','i','n',0}; @@ -89,12 +90,16 @@ struct { GUID InterfaceGuid; -#ifdef __WINE__ - WCHAR InterfaceName[0]; /* "COMx" */ -#else GUID ClassGuid; - WCHAR DeviceInstance[0]; /* "ACPI\PNP0501\4&2658d0a0&0"..., NULL on Wine */ +#ifndef __WINE__ + /* Pointer into Data field. Contains something like */ + /* "ACPI\PNP0501\4&2658d0a0&0" */ + PWSTR pInstancePath; #endif + /* Pointer into Data field. Contains something like + * "\\?\ACPI#PNP0501#4&2658d0a0&0#{GUID}", or "COMx" for WINE */ + PWSTR pSymbolicLink; + WCHAR Data[0]; } Interface; }; } DeviceInfo; @@ -1152,7 +1157,7 @@ if (MachineName) WARN("'MachineName' is ignored on Wine!\n"); - if (DeviceInstanceW){ + if (DeviceInstanceW) WARN("'DeviceInstanceW' can't be set on Wine!\n"); devices = buf; @@ -1187,7 +1192,7 @@ /* We have found a device */ TRACE("Adding %s to list\n", debugstr_w(ptr)); deviceInfo = HeapAlloc(GetProcessHeap(), 0, - FIELD_OFFSET(DeviceInfo, Interface.InterfaceName) + strlenW(ptr) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + FIELD_OFFSET(DeviceInfo, Interface.Data) + strlenW(ptr) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); if (!deviceInfo) { if (devices != buf) @@ -1195,8 +1200,9 @@ return ERROR_NO_SYSTEM_RESOURCES; } deviceInfo->IsDevice = FALSE; + deviceInfo->Interface.pSymbolicLink = &deviceInfo->Interface.Data[0]; memcpy(&deviceInfo->Interface.InterfaceGuid, InterfaceGuid, sizeof(GUID)); - wcscpy(&deviceInfo->Interface.InterfaceName[0], ptr); + wcscpy(deviceInfo->Interface.pSymbolicLink, ptr); InsertTailList(&list->ListHead, &deviceInfo->ItemEntry); list->numberOfEntries++; } @@ -1214,11 +1220,18 @@ LPGUID InterfaceGuid, PCWSTR DeviceInstanceW /* OPTIONAL */) { - HKEY hInterfaceKey, hEnumKey, hKey; + HKEY hInterfaceKey; /* HKLM\SYSTEM\CurrentControlSet\Control\DeviceClasses\{GUID} */ + HKEY hDeviceInstanceKey; /* HKLM\SYSTEM\CurrentControlSet\Control\DeviceClasses\{GUID}\##?#{Instance Path} */ + HKEY hReferenceKey; /* HKLM\SYSTEM\CurrentControlSet\Control\DeviceClasses\{GUID}\##?#{Instance Path}\#{ReferenceString} */ + HKEY hEnumKey; /* HKLM\SYSTEM\CurrentControlSet\Enum */ + HKEY hKey; /* HKLM\SYSTEM\CurrentControlSet\Enum\{Instance\Path} */ LONG rc; WCHAR KeyBuffer[max(MAX_PATH, MAX_GUID_STRING_LEN) + 1]; - DWORD i; - DWORD dwLength, dwRegType; + PWSTR InstancePath; + DWORD i, j; + DWORD dwLength, dwInstancePathLength; + DWORD dwRegType; + GUID ClassGuid; DeviceInfo *deviceInfo; /* Open registry key related to this interface */ @@ -1226,7 +1239,7 @@ if (hInterfaceKey == INVALID_HANDLE_VALUE) return GetLastError(); - /* Enumerate sub keys */ + /* Enumerate sub keys of hInterfaceKey */ i = 0; while (TRUE) { @@ -1242,54 +1255,52 @@ i++; /* Open sub key */ - rc = RegOpenKeyEx(hInterfaceKey, KeyBuffer, 0, KEY_QUERY_VALUE, &hKey); + rc = RegOpenKeyEx(hInterfaceKey, KeyBuffer, 0, KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, &hDeviceInstanceKey); if (rc != ERROR_SUCCESS) { RegCloseKey(hInterfaceKey); return rc; } - /* Read DeviceInstance value */ - rc = RegQueryValueExW(hKey, DeviceInstance, NULL, &dwRegType, NULL, &dwLength); + /* Read DeviceInstance */ + rc = RegQueryValueExW(hDeviceInstanceKey, DeviceInstance, NULL, &dwRegType, NULL, &dwInstancePathLength); if (rc != ERROR_SUCCESS ) { - RegCloseKey(hKey); + RegCloseKey(hDeviceInstanceKey); RegCloseKey(hInterfaceKey); return rc; } if (dwRegType != REG_SZ) { - RegCloseKey(hKey); + RegCloseKey(hDeviceInstanceKey); RegCloseKey(hInterfaceKey); return ERROR_GEN_FAILURE; } - - /* Allocate memory for list entry and read DeviceInstance */ - deviceInfo = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DeviceInfo, Interface.DeviceInstance) + dwLength + sizeof(UNICODE_NULL)); - if (!deviceInfo) + InstancePath = HeapAlloc(GetProcessHeap(), 0, dwInstancePathLength + sizeof(UNICODE_NULL)); + if (!InstancePath) { - RegCloseKey(hKey); + RegCloseKey(hDeviceInstanceKey); RegCloseKey(hInterfaceKey); return ERROR_NO_SYSTEM_RESOURCES; } - rc = RegQueryValueExW(hKey, DeviceInstance, NULL, NULL, (LPBYTE)&deviceInfo->Interface.DeviceInstance[0], &dwLength); + rc = RegQueryValueExW(hDeviceInstanceKey, DeviceInstance, NULL, NULL, (LPBYTE)InstancePath, &dwInstancePathLength); if (rc != ERROR_SUCCESS) { - HeapFree(GetProcessHeap(), 0, deviceInfo); - RegCloseKey(hKey); + HeapFree(GetProcessHeap(), 0, InstancePath); + RegCloseKey(hDeviceInstanceKey); RegCloseKey(hInterfaceKey); return rc; } - deviceInfo->Interface.DeviceInstance[dwLength / sizeof(WCHAR)] = UNICODE_NULL; - TRACE("DeviceInstance %s\n", debugstr_w(deviceInfo->Interface.DeviceInstance)); - RegCloseKey(hKey); + InstancePath[dwInstancePathLength / sizeof(WCHAR)] = UNICODE_NULL; + TRACE("DeviceInstance %s\n", debugstr_w(InstancePath)); if (DeviceInstanceW) { /* Check if device enumerator is not the right one */ - if (wcscmp(DeviceInstanceW, deviceInfo->Interface.DeviceInstance) != 0) + if (wcscmp(DeviceInstanceW, InstancePath) != 0) { - HeapFree(GetProcessHeap(), 0, deviceInfo);; + HeapFree(GetProcessHeap(), 0, InstancePath); + RegCloseKey(hDeviceInstanceKey); continue; } } @@ -1303,58 +1314,133 @@ &hEnumKey); if (rc != ERROR_SUCCESS) { - HeapFree(GetProcessHeap(), 0, deviceInfo); + HeapFree(GetProcessHeap(), 0, InstancePath); + RegCloseKey(hDeviceInstanceKey); RegCloseKey(hInterfaceKey); return rc; } rc = RegOpenKeyEx( hEnumKey, - deviceInfo->Interface.DeviceInstance, + InstancePath, 0, /* Options */ KEY_QUERY_VALUE, &hKey); RegCloseKey(hEnumKey); if (rc != ERROR_SUCCESS) { - HeapFree(GetProcessHeap(), 0, deviceInfo); + HeapFree(GetProcessHeap(), 0, InstancePath); + RegCloseKey(hDeviceInstanceKey); RegCloseKey(hInterfaceKey); return rc; } dwLength = sizeof(KeyBuffer) - sizeof(UNICODE_NULL); rc = RegQueryValueExW(hKey, ClassGUID, NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); + RegCloseKey(hKey); if (rc != ERROR_SUCCESS) { - HeapFree(GetProcessHeap(), 0, deviceInfo); - RegCloseKey(hKey); + HeapFree(GetProcessHeap(), 0, InstancePath); + RegCloseKey(hDeviceInstanceKey); RegCloseKey(hInterfaceKey); return rc; } KeyBuffer[dwLength / sizeof(WCHAR)] = UNICODE_NULL; - RegCloseKey(hKey); KeyBuffer[37] = UNICODE_NULL; /* Replace the } by a NULL character */ - if (UuidFromStringW(&KeyBuffer[1], &deviceInfo->Interface.ClassGuid) != RPC_S_OK) + if (UuidFromStringW(&KeyBuffer[1], &ClassGuid) != RPC_S_OK) { - HeapFree(GetProcessHeap(), 0, deviceInfo); + HeapFree(GetProcessHeap(), 0, InstancePath); + RegCloseKey(hDeviceInstanceKey); + RegCloseKey(hInterfaceKey); return ERROR_GEN_FAILURE; } - TRACE("ClassGUID %s\n", debugstr_guid(&deviceInfo->Interface.ClassGuid)); + TRACE("ClassGUID %s\n", debugstr_guid(&ClassGuid)); - /* If current device matches the list GUID (if any), append the entry to the list */ - if (IsEqualIID(&list->ClassGuid, &GUID_NULL) || IsEqualIID(&list->ClassGuid, &deviceInfo->Interface.ClassGuid)) + /* If current device doesn't match the list GUID (if any), skip this entry */ + if (!IsEqualIID(&list->ClassGuid, &GUID_NULL) && !IsEqualIID(&list->ClassGuid, &ClassGuid)) { + HeapFree(GetProcessHeap(), 0, InstancePath); + RegCloseKey(hDeviceInstanceKey); + continue; + } + + /* Enumerate subkeys of hDeviceInstanceKey (ie "#ReferenceString" in IoRegisterDeviceInterface). Skip entries that don't start with '#' */ + j = 0; + while (TRUE) + { + dwLength = sizeof(KeyBuffer) / sizeof(KeyBuffer[0]); + rc = RegEnumKeyExW(hDeviceInstanceKey, j, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); + if (rc == ERROR_NO_MORE_ITEMS) + break; + if (rc != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, InstancePath); + RegCloseKey(hDeviceInstanceKey); + RegCloseKey(hInterfaceKey); + return rc; + } + j++; + if (KeyBuffer[0] != '#') + /* This entry doesn't represent an interesting entry */ + continue; + + /* Open sub key */ + rc = RegOpenKeyEx(hDeviceInstanceKey, KeyBuffer, 0, KEY_QUERY_VALUE, &hReferenceKey); + if (rc != ERROR_SUCCESS) + { + RegCloseKey(hDeviceInstanceKey); + RegCloseKey(hInterfaceKey); + return rc; + } + + /* Read SymbolicLink value */ + rc = RegQueryValueExW(hReferenceKey, SymbolicLink, NULL, &dwRegType, NULL, &dwLength); + if (rc != ERROR_SUCCESS ) + { + RegCloseKey(hReferenceKey); + RegCloseKey(hDeviceInstanceKey); + RegCloseKey(hInterfaceKey); + return rc; + } + if (dwRegType != REG_SZ) + { + RegCloseKey(hReferenceKey); + RegCloseKey(hDeviceInstanceKey); + RegCloseKey(hInterfaceKey); + return ERROR_GEN_FAILURE; + } + deviceInfo = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DeviceInfo, Interface.Data) + dwInstancePathLength + sizeof(UNICODE_NULL) + dwLength + sizeof(UNICODE_NULL)); + if (!deviceInfo) + { + RegCloseKey(hReferenceKey); + RegCloseKey(hDeviceInstanceKey); + RegCloseKey(hInterfaceKey); + return ERROR_NO_SYSTEM_RESOURCES; + } + deviceInfo->Interface.pInstancePath = &deviceInfo->Interface.Data[0]; + deviceInfo->Interface.pSymbolicLink = &deviceInfo->Interface.Data[dwInstancePathLength + 1]; + rc = RegQueryValueExW(hReferenceKey, SymbolicLink, NULL, NULL, (LPBYTE)deviceInfo->Interface.pSymbolicLink, &dwLength); + RegCloseKey(hReferenceKey); + if (rc != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, deviceInfo); + RegCloseKey(hDeviceInstanceKey); + RegCloseKey(hInterfaceKey); + return rc; + } + deviceInfo->Interface.pSymbolicLink[dwLength / sizeof(WCHAR)] = UNICODE_NULL; + TRACE("Symbolic link %s\n", debugstr_w(deviceInfo->Interface.pSymbolicLink)); + + /* Add this entry to the list */ TRACE("Entry found\n"); deviceInfo->IsDevice = FALSE; memcpy( &deviceInfo->Interface.InterfaceGuid, InterfaceGuid, sizeof(deviceInfo->Interface.InterfaceGuid)); + wcscpy(deviceInfo->Interface.pInstancePath, InstancePath); InsertTailList(&list->ListHead, &deviceInfo->ItemEntry); list->numberOfEntries++; } - else - { - HeapFree(GetProcessHeap(), 0, deviceInfo); - } + RegCloseKey(hDeviceInstanceKey); } RegCloseKey(hInterfaceKey); return ERROR_SUCCESS; @@ -1555,11 +1641,7 @@ * expected lifetime of the device data is the same as the * HDEVINFO; once that is closed, the data are no longer valid. */ -#ifdef __WINE__ - DeviceInterfaceData->Reserved = (ULONG_PTR)DevInfo->Interface.InterfaceName; -#else DeviceInterfaceData->Reserved = (ULONG_PTR)DevInfo; -#endif ret = TRUE; } else @@ -1619,70 +1701,61 @@ PDWORD RequiredSize, PSP_DEVINFO_DATA DeviceInfoData) { + PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailDataW = NULL; + DWORD sizeW = 0, sizeA; BOOL ret = FALSE; TRACE("(%p, %p, %p, %ld, %p, %p)\n", DeviceInfoSet, - DeviceInterfaceData, DeviceInterfaceDetailData, - DeviceInterfaceDetailDataSize, RequiredSize, DeviceInfoData); - if (!DeviceInterfaceData) + DeviceInterfaceData, DeviceInterfaceDetailData, + DeviceInterfaceDetailDataSize, RequiredSize, DeviceInfoData); + + if (DeviceInterfaceDetailData->cbSize != sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_A)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (DeviceInterfaceDetailData == NULL && DeviceInterfaceDetailDataSize != 0) SetLastError(ERROR_INVALID_PARAMETER); - else if ((DeviceInterfaceDetailDataSize && !DeviceInterfaceDetailData) || - (DeviceInterfaceDetailData && !DeviceInterfaceDetailDataSize)) + else if (DeviceInterfaceDetailData != NULL && DeviceInterfaceDetailDataSize < FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath) + 1) SetLastError(ERROR_INVALID_PARAMETER); - else if (DeviceInfoSet && DeviceInfoSet != (HDEVINFO)INVALID_HANDLE_VALUE) + else { - DeviceInfoList *list = (DeviceInfoList *)DeviceInfoSet; - - if (list->magic == SETUP_DEV_INFO_LIST_MAGIC) + if (DeviceInterfaceDetailData != NULL) { -#ifdef __WINE__ - /* FIXME: this assumes the only possible enumeration is of serial - * ports. - */ - LPCWSTR devName = (LPCWSTR)DeviceInterfaceData->Reserved; - DWORD sizeRequired = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_A) + - lstrlenW(devName); - - if (sizeRequired > DeviceInterfaceDetailDataSize) + sizeW = FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath) + + (DeviceInterfaceDetailDataSize - FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath)) * sizeof(WCHAR); + DeviceInterfaceDetailDataW = (PSP_DEVICE_INTERFACE_DETAIL_DATA_W)HeapAlloc(GetProcessHeap(), 0, sizeW); + if (!DeviceInterfaceDetailDataW) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - if (RequiredSize) - *RequiredSize = sizeRequired; + SetLastError(ERROR_NOT_ENOUGH_MEMORY); } - else + } + if (!DeviceInterfaceDetailData || (DeviceInterfaceDetailData && DeviceInterfaceDetailDataW)) + { + DeviceInterfaceDetailDataW->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); + ret = SetupDiGetDeviceInterfaceDetailW( + DeviceInfoSet, + DeviceInterfaceData, + DeviceInterfaceDetailDataW, + sizeW, + &sizeW, + DeviceInfoData); + sizeA = (sizeW - FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath)) / sizeof(WCHAR) + + FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath); + if (RequiredSize) + *RequiredSize = sizeA; + if (ret && DeviceInterfaceDetailData && DeviceInterfaceDetailDataSize <= sizeA) { - LPSTR dst = DeviceInterfaceDetailData->DevicePath; - LPCWSTR src = devName; - - /* MSDN claims cbSize must be set by the caller, but it lies */ - DeviceInterfaceDetailData->cbSize = - sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_A); - for ( ; *src; src++, dst++) - *dst = *src; - *dst = '\0'; - TRACE("DevicePath is %s\n", - debugstr_a(DeviceInterfaceDetailData->DevicePath)); - if (DeviceInfoData) + if (!WideCharToMultiByte( + CP_ACP, 0, + DeviceInterfaceDetailDataW->DevicePath, -1, + DeviceInterfaceDetailData->DevicePath, DeviceInterfaceDetailDataSize - FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath), + NULL, NULL)) { - DeviceInfoData->cbSize = sizeof(SP_DEVINFO_DATA); - memcpy(&DeviceInfoData->ClassGuid, - &GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR, - sizeof(DeviceInfoData->ClassGuid)); - DeviceInfoData->DevInst = 0; - DeviceInfoData->Reserved = (ULONG_PTR)devName; + ret = FALSE; } - ret = TRUE; } -#else /* __WINE__ */ - FIXME("unimplemented\n"); - ret = FALSE; -#endif /* __WINE__ */ } - else - SetLastError(ERROR_INVALID_HANDLE); + HeapFree(GetProcessHeap(), 0, DeviceInterfaceDetailDataW); } - else - SetLastError(ERROR_INVALID_HANDLE); + TRACE("Returning %d\n", ret); return ret; } @@ -1698,10 +1771,59 @@ PDWORD RequiredSize, PSP_DEVINFO_DATA DeviceInfoData) { - FIXME("(%p, %p, %p, %ld, %p, %p): stub\n", DeviceInfoSet, - DeviceInterfaceData, DeviceInterfaceDetailData, - DeviceInterfaceDetailDataSize, RequiredSize, DeviceInfoData); - return FALSE; + BOOL ret = FALSE; + + TRACE("(%p, %p, %p, %ld, %p, %p): stub\n", DeviceInfoSet, + DeviceInterfaceData, DeviceInterfaceDetailData, + DeviceInterfaceDetailDataSize, RequiredSize, DeviceInfoData); + + if (!DeviceInfoSet || !DeviceInterfaceData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + SetLastError(ERROR_INVALID_HANDLE); + else if (((DeviceInfoList*)DeviceInfoSet)->magic != SETUP_DEV_INFO_LIST_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (DeviceInterfaceData->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (DeviceInterfaceDetailData->cbSize != sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (DeviceInterfaceDetailData == NULL && DeviceInterfaceDetailDataSize != 0) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInterfaceDetailData != NULL && DeviceInterfaceDetailDataSize < FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath) + sizeof(UNICODE_NULL)) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + DeviceInfo *deviceInfo = (DeviceInfo *)DeviceInterfaceData->Reserved; + LPCWSTR devName = deviceInfo->Interface.pSymbolicLink; + DWORD sizeRequired = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + + lstrlenW(devName); + + if (sizeRequired > DeviceInterfaceDetailDataSize) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + if (RequiredSize) + *RequiredSize = sizeRequired; + } + else + { + wcscpy(DeviceInterfaceDetailData->DevicePath, devName); + TRACE("DevicePath is %s\n", debugstr_w(DeviceInterfaceDetailData->DevicePath)); + if (DeviceInfoData) + { + memcpy(&DeviceInfoData->ClassGuid, + &deviceInfo->Interface.ClassGuid, + sizeof(GUID)); + DeviceInfoData->DevInst = 0; /* FIXME */ + DeviceInfoData->Reserved = (ULONG_PTR)0; + } + ret = TRUE; + } + } + + TRACE("Returning %d\n", ret); + return ret; } /*********************************************************************** _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-07-17 15:10:03 UTC (rev 16621) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-07-17 15:57:41 UTC (rev 16622) @@ -327,7 +327,7 @@ @ stub SetupDiGetDeviceInstanceIdA @ stub SetupDiGetDeviceInstanceIdW @ stdcall SetupDiGetDeviceRegistryPropertyA(long ptr long ptr ptr long ptr) -@ stub SetupDiGetDeviceRegistryPropertyW +@ stdcall SetupDiGetDeviceRegistryPropertyW(long ptr long ptr ptr long ptr) @ stub SetupDiGetDriverInfoDetailA @ stub SetupDiGetDriverInfoDetailW @ stub SetupDiGetDriverInstallParamsA

19 years, 3 months

← Newer
1
...
27
28
29
30
31
32
33
...
57
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005