Ros-diffs June 2015

ros-diffs@reactos.org

13 participants
343 discussions

[pschweitzer] 68177: [NDK] Fix KNODE definition, to be compatible with w2k3. Thanks to Thomas for his help.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Jun 17 20:07:44 2015 New Revision: 68177 URL: http://svn.reactos.org/svn/reactos?rev=68177&view=rev Log: [NDK] Fix KNODE definition, to be compatible with w2k3. Thanks to Thomas for his help. Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Wed Jun 17 20:07:44 2015 @@ -774,10 +774,13 @@ SLIST_HEADER DeadStackList; SLIST_HEADER PfnDereferenceSListHead; KAFFINITY ProcessorMask; - ULONG Color; + UCHAR Color; UCHAR Seed; UCHAR NodeNumber; - ULONG Flags; + struct _flags { + UCHAR Removable : 1; + UCHAR Fill : 7; + } Flags; ULONG MmShiftedColor; ULONG FreeCount[2]; struct _SINGLE_LIST_ENTRY *PfnDeferredList;

9 years, 4 months

[akhaldi] 68176: [SHELL32] Report file system changes in SHChangeNotifyRegister. Brought to you by Huw Campbell. CORE-1171

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jun 17 19:55:43 2015 New Revision: 68176 URL: http://svn.reactos.org/svn/reactos?rev=68176&view=rev Log: [SHELL32] Report file system changes in SHChangeNotifyRegister. Brought to you by Huw Campbell. CORE-1171 Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/wine/changenotify.c Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Wed Jun 17 19:55:43 2015 @@ -138,6 +138,7 @@ BOOLEAN LV_AddItem(PCUITEMID_CHILD pidl); BOOLEAN LV_DeleteItem(PCUITEMID_CHILD pidl); BOOLEAN LV_RenameItem(PCUITEMID_CHILD pidlOld, PCUITEMID_CHILD pidlNew); + BOOLEAN LV_ProdItem(PCUITEMID_CHILD pidl); static INT CALLBACK fill_list(LPVOID ptr, LPVOID arg); HRESULT FillList(); HMENU BuildFileMenu(); @@ -841,6 +842,31 @@ } /********************************************************** +* LV_ProdItem() +*/ +BOOLEAN CDefView::LV_ProdItem(PCUITEMID_CHILD pidl) +{ + int nItem; + LVITEMW lvItem; + + TRACE("(%p)(pidl=%p)\n", this, pidl); + + nItem = LV_FindItemByPidl(pidl); + + if ( -1 != nItem ) + { + lvItem.mask = LVIF_IMAGE; + lvItem.iItem = nItem; + lvItem.iImage = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidl, 0); + m_ListView.SetItem(&lvItem); + m_ListView.Update(nItem); + return TRUE; + } + + return FALSE; +} + +/********************************************************** * ShellView_FillList() * * - gets the objectlist from the shellfolder @@ -1925,7 +1951,16 @@ case SHCNE_MKDIR: case SHCNE_CREATE: if (bParent0) - LV_AddItem(ILFindLastID(Pidls[0])); + { + if (LV_FindItemByPidl(ILFindLastID(Pidls[0])) == -1) + { + LV_AddItem(ILFindLastID(Pidls[0])); + } + else + { + LV_ProdItem(ILFindLastID(Pidls[0])); + } + } break; case SHCNE_RMDIR: @@ -1941,7 +1976,7 @@ else if (bParent0) LV_DeleteItem(ILFindLastID(Pidls[0])); else if (bParent1) - LV_AddItem(ILFindLastID(Pidls[0])); + LV_AddItem(ILFindLastID(Pidls[1])); break; case SHCNE_UPDATEITEM: Modified: trunk/reactos/dll/win32/shell32/wine/changenotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/cha… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] Wed Jun 17 19:55:43 2015 @@ -20,16 +20,20 @@ #define WIN32_NO_STATUS #define _INC_WINDOWS +#define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT +#define BUFFER_SIZE 1024 #include <windef.h> #include <winbase.h> #include <shlobj.h> +#include <strsafe.h> #include <undocshell.h> #include <shlwapi.h> #include <wine/debug.h> #include <wine/list.h> +#include <process.h> #include "pidl.h" @@ -44,7 +48,20 @@ }; static CRITICAL_SECTION SHELL32_ChangenotifyCS = { &critsect_debug, -1, 0, 0, 0, 0 }; +#ifdef __REACTOS__ +typedef struct { + PCIDLIST_ABSOLUTE pidl; + BOOL fRecursive; + /* File system notification items */ + HANDLE hDirectory; /* Directory handle */ + WCHAR wstrDirectory[MAX_PATH]; /* Directory name */ + OVERLAPPED overlapped; /* Overlapped structure */ + BYTE *buffer; /* Async buffer to fill */ + BYTE *backBuffer; /* Back buffer to swap buffer into */ +} SHChangeNotifyEntryInternal, *LPNOTIFYREGISTER; +#else typedef SHChangeNotifyEntry *LPNOTIFYREGISTER; +#endif /* internal list of notification clients (internal) */ typedef struct _NOTIFICATIONLIST @@ -59,8 +76,24 @@ ULONG id; } NOTIFICATIONLIST, *LPNOTIFICATIONLIST; +#ifdef __REACTOS__ +VOID _ProcessNotification(LPNOTIFYREGISTER item); +BOOL _OpenDirectory(LPNOTIFYREGISTER item); +static void CALLBACK _RequestTermination(ULONG_PTR arg); +static void CALLBACK _RequestAllTermination(ULONG_PTR arg); +static void CALLBACK _AddDirectoryProc(ULONG_PTR arg); +static VOID _BeginRead(LPNOTIFYREGISTER item); +static unsigned int WINAPI _RunAsyncThreadProc(LPVOID arg); +#endif + static struct list notifications = LIST_INIT( notifications ); static LONG next_id; + +#ifdef __REACTOS__ +HANDLE m_hThread; +UINT m_dwThreadId; +BOOL m_bTerminate; +#endif #define SHCNE_NOITEMEVENTS ( \ SHCNE_ASSOCCHANGED ) @@ -131,13 +164,26 @@ /* free the item */ for (i=0; i<item->cidl; i++) +#ifdef __REACTOS__ + { + QueueUserAPC(_RequestTermination, m_hThread, (ULONG_PTR) &item->apidl[i] ); + WaitForSingleObjectEx(m_hThread, 100, FALSE); +#endif SHFree((LPITEMIDLIST)item->apidl[i].pidl); +#ifdef __REACTOS__ + SHFree(item->apidl[i].buffer); + SHFree(item->apidl[i].backBuffer); + } +#endif SHFree(item->apidl); SHFree(item); } void InitChangeNotifications(void) { +#ifdef __REACTOS__ + m_hThread = NULL; +#endif } void FreeChangeNotifications(void) @@ -152,6 +198,10 @@ DeleteNode( ptr ); LeaveCriticalSection(&SHELL32_ChangenotifyCS); + +#ifdef __REACTOS__ + QueueUserAPC(_RequestAllTermination, m_hThread, (ULONG_PTR) NULL ); +#endif DeleteCriticalSection(&SHELL32_ChangenotifyCS); } @@ -177,12 +227,33 @@ TRACE("(%p,0x%08x,0x%08x,0x%08x,%d,%p) item=%p\n", hwnd, fSources, wEventMask, uMsg, cItems, lpItems, item); +#ifdef __REACTOS__ + if (!m_hThread) + m_hThread = (HANDLE) _beginthreadex(NULL, 0, _RunAsyncThreadProc, NULL, 0, &m_dwThreadId); +#endif + item->cidl = cItems; +#ifdef __REACTOS__ + item->apidl = SHAlloc(sizeof(SHChangeNotifyEntryInternal) * cItems); +#else item->apidl = SHAlloc(sizeof(SHChangeNotifyEntry) * cItems); +#endif for(i=0;i<cItems;i++) { +#ifdef __REACTOS__ + ZeroMemory(&item->apidl[i], sizeof(SHChangeNotifyEntryInternal)); +#endif item->apidl[i].pidl = ILClone(lpItems[i].pidl); item->apidl[i].fRecursive = lpItems[i].fRecursive; +#ifdef __REACTOS__ + item->apidl[i].buffer = SHAlloc(BUFFER_SIZE); + item->apidl[i].backBuffer = SHAlloc(BUFFER_SIZE); + item->apidl[i].overlapped.hEvent = &item->apidl[i]; + + if (fSources & SHCNRF_InterruptLevel && _OpenDirectory( &item->apidl[i] )) + QueueUserAPC(_AddDirectoryProc, m_hThread, (ULONG_PTR) &item->apidl[i] ); + else ERR("_OpenDirectory Failed\n"); +#endif } item->hwnd = hwnd; item->uMsg = uMsg; @@ -536,3 +607,210 @@ return SHChangeNotifyDeregister( x1 ); } + +#ifdef __REACTOS__ + +static +void +CALLBACK +_AddDirectoryProc(ULONG_PTR arg) +{ + LPNOTIFYREGISTER item = (LPNOTIFYREGISTER)arg; + _BeginRead(item); +} + +BOOL _OpenDirectory(LPNOTIFYREGISTER item) +{ + STRRET strFile; + IShellFolder *psfDesktop; + HRESULT hr; + + // Makes function idempotent + if (item->hDirectory && !(item->hDirectory == INVALID_HANDLE_VALUE)) + return TRUE; + + hr = SHGetDesktopFolder(&psfDesktop); + if (!SUCCEEDED(hr)) + return FALSE; + + hr = IShellFolder_GetDisplayNameOf(psfDesktop, item->pidl, SHGDN_FORPARSING, &strFile); + if (!SUCCEEDED(hr)) + return FALSE; + + hr = StrRetToBufW(&strFile, NULL, item->wstrDirectory, _countof(item->wstrDirectory)); + if (!SUCCEEDED(hr)) + return FALSE; + + TRACE("_OpenDirectory %s\n", debugstr_w(item->wstrDirectory)); + + item->hDirectory = CreateFileW(item->wstrDirectory, // pointer to the file name + GENERIC_READ | FILE_LIST_DIRECTORY, // access (read/write) mode + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, // share mode + NULL, // security descriptor + OPEN_EXISTING, // how to create + FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, // file attributes + NULL); // file with attributes to copy + + if (item->hDirectory == INVALID_HANDLE_VALUE) + { + return FALSE; + } + return TRUE; +} + +static void CALLBACK _RequestTermination(ULONG_PTR arg) +{ + LPNOTIFYREGISTER item = (LPNOTIFYREGISTER) arg; + TRACE("_RequestTermination %p \n", item->hDirectory); + if (!item->hDirectory || item->hDirectory == INVALID_HANDLE_VALUE) return; + + CancelIo(item->hDirectory); + CloseHandle(item->hDirectory); + item->hDirectory = NULL; +} + +static +void +CALLBACK +_NotificationCompletion(DWORD dwErrorCode, // completion code + DWORD dwNumberOfBytesTransfered, // number of bytes transferred + LPOVERLAPPED lpOverlapped) // I/O information buffer +{ + /* MSDN: The hEvent member of the OVERLAPPED structure is not used by the + system, so you can use it yourself. We do just this, storing a pointer + to the working struct in the overlapped structure. */ + LPNOTIFYREGISTER item = (LPNOTIFYREGISTER) lpOverlapped->hEvent; + TRACE("_NotificationCompletion\n"); + + if (dwErrorCode == ERROR_OPERATION_ABORTED) + { + /* Command was induced by CancelIo in the shutdown procedure. */ + TRACE("_NotificationCompletion ended.\n"); + return; + } + + /* This likely means overflow, so force whole directory refresh. */ + if (!dwNumberOfBytesTransfered) + { + ERR("_NotificationCompletion overflow\n"); + + ZeroMemory(item->buffer, BUFFER_SIZE); + _BeginRead(item); + + SHChangeNotify(SHCNE_UPDATEITEM | SHCNE_INTERRUPT, + SHCNF_IDLIST, + item->pidl, + NULL); + + return; + } + + /* + * Get the new read issued as fast as possible (before we do the + * processing and message posting). All of the file notification + * occur on one thread so the buffers should not collide with one another. + * The extra zero mems are because the FNI size isn't written correctly. + */ + + ZeroMemory(item->backBuffer, BUFFER_SIZE); + memcpy(item->backBuffer, item->buffer, dwNumberOfBytesTransfered); + ZeroMemory(item->buffer, BUFFER_SIZE); + + _BeginRead(item); + + _ProcessNotification(item); +} + +static VOID _BeginRead(LPNOTIFYREGISTER item ) +{ + TRACE("_BeginRead %p \n", item->hDirectory); + + /* This call needs to be reissued after every APC. */ + if (!ReadDirectoryChangesW(item->hDirectory, // handle to directory + item->buffer, // read results buffer + BUFFER_SIZE, // length of buffer + FALSE, // monitoring option (recursion) + FILE_NOTIFY_CHANGE_DIR_NAME | FILE_NOTIFY_CHANGE_FILE_NAME, // filter conditions + NULL, // bytes returned + &item->overlapped, // overlapped buffer + _NotificationCompletion)) // completion routine + ERR("ReadDirectoryChangesW failed. (%p, %p, %p, %p) Code: %u \n", + item->hDirectory, + item->buffer, + &item->overlapped, + _NotificationCompletion, + GetLastError()); +} + +DWORD _MapAction(DWORD dwAction, BOOL isDir) +{ + switch (dwAction) + { + case FILE_ACTION_ADDED : return isDir ? SHCNE_MKDIR : SHCNE_CREATE; + case FILE_ACTION_REMOVED : return isDir ? SHCNE_RMDIR : SHCNE_DELETE; + case FILE_ACTION_MODIFIED : return isDir ? SHCNE_UPDATEDIR : SHCNE_UPDATEITEM; + case FILE_ACTION_RENAMED_OLD_NAME : return isDir ? SHCNE_UPDATEDIR : SHCNE_UPDATEITEM; + case FILE_ACTION_RENAMED_NEW_NAME : return isDir ? SHCNE_UPDATEDIR : SHCNE_UPDATEITEM; + default: return SHCNE_UPDATEITEM; + } +} + +VOID _ProcessNotification(LPNOTIFYREGISTER item) +{ + BYTE* pBase = item->backBuffer; + TRACE("_ProcessNotification\n"); + + for (;;) + { + FILE_NOTIFY_INFORMATION* fni = (FILE_NOTIFY_INFORMATION*)pBase; + LPWSTR wszFilename; + INT len = 0; + WCHAR wstrFilename[MAX_PATH]; + WCHAR tmp[MAX_PATH]; + StringCchCopy(tmp, fni->FileNameLength, fni->FileName); + + PathCombine(wstrFilename, item->wstrDirectory, tmp); + + /* If it could be a short filename, expand it. */ + wszFilename = PathFindFileNameW(wstrFilename); + + len = lstrlenW(wszFilename); + /* The maximum length of an 8.3 filename is twelve, including the dot. */ + if (len <= 12 && wcschr(wszFilename, L'~')) + { + /* Convert to the long filename form. Unfortunately, this + does not work for deletions, so it's an imperfect fix. */ + wchar_t wbuf[MAX_PATH]; + if (GetLongPathName(wstrFilename, wbuf, _countof (wbuf)) > 0) + StringCchCopyW(wstrFilename, MAX_PATH, wbuf); + } + + /* On deletion of a folder PathIsDirectory will return false even if + it *was* a directory, so, again, imperfect. */ + SHChangeNotify(_MapAction(fni->Action, PathIsDirectory(wstrFilename)) | SHCNE_INTERRUPT, + SHCNF_PATHW, + wstrFilename, + NULL); + + if (!fni->NextEntryOffset) + break; + pBase += fni->NextEntryOffset; + } +} + +static void CALLBACK _RequestAllTermination(ULONG_PTR arg) +{ + m_bTerminate = TRUE; +} + +static unsigned int WINAPI _RunAsyncThreadProc(LPVOID arg) +{ + m_bTerminate = FALSE; + while (!m_bTerminate) + { + SleepEx(INFINITE, TRUE); + } + return 0; +} + +#endif /* __REACTOS__ */

9 years, 4 months

[tfaber] 68175: [FASTFAT] - Set the correct length in FsdGetFsVolumeInformation/FsdGetFsAttributeInformation, and write back partial data when returning STATUS_BUFFER_OVERFLOW - Replace unnecessary...

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Jun 17 19:19:39 2015 New Revision: 68175 URL: http://svn.reactos.org/svn/reactos?rev=68175&view=rev Log: [FASTFAT] - Set the correct length in FsdGetFsVolumeInformation/FsdGetFsAttributeInformation, and write back partial data when returning STATUS_BUFFER_OVERFLOW - Replace unnecessary checks with ASSERTs CORE-9820 #resolve Modified: trunk/reactos/drivers/filesystems/fastfat/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] Wed Jun 17 19:19:39 2015 @@ -23,28 +23,41 @@ PFILE_FS_VOLUME_INFORMATION FsVolumeInfo, PULONG BufferLength) { + NTSTATUS Status; PDEVICE_EXTENSION DeviceExt; DPRINT("FsdGetFsVolumeInformation()\n"); DPRINT("FsVolumeInfo = %p\n", FsVolumeInfo); DPRINT("BufferLength %lu\n", *BufferLength); - DPRINT("Required length %lu\n", (sizeof(FILE_FS_VOLUME_INFORMATION) + DeviceObject->Vpb->VolumeLabelLength)); + DPRINT("Required length %lu\n", FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel) + DeviceObject->Vpb->VolumeLabelLength); DPRINT("LabelLength %hu\n", DeviceObject->Vpb->VolumeLabelLength); DPRINT("Label %*.S\n", DeviceObject->Vpb->VolumeLabelLength / sizeof(WCHAR), DeviceObject->Vpb->VolumeLabel); - if (*BufferLength < sizeof(FILE_FS_VOLUME_INFORMATION)) - return STATUS_INFO_LENGTH_MISMATCH; - - if (*BufferLength < (sizeof(FILE_FS_VOLUME_INFORMATION) + DeviceObject->Vpb->VolumeLabelLength)) - return STATUS_BUFFER_OVERFLOW; + ASSERT(*BufferLength >= sizeof(FILE_FS_VOLUME_INFORMATION)); + *BufferLength -= FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel); DeviceExt = DeviceObject->DeviceExtension; /* valid entries */ FsVolumeInfo->VolumeSerialNumber = DeviceObject->Vpb->SerialNumber; FsVolumeInfo->VolumeLabelLength = DeviceObject->Vpb->VolumeLabelLength; - RtlCopyMemory(FsVolumeInfo->VolumeLabel, DeviceObject->Vpb->VolumeLabel, FsVolumeInfo->VolumeLabelLength); + if (*BufferLength < DeviceObject->Vpb->VolumeLabelLength) + { + Status = STATUS_BUFFER_OVERFLOW; + RtlCopyMemory(FsVolumeInfo->VolumeLabel, + DeviceObject->Vpb->VolumeLabel, + *BufferLength); + *BufferLength = 0; + } + else + { + Status = STATUS_SUCCESS; + RtlCopyMemory(FsVolumeInfo->VolumeLabel, + DeviceObject->Vpb->VolumeLabel, + FsVolumeInfo->VolumeLabelLength); + *BufferLength -= DeviceObject->Vpb->VolumeLabelLength; + } if (DeviceExt->VolumeFcb->Flags & FCB_IS_FATX_ENTRY) { @@ -64,12 +77,9 @@ FsVolumeInfo->SupportsObjects = FALSE; DPRINT("Finished FsdGetFsVolumeInformation()\n"); - - *BufferLength -= (sizeof(FILE_FS_VOLUME_INFORMATION) + DeviceObject->Vpb->VolumeLabelLength); - DPRINT("BufferLength %lu\n", *BufferLength); - return STATUS_SUCCESS; + return Status; } @@ -80,29 +90,38 @@ PFILE_FS_ATTRIBUTE_INFORMATION FsAttributeInfo, PULONG BufferLength) { - PCWSTR pName; ULONG Length; + NTSTATUS Status; + PCWSTR pName; + ULONG Length; + DPRINT("FsdGetFsAttributeInformation()\n"); DPRINT("FsAttributeInfo = %p\n", FsAttributeInfo); DPRINT("BufferLength %lu\n", *BufferLength); - if (*BufferLength < sizeof (FILE_FS_ATTRIBUTE_INFORMATION)) - return STATUS_INFO_LENGTH_MISMATCH; + ASSERT(*BufferLength >= sizeof(FILE_FS_ATTRIBUTE_INFORMATION)); + *BufferLength -= FIELD_OFFSET(FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName); if (DeviceExt->FatInfo.FatType == FAT32) { - Length = 10; pName = L"FAT32"; } else { - Length = 6; pName = L"FAT"; } - DPRINT("Required length %lu\n", (sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + Length)); - - if (*BufferLength < (sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + Length)) - return STATUS_BUFFER_OVERFLOW; + Length = wcslen(pName) * sizeof(WCHAR); + DPRINT("Required length %lu\n", (FIELD_OFFSET(FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName) + Length)); + + if (*BufferLength < Length) + { + Status = STATUS_BUFFER_OVERFLOW; + Length = *BufferLength; + } + else + { + Status = STATUS_SUCCESS; + } FsAttributeInfo->FileSystemAttributes = FILE_CASE_PRESERVED_NAMES | FILE_UNICODE_ON_DISK; @@ -115,10 +134,10 @@ DPRINT("Finished FsdGetFsAttributeInformation()\n"); - *BufferLength -= (sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + Length); + *BufferLength -= Length; DPRINT("BufferLength %lu\n", *BufferLength); - return STATUS_SUCCESS; + return Status; } @@ -135,8 +154,7 @@ DPRINT("FsdGetFsSizeInformation()\n"); DPRINT("FsSizeInfo = %p\n", FsSizeInfo); - if (*BufferLength < sizeof(FILE_FS_SIZE_INFORMATION)) - return STATUS_BUFFER_OVERFLOW; + ASSERT(*BufferLength >= sizeof(FILE_FS_SIZE_INFORMATION)); DeviceExt = DeviceObject->DeviceExtension; Status = CountAvailableClusters(DeviceExt, &FsSizeInfo->AvailableAllocationUnits); @@ -165,8 +183,7 @@ DPRINT("BufferLength %lu\n", *BufferLength); DPRINT("Required length %lu\n", sizeof(FILE_FS_DEVICE_INFORMATION)); - if (*BufferLength < sizeof(FILE_FS_DEVICE_INFORMATION)) - return STATUS_BUFFER_OVERFLOW; + ASSERT(*BufferLength >= sizeof(FILE_FS_DEVICE_INFORMATION)); FsDeviceInfo->DeviceType = FILE_DEVICE_DISK; FsDeviceInfo->Characteristics = DeviceObject->Characteristics; @@ -193,8 +210,7 @@ DPRINT("FsdGetFsFullSizeInformation()\n"); DPRINT("FsSizeInfo = %p\n", FsSizeInfo); - if (*BufferLength < sizeof(FILE_FS_FULL_SIZE_INFORMATION)) - return STATUS_BUFFER_OVERFLOW; + ASSERT(*BufferLength >= sizeof(FILE_FS_FULL_SIZE_INFORMATION)); DeviceExt = DeviceObject->DeviceExtension; Status = CountAvailableClusters(DeviceExt, &FsSizeInfo->CallerAvailableAllocationUnits); @@ -445,11 +461,8 @@ ExReleaseResourceLite(&((PDEVICE_EXTENSION)IrpContext->DeviceObject->DeviceExtension)->DirResource); - if (NT_SUCCESS(RC)) - IrpContext->Irp->IoStatus.Information = - IrpContext->Stack->Parameters.QueryVolume.Length - BufferLength; - else - IrpContext->Irp->IoStatus.Information = 0; + IrpContext->Irp->IoStatus.Information = + IrpContext->Stack->Parameters.QueryVolume.Length - BufferLength; return RC; }

9 years, 4 months

[akhaldi] 68174: [SHELL32] Fix IDI_SHELL_EXTENDED_PROPERTIES, use the icons 6 and 7 for floppy drive and remove floppy.ico. By Jared Smudde. CORE-9804

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jun 17 18:30:14 2015 New Revision: 68174 URL: http://svn.reactos.org/svn/reactos?rev=68174&view=rev Log: [SHELL32] Fix IDI_SHELL_EXTENDED_PROPERTIES, use the icons 6 and 7 for floppy drive and remove floppy.ico. By Jared Smudde. CORE-9804 Added: trunk/reactos/dll/win32/shell32/res/icons/174.ico (with props) Removed: trunk/reactos/dll/win32/shell32/res/icons/floppy.ico Modified: trunk/reactos/dll/win32/shell32/icon_res.rc trunk/reactos/dll/win32/shell32/res/icons/6.ico trunk/reactos/dll/win32/shell32/res/icons/7.ico trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/icon_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/icon_res… ============================================================================== --- trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] Wed Jun 17 18:30:14 2015 @@ -3,9 +3,9 @@ IDI_SHELL_EXE ICON "res/icons/3.ico" IDI_SHELL_FOLDER ICON "res/icons/4.ico" IDI_SHELL_FOLDER_OPEN ICON "res/icons/5.ico" -IDI_SHELL_5_12_FLOPPY ICON "res/icons/floppy.ico" -IDI_SHELL_3_14_FLOPPY ICON "res/icons/floppy.ico" -IDI_SHELL_FLOPPY ICON "res/icons/floppy.ico" +IDI_SHELL_5_12_FLOPPY ICON "res/icons/6.ico" +IDI_SHELL_3_14_FLOPPY ICON "res/icons/7.ico" +IDI_SHELL_FLOPPY ICON "res/icons/7.ico" IDI_SHELL_DRIVE ICON "res/icons/9.ico" IDI_SHELL_NETDRIVE ICON "res/icons/10.ico" IDI_SHELL_NETDRIVE2 ICON "res/icons/11.ico" /* THIS SHOULD BE IDI_SHELL_NETDRIVE_OFF */ @@ -65,7 +65,8 @@ /* TODO: 168.ico, 169.ico, 170.ico, 171.ico */ IDI_SHELL_NETWORK_FOLDER ICON "res/icons/172.ico" IDI_SHELL_FAVORITES2 ICON "res/icons/173.ico" -/* TODO: 174.ico, 175.ico, 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ +IDI_SHELL_EXTENDED_PROPERTIES ICON "res/icons/174.ico" +/* TODO: 175.ico, 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ /* Folder Options, General dialog */ IDI_SHELL_SHOW_COMMON_TASKS ICON "res/icons/182.ico" @@ -123,8 +124,7 @@ IDI_SHELL_TUNES ICON "res/icons/277.ico" /* TODO: 278.ico */ IDI_SHELL_USER_ACCOUNTS ICON "res/icons/279.ico" -IDI_SHELL_EXTENDED_PROPERTIES ICON "res/icons/280.ico" -/* TODO: 281.ico, 282.ico, 283.ico, 284.ico */ +/* TODO: 280.ico, 281.ico, 282.ico, 283.ico, 284.ico */ IDI_SHELL_HELP_FILE ICON "res/icons/289.ico" IDI_SHELL_GO ICON "res/icons/290.ico" IDI_SHELL_DVD_DRIVE ICON "res/icons/291.ico" Added: trunk/reactos/dll/win32/shell32/res/icons/174.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/174.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/shell32/res/icons/6.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/7.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Removed: trunk/reactos/dll/win32/shell32/res/icons/floppy.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Wed Jun 17 18:30:14 2015 @@ -381,7 +381,8 @@ /* TODO: 168.ico, 169.ico, 170.ico, 171.ico */ #define IDI_SHELL_NETWORK_FOLDER 172 #define IDI_SHELL_FAVORITES2 173 -/* TODO: 174.ico, 175.ico, 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ +#define IDI_SHELL_EXTENDED_PROPERTIES 174 +/* TODO: 175.ico, 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ #define IDI_SHELL_EMPTY_RECYCLE_BIN1 191 #define IDI_SHELL_FULL_RECYCLE_BIN1 192 /* TODO: 193.ico, 194.ico, 196.ico, 197.ico, 198.ico, 199.ico, 200.ico */ @@ -429,7 +430,6 @@ #define IDI_SHELL_TUNES 277 /* TODO: 278.ico */ #define IDI_SHELL_USER_ACCOUNTS 279 -#define IDI_SHELL_EXTENDED_PROPERTIES 280 /* TODO: 281.ico, 282.ico, 283.ico, 284.ico */ #define IDI_SHELL_HELP_FILE 289 #define IDI_SHELL_GO 290

9 years, 4 months

[pschweitzer] 68173: [NTOSKRNL] Implement NtQuerySystemInformation - SystemNumaAvailableMemory Stub out NtQuerySystemInformation - SystemPrefetcherInformation Stub out NtQuerySystemInformation - Sy...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Jun 17 18:23:39 2015 New Revision: 68173 URL: http://svn.reactos.org/svn/reactos?rev=68173&view=rev Log: [NTOSKRNL] Implement NtQuerySystemInformation - SystemNumaAvailableMemory Stub out NtQuerySystemInformation - SystemPrefetcherInformation Stub out NtQuerySystemInformation - SystemExtendedProcessInformation Stub out NtQuerySystemInformation - SystemRecommendedSharedDataAlignment Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Wed Jun 17 18:23:39 2015 @@ -2200,6 +2200,88 @@ for (Node = 0; Node < MaxEntries; ++Node) { NumaInformation->ActiveProcessorsAffinityMask[Node] = KeNodeBlock[Node]->ProcessorMask; + } + } + else + { + /* We only returned highest node number */ + *ReqSize = sizeof(ULONG); + } + + return STATUS_SUCCESS; +} + + +/* Class 56 - Prefetcher information */ +QSI_DEF(SystemPrefetcherInformation) +{ + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemPrefetcherInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +/* Class 57 - Extended process information */ +QSI_DEF(SystemExtendedProcessInformation) +{ + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemExtendedProcessInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +/* Class 58 - Recommended shared ata alignment */ +QSI_DEF(SystemRecommendedSharedDataAlignment) +{ + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemRecommendedSharedDataAlignment not implemented\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +/* Class 60 - NUMA memory information */ +QSI_DEF(SystemNumaAvailableMemory) +{ + ULONG MaxEntries, Node; + PSYSTEM_NUMA_INFORMATION NumaInformation = (PSYSTEM_NUMA_INFORMATION)Buffer; + + /* Validate input size */ + if (Size < sizeof(ULONG)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + /* Return highest node */ + NumaInformation->HighestNodeNumber = KeNumberNodes - 1; + + /* Compute how much entries we will be able to put in output structure */ + MaxEntries = (Size - FIELD_OFFSET(SYSTEM_NUMA_INFORMATION, AvailableMemory)) / sizeof(ULONGLONG); + /* Make sure we don't overflow KeNodeBlock */ + if (MaxEntries > KeNumberNodes) + { + MaxEntries = KeNumberNodes; + } + + /* If we have entries to write, and room for it */ + if (Size >= FIELD_OFFSET(SYSTEM_NUMA_INFORMATION, AvailableMemory) && + MaxEntries != 0) + { + /* Already set size we return */ + *ReqSize = FIELD_OFFSET(SYSTEM_NUMA_INFORMATION, AvailableMemory) + + MaxEntries * sizeof(ULONGLONG); + + /* If we have a single entry (us), directly return MM information */ + if (MaxEntries == 1) + { + NumaInformation->AvailableMemory[0] = MmAvailablePages << PAGE_SHIFT; + } + else + { + /* Otherwise, for each node, return available bytes */ + for (Node = 0; Node < MaxEntries; ++Node) + { + NumaInformation->AvailableMemory[Node] = (KeNodeBlock[Node]->FreeCount[0] + KeNodeBlock[Node]->FreeCount[1]) << PAGE_SHIFT; + } } } else @@ -2290,7 +2372,12 @@ SI_XS(SystemAddVerifier), SI_QX(SystemSessionProcessesInformation), SI_XS(SystemLoadGdiDriverInSystemSpaceInformation), - SI_QX(SystemNumaProcessorMap) + SI_QX(SystemNumaProcessorMap), + SI_QX(SystemPrefetcherInformation), + SI_QX(SystemExtendedProcessInformation), + SI_QX(SystemRecommendedSharedDataAlignment), + SI_XX(SystemComPlusPackage), + SI_QX(SystemNumaAvailableMemory) }; C_ASSERT(SystemBasicInformation == 0);

9 years, 4 months

[akhaldi] 68172: [CRYPTUI][NETSHELL] Add some missing DS_MODALFRAME. By Jared Smudde. CORE-9822

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jun 17 17:32:48 2015 New Revision: 68172 URL: http://svn.reactos.org/svn/reactos?rev=68172&view=rev Log: [CRYPTUI][NETSHELL] Add some missing DS_MODALFRAME. By Jared Smudde. CORE-9822 Modified: trunk/reactos/dll/shellext/netshell/lang/bg-BG.rc trunk/reactos/dll/shellext/netshell/lang/cs-CZ.rc trunk/reactos/dll/shellext/netshell/lang/da-DK.rc trunk/reactos/dll/shellext/netshell/lang/de-DE.rc trunk/reactos/dll/shellext/netshell/lang/el-GR.rc trunk/reactos/dll/shellext/netshell/lang/en-US.rc trunk/reactos/dll/shellext/netshell/lang/es-ES.rc trunk/reactos/dll/shellext/netshell/lang/fr-FR.rc trunk/reactos/dll/shellext/netshell/lang/he-IL.rc trunk/reactos/dll/shellext/netshell/lang/hu-HU.rc trunk/reactos/dll/shellext/netshell/lang/id-ID.rc trunk/reactos/dll/shellext/netshell/lang/it-IT.rc trunk/reactos/dll/shellext/netshell/lang/ja-JP.rc trunk/reactos/dll/shellext/netshell/lang/nl-NL.rc trunk/reactos/dll/shellext/netshell/lang/no-NO.rc trunk/reactos/dll/shellext/netshell/lang/pl-PL.rc trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc trunk/reactos/dll/shellext/netshell/lang/ru-RU.rc trunk/reactos/dll/shellext/netshell/lang/sk-SK.rc trunk/reactos/dll/shellext/netshell/lang/sq-AL.rc trunk/reactos/dll/shellext/netshell/lang/sv-SE.rc trunk/reactos/dll/shellext/netshell/lang/tr-TR.rc trunk/reactos/dll/shellext/netshell/lang/uk-UA.rc trunk/reactos/dll/shellext/netshell/lang/zh-CN.rc trunk/reactos/dll/shellext/netshell/lang/zh-TW.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_De.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_En.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Fr.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_He.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_It.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Ko.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Lt.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Nl.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_No.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Pl.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Pt.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Ro.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Ru.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Sq.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Uk.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/shellext/netshell/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry…

9 years, 4 months

[pschweitzer] 68171: [NTOSKRNL] Completely implement Complete NtQuerySystemInformation - SystemNumaProcessorMap CORE-9680

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Jun 17 17:28:19 2015 New Revision: 68171 URL: http://svn.reactos.org/svn/reactos?rev=68171&view=rev Log: [NTOSKRNL] Completely implement Complete NtQuerySystemInformation - SystemNumaProcessorMap CORE-9680 Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Wed Jun 17 17:28:19 2015 @@ -2168,31 +2168,47 @@ /* Class 55 - NUMA processor information */ QSI_DEF(SystemNumaProcessorMap) { + ULONG MaxEntries, Node; PSYSTEM_NUMA_INFORMATION NumaInformation = (PSYSTEM_NUMA_INFORMATION)Buffer; + /* Validate input size */ if (Size < sizeof(ULONG)) { return STATUS_INFO_LENGTH_MISMATCH; } -#if 1 // Partial & incomplete implementation just to let GetNumaHighestNodeNumber() work - /* In case of a partial query, just return number of nodes and stop here */ - if (Size < sizeof(SYSTEM_NUMA_INFORMATION)) - { - NumaInformation->HighestNodeNumber = KeNumberNodes - 1; + /* Return highest node */ + NumaInformation->HighestNodeNumber = KeNumberNodes - 1; + + /* Compute how much entries we will be able to put in output structure */ + MaxEntries = (Size - FIELD_OFFSET(SYSTEM_NUMA_INFORMATION, ActiveProcessorsAffinityMask)) / sizeof(ULONGLONG); + /* Make sure we don't overflow KeNodeBlock */ + if (MaxEntries > KeNumberNodes) + { + MaxEntries = KeNumberNodes; + } + + /* If we have entries to write, and room for it */ + if (Size >= FIELD_OFFSET(SYSTEM_NUMA_INFORMATION, ActiveProcessorsAffinityMask) && + MaxEntries != 0) + { + /* Already set size we return */ + *ReqSize = FIELD_OFFSET(SYSTEM_NUMA_INFORMATION, ActiveProcessorsAffinityMask) + + MaxEntries * sizeof(ULONGLONG); + + /* For each node, return processor mask */ + for (Node = 0; Node < MaxEntries; ++Node) + { + NumaInformation->ActiveProcessorsAffinityMask[Node] = KeNodeBlock[Node]->ProcessorMask; + } + } + else + { + /* We only returned highest node number */ *ReqSize = sizeof(ULONG); - return STATUS_SUCCESS; - } - else - { - DPRINT1("NtQuerySystemInformation - SystemNumaProcessorMap not implemented\n"); - return STATUS_NOT_IMPLEMENTED; - } -#else - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemNumaProcessorMap not implemented\n"); - return STATUS_NOT_IMPLEMENTED; -#endif + } + + return STATUS_SUCCESS; }

9 years, 4 months

[akhaldi] 68170: [APPLICATIONS] Properly track resource file dependencies. CORE-9806

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jun 17 17:20:29 2015 New Revision: 68170 URL: http://svn.reactos.org/svn/reactos?rev=68170&view=rev Log: [APPLICATIONS] Properly track resource file dependencies. CORE-9806 Modified: trunk/reactos/base/applications/calc/CMakeLists.txt trunk/reactos/base/applications/charmap/CMakeLists.txt trunk/reactos/base/applications/control/CMakeLists.txt trunk/reactos/base/applications/dxdiag/CMakeLists.txt trunk/reactos/base/applications/fontview/CMakeLists.txt trunk/reactos/base/applications/games/solitaire/CMakeLists.txt trunk/reactos/base/applications/games/spider/CMakeLists.txt trunk/reactos/base/applications/games/winmine/CMakeLists.txt trunk/reactos/base/applications/hh/CMakeLists.txt trunk/reactos/base/applications/iexplore/CMakeLists.txt trunk/reactos/base/applications/kbswitch/CMakeLists.txt trunk/reactos/base/applications/magnify/CMakeLists.txt trunk/reactos/base/applications/mmc/CMakeLists.txt trunk/reactos/base/applications/mplay32/CMakeLists.txt trunk/reactos/base/applications/msconfig/CMakeLists.txt trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt trunk/reactos/base/applications/mspaint/CMakeLists.txt trunk/reactos/base/applications/mspaint_new/CMakeLists.txt trunk/reactos/base/applications/mstsc/CMakeLists.txt trunk/reactos/base/applications/notepad/CMakeLists.txt trunk/reactos/base/applications/osk/CMakeLists.txt trunk/reactos/base/applications/rapps/CMakeLists.txt trunk/reactos/base/applications/rapps_new/CMakeLists.txt trunk/reactos/base/applications/regedit/CMakeLists.txt trunk/reactos/base/applications/regedt32/CMakeLists.txt trunk/reactos/base/applications/screensavers/3dtext/CMakeLists.txt trunk/reactos/base/applications/screensavers/logon/CMakeLists.txt trunk/reactos/base/applications/sndrec32/CMakeLists.txt trunk/reactos/base/applications/sndvol32/CMakeLists.txt trunk/reactos/base/applications/taskmgr/CMakeLists.txt trunk/reactos/base/applications/winhlp32/CMakeLists.txt trunk/reactos/base/applications/wordpad/CMakeLists.txt Modified: trunk/reactos/base/applications/calc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/CMa… ============================================================================== --- trunk/reactos/base/applications/calc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -10,6 +10,8 @@ winmain.c calc.h) +file(GLOB calc_rc_deps res/*.*) +add_rc_deps(resource.rc ${calc_rc_deps}) add_executable(calc ${SOURCE} resource.rc) set_module_type(calc win32gui UNICODE) add_importlibs(calc advapi32 user32 gdi32 msvcrt kernel32) Modified: trunk/reactos/base/applications/charmap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -7,6 +7,7 @@ settings.c precomp.h) +add_rc_deps(charmap.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/charmap.ico) add_executable(charmap ${SOURCE} charmap.rc) set_module_type(charmap win32gui UNICODE) add_importlibs(charmap advapi32 user32 gdi32 comctl32 msvcrt kernel32) Modified: trunk/reactos/base/applications/control/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/control/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -1,4 +1,5 @@ +add_rc_deps(control.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/config.ico) add_executable(control control.c control.rc) set_module_type(control win32gui UNICODE) add_importlibs(control advapi32 shell32 user32 msvcrt kernel32) Modified: trunk/reactos/base/applications/dxdiag/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/C… ============================================================================== --- trunk/reactos/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -15,6 +15,7 @@ d3dtest9.c precomp.h) +add_rc_deps(dxdiag.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/dxdiag.ico) add_executable(dxdiag ${SOURCE} dxdiag.rc) set_module_type(dxdiag win32gui UNICODE) target_link_libraries(dxdiag dxguid) Modified: trunk/reactos/base/applications/fontview/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -4,6 +4,7 @@ fontview.c precomp.h) +add_rc_deps(fontview.rc ${CMAKE_CURRENT_SOURCE_DIR}/ttf.ico) add_executable(fontview ${SOURCE} fontview.rc) set_module_type(fontview win32gui) add_importlibs(fontview comdlg32 gdi32 shell32 user32 msvcrt kernel32) Modified: trunk/reactos/base/applications/games/solitaire/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -8,6 +8,7 @@ solitaire.cpp solitaire.h) +add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/solitaire.ico) add_executable(sol ${SOURCE} rsrc.rc) target_link_libraries(sol cardlib) set_module_type(sol win32gui UNICODE) Modified: trunk/reactos/base/applications/games/spider/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -10,6 +10,7 @@ spigame.cpp spider.h) +add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/spider.ico) add_executable(spider ${SOURCE} rsrc.rc) target_link_libraries(spider cardlib) add_pch(spider spider.h SOURCE) Modified: trunk/reactos/base/applications/games/winmine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -6,6 +6,8 @@ dialog.c main.h) +file(GLOB winmine_rc_deps rc/*.*) +add_rc_deps(rsrc.rc ${winmine_rc_deps}) add_executable(winmine ${SOURCE} rsrc.rc) set_module_type(winmine win32gui UNICODE) target_link_libraries(winmine wine) Modified: trunk/reactos/base/applications/hh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/hh/CMake… ============================================================================== --- trunk/reactos/base/applications/hh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/hh/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -1,4 +1,5 @@ +add_rc_deps(hh.rc ${CMAKE_CURRENT_SOURCE_DIR}/hh.ico) add_executable(hh main.c hh.rc) set_module_type(hh win32gui) add_importlibs(hh gdi32 user32 msvcrt kernel32) Modified: trunk/reactos/base/applications/iexplore/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… ============================================================================== --- trunk/reactos/base/applications/iexplore/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/iexplore/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -1,4 +1,5 @@ +add_rc_deps(iexplore.rc ${CMAKE_CURRENT_SOURCE_DIR}/iexplore.ico) add_executable(iexplore main.c iexplore.rc) target_link_libraries(iexplore wine) set_module_type(iexplore win32gui UNICODE) Modified: trunk/reactos/base/applications/kbswitch/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -1,4 +1,5 @@ +add_rc_deps(kbswitch.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/kbswitch.ico) add_executable(kbswitch kbswitch.c kbswitch.rc) set_module_type(kbswitch win32gui UNICODE) add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt kernel32) Modified: trunk/reactos/base/applications/magnify/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -4,6 +4,7 @@ settings.c magnifier.h) +add_rc_deps(magnify.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/magnify.ico) add_executable(magnify ${SOURCE} magnify.rc) set_module_type(magnify win32gui) add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt kernel32) Modified: trunk/reactos/base/applications/mmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/CMak… ============================================================================== --- trunk/reactos/base/applications/mmc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -5,6 +5,7 @@ mmc.c precomp.h) +add_rc_deps(mmc.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/mmc.ico) add_executable(mmcclient ${SOURCE} mmc.rc) set_module_type(mmcclient win32gui UNICODE) add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32) Modified: trunk/reactos/base/applications/mplay32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -1,4 +1,6 @@ +file(GLOB mplay32_rc_deps resources/*.*) +add_rc_deps(mplay32.rc ${mplay32_rc_deps}) add_executable(mplay32 mplay32.c mplay32.rc) set_module_type(mplay32 win32gui UNICODE) add_importlibs(mplay32 advapi32 comctl32 comdlg32 user32 gdi32 winmm shell32 msvcrt kernel32) Modified: trunk/reactos/base/applications/msconfig/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -9,6 +9,7 @@ msconfig.c precomp.h) +add_rc_deps(msconfig.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/msconfig.ico) add_executable(msconfig ${SOURCE} msconfig.rc) set_module_type(msconfig win32gui UNICODE) add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt kernel32) Modified: trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -7,6 +7,8 @@ misc.c precomp.h) +file(GLOB devmgmt_rc_deps res/*.*) +add_rc_deps(devmgmt.rc ${devmgmt_rc_deps}) add_executable(devmgmt ${SOURCE} devmgmt.rc) set_module_type(devmgmt win32gui UNICODE) add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32) Modified: trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -1,4 +1,6 @@ +file(GLOB eventvwr_rc_deps res/*.*) +add_rc_deps(eventvwr.rc ${eventvwr_rc_deps}) add_executable(eventvwr eventvwr.c eventvwr.rc) set_module_type(eventvwr win32gui UNICODE) add_importlibs(eventvwr user32 comctl32 comdlg32 advapi32 msvcrt kernel32) Modified: trunk/reactos/base/applications/mspaint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -16,6 +16,8 @@ winproc.c precomp.h) +file(GLOB mspaint_rc_deps icons/*.*) +add_rc_deps(rsrc.rc ${mspaint_rc_deps}) add_executable(mspaint ${SOURCE} rsrc.rc) set_module_type(mspaint win32gui UNICODE) add_importlibs(mspaint hhctrl comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) Modified: trunk/reactos/base/applications/mspaint_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -21,6 +21,8 @@ winproc.cpp precomp.h) +file(GLOB mspaint_new_rc_deps icons/*.*) +add_rc_deps(rsrc.rc ${mspaint_new_rc_deps}) add_executable(mspaint_new ${SOURCE} rsrc.rc) set_module_type(mspaint_new win32gui UNICODE) add_importlibs(mspaint_new hhctrl comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) Modified: trunk/reactos/base/applications/mstsc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/CM… ============================================================================== --- trunk/reactos/base/applications/mstsc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -30,6 +30,8 @@ uimain.h precomp.h) +file(GLOB mstsc_rc_deps res/*.*) +add_rc_deps(rdc.rc ${mstsc_rc_deps}) add_executable(mstsc ${SOURCE} rdc.rc) set_module_type(mstsc win32gui UNICODE) add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32) Modified: trunk/reactos/base/applications/notepad/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -6,6 +6,7 @@ text.c notepad.h) +add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/notepad.ico) add_executable(notepad ${SOURCE} rsrc.rc) set_module_type(notepad win32gui UNICODE) add_importlibs(notepad user32 gdi32 comctl32 comdlg32 advapi32 shell32 msvcrt kernel32) Modified: trunk/reactos/base/applications/osk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/CMak… ============================================================================== --- trunk/reactos/base/applications/osk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/osk/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -1,4 +1,6 @@ +file(GLOB osk_rc_deps res/*.*) +add_rc_deps(rsrc.rc ${osk_rc_deps}) add_executable(osk main.c rsrc.rc) set_module_type(osk win32gui UNICODE) add_importlibs(osk comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CM… ============================================================================== --- trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -16,6 +16,8 @@ winmain.c rapps.h) +file(GLOB_RECURSE rapps_rc_deps res/*.*) +add_rc_deps(rapps.rc ${rapps_rc_deps}) add_executable(rapps ${SOURCE} rapps.rc) set_module_type(rapps win32gui UNICODE) target_link_libraries(rapps uuid) Modified: trunk/reactos/base/applications/rapps_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -16,6 +16,8 @@ winmain.cpp rapps.h) +file(GLOB_RECURSE rapps_new_rc_deps res/*.*) +add_rc_deps(rapps.rc ${rapps_new_rc_deps}) add_executable(rapps_new ${SOURCE} rapps.rc) set_module_type(rapps_new win32gui UNICODE) target_link_libraries(rapps_new atlnew uuid wine) Modified: trunk/reactos/base/applications/regedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -18,6 +18,8 @@ treeview.c regedit.h) +file(GLOB regedit_rc_deps res/*.*) +add_rc_deps(regedit.rc ${regedit_rc_deps}) add_executable(regedit ${SOURCE} regedit.rc) set_module_type(regedit win32gui UNICODE) target_link_libraries(regedit uuid) Modified: trunk/reactos/base/applications/regedt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… ============================================================================== --- trunk/reactos/base/applications/regedt32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedt32/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -1,4 +1,5 @@ +add_rc_deps(resource.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/regedt32.ico) add_executable(regedt32 regedt32.c resource.rc) set_module_type(regedt32 win32gui UNICODE) add_importlibs(regedt32 shell32 shlwapi msvcrt kernel32) Modified: trunk/reactos/base/applications/screensavers/3dtext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/3dtext/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -4,6 +4,7 @@ settings.c 3dtext.h) +add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/icon_3dtext.ico) add_executable(3dtext ${SOURCE} rsrc.rc) set_module_type(3dtext win32gui UNICODE) set_target_properties(3dtext PROPERTIES SUFFIX ".scr") Modified: trunk/reactos/base/applications/screensavers/logon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/logon/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -1,4 +1,6 @@ +file(GLOB logon_rc_deps res/*.*) +add_rc_deps(logon.rc ${logon_rc_deps}) add_executable(logon logon.c logon.rc) set_module_type(logon win32gui UNICODE) set_target_properties(logon PROPERTIES SUFFIX ".scr") Modified: trunk/reactos/base/applications/sndrec32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -12,6 +12,8 @@ sndrec32.cpp stdafx.h) +file(GLOB sndrec32_rc_deps resources/*.*) +add_rc_deps(rsrc.rc ${sndrec32_rc_deps}) add_executable(sndrec32 ${SOURCE} rsrc.rc) set_module_type(sndrec32 win32gui UNICODE) add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 shell32 msvcrt kernel32) Modified: trunk/reactos/base/applications/sndvol32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -6,6 +6,7 @@ sndvol32.c sndvol32.h) +add_rc_deps(sndvol32.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/sndvol32.ico) add_executable(sndvol32 ${SOURCE} sndvol32.rc) set_module_type(sndvol32 win32gui UNICODE) add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32 ntdll) Modified: trunk/reactos/base/applications/taskmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -21,6 +21,8 @@ trayicon.c precomp.h) +file(GLOB taskmgr_rc_deps res/*.*) +add_rc_deps(taskmgr.rc ${taskmgr_rc_deps}) add_executable(taskmgr ${SOURCE} taskmgr.rc) set_module_type(taskmgr win32gui UNICODE) add_importlibs(taskmgr advapi32 user32 gdi32 shell32 shlwapi comctl32 msvcrt kernel32 ntdll) Modified: trunk/reactos/base/applications/winhlp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -15,11 +15,8 @@ winhelp.c winhelp.h) -add_executable(winhlp32 - ${SOURCE} - string.c - rsrc.rc) - +add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/winhelp.ico) +add_executable(winhlp32 ${SOURCE} string.c rsrc.rc) set_module_type(winhlp32 win32gui) target_link_libraries(winhlp32 wine) add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll) Modified: trunk/reactos/base/applications/wordpad/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/CMakeLists.txt [iso-8859-1] Wed Jun 17 17:20:29 2015 @@ -8,10 +8,11 @@ olecallback.c print.c registry.c - wordpad.c - rsrc.rc) + wordpad.c) -add_executable(wordpad ${SOURCE}) +file(GLOB wordpad_rc_deps res/*.*) +add_rc_deps(rsrc.rc ${wordpad_rc_deps}) +add_executable(wordpad ${SOURCE} rsrc.rc) set_module_type(wordpad win32gui) target_link_libraries(wordpad wine uuid) add_importlibs(wordpad comdlg32 ole32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll)

9 years, 4 months

[gedmurphy] 68169: [DEVMGR] - Make sure the device nodes use the latest device status'

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Jun 17 08:38:34 2015 New Revision: 68169 URL: http://svn.reactos.org/svn/reactos?rev=68169&view=rev Log: [DEVMGR] - Make sure the device nodes use the latest device status' Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Wed Jun 17 08:38:34 2015 @@ -34,7 +34,7 @@ { CDeviceView *This; BOOL ScanForChanges; -BOOL UpdateView; + BOOL UpdateView; }; Modified: trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/N… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp [iso-8859-1] Wed Jun 17 08:38:34 2015 @@ -75,32 +75,87 @@ bool CNode::IsHidden() { - return ((m_Status & DN_NO_SHOW_IN_DM) != 0); + CONFIGRET cr; + cr = CM_Get_DevNode_Status_Ex(&m_Status, + &m_ProblemNumber, + m_DevInst, + 0, + NULL); + if (cr == CR_SUCCESS) + { + return ((m_Status & DN_NO_SHOW_IN_DM) != 0); + } + + return false; } bool CNode::CanDisable() { - return (m_NodeType == NodeDevice && ((m_Status & DN_DISABLEABLE) != 0)); + CONFIGRET cr; + cr = CM_Get_DevNode_Status_Ex(&m_Status, + &m_ProblemNumber, + m_DevInst, + 0, + NULL); + if (cr == CR_SUCCESS) + { + return (m_NodeType == NodeDevice && ((m_Status & DN_DISABLEABLE) != 0)); + } + + return false; } bool CNode::IsDisabled() { - return ((m_ProblemNumber & (CM_PROB_DISABLED | CM_PROB_HARDWARE_DISABLED)) != 0); + CONFIGRET cr; + cr = CM_Get_DevNode_Status_Ex(&m_Status, + &m_ProblemNumber, + m_DevInst, + 0, + NULL); + if (cr == CR_SUCCESS) + { + return ((m_ProblemNumber & (CM_PROB_DISABLED | CM_PROB_HARDWARE_DISABLED)) != 0); + } + + return false; } bool CNode::IsStarted() { - return ((m_Status & DN_STARTED) != 0); + CONFIGRET cr; + cr = CM_Get_DevNode_Status_Ex(&m_Status, + &m_ProblemNumber, + m_DevInst, + 0, + NULL); + if (cr == CR_SUCCESS) + { + return ((m_Status & DN_STARTED) != 0); + } + + return false; } bool CNode::IsInstalled() { - return ((m_Status & DN_HAS_PROBLEM) != 0 || - (m_Status & (DN_DRIVER_LOADED | DN_STARTED)) != 0); + CONFIGRET cr; + cr = CM_Get_DevNode_Status_Ex(&m_Status, + &m_ProblemNumber, + m_DevInst, + 0, + NULL); + if (cr == CR_SUCCESS) + { + return ((m_Status & DN_HAS_PROBLEM) != 0 || + (m_Status & (DN_DRIVER_LOADED | DN_STARTED)) != 0); + } + + return false; }

9 years, 4 months

[cwittich] 68168: [DEVMGMT] fix a typo

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jun 17 08:24:05 2015 New Revision: 68168 URL: http://svn.reactos.org/svn/reactos?rev=68168&view=rev Log: [DEVMGMT] fix a typo Modified: trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc Modified: trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/l… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc [iso-8859-1] Wed Jun 17 08:24:05 2015 @@ -69,7 +69,7 @@ IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" + IDS_HINT_RES_BY_TYPE "Displays resources by type" IDS_HINT_RES_BY_CONN "Displays resources by connection type" IDS_HINT_SYS_RESTORE " Restores this window to normal size."

9 years, 4 months

← Newer
1
...
13
14
15
16
17
18
19
...
35
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 June 2015