Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Oct 5 11:02:11 2014 New Revision: 64540 URL: http://svn.reactos.org/svn/reactos?rev=64540&view=rev Log: [uxtheme] fix a typo Modified: trunk/reactos/dll/win32/uxtheme/uxthemep.h Modified: trunk/reactos/dll/win32/uxtheme/uxthemep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemep… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] Sun Oct 5 11:02:11 2014 @@ -156,7 +156,7 @@ } CAPTIONBUTTON; /* -The following values specify all possible vutton states +The following values specify all possible button states Note that not all of them are documented but it is easy to find them by opening a theme file */

9 years, 11 months

[jgardou] 64539: [MSI] - Revert unwanted change

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Oct 5 10:02:34 2014 New Revision: 64539 URL: http://svn.reactos.org/svn/reactos?rev=64539&view=rev Log: [MSI] - Revert unwanted change Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] Sun Oct 5 10:02:34 2014 @@ -5,7 +5,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -spec2def(msi.dll msi.spec ADD_IMPORTLIB WITH_RELAY) +spec2def(msi.dll msi.spec ADD_IMPORTLIB) generate_idl_iids(msiserver.idl)

9 years, 11 months

[jgardou] 64538: [LIBWINE] - Add support for the +tid debug channel, prefixing every traces with the current thread ID.

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Oct 5 09:57:11 2014 New Revision: 64538 URL: http://svn.reactos.org/svn/reactos?rev=64538&view=rev Log: [LIBWINE] - Add support for the +tid debug channel, prefixing every traces with the current thread ID. Modified: trunk/reactos/lib/3rdparty/libwine/debug.c Modified: trunk/reactos/lib/3rdparty/libwine/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/debug… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libwine/debug.c [iso-8859-1] Sun Oct 5 09:57:11 2014 @@ -35,6 +35,8 @@ #include <rtlfuncs.h> #include <cmfuncs.h> +WINE_DECLARE_DEBUG_CHANNEL(tid); + ULONG NTAPI vDbgPrintExWithPrefix( @@ -416,6 +418,9 @@ { int ret = 0; + if (TRACE_ON(tid)) + ret += wine_dbg_printf("%04x:", HandleToULong(NtCurrentTeb()->ClientId.UniqueThread)); + if (cls < sizeof(debug_classes)/sizeof(debug_classes[0])) ret += wine_dbg_printf( "%s:", debug_classes[cls] );

9 years, 11 months

[jgardou] 64537: [NTOS/MM] - Do not assert in case of stack overflow, just let the page fault handler raise STATUS_STACK_OVERFLOW

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Oct 5 09:57:02 2014 New Revision: 64537 URL: http://svn.reactos.org/svn/reactos?rev=64537&view=rev Log: [NTOS/MM] - Do not assert in case of stack overflow, just let the page fault handler raise STATUS_STACK_OVERFLOW Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Oct 5 09:57:02 2014 @@ -82,7 +82,6 @@ { /* We don't -- Windows would try to make this guard page valid now */ DPRINT1("Close to our death...\n"); - ASSERT(FALSE); return STATUS_STACK_OVERFLOW; }

9 years, 11 months

[jgardou] 64536: [MSI] - Do not use PCH with auto-generated files.

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Oct 5 09:56:48 2014 New Revision: 64536 URL: http://svn.reactos.org/svn/reactos?rev=64536&view=rev Log: [MSI] - Do not use PCH with auto-generated files. Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] Sun Oct 5 09:56:48 2014 @@ -5,7 +5,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -spec2def(msi.dll msi.spec ADD_IMPORTLIB) +spec2def(msi.dll msi.spec ADD_IMPORTLIB WITH_RELAY) generate_idl_iids(msiserver.idl) @@ -51,12 +51,12 @@ update.c upgrade.c where.c - msipriv.h - ${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c - ${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c) + msipriv.h) add_library(msi SHARED ${SOURCE} + ${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c + ${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c msi.rc ${CMAKE_CURRENT_BINARY_DIR}/msi.def)

9 years, 11 months

[ekohl] 64535: [SETUPAPI] Add overlay icons to the class image list.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Oct 5 08:55:55 2014 New Revision: 64535 URL: http://svn.reactos.org/svn/reactos?rev=64535&view=rev Log: [SETUPAPI] Add overlay icons to the class image list. Modified: trunk/reactos/dll/win32/setupapi/devclass.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] Sun Oct 5 08:55:55 2014 @@ -486,6 +486,7 @@ HICON hIcon; DWORD size; INT i, bpp; + UINT idx; /* Get list of all class GUIDs in given computer */ ret = SetupDiBuildClassInfoListExW( @@ -587,6 +588,19 @@ } else list->IconIndexes[i] = -1; /* Special value to indicate that the icon is unavailable */ + } + + /* Finally, add the overlay icons to the image list */ + for (i = 0; i < 2; i++) + { + hIcon = LoadImage(hInstance, MAKEINTRESOURCE(500 + i), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + if (hIcon) + { + idx = ImageList_AddIcon(ClassImageListData->ImageList, hIcon); + if (idx != -1) + ImageList_SetOverlayImage(ClassImageListData->ImageList, idx, i); + DestroyIcon(hIcon); + } } ret = TRUE;

9 years, 11 months

[ekohl] 64534: [DEVMGMT] - Reimplement the 'list by device type' function. The old implementation did not list devices as 'unknown devices' if they had no device class GUID or an unknown class GUID...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Oct 5 08:53:51 2014 New Revision: 64534 URL: http://svn.reactos.org/svn/reactos?rev=64534&view=rev Log: [DEVMGMT] - Reimplement the 'list by device type' function. The old implementation did not list devices as 'unknown devices' if they had no device class GUID or an unknown class GUID. - Use overlay images to indicate problems on a device. Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c trunk/reactos/base/applications/mscutils/devmgmt/precomp.h Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c [iso-8859-1] Sun Oct 5 08:53:51 2014 @@ -15,9 +15,7 @@ #include <devguid.h> static SP_CLASSIMAGELIST_DATA ImageListData; -static HDEVINFO hDevInfo; - -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + VOID FreeDeviceStrings(HWND hTreeView) @@ -96,7 +94,6 @@ DPF_EXTENDED, FALSE); } - } @@ -106,7 +103,7 @@ LPTSTR lpLabel, LPTSTR DeviceID, INT DevImage, - LONG DevProb) + UINT OverlayImage) { TV_ITEM tvi; TV_INSERTSTRUCT tvins; @@ -121,15 +118,11 @@ tvi.iImage = DevImage; tvi.iSelectedImage = DevImage; - if (DevProb != 0) - { + if (OverlayImage != 0) + { + tvi.mask |= TVIF_STATE; tvi.stateMask = TVIS_OVERLAYMASK; - - if (DevProb == CM_PROB_DISABLED) - { - /* FIXME: set the overlay icon */ - } - + tvi.state = INDEXTOOVERLAYMASK(OverlayImage); } tvins.item = tvi; @@ -139,212 +132,295 @@ } -static INT -EnumDeviceClasses(INT ClassIndex, - BOOL ShowHidden, - LPTSTR DevClassName, - LPTSTR DevClassDesc, - BOOL *DevPresent, - INT *ClassImage, - BOOL *IsUnknown, - BOOL *IsHidden) -{ +static +ULONG +GetClassCount(VOID) +{ + ULONG ulClassIndex; GUID ClassGuid; - HKEY KeyClass; - TCHAR ClassName[MAX_CLASS_NAME_LEN]; - DWORD RequiredSize = MAX_CLASS_NAME_LEN; - UINT Ret; - - *DevPresent = FALSE; - *DevClassName = _T('\0'); - *IsHidden = FALSE; - - Ret = CM_Enumerate_Classes(ClassIndex, - &ClassGuid, - 0); - if (Ret != CR_SUCCESS) - { - /* all classes enumerated */ - if(Ret == CR_NO_SUCH_VALUE) - { - return -1; - } - - if (Ret == CR_INVALID_DATA) - { - ; /*FIXME: what should we do here? */ - } - - /* handle other errors... */ - } - - /* This case is special because these devices don't show up with normal class enumeration */ - *IsUnknown = IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_UNKNOWN); - - if (ShowHidden == FALSE && - (IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_LEGACYDRIVER) || - IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_VOLUME))) - *IsHidden = TRUE; - - if (SetupDiClassNameFromGuid(&ClassGuid, - ClassName, - RequiredSize, - &RequiredSize)) - { - lstrcpy(DevClassName, ClassName); - } - - if (!SetupDiGetClassImageIndex(&ImageListData, - &ClassGuid, - ClassImage)) - { - /* FIXME: can we do this? - * Set the blank icon: IDI_SETUPAPI_BLANK = 41 - * it'll be image 24 in the imagelist */ - *ClassImage = 24; - } - - /* Get device info for all devices of a particular class */ - hDevInfo = SetupDiGetClassDevs(*IsUnknown ? NULL : &ClassGuid, - NULL, - NULL, - DIGCF_PRESENT | (*IsUnknown ? DIGCF_ALLCLASSES : 0)); - if (hDevInfo == INVALID_HANDLE_VALUE) - { - return 0; - } - - KeyClass = SetupDiOpenClassRegKeyEx(&ClassGuid, + CONFIGRET cr; + + for (ulClassIndex = 0; ; ulClassIndex++) + { + cr = CM_Enumerate_Classes(ulClassIndex, + &ClassGuid, + 0); + if (cr == CR_NO_SUCH_VALUE) + return ulClassIndex; + } +} + + +static +PDEVCLASS_ENTRY +GetClassFromClassGuid( + PDEVCLASS_ENTRY pClassArray, + ULONG ulClassCount, + GUID *pGuid) +{ + PDEVCLASS_ENTRY pClass, pUnknownClass = NULL; + ULONG i; + + for (i = 0; i < ulClassCount; i++) + { + pClass = &pClassArray[i]; + + if (IsEqualGUID(&pClass->ClassGuid, &GUID_DEVCLASS_UNKNOWN)) + pUnknownClass = pClass; + + if (IsEqualGUID(&pClass->ClassGuid, pGuid)) + return pClass; + } + + return pUnknownClass; +} + + +static +VOID +EnumDeviceClasses( + HWND hTreeView, + HTREEITEM hRoot, + PDEVCLASS_ENTRY pClassArray, + ULONG ClassCount) +{ + WCHAR ClassName[MAX_DEV_LEN]; + WCHAR ClassDesc[MAX_DEV_LEN]; + PDEVCLASS_ENTRY pClass; + ULONG ClassIndex; + DWORD dwSize; + LONG lSize; + HKEY hKey; + CONFIGRET cr; + + for (ClassIndex = 0; ClassIndex < ClassCount; ClassIndex++) + { + pClass = &pClassArray[ClassIndex]; + + cr = CM_Enumerate_Classes(ClassIndex, + &pClass->ClassGuid, + 0); + if (cr == CR_NO_SUCH_VALUE) + return; + + dwSize = MAX_CLASS_NAME_LEN; + if (!SetupDiClassNameFromGuid(&pClass->ClassGuid, + ClassName, + dwSize, + &dwSize)) + { + ClassName[0] = _T('\0'); + } + + if (!SetupDiGetClassImageIndex(&ImageListData, + &pClass->ClassGuid, + &pClass->ClassImage)) + { + /* FIXME: can we do this? + * Set the blank icon: IDI_SETUPAPI_BLANK = 41 + * it'll be image 24 in the imagelist */ + pClass->ClassImage = 24; + } + + hKey = SetupDiOpenClassRegKeyEx(&pClass->ClassGuid, MAXIMUM_ALLOWED, DIOCR_INSTALLER, NULL, 0); - if (KeyClass != INVALID_HANDLE_VALUE) - { - - LONG dwSize = MAX_DEV_LEN; - - if (RegQueryValue(KeyClass, - NULL, - DevClassDesc, - &dwSize) != ERROR_SUCCESS) - { - *DevClassDesc = _T('\0'); - } - } - else - { - return 0; - } - - *DevPresent = TRUE; - - RegCloseKey(KeyClass); - - return 0; -} - - -static LONG -EnumDevices(INT index, - LPTSTR DeviceClassName, - LPTSTR DeviceName, - LPTSTR *DeviceID) -{ + if (hKey != INVALID_HANDLE_VALUE) + { + lSize = MAX_DEV_LEN; + if (RegQueryValue(hKey, + NULL, + ClassDesc, + &lSize) != ERROR_SUCCESS) + { + ClassDesc[0] = _T('\0'); + } + + RegCloseKey(hKey); + } + + pClass->hItem = InsertIntoTreeView(hTreeView, + hRoot, + (ClassDesc[0] != _T('\0')) ? ClassDesc : ClassName, + NULL, + pClass->ClassImage, + 0); + } +} + + +static +VOID +EnumDevices( + HWND hTreeView, + PDEVCLASS_ENTRY pClassArray, + ULONG ulClassCount, + BOOL bShowHidden) +{ + HDEVINFO hDevInfo = INVALID_HANDLE_VALUE; SP_DEVINFO_DATA DeviceInfoData; + ULONG Status, Problem; + DWORD DevIdSize; + TCHAR DeviceName[MAX_DEV_LEN]; + DWORD DevIndex; + LPTSTR InstanceId; + PDEVCLASS_ENTRY pClass; + UINT OverlayImage; CONFIGRET cr; - ULONG Status, ProblemNumber; - DWORD DevIdSize; - - *DeviceName = _T('\0'); - *DeviceID = NULL; - - ZeroMemory(&DeviceInfoData, sizeof(SP_DEVINFO_DATA)); - DeviceInfoData.cbSize = sizeof(SP_DEVINFO_DATA); - - if (!SetupDiEnumDeviceInfo(hDevInfo, - index, - &DeviceInfoData)) - { - /* no such device */ - return -1; - } - - if (DeviceClassName == NULL && !IsEqualGUID(&DeviceInfoData.ClassGuid, &GUID_NULL)) - { - /* we're looking for unknown devices and this isn't one */ - return -2; - } - - /* get the device ID */ - if (!SetupDiGetDeviceInstanceId(hDevInfo, - &DeviceInfoData, - NULL, - 0, - &DevIdSize)) - { - if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - (*DeviceID) = (LPTSTR)HeapAlloc(GetProcessHeap(), - 0, - DevIdSize * sizeof(TCHAR)); - if (*DeviceID) + + + /* Get device info for all devices of a particular class */ + hDevInfo = SetupDiGetClassDevs(NULL, + NULL, + NULL, + DIGCF_PRESENT | DIGCF_ALLCLASSES); + if (hDevInfo == INVALID_HANDLE_VALUE) + return; + + for (DevIndex = 0; ; DevIndex++) + { + ZeroMemory(&DeviceInfoData, sizeof(SP_DEVINFO_DATA)); + DeviceInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + + InstanceId = NULL; + DeviceName[0] = _T('\0'); + OverlayImage = 0; + + if (!SetupDiEnumDeviceInfo(hDevInfo, + DevIndex, + &DeviceInfoData)) + break; + + if (bShowHidden == FALSE && + (IsEqualGUID(&DeviceInfoData.ClassGuid, &GUID_DEVCLASS_LEGACYDRIVER) || + IsEqualGUID(&DeviceInfoData.ClassGuid, &GUID_DEVCLASS_VOLUME))) + continue; + + pClass = GetClassFromClassGuid(pClassArray, + ulClassCount, + &DeviceInfoData.ClassGuid); + + /* get the device ID */ + if (!SetupDiGetDeviceInstanceId(hDevInfo, + &DeviceInfoData, + NULL, + 0, + &DevIdSize)) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { - if (!SetupDiGetDeviceInstanceId(hDevInfo, - &DeviceInfoData, - *DeviceID, - DevIdSize, - NULL)) + InstanceId = (LPTSTR)HeapAlloc(GetProcessHeap(), + 0, + DevIdSize * sizeof(TCHAR)); + if (InstanceId != NULL) { - HeapFree(GetProcessHeap(), - 0, - *DeviceID); - *DeviceID = NULL; + if (!SetupDiGetDeviceInstanceId(hDevInfo, + &DeviceInfoData, + InstanceId, + DevIdSize, + NULL)) + { + HeapFree(GetProcessHeap(), + 0, + InstanceId); + InstanceId = NULL; + } } } } - } - - if (DeviceID != NULL && - _tcscmp(*DeviceID, _T("HTREE\\ROOT\\0")) == 0) - { - HeapFree(GetProcessHeap(), - 0, - *DeviceID); - *DeviceID = NULL; - return -1; - } - - /* get the device's friendly name */ - if (!SetupDiGetDeviceRegistryProperty(hDevInfo, - &DeviceInfoData, - SPDRP_FRIENDLYNAME, - 0, - (BYTE*)DeviceName, - MAX_DEV_LEN, - NULL)) - { - /* if the friendly name fails, try the description instead */ - SetupDiGetDeviceRegistryProperty(hDevInfo, - &DeviceInfoData, - SPDRP_DEVICEDESC, - 0, - (BYTE*)DeviceName, - MAX_DEV_LEN, - NULL); - } - - cr = CM_Get_DevNode_Status_Ex(&Status, - &ProblemNumber, - DeviceInfoData.DevInst, - 0, - NULL); - if (cr == CR_SUCCESS && (Status & DN_HAS_PROBLEM)) - { - return ProblemNumber; - } - - return 0; + + /* Skip the root device */ + if (InstanceId != NULL && + _tcscmp(InstanceId, _T("HTREE\\ROOT\\0")) == 0) + { + HeapFree(GetProcessHeap(), + 0, + InstanceId); + InstanceId = NULL; + continue; + } + + /* Get the device's friendly name */ + if (!SetupDiGetDeviceRegistryProperty(hDevInfo, + &DeviceInfoData, + SPDRP_FRIENDLYNAME, + 0, + (BYTE*)DeviceName, + MAX_DEV_LEN, + NULL)) + { + /* If the friendly name fails, try the description instead */ + SetupDiGetDeviceRegistryProperty(hDevInfo, + &DeviceInfoData, + SPDRP_DEVICEDESC, + 0, + (BYTE*)DeviceName, + MAX_DEV_LEN, + NULL); + } + + cr = CM_Get_DevNode_Status_Ex(&Status, + &Problem, + DeviceInfoData.DevInst, + 0, + NULL); + if ((cr == CR_SUCCESS) && + (Status & DN_HAS_PROBLEM)) + { + if (Problem == CM_PROB_DISABLED || + Problem == CM_PROB_HARDWARE_DISABLED) + OverlayImage = 2; + else + OverlayImage = 1; + } + + InsertIntoTreeView(hTreeView, + pClass->hItem, + DeviceName, + InstanceId, + pClass->ClassImage, + OverlayImage); + + if (OverlayImage != 0) + { + /* Expand the class if the device has a problem */ + (void)TreeView_Expand(hTreeView, + pClass->hItem, + TVE_EXPAND); + } + + pClass->bUsed = TRUE; + } + + if (hDevInfo != INVALID_HANDLE_VALUE) + SetupDiDestroyDeviceInfoList(hDevInfo); +} + + +static +VOID +CleanupDeviceClasses( + HWND hTreeView, + PDEVCLASS_ENTRY pClassArray, + ULONG ulClassCount) +{ + PDEVCLASS_ENTRY pClass; + ULONG i; + + for (i = 0; i < ulClassCount; i++) + { + pClass = &pClassArray[i]; + + if (pClass->bUsed == FALSE) + (void)TreeView_DeleteItem(hTreeView, + pClass->hItem); + else + (void)TreeView_SortChildren(hTreeView, + pClass->hItem, + 0); + } } @@ -353,105 +429,33 @@ HTREEITEM hRoot, BOOL bShowHidden) { - HTREEITEM hDevItem; - TCHAR DevName[MAX_DEV_LEN]; - TCHAR DevDesc[MAX_DEV_LEN]; - LPTSTR DeviceID = NULL; - BOOL DevExist = FALSE; - INT ClassRet; - INT index = 0; - INT DevImage; - BOOL IsUnknown = FALSE; - BOOL IsHidden = FALSE; - - do - { - ClassRet = EnumDeviceClasses(index, - bShowHidden, - DevName, - DevDesc, - &DevExist, - &DevImage, - &IsUnknown, - &IsHidden); - - if ((ClassRet != -1) && (DevExist) && !IsHidden) - { - TCHAR DeviceName[MAX_DEV_LEN]; - INT DevIndex = 0; - LONG Ret; - - if (DevDesc[0] != _T('\0')) - { - hDevItem = InsertIntoTreeView(hTreeView, - hRoot, - DevDesc, - NULL, - DevImage, - 0); - } - else - { - hDevItem = InsertIntoTreeView(hTreeView, - hRoot, - DevName, - NULL, - DevImage, - 0); - } - - do - { - Ret = EnumDevices(DevIndex, - IsUnknown ? NULL : DevName, - DeviceName, - &DeviceID); - if (Ret >= 0) - { - InsertIntoTreeView(hTreeView, - hDevItem, - DeviceName, - DeviceID, - DevImage, - Ret); - if (Ret != 0) - { - /* Expand the class if the device has a problem */ - (void)TreeView_Expand(hTreeView, - hDevItem, - TVE_EXPAND); - } - } - - DevIndex++; - - } while (Ret != -1); - - /* kill InfoList initialized in EnumDeviceClasses */ - if (hDevInfo) - { - SetupDiDestroyDeviceInfoList(hDevInfo); - hDevInfo = NULL; - } - - /* don't insert classes with no devices */ - if (!TreeView_GetChild(hTreeView, - hDevItem)) - { - (void)TreeView_DeleteItem(hTreeView, - hDevItem); - } - else - { - (void)TreeView_SortChildren(hTreeView, - hDevItem, - 0); - } - } - - index++; - - } while (ClassRet != -1); + PDEVCLASS_ENTRY pClassArray; + ULONG ulClassCount; + + ulClassCount = GetClassCount(); + + pClassArray = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + ulClassCount * sizeof(DEVCLASS_ENTRY)); + if (pClassArray == NULL) + return; + + EnumDeviceClasses(hTreeView, + hRoot, + pClassArray, + ulClassCount); + + EnumDevices(hTreeView, + pClassArray, + ulClassCount, + bShowHidden); + + CleanupDeviceClasses(hTreeView, + pClassArray, + ulClassCount); + + if (pClassArray != NULL) + HeapFree(GetProcessHeap(), 0, pClassArray); (void)TreeView_Expand(hTreeView, hRoot, @@ -647,25 +651,15 @@ InitTreeView(HWND hTreeView) { HTREEITEM hRoot; - HBITMAP hComp; TCHAR ComputerName[MAX_PATH]; DWORD dwSize = MAX_PATH; INT RootImage; (void)TreeView_DeleteAllItems(hTreeView); - /* get the device image List */ + /* Get the device image list */ ImageListData.cbSize = sizeof(ImageListData); SetupDiGetClassImageList(&ImageListData); - - hComp = LoadBitmap(hInstance, - MAKEINTRESOURCE(IDB_ROOT_IMAGE)); - - ImageList_Add(ImageListData.ImageList, - hComp, - NULL); - - DeleteObject(hComp); (void)TreeView_SetImageList(hTreeView, ImageListData.ImageList, @@ -677,9 +671,12 @@ ComputerName[0] = _T('\0'); } - RootImage = ImageList_GetImageCount(ImageListData.ImageList) - 1; - - /* insert the root item into the tree */ + /* Get the image index of the computer class */ + SetupDiGetClassImageIndex(&ImageListData, + &GUID_DEVCLASS_COMPUTER, + &RootImage); + + /* Insert the root item into the tree */ hRoot = InsertIntoTreeView(hTreeView, NULL, ComputerName, Modified: trunk/reactos/base/applications/mscutils/devmgmt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] Sun Oct 5 08:53:51 2014 @@ -44,6 +44,15 @@ UINT InMenuLoop : 1; } MAIN_WND_INFO, *PMAIN_WND_INFO; + + +typedef struct _DEVCLASS_ENTRY +{ + GUID ClassGuid; + INT ClassImage; + BOOL bUsed; + HTREEITEM hItem; +} DEVCLASS_ENTRY, *PDEVCLASS_ENTRY; INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);

9 years, 11 months

[tkreuzer] 64533: [NTOSKRNL] Kill MiZeroFillSection

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Oct 5 08:49:15 2014 New Revision: 64533 URL: http://svn.reactos.org/svn/reactos?rev=64533&view=rev Log: [NTOSKRNL] Kill MiZeroFillSection Modified: trunk/reactos/ntoskrnl/cache/copysup.c trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/newmm.h Modified: trunk/reactos/ntoskrnl/cache/copysup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/copysup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/cache/copysup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/copysup.c [iso-8859-1] Sun Oct 5 08:49:15 2014 @@ -186,7 +186,6 @@ WriteBuf, Bcb->BaseAddress); - //MiZeroFillSection(WriteBuf, &CurrentOffset, WriteLen); RtlCopyMemory(WriteBuf, ((PCHAR)Buffer) + Count, WriteLen); Count += WriteLen; Length -= WriteLen; Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Sun Oct 5 08:49:15 2014 @@ -112,78 +112,6 @@ //DPRINT("MmUnlockSectionSegment(%p,%s:%d)\n", Segment, file, line); } -NTSTATUS -NTAPI -MiZeroFillSection(PVOID Address, PLARGE_INTEGER FileOffsetPtr, ULONG Length) -{ - PFN_NUMBER Page; - PMMSUPPORT AddressSpace; - PMEMORY_AREA MemoryArea; - PMM_SECTION_SEGMENT Segment; - LARGE_INTEGER FileOffset = *FileOffsetPtr, End, FirstMapped; - KIRQL OldIrql; - - DPRINT("MiZeroFillSection(Address %p, Offset 0x%I64x,Length 0x%lx)\n", - Address, - FileOffset.QuadPart, - Length); - - AddressSpace = MmGetKernelAddressSpace(); - - MmLockAddressSpace(AddressSpace); - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); - MmUnlockAddressSpace(AddressSpace); - if (!MemoryArea || MemoryArea->Type != MEMORY_AREA_SECTION_VIEW || MemoryArea->DeleteInProgress) - { - return STATUS_NOT_MAPPED_DATA; - } - - Segment = MemoryArea->Data.SectionData.Segment; - End.QuadPart = FileOffset.QuadPart + Length; - End.LowPart = PAGE_ROUND_DOWN(End.LowPart); - FileOffset.LowPart = PAGE_ROUND_UP(FileOffset.LowPart); - FirstMapped.QuadPart = MemoryArea->Data.SectionData.ViewOffset.QuadPart; - DPRINT("Pulling zero pages for %08x%08x-%08x%08x\n", - FileOffset.u.HighPart, FileOffset.u.LowPart, - End.u.HighPart, End.u.LowPart); - - while (FileOffset.QuadPart < End.QuadPart) - { - PVOID CurrentAddress; - ULONG_PTR Entry; - - if (!NT_SUCCESS(MmRequestPageMemoryConsumer(MC_CACHE, TRUE, &Page))) - break; - - MmLockAddressSpace(AddressSpace); - MmLockSectionSegment(Segment); - - Entry = MmGetPageEntrySectionSegment(Segment, &FileOffset); - if (Entry == 0) - { - MmSetPageEntrySectionSegment(Segment, &FileOffset, MAKE_PFN_SSE(Page)); - CurrentAddress = ((PCHAR)MemoryArea->StartingAddress) + FileOffset.QuadPart - FirstMapped.QuadPart; - - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MmReferencePage(Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - - MmCreateVirtualMapping(NULL, CurrentAddress, PAGE_READWRITE, &Page, 1); - MmInsertRmap(Page, NULL, CurrentAddress); - } - else - { - MmReleasePageMemoryConsumer(MC_CACHE, Page); - } - - MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); - - FileOffset.QuadPart += PAGE_SIZE; - } - return STATUS_SUCCESS; -} - /* MiFlushMappedSection Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/new… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] Sun Oct 5 08:49:15 2014 @@ -262,12 +262,6 @@ _In_ BOOLEAN Locked, _Inout_ PMM_REQUIRED_RESOURCES Required); -NTSTATUS -NTAPI -MiZeroFillSection(PVOID Address, - PLARGE_INTEGER FileOffsetPtr, - ULONG Length); - VOID MmPageOutDeleteMapping(PVOID Context, PEPROCESS Process,

9 years, 11 months

[tkreuzer] 64532: [NTOSKRNL] Remove obsolete FreePage parameter from MmDeleteVirtualMapping

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Oct 5 07:16:01 2014 New Revision: 64532 URL: http://svn.reactos.org/svn/reactos?rev=64532&view=rev Log: [NTOSKRNL] Remove obsolete FreePage parameter from MmDeleteVirtualMapping Modified: trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/swapout.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/amd64/page.c trunk/reactos/ntoskrnl/mm/arm/page.c trunk/reactos/ntoskrnl/mm/arm/stubs.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/i386/pagepae.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/powerpc/page.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -771,7 +771,7 @@ DPRINT("Removing page %p:%I64x -> %x\n", Segment, Offset.QuadPart, Entry); MmSetSavedSwapEntryPage(Page, 0); MmDeleteRmap(Page, Process, Address); - MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); + MmDeleteVirtualMapping(Process, Address, NULL, NULL); MmReleasePageMemoryConsumer(MC_CACHE, Page); } if (SwapEntry != 0) Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swa… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -309,7 +309,7 @@ } MmDeleteRmap(Required->Page[0], Process, Address); - MmDeleteVirtualMapping(Process, Address, FALSE, Dirty, &OurPage); + MmDeleteVirtualMapping(Process, Address, Dirty, &OurPage); ASSERT(OurPage == Required->Page[0]); /* Note: this releases the reference held by this address space only. */ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -1158,7 +1158,6 @@ MmDeleteVirtualMapping( struct _EPROCESS *Process, PVOID Address, - BOOLEAN FreePage, BOOLEAN* WasDirty, PPFN_NUMBER Page ); Modified: trunk/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/page.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -451,7 +451,6 @@ MmDeleteVirtualMapping( PEPROCESS Process, PVOID Address, - BOOLEAN FreePage, BOOLEAN* WasDirty, PPFN_NUMBER Page) { @@ -469,9 +468,6 @@ if (OldPte.u.Hard.Valid) { Pfn = OldPte.u.Hard.PageFrameNumber; - - //if (FreePage) - //MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); } else Pfn = 0; Modified: trunk/reactos/ntoskrnl/mm/arm/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/page.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -180,7 +180,6 @@ NTAPI MmDeleteVirtualMapping(IN PEPROCESS Process, IN PVOID Address, - IN BOOLEAN FreePage, OUT PBOOLEAN WasDirty, OUT PPFN_NUMBER Page) { Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -474,7 +474,6 @@ NTAPI MmDeleteVirtualMapping(IN PEPROCESS Process, IN PVOID Address, - IN BOOLEAN FreePage, OUT PBOOLEAN WasDirty, OUT PPFN_NUMBER Page) { Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -358,7 +358,7 @@ VOID NTAPI -MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, +MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER Page) /* * FUNCTION: Delete a virtual mapping @@ -369,8 +369,8 @@ ULONG Pte; PULONG Pt; - DPRINT("MmDeleteVirtualMapping(%p, %p, %u, %p, %p)\n", - Process, Address, FreePage, WasDirty, Page); + DPRINT("MmDeleteVirtualMapping(%p, %p, %p, %p)\n", + Process, Address, WasDirty, Page); Pt = MmGetPageTableForProcess(Process, Address, FALSE); @@ -410,12 +410,6 @@ } Pfn = PTE_TO_PFN(Pte); - - if (FreePage) - { - MmReleasePageMemoryConsumer(MC_SYSTEM, Pfn); - Pfn = 0; - } } else { Modified: trunk/reactos/ntoskrnl/mm/i386/pagepae.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pagepae.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -622,7 +622,7 @@ VOID NTAPI -MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, +MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER Page) /* * FUNCTION: Delete a virtual mapping @@ -632,7 +632,7 @@ PFN_NUMBER Pfn; DPRINT("MmDeleteVirtualMapping(%x, %x, %d, %x, %x)\n", - Process, Address, FreePage, WasDirty, Page); + Process, Address, WasDirty, Page); if (Ke386Pae) { ULONGLONG Pte; @@ -671,11 +671,6 @@ Pfn = 0; } - if (FreePage && WasValid) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); - } - /* * Return some information to the caller */ @@ -724,11 +719,6 @@ else { Pfn = 0; - } - - if (FreePage && WasValid) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); } /* Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=64… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -837,7 +837,7 @@ } else { - MmDeleteVirtualMapping(Process, (PVOID)Address, FALSE, &Dirty, &Page); + MmDeleteVirtualMapping(Process, (PVOID)Address, &Dirty, &Page); } if (FreePage != NULL) { Modified: trunk/reactos/ntoskrnl/mm/powerpc/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/page.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -170,7 +170,7 @@ VOID NTAPI -MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, +MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER Page) /* * FUNCTION: Delete a virtual mapping @@ -179,16 +179,11 @@ ppc_map_info_t info = { 0 }; DPRINT("MmDeleteVirtualMapping(%x, %x, %d, %x, %x)\n", - Process, Address, FreePage, WasDirty, Page); + Process, Address, WasDirty, Page); info.proc = Process ? (int)Process->UniqueProcessId : 0; info.addr = (vaddr_t)Address; MmuInqPage(&info, 1); - - if (FreePage && info.phys) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, info.phys >> PAGE_SHIFT); - } /* * Return some information to the caller Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -1763,7 +1763,7 @@ } MmDeleteRmap(OldPage, Process, PAddress); - MmDeleteVirtualMapping(Process, PAddress, FALSE, NULL, NULL); + MmDeleteVirtualMapping(Process, PAddress, NULL, NULL); MmCreatePageFileMapping(Process, PAddress, MM_WAIT_ENTRY); /* @@ -1836,7 +1836,6 @@ MmDeleteVirtualMapping(Process, Address, - FALSE, &WasDirty, &Page); if (WasDirty)

9 years, 11 months

[tkreuzer] 64531: [NTOSKRNL] Apply indentation of 4 spaces, no code change.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Oct 5 06:33:34 2014 New Revision: 64531 URL: http://svn.reactos.org/svn/reactos?rev=64531&view=rev Log: [NTOSKRNL] Apply indentation of 4 spaces, no code change. Modified: trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mmfault.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/region.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=64… Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=6… Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… Modified: trunk/reactos/ntoskrnl/mm/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/region.c?rev=6… Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=645… Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=…

9 years, 11 months

← Newer
1
...
60
61
62
63
64
65
66
...
73
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 October 2014