Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 57957: [REGEDIT] Improve the look of the "Go" button (at the right of the address bar).
by hbelusca＠svn.reactos.org 20 Dec '12

20 Dec '12

Author: hbelusca Date: Thu Dec 20 14:10:38 2012 New Revision: 57957 URL: http://svn.reactos.org/svn/reactos?rev=57957&view=rev Log: [REGEDIT] Improve the look of the "Go" button (at the right of the address bar). Modified: trunk/reactos/base/applications/regedit/childwnd.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] Thu Dec 20 14:10:38 2012 @@ -42,7 +42,7 @@ { HDWP hdwp = BeginDeferWindowPos(3); RECT rt, rs, rb; - const int tHeight = 18; + const int tHeight = 22; SetRect(&rt, 0, 0, cx, cy); cy = 0; if (hStatusBar != NULL) @@ -52,8 +52,8 @@ } GetWindowRect(g_pChildWnd->hAddressBtnWnd, &rb); cx = g_pChildWnd->nSplitPos + SPLIT_WIDTH/2; - DeferWindowPos(hdwp, g_pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left - tHeight-2, tHeight, SWP_NOZORDER|SWP_NOACTIVATE); - DeferWindowPos(hdwp, g_pChildWnd->hAddressBtnWnd, 0, rt.right - tHeight, rt.top, tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, g_pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left - 2*tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, g_pChildWnd->hAddressBtnWnd, 0, rt.right - 2*tHeight, rt.top, 2*tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE); DeferWindowPos(hdwp, g_pChildWnd->hTreeWnd, 0, rt.left, rt.top + tHeight+2, g_pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE); DeferWindowPos(hdwp, g_pChildWnd->hListWnd, 0, rt.left+cx, rt.top + tHeight+2, rt.right-cx, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE); EndDeferWindowPos(hdwp); @@ -385,7 +385,7 @@ g_pChildWnd->hAddressBarWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Edit", NULL, WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hWnd, (HMENU)0, hInst, 0); - g_pChildWnd->hAddressBtnWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Button", L"Â»", WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP | BS_DEFPUSHBUTTON, + g_pChildWnd->hAddressBtnWnd = CreateWindowExW(0, L"Button", L"Â»", WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP | BS_TEXT | BS_CENTER | BS_VCENTER | BS_FLAT | BS_DEFPUSHBUTTON, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hWnd, (HMENU)0, hInst, 0); g_pChildWnd->hTreeWnd = CreateTreeView(hWnd, g_pChildWnd->szPath, (HMENU) TREE_WINDOW);

1 0

[hbelusca] 57956: [REGEDIT] Improve the overall look (a little part was committed by accident in r57955).
by hbelusca＠svn.reactos.org 20 Dec '12

20 Dec '12

Author: hbelusca Date: Thu Dec 20 02:13:53 2012 New Revision: 57956 URL: http://svn.reactos.org/svn/reactos?rev=57956&view=rev Log: [REGEDIT] Improve the overall look (a little part was committed by accident in r57955). Modified: trunk/reactos/base/applications/regedit/treeview.c Modified: trunk/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] Thu Dec 20 02:13:53 2012 @@ -639,7 +639,7 @@ /* Get the dimensions of the parent window's client area, and create the tree view control. */ GetClientRect(hwndParent, &rcClient); hwndTV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEW, NULL, - WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_EDITLABELS, + WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS, 0, 0, rcClient.right, rcClient.bottom, hwndParent, id, hInst, NULL); /* Initialize the image list, and add items to the control. */

1 0

[hbelusca] 57955: [REGEDIT] Improve the way sorting is done.
by hbelusca＠svn.reactos.org 20 Dec '12

20 Dec '12

Author: hbelusca Date: Thu Dec 20 02:02:38 2012 New Revision: 57955 URL: http://svn.reactos.org/svn/reactos?rev=57955&view=rev Log: [REGEDIT] Improve the way sorting is done. Modified: trunk/reactos/base/applications/regedit/listview.c Modified: trunk/reactos/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] Thu Dec 20 02:02:38 2012 @@ -37,12 +37,17 @@ size_t val_len; } LINE_INFO, *PLINE_INFO; +typedef struct tagSORT_INFO +{ + INT iSortingColumn; + BOOL bSortAscending; +} SORT_INFO, *PSORT_INFO; + /******************************************************************************* * Global and Local Variables: */ -static DWORD g_columnToSort = ~0UL; -static BOOL g_invertSort = FALSE; +static INT g_iSortedColumn = 0; #define MAX_LIST_COLUMNS (IDS_LIST_COLUMN_LAST - IDS_LIST_COLUMN_FIRST + 1) static const int default_column_widths[MAX_LIST_COLUMNS] = { 200, 175, 400 }; @@ -281,14 +286,15 @@ /* Create the image list. */ if ((himl = ImageList_Create(CX_ICON, CY_ICON, ILC_MASK, 0, NUM_ICONS)) == NULL) + { return FALSE; + } hico = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_BIN)); Image_Bin = ImageList_AddIcon(himl, hico); hico = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_STRING)); Image_String = ImageList_AddIcon(himl, hico); - /* Fail if not all of the images were added. */ if (ImageList_GetImageCount(himl) < NUM_ICONS) @@ -374,54 +380,49 @@ static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) { + PSORT_INFO pSortInfo = (PSORT_INFO)lParamSort; LINE_INFO *l, *r; DWORD dw1, dw2; DWORDLONG qw1, qw2; - UNREFERENCED_PARAMETER(lParamSort); l = (LINE_INFO*)lParam1; r = (LINE_INFO*)lParam2; - if (g_columnToSort == ~0UL) - g_columnToSort = 0; - - if (g_columnToSort == 1 && l->dwValType != r->dwValType) + if (pSortInfo->iSortingColumn == 1 && l->dwValType != r->dwValType) { /* Sort by type */ - - if (g_invertSort) + if (pSortInfo->bSortAscending) + return ((int)l->dwValType - (int)r->dwValType); + else return ((int)r->dwValType - (int)l->dwValType); + } + if (pSortInfo->iSortingColumn == 2) + { + /* Sort by value */ + if (l->dwValType != r->dwValType) + { + if (pSortInfo->bSortAscending) + return ((int)l->dwValType - (int)r->dwValType); + else + return ((int)r->dwValType - (int)l->dwValType); + } + + if (l->val == NULL && r->val == NULL) + return 0; + + if (pSortInfo->bSortAscending) + { + if (l->val == NULL) + return -1; + if (r->val == NULL) + return 1; + } else - return ((int)l->dwValType - (int)r->dwValType); - } - if (g_columnToSort == 2) - { - /* Sort by value */ - - if (l->dwValType != r->dwValType) - { - if (g_invertSort) - return ((int)r->dwValType - (int)l->dwValType); - else - return ((int)l->dwValType - (int)r->dwValType); - } - - if (r->val == NULL && l->val == NULL) - return 0; - - if (g_invertSort) - { + { + if (l->val == NULL) + return 1; if (r->val == NULL) return -1; - if (l->val == NULL) - return 1; - } - else - { - if (r->val == NULL) - return 1; - if (l->val == NULL) - return -1; } switch(l->dwValType) @@ -430,42 +431,42 @@ { dw1 = *(DWORD*)l->val; dw2 = *(DWORD*)r->val; - if (g_invertSort) + if (pSortInfo->bSortAscending) + // return (dw1 > dw2 ? 1 : -1); + return ((int)dw1 - (int)dw2); + else // return (dw1 > dw2 ? -1 : 1); return ((int)dw2 - (int)dw1); - else - // return (dw1 > dw2 ? 1 : -1); - return ((int)dw1 - (int)dw2); } case REG_QWORD: { qw1 = *(DWORDLONG*)l->val; qw2 = *(DWORDLONG*)r->val; - if (g_invertSort) + if (pSortInfo->bSortAscending) + // return (qw1 > qw2 ? 1 : -1); + return ((int)qw1 - (int)qw2); + else // return (qw1 > qw2 ? -1 : 1); return ((int)qw2 - (int)qw1); + } + + default: + { + INT nCompare = 0; + + if (pSortInfo->bSortAscending) + { + nCompare = memcmp(l->val, r->val, min(l->val_len, r->val_len)); + if (nCompare == 0) + nCompare = l->val_len - r->val_len; + } else - // return (qw1 > qw2 ? 1 : -1); - return ((int)qw1 - (int)qw2); - } - - default: - { - INT nCompare = 0; - - if (g_invertSort) { nCompare = memcmp(r->val, l->val, min(r->val_len, l->val_len)); if (nCompare == 0) nCompare = r->val_len - l->val_len; } - else - { - nCompare = memcmp(l->val, r->val, min(l->val_len, r->val_len)); - if (nCompare == 0) - nCompare = l->val_len - r->val_len; - } return nCompare; } @@ -473,12 +474,77 @@ } /* Sort by name */ - return (g_invertSort ? wcsicmp(r->name, l->name) : wcsicmp(l->name, r->name)); + return (pSortInfo->bSortAscending ? StrCmpLogicalW(l->name, r->name) : StrCmpLogicalW(r->name, l->name)); +} + +static BOOL ListView_Sort(HWND hListView, int iSortingColumn, int iSortedColumn) +{ + if ( (GetWindowLongPtr(hListView, GWL_STYLE) & ~LVS_NOSORTHEADER) && + (iSortingColumn >= 0) ) + { + BOOL bSortAscending; + SORT_INFO SortInfo; + + HWND hHeader = ListView_GetHeader(hListView); + HDITEM hColumn = {0}; + + /* If we are sorting according to another column, uninitialize the old one */ + if ( (iSortedColumn >= 0) && (iSortingColumn != iSortedColumn) ) + { + hColumn.mask = HDI_FORMAT; + Header_GetItem(hHeader, iSortedColumn, &hColumn); + hColumn.fmt &= ~(HDF_SORTUP | HDF_SORTDOWN); + Header_SetItem(hHeader, iSortedColumn, &hColumn); + } + + /* Get the sorting state of the new column */ + hColumn.mask = HDI_FORMAT; + Header_GetItem(hHeader, iSortingColumn, &hColumn); + + /* + * Check whether we are sorting the list because the user clicked + * on a column, or because we are refreshing the list: + * + * iSortedColumn >= 0 - User clicked on a column; holds the + * old sorting column index. + * iSortedColumn < 0 - List being refreshed. + */ + if (iSortedColumn >= 0) + { + /* Invert the sorting direction */ + bSortAscending = ((hColumn.fmt & HDF_SORTUP) == 0); + } + else + { + /* + * If the sorting state of the column is uninitialized, + * initialize it by default to ascending sorting. + */ + if ((hColumn.fmt & (HDF_SORTUP | HDF_SORTDOWN)) == 0) + hColumn.fmt |= HDF_SORTUP; + + /* Keep the same sorting direction */ + bSortAscending = ((hColumn.fmt & HDF_SORTUP) != 0); + } + + /* Set the new column sorting state */ + hColumn.fmt &= ~(bSortAscending ? HDF_SORTDOWN : HDF_SORTUP ); + hColumn.fmt |= (bSortAscending ? HDF_SORTUP : HDF_SORTDOWN); + Header_SetItem(hHeader, iSortingColumn, &hColumn); + + /* Sort the list */ + SortInfo.iSortingColumn = iSortingColumn; + SortInfo.bSortAscending = bSortAscending; + return ListView_SortItems(hListView, CompareFunc, (LPARAM)&SortInfo); + } + else + return TRUE; } BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) { NMLVDISPINFO* Info; + int iSortingColumn; UNREFERENCED_PARAMETER(wParam); *Result = TRUE; switch (((LPNMHDR)lParam)->code) @@ -487,15 +553,9 @@ OnGetDispInfo((NMLVDISPINFO*)lParam); return TRUE; case LVN_COLUMNCLICK: - if (g_columnToSort == (DWORD)((LPNMLISTVIEW)lParam)->iSubItem) - g_invertSort = !g_invertSort; - else - { - g_columnToSort = ((LPNMLISTVIEW)lParam)->iSubItem; - g_invertSort = FALSE; - } - - (void)ListView_SortItems(hWnd, CompareFunc, (WPARAM)hWnd); + iSortingColumn = ((LPNMLISTVIEW)lParam)->iSubItem; + (void)ListView_Sort(hWnd, iSortingColumn, g_iSortedColumn); + g_iSortedColumn = iSortingColumn; return TRUE; case NM_DBLCLK: case NM_RETURN: @@ -568,21 +628,20 @@ return FALSE; } - HWND CreateListView(HWND hwndParent, HMENU id) { RECT rcClient; HWND hwndLV; - /* Get the dimensions of the parent window's client area, and create the list view control. */ + /* Get the dimensions of the parent window's client area, and create the list view control. */ GetClientRect(hwndParent, &rcClient); hwndLV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_LISTVIEW, L"List View", - WS_VISIBLE | WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS, + WS_VISIBLE | WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS | LVS_SHOWSELALWAYS, 0, 0, rcClient.right, rcClient.bottom, hwndParent, id, hInst, NULL); if (!hwndLV) return NULL; - /* Initialize the image list, and add items to the control. */ + /* Initialize the image list, and add items to the control. */ if (!CreateListColumns(hwndLV)) goto fail; if (!InitListViewImageLists(hwndLV)) goto fail; @@ -627,7 +686,6 @@ SendMessageW(hwndLV, WM_SETREDRAW, FALSE, 0); DestroyListView(hwndLV); - g_columnToSort = ~0UL; (void)ListView_DeleteAllItems(hwndLV); if(!hKey) return FALSE; @@ -669,11 +727,12 @@ HeapFree(GetProcessHeap(), 0, ValBuf); HeapFree(GetProcessHeap(), 0, ValName); } + RegCloseKey(hNewKey); + if(!AddedDefault) { AddEntryToList(hwndLV, L"", REG_SZ, NULL, 0, 0, FALSE); } - ListView_SortItems(hwndLV, CompareFunc, (WPARAM)hwndLV); c = ListView_GetItemCount(hwndLV); for(i = 0; i < c; i++) { @@ -682,7 +741,7 @@ ListView_SetItemState(hwndLV, iListViewSelect, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED); - RegCloseKey(hNewKey); + (void)ListView_Sort(hwndLV, g_iSortedColumn, -1); SendMessageW(hwndLV, WM_SETREDRAW, TRUE, 0); return TRUE;

1 0

[tkreuzer] 57954: [NTOSKRNL] - Add some missing return value checks - Add some annotations - Fix format specifiers - Fix variable scope conflicts - Fix possible closing of a NULL handle - Use ObClo...
by tkreuzer＠svn.reactos.org 19 Dec '12

19 Dec '12

Author: tkreuzer Date: Wed Dec 19 23:49:13 2012 New Revision: 57954 URL: http://svn.reactos.org/svn/reactos?rev=57954&view=rev Log: [NTOSKRNL] - Add some missing return value checks - Add some annotations - Fix format specifiers - Fix variable scope conflicts - Fix possible closing of a NULL handle - Use ObCloseHandle instead of ZwClose Modified: trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/fault.c trunk/reactos/ntoskrnl/cache/section/io.c trunk/reactos/ntoskrnl/cache/section/newmm.h trunk/reactos/ntoskrnl/cache/section/sptab.c trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/config/cmconfig.c trunk/reactos/ntoskrnl/config/cmdelay.c trunk/reactos/ntoskrnl/config/cmhook.c trunk/reactos/ntoskrnl/config/cmlazy.c trunk/reactos/ntoskrnl/ex/callback.c trunk/reactos/ntoskrnl/ex/keyedevt.c trunk/reactos/ntoskrnl/ex/locale.c trunk/reactos/ntoskrnl/ex/timer.c trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/io/iomgr/driver.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] Wed Dec 19 23:49:13 2012 @@ -154,9 +154,10 @@ 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 Address; + PVOID CurrentAddress; ULONG_PTR Entry; if (!NT_SUCCESS(MmRequestPageMemoryConsumer(MC_CACHE, TRUE, &Page))) @@ -169,14 +170,14 @@ if (Entry == 0) { MmSetPageEntrySectionSegment(Segment, &FileOffset, MAKE_PFN_SSE(Page)); - Address = ((PCHAR)MemoryArea->StartingAddress) + FileOffset.QuadPart - FirstMapped.QuadPart; + CurrentAddress = ((PCHAR)MemoryArea->StartingAddress) + FileOffset.QuadPart - FirstMapped.QuadPart; OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmReferencePage(Page); KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - MmCreateVirtualMapping(NULL, Address, PAGE_READWRITE, &Page, 1); - MmInsertRmap(Page, NULL, Address); + MmCreateVirtualMapping(NULL, CurrentAddress, PAGE_READWRITE, &Page, 1); + MmInsertRmap(Page, NULL, CurrentAddress); } else { Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -102,11 +102,12 @@ NTSTATUS NTAPI -MmNotPresentFaultCachePage(PMMSUPPORT AddressSpace, - MEMORY_AREA* MemoryArea, - PVOID Address, - BOOLEAN Locked, - PMM_REQUIRED_RESOURCES Required) +MmNotPresentFaultCachePage ( + _In_ PMMSUPPORT AddressSpace, + _In_ MEMORY_AREA* MemoryArea, + _In_ PVOID Address, + _In_ BOOLEAN Locked, + _Inout_ PMM_REQUIRED_RESOURCES Required) { NTSTATUS Status; PVOID PAddress; @@ -317,11 +318,12 @@ NTSTATUS NTAPI -MiCowCacheSectionPage(PMMSUPPORT AddressSpace, - PMEMORY_AREA MemoryArea, - PVOID Address, - BOOLEAN Locked, - PMM_REQUIRED_RESOURCES Required) +MiCowCacheSectionPage ( + _In_ PMMSUPPORT AddressSpace, + _In_ PMEMORY_AREA MemoryArea, + _In_ PVOID Address, + _In_ BOOLEAN Locked, + _Inout_ PMM_REQUIRED_RESOURCES Required) { PMM_SECTION_SEGMENT Segment; PFN_NUMBER NewPage, OldPage; @@ -422,8 +424,8 @@ DPRINT("Allocated page %x\n", NewPage); - /* Unshare the old page */ - MmDeleteRmap(OldPage, Process, PAddress); + /* Unshare the old page */ + MmDeleteRmap(OldPage, Process, PAddress); /* Copy the old page */ DPRINT("Copying\n"); @@ -474,10 +476,13 @@ */ +_Function_class_(WORKER_THREAD_ROUTINE) VOID NTAPI -MmpFaultWorker(PWORK_QUEUE_WITH_CONTEXT WorkItem) +MmpFaultWorker(PVOID Parameter) { + PWORK_QUEUE_WITH_CONTEXT WorkItem = Parameter; + DPRINT("Calling work\n"); WorkItem->Status = WorkItem->Required->DoAcquisition(WorkItem->AddressSpace, WorkItem->MemoryArea, @@ -622,7 +627,7 @@ KeInitializeEvent(&Context.Wait, NotificationEvent, FALSE); ExInitializeWorkItem(&Context.WorkItem, - (PWORKER_THREAD_ROUTINE)MmpFaultWorker, + MmpFaultWorker, &Context); DPRINT("Queue work item\n"); Modified: trunk/reactos/ntoskrnl/cache/section/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/io.… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/io.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/io.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -71,6 +71,7 @@ nothing, including freeing the mdls. */ +_Function_class_(IO_COMPLETION_ROUTINE) NTSTATUS NTAPI MiSimpleReadComplete(PDEVICE_OBJECT DeviceObject, 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] Wed Dec 19 23:49:13 2012 @@ -251,13 +251,16 @@ MiFreeSegmentPage(PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER FileOffset); -NTSTATUS -NTAPI -MiCowCacheSectionPage(PMMSUPPORT AddressSpace, - PMEMORY_AREA MemoryArea, - PVOID Address, - BOOLEAN Locked, - PMM_REQUIRED_RESOURCES Required); +_Success_(1) +_When_(return==STATUS_MORE_PROCESSING_REQUIRED, _At_(Required->DoAcquisition, _Post_notnull_)) +NTSTATUS +NTAPI +MiCowCacheSectionPage ( + _In_ PMMSUPPORT AddressSpace, + _In_ PMEMORY_AREA MemoryArea, + _In_ PVOID Address, + _In_ BOOLEAN Locked, + _Inout_ PMM_REQUIRED_RESOURCES Required); NTSTATUS NTAPI @@ -344,13 +347,16 @@ NTAPI MmUnmapCacheViewInSystemSpace(PVOID Address); -NTSTATUS -NTAPI -MmNotPresentFaultCachePage(PMMSUPPORT AddressSpace, - PMEMORY_AREA MemoryArea, - PVOID Address, - BOOLEAN Locked, - PMM_REQUIRED_RESOURCES Required); +_Success_(1) +_When_(return==STATUS_MORE_PROCESSING_REQUIRED, _At_(Required->DoAcquisition, _Post_notnull_)) +NTSTATUS +NTAPI +MmNotPresentFaultCachePage ( + _In_ PMMSUPPORT AddressSpace, + _In_ MEMORY_AREA* MemoryArea, + _In_ PVOID Address, + _In_ BOOLEAN Locked, + _Inout_ PMM_REQUIRED_RESOURCES Required); NTSTATUS NTAPI Modified: trunk/reactos/ntoskrnl/cache/section/sptab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/spt… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/sptab.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/sptab.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -64,6 +64,7 @@ extern KSPIN_LOCK MiSectionPageTableLock; +_Function_class_(RTL_GENERIC_ALLOCATE_ROUTINE) static PVOID NTAPI @@ -75,6 +76,7 @@ return Result; } +_Function_class_(RTL_GENERIC_FREE_ROUTINE) static VOID NTAPI @@ -84,6 +86,7 @@ ExFreePoolWithTag(Data, 'MmPt'); } +_Function_class_(RTL_GENERIC_COMPARE_ROUTINE) static RTL_GENERIC_COMPARE_RESULTS NTAPI @@ -341,7 +344,7 @@ { Segment = PageTable->Segment; Offset->QuadPart = PageTable->FileOffset.QuadPart + - (RawOffset << PAGE_SHIFT); + ((ULONG64)RawOffset << PAGE_SHIFT); } return Segment; Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=5795… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -242,6 +242,7 @@ { PINTERNAL_BCB iBcb = Bcb; + IoStatus->Status = STATUS_SUCCESS; if (--iBcb->RefCount == 0) { IoStatus->Information = 0; Modified: trunk/reactos/ntoskrnl/config/cmconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmconfig.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmconfig.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -67,7 +67,12 @@ /* Convert it to Unicode */ RtlInitEmptyUnicodeString(&KeyName, Buffer, sizeof(Buffer)); - RtlAnsiStringToUnicodeString(&KeyName, &TempString, FALSE); + Status = RtlAnsiStringToUnicodeString(&KeyName, &TempString, FALSE); + if (!NT_SUCCESS(Status)) + { + NtClose(KeyHandle); + return Status; + } /* Create the key */ ParentHandle = KeyHandle; @@ -221,7 +226,7 @@ { /* EISA */ case EisaAdapter: - + /* Fixup information */ Interface = Eisa; Bus = CmpTypeCount[EisaAdapter]++; @@ -229,7 +234,7 @@ /* Turbo-channel */ case TcAdapter: - + /* Fixup information */ Interface = TurboChannel; Bus = CmpTypeCount[TurboChannel]++; @@ -237,7 +242,7 @@ /* ISA, PCI, etc busses */ case MultiFunctionAdapter: - + /* Check if we have an identifier */ if (Component->Identifier) { @@ -252,7 +257,7 @@ break; } } - + /* Fix up information */ Interface = CmpMultifunctionTypes[i].InterfaceType; Bus = CmpMultifunctionTypes[i].Count++; @@ -261,7 +266,7 @@ /* SCSI Bus */ case ScsiAdapter: - + /* Fix up */ Interface = Internal; Bus = CmpTypeCount[ScsiAdapter]++; @@ -274,7 +279,7 @@ break; } } - + /* Dump information on the component */ /* Setup the hardware node */ @@ -285,7 +290,7 @@ Bus, DeviceIndexTable); if (!NT_SUCCESS(Status)) return Status; - + /* Check for children */ if (CurrentEntry->Child) { @@ -301,12 +306,12 @@ return Status; } } - + /* Get to the next entry */ NtClose(NewHandle); CurrentEntry = CurrentEntry->Sibling; } - + /* We're done */ return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/config/cmdelay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdelay.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdelay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmdelay.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -35,6 +35,7 @@ /* FUNCTIONS *****************************************************************/ +_Function_class_(KDEFERRED_ROUTINE) VOID NTAPI CmpDelayCloseDpcRoutine(IN PKDPC Dpc, @@ -49,6 +50,7 @@ ExQueueWorkItem(&CmpDelayCloseWorkItem, DelayedWorkQueue); } +_Function_class_(WORKER_THREAD_ROUTINE) VOID NTAPI CmpDelayCloseWorker(IN PVOID Context) @@ -188,21 +190,22 @@ INIT_FUNCTION CmpInitializeDelayedCloseTable(VOID) { - + /* Setup the delayed close lock */ KeInitializeGuardedMutex(&CmpDelayedCloseTableLock); - + /* Setup the work item */ ExInitializeWorkItem(&CmpDelayCloseWorkItem, CmpDelayCloseWorker, NULL); - + /* Setup the list head */ InitializeListHead(&CmpDelayedLRUListHead); - + /* Setup the DPC and its timer */ KeInitializeDpc(&CmpDelayCloseDpc, CmpDelayCloseDpcRoutine, NULL); KeInitializeTimer(&CmpDelayCloseTimer); } +_Function_class_(KDEFERRED_ROUTINE) VOID NTAPI CmpDelayDerefKCBDpcRoutine(IN PKDPC Dpc, @@ -217,6 +220,7 @@ ExQueueWorkItem(&CmpDelayDerefKCBWorkItem, DelayedWorkQueue); } +_Function_class_(WORKER_THREAD_ROUTINE) VOID NTAPI CmpDelayDerefKCBWorker(IN PVOID Context) @@ -236,22 +240,22 @@ { /* Grab an entry */ Entry = (PVOID)RemoveHeadList(&CmpDelayDerefKCBListHead); - + /* We can release the lock now */ KeReleaseGuardedMutex(&CmpDelayDerefKCBLock); - + /* Now grab the actual entry */ Entry = CONTAINING_RECORD(Entry, CM_DELAY_DEREF_KCB_ITEM, ListEntry); Entry->ListEntry.Flink = Entry->ListEntry.Blink = NULL; - + /* Dereference and free */ CmpDereferenceKeyControlBlock(Entry->Kcb); CmpFreeDelayItem(Entry); - + /* Lock the list again */ KeAcquireGuardedMutex(&CmpDelayDerefKCBLock); } - + /* We're done */ CmpDelayDerefKCBWorkItemActive = FALSE; KeReleaseGuardedMutex(&CmpDelayDerefKCBLock); @@ -332,7 +336,7 @@ { LARGE_INTEGER Timeout; PAGED_CODE(); - + /* Set the worker active */ CmpDelayCloseWorkItemActive = TRUE; @@ -424,36 +428,36 @@ PCM_DELAYED_CLOSE_ENTRY Entry; ULONG NewRefCount, OldRefCount; PAGED_CODE(); - + /* Sanity checks */ ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || (CmpTestRegistryLockExclusive() == TRUE)); if (Kcb->DelayedCloseIndex == CmpDelayedCloseSize) ASSERT(FALSE); - + /* Get the entry and lock the table */ Entry = Kcb->DelayCloseEntry; ASSERT(Entry); KeAcquireGuardedMutex(&CmpDelayedCloseTableLock); - + /* Remove the entry */ RemoveEntryList(&Entry->DelayedLRUList); - + /* Release the lock */ KeReleaseGuardedMutex(&CmpDelayedCloseTableLock); - + /* Free the entry */ CmpFreeDelayItem(Entry); - + /* Reduce the number of elements */ InterlockedDecrement((PLONG)&CmpDelayedCloseElements); - + /* Sanity check */ if (!Kcb->InDelayClose) ASSERT(FALSE); - + /* Get the previous reference count */ OldRefCount = *(PLONG)&Kcb->InDelayClose; ASSERT(OldRefCount == 1); - + /* Write the new one */ NewRefCount = 0; if (InterlockedCompareExchange((PLONG)&Kcb->InDelayClose, @@ -463,10 +467,10 @@ /* Sanity check */ ASSERT(FALSE); } - + /* Remove the link to the entry */ Kcb->DelayCloseEntry = NULL; - + /* Set new delay size and remove the delete flag */ Kcb->DelayedCloseIndex = CmpDelayedCloseSize; } Modified: trunk/reactos/ntoskrnl/config/cmhook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmhook.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmhook.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmhook.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -116,31 +116,31 @@ ASSERT(Function && Cookie); Callback = ExAllocatePoolWithTag(PagedPool, - sizeof(REGISTRY_CALLBACK), - 'bcMC'); - if (Callback != NULL) + sizeof(REGISTRY_CALLBACK), + 'bcMC'); + if (Callback == NULL) { - /* initialize the callback */ - ExInitializeRundownProtection(&Callback->RundownRef); - Callback->Function = Function; - Callback->Context = Context; - Callback->PendingDelete = FALSE; - - /* add it to the callback list and receive a cookie for the callback */ - ExAcquireFastMutex(&CmiCallbackLock); - - /* FIXME - to receive a unique cookie we'll just return the pointer to the - callback object */ - Callback->Cookie.QuadPart = (ULONG_PTR)Callback; - InsertTailList(&CmiCallbackHead, &Callback->ListEntry); - - ExReleaseFastMutex(&CmiCallbackLock); - - *Cookie = Callback->Cookie; - return STATUS_SUCCESS; + return STATUS_INSUFFICIENT_RESOURCES; } - return STATUS_INSUFFICIENT_RESOURCES; + /* initialize the callback */ + ExInitializeRundownProtection(&Callback->RundownRef); + Callback->Function = Function; + Callback->Context = Context; + Callback->PendingDelete = FALSE; + + /* add it to the callback list and receive a cookie for the callback */ + ExAcquireFastMutex(&CmiCallbackLock); + + /* FIXME - to receive a unique cookie we'll just return the pointer to the + callback object */ + Callback->Cookie.QuadPart = (ULONG_PTR)Callback; + InsertTailList(&CmiCallbackHead, &Callback->ListEntry); + + ExReleaseFastMutex(&CmiCallbackLock); + + *Cookie = Callback->Cookie; + return STATUS_SUCCESS; } /* Modified: trunk/reactos/ntoskrnl/config/cmlazy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmlazy.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmlazy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmlazy.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -38,13 +38,13 @@ NTSTATUS Status; PLIST_ENTRY NextEntry; PCMHIVE CmHive; - BOOLEAN Result; + BOOLEAN Result; ULONG HiveCount = CmpLazyFlushHiveCount; /* Set Defaults */ *Error = FALSE; *DirtyCount = 0; - + /* Don't do anything if we're not supposed to */ if (CmpNoWrite) return TRUE; @@ -66,7 +66,7 @@ { /* Great sucess! */ Result = TRUE; - + /* Ignore clean or volatile hves */ if (!(CmHive->Hive.DirtyCount) || (CmHive->Hive.HiveFlags & HIVE_VOLATILE)) @@ -100,7 +100,7 @@ /* Try the next one */ NextEntry = NextEntry->Flink; } - + /* Check if we've flushed everything */ if (NextEntry == &CmpHiveListHead) { @@ -112,12 +112,13 @@ /* We need to be called again */ Result = TRUE; } - + /* Unlock the list and return the result */ ExReleasePushLock(&CmpHiveListHeadLock); return Result; } +_Function_class_(KDEFERRED_ROUTINE) VOID NTAPI CmpEnableLazyFlushDpcRoutine(IN PKDPC Dpc, @@ -129,6 +130,7 @@ CmpHoldLazyFlush = FALSE; } +_Function_class_(KDEFERRED_ROUTINE) VOID NTAPI CmpLazyFlushDpcRoutine(IN PKDPC Dpc, @@ -150,7 +152,7 @@ { LARGE_INTEGER DueTime; PAGED_CODE(); - + /* Check if we should set the lazy flush timer */ if ((!CmpNoWrite) && (!CmpHoldLazyFlush)) { @@ -161,6 +163,7 @@ } } +_Function_class_(WORKER_THREAD_ROUTINE) VOID NTAPI CmpLazyFlushWorker(IN PVOID Parameter) @@ -171,7 +174,7 @@ /* Don't do anything if lazy flushing isn't enabled yet */ if (CmpHoldLazyFlush) return; - + /* Check if we are forcing a flush */ ForceFlush = CmpForceForceFlush; if (ForceFlush) @@ -185,7 +188,7 @@ CmpLockRegistry(); InterlockedIncrement(&CmpFlushStarveWriters); } - + /* Flush the next hive */ MoreWork = CmpDoFlushNextHive(ForceFlush, &Result, &DirtyCount); if (!MoreWork) @@ -200,7 +203,7 @@ /* Not pending anymore, release the registry lock */ CmpLazyFlushPending = FALSE; CmpUnlockRegistry(); - + /* Check if we need to flush another hive */ if ((MoreWork) || (DirtyCount)) CmpLazyFlush(); } @@ -209,15 +212,15 @@ NTAPI CmpCmdInit(IN BOOLEAN SetupBoot) { - LARGE_INTEGER DueTime; - PAGED_CODE(); - + LARGE_INTEGER DueTime; + PAGED_CODE(); + /* Setup the lazy DPC */ KeInitializeDpc(&CmpLazyFlushDpc, CmpLazyFlushDpcRoutine, NULL); - + /* Setup the lazy timer */ KeInitializeTimer(&CmpLazyFlushTimer); - + /* Setup the lazy worker */ ExInitializeWorkItem(&CmpLazyWorkItem, CmpLazyFlushWorker, NULL); @@ -226,7 +229,7 @@ CmpEnableLazyFlushDpcRoutine, NULL); KeInitializeTimer(&CmpEnableLazyFlushTimer); - + /* Enable lazy flushing after 10 minutes */ DueTime.QuadPart = Int32x32To64(600, -10 * 1000 * 1000); KeSetTimer(&CmpEnableLazyFlushTimer, DueTime, &CmpEnableLazyFlushDpc); @@ -234,10 +237,10 @@ /* Setup flush variables */ CmpNoWrite = CmpMiniNTBoot; CmpWasSetupBoot = SetupBoot; - + /* Testing: Force Lazy Flushing */ CmpHoldLazyFlush = FALSE; - + /* Setup the hive list */ CmpInitializeHiveList(SetupBoot); } Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -433,7 +433,10 @@ } /* Everything went fine, so return a pointer to the Object */ - if (NT_SUCCESS(Status)) *CallbackObject = Callback; + if (NT_SUCCESS(Status)) + { + *CallbackObject = Callback; + } return Status; } Modified: trunk/reactos/ntoskrnl/ex/keyedevt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/keyedevt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -51,6 +51,7 @@ /* FUNCTIONS *****************************************************************/ +_IRQL_requires_max_(APC_LEVEL) BOOLEAN INIT_FUNCTION NTAPI @@ -116,6 +117,7 @@ } } +_IRQL_requires_max_(APC_LEVEL) NTSTATUS NTAPI ExpReleaseOrWaitForKeyedEvent( @@ -203,6 +205,7 @@ return STATUS_SUCCESS; } +_IRQL_requires_max_(APC_LEVEL) NTSTATUS NTAPI ExpWaitForKeyedEvent( @@ -219,6 +222,7 @@ FALSE); } +_IRQL_requires_max_(APC_LEVEL) NTSTATUS NTAPI ExpReleaseKeyedEvent( @@ -235,6 +239,7 @@ TRUE); } +_IRQL_requires_max_(APC_LEVEL) NTSTATUS NTAPI NtCreateKeyedEvent( @@ -311,6 +316,7 @@ return Status; } +_IRQL_requires_max_(APC_LEVEL) NTSTATUS NTAPI NtOpenKeyedEvent( @@ -359,6 +365,7 @@ return Status; } +_IRQL_requires_max_(APC_LEVEL) NTSTATUS NTAPI NtWaitForKeyedEvent( @@ -401,6 +408,7 @@ return Status; } +_IRQL_requires_max_(APC_LEVEL) NTSTATUS NTAPI NtReleaseKeyedEvent( Modified: trunk/reactos/ntoskrnl/ex/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/locale.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -209,7 +209,7 @@ HANDLE KeyHandle; ULONG ValueLength; WCHAR ValueBuffer[20]; - HANDLE UserKey = NULL; + HANDLE UserKey; NTSTATUS Status; PAGED_CODE(); @@ -231,6 +231,7 @@ L"\\Registry\\Machine\\System\\CurrentControlSet" L"\\Control\\Nls\\Language"); RtlInitUnicodeString(&ValueName, L"Default"); + UserKey = NULL; } /* Initailize the object attributes */ @@ -286,7 +287,10 @@ } /* Close the user key */ - ZwClose(UserKey); + if (UserKey) + { + ObCloseHandle(UserKey, KernelMode); + } /* Check for success */ if (NT_SUCCESS(Status)) Modified: trunk/reactos/ntoskrnl/ex/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/timer.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/ex/timer.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/timer.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -133,6 +133,7 @@ KeFlushQueuedDpcs(); } +_Function_class_(KDEFERRED_ROUTINE) VOID NTAPI ExpTimerDpcRoutine(IN PKDPC Dpc, @@ -355,7 +356,8 @@ } _SEH2_EXCEPT(ExSystemExceptionFilter()) { - + /* Do nothing */ + (void)0; } _SEH2_END; } @@ -445,7 +447,8 @@ } _SEH2_EXCEPT(ExSystemExceptionFilter()) { - + /* Do nothing */ + (void)0; } _SEH2_END; } @@ -500,7 +503,8 @@ } _SEH2_EXCEPT(ExSystemExceptionFilter()) { - + /* Do nothing */ + (void)0; } _SEH2_END; } @@ -629,9 +633,9 @@ (PVOID*)&Timer, NULL); - /* + /* * Tell the user we don't support Wake Timers... - * when we have the ability to use/detect the Power Management + * when we have the ability to use/detect the Power Management * functionality required to support them, make this check dependent * on the actual PM capabilities */ @@ -740,7 +744,8 @@ } _SEH2_EXCEPT(ExSystemExceptionFilter()) { - + /* Do nothing */ + (void)0; } _SEH2_END; } Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -841,8 +841,8 @@ { extern ULONGLONG BootCyclesEnd, BootCycles; BootCyclesEnd = __rdtsc(); - DbgPrint("Boot took %I64d cycles!\n", BootCyclesEnd - BootCycles); - DbgPrint("Interrupts: %d System Calls: %d Context Switches: %d\n", + DbgPrint("Boot took %I64u cycles!\n", BootCyclesEnd - BootCycles); + DbgPrint("Interrupts: %u System Calls: %u Context Switches: %u\n", KeGetCurrentPrcb()->InterruptCount, KeGetCurrentPrcb()->KeSystemCalls, KeGetContextSwitches(KeGetCurrentPrcb())); Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -237,10 +237,12 @@ * The input image path isn't freed on error. */ -NTSTATUS FASTCALL +NTSTATUS +FASTCALL IopNormalizeImagePath( - IN OUT PUNICODE_STRING ImagePath, - IN PUNICODE_STRING ServiceName) + _Inout_ _When_(return>=0, _At_(ImagePath->Buffer, _Post_notnull_ __drv_allocatesMem(Mem))) + PUNICODE_STRING ImagePath, + _In_ PUNICODE_STRING ServiceName) { UNICODE_STRING InputImagePath;

1 0

[tkreuzer] 57953: [CSQ] Formatting, add annotations, use doxygen style comments, no functional change
by tkreuzer＠svn.reactos.org 19 Dec '12

19 Dec '12

Author: tkreuzer Date: Wed Dec 19 23:33:57 2012 New Revision: 57953 URL: http://svn.reactos.org/svn/reactos?rev=57953&view=rev Log: [CSQ] Formatting, add annotations, use doxygen style comments, no functional change Modified: trunk/reactos/lib/drivers/csq/csq.c Modified: trunk/reactos/lib/drivers/csq/csq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/csq/csq.c?rev=… ============================================================================== --- trunk/reactos/lib/drivers/csq/csq.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/csq/csq.c [iso-8859-1] Wed Dec 19 23:33:57 2012 @@ -30,13 +30,13 @@ #include <ntifs.h> -static VOID NTAPI IopCsqCancelRoutine(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -/* - * FUNCTION: Cancel routine that is installed on any IRP that this library manages - * ARGUMENTS: - * [Called back by the system] - * NOTES: +/*! + * @brief Cancel routine that is installed on any IRP that this library manages + * + * @param DeviceObject + * @param Irp + * + * @note * - We assume that Irp->Tail.Overlay.DriverContext[3] has either a IO_CSQ * or an IO_CSQ_IRP_CONTEXT in it, but we have to figure out which it is * - By the time this routine executes, the I/O Manager has already cleared @@ -46,135 +46,152 @@ * system * - May be called at high IRQL */ -{ - PIO_CSQ Csq; - KIRQL Irql; - - /* First things first: */ - IoReleaseCancelSpinLock(Irp->CancelIrql); - - /* We could either get a context or just a csq */ - Csq = (PIO_CSQ)Irp->Tail.Overlay.DriverContext[3]; - - if(Csq->Type == IO_TYPE_CSQ_IRP_CONTEXT) - { - PIO_CSQ_IRP_CONTEXT Context = (PIO_CSQ_IRP_CONTEXT)Csq; - Csq = Context->Csq; - - /* clean up context while we're here */ - Context->Irp = NULL; - } - - /* Now that we have our CSQ, complete the IRP */ - Csq->CsqAcquireLock(Csq, &Irql); - Csq->CsqRemoveIrp(Csq, Irp); - Csq->CsqReleaseLock(Csq, Irql); - - Csq->CsqCompleteCanceledIrp(Csq, Irp); -} - - -NTSTATUS NTAPI IoCsqInitialize(PIO_CSQ Csq, - PIO_CSQ_INSERT_IRP CsqInsertIrp, - PIO_CSQ_REMOVE_IRP CsqRemoveIrp, - PIO_CSQ_PEEK_NEXT_IRP CsqPeekNextIrp, - PIO_CSQ_ACQUIRE_LOCK CsqAcquireLock, - PIO_CSQ_RELEASE_LOCK CsqReleaseLock, - PIO_CSQ_COMPLETE_CANCELED_IRP CsqCompleteCanceledIrp) -/* - * FUNCTION: Set up a CSQ struct to initialize the queue - * ARGUMENTS: - * Csq: Caller-allocated non-paged space for our IO_CSQ to be initialized - * CsqInsertIrp: Insert routine - * CsqRemoveIrp: Remove routine - * CsqPeekNextIrp: Routine to paeek at the next IRP in queue - * CsqAcquireLock: Acquire the queue's lock - * CsqReleaseLock: Release the queue's lock - * CsqCompleteCanceledIrp: Routine to complete IRPs when they are canceled - * RETURNS: +_Function_class_(DRIVER_CANCEL) +static +VOID +NTAPI +IopCsqCancelRoutine( + _Inout_ PDEVICE_OBJECT DeviceObject, + _Inout_ _IRQL_uses_cancel_ PIRP Irp) +{ + PIO_CSQ Csq; + KIRQL Irql; + + /* First things first: */ + IoReleaseCancelSpinLock(Irp->CancelIrql); + + /* We could either get a context or just a csq */ + Csq = (PIO_CSQ)Irp->Tail.Overlay.DriverContext[3]; + + if(Csq->Type == IO_TYPE_CSQ_IRP_CONTEXT) + { + PIO_CSQ_IRP_CONTEXT Context = (PIO_CSQ_IRP_CONTEXT)Csq; + Csq = Context->Csq; + + /* clean up context while we're here */ + Context->Irp = NULL; + } + + /* Now that we have our CSQ, complete the IRP */ + Csq->CsqAcquireLock(Csq, &Irql); + Csq->CsqRemoveIrp(Csq, Irp); + Csq->CsqReleaseLock(Csq, Irql); + + Csq->CsqCompleteCanceledIrp(Csq, Irp); +} + + +/*! + * @brief Set up a CSQ struct to initialize the queue + * + * @param Csq - Caller-allocated non-paged space for our IO_CSQ to be initialized + * @param CsqInsertIrp - Insert routine + * @param CsqRemoveIrp - Remove routine + * @param CsqPeekNextIrp - Routine to paeek at the next IRP in queue + * @param CsqAcquireLock - Acquire the queue's lock + * @param CsqReleaseLock - Release the queue's lock + * @param CsqCompleteCanceledIrp - Routine to complete IRPs when they are canceled + * + * @return * - STATUS_SUCCESS in all cases - * NOTES: + * + * @note * - Csq must be non-paged, as the queue is manipulated with a held spinlock */ -{ - Csq->Type = IO_TYPE_CSQ; - Csq->CsqInsertIrp = CsqInsertIrp; - Csq->CsqRemoveIrp = CsqRemoveIrp; - Csq->CsqPeekNextIrp = CsqPeekNextIrp; - Csq->CsqAcquireLock = CsqAcquireLock; - Csq->CsqReleaseLock = CsqReleaseLock; - Csq->CsqCompleteCanceledIrp = CsqCompleteCanceledIrp; - Csq->ReservePointer = NULL; - - return STATUS_SUCCESS; -} - - -NTSTATUS NTAPI IoCsqInitializeEx(PIO_CSQ Csq, - PIO_CSQ_INSERT_IRP_EX CsqInsertIrpEx, - PIO_CSQ_REMOVE_IRP CsqRemoveIrp, - PIO_CSQ_PEEK_NEXT_IRP CsqPeekNextIrp, - PIO_CSQ_ACQUIRE_LOCK CsqAcquireLock, - PIO_CSQ_RELEASE_LOCK CsqReleaseLock, - PIO_CSQ_COMPLETE_CANCELED_IRP CsqCompleteCanceledIrp) -/* - * FUNCTION: Set up a CSQ struct to initialize the queue (extended version) - * ARGUMENTS: - * Csq: Caller-allocated non-paged space for our IO_CSQ to be initialized - * CsqInsertIrpEx: Extended insert routine - * CsqRemoveIrp: Remove routine - * CsqPeekNextIrp: Routine to paeek at the next IRP in queue - * CsqAcquireLock: Acquire the queue's lock - * CsqReleaseLock: Release the queue's lock - * CsqCompleteCanceledIrp: Routine to complete IRPs when they are canceled - * RETURNS: +NTSTATUS +NTAPI +IoCsqInitialize( + _Out_ PIO_CSQ Csq, + _In_ PIO_CSQ_INSERT_IRP CsqInsertIrp, + _In_ PIO_CSQ_REMOVE_IRP CsqRemoveIrp, + _In_ PIO_CSQ_PEEK_NEXT_IRP CsqPeekNextIrp, + _In_ PIO_CSQ_ACQUIRE_LOCK CsqAcquireLock, + _In_ PIO_CSQ_RELEASE_LOCK CsqReleaseLock, + _In_ PIO_CSQ_COMPLETE_CANCELED_IRP CsqCompleteCanceledIrp) +{ + Csq->Type = IO_TYPE_CSQ; + Csq->CsqInsertIrp = CsqInsertIrp; + Csq->CsqRemoveIrp = CsqRemoveIrp; + Csq->CsqPeekNextIrp = CsqPeekNextIrp; + Csq->CsqAcquireLock = CsqAcquireLock; + Csq->CsqReleaseLock = CsqReleaseLock; + Csq->CsqCompleteCanceledIrp = CsqCompleteCanceledIrp; + Csq->ReservePointer = NULL; + + return STATUS_SUCCESS; +} + + +/*! + * @brief Set up a CSQ struct to initialize the queue (extended version) + * + * @param Csq - Caller-allocated non-paged space for our IO_CSQ to be initialized + * @param CsqInsertIrpEx - Extended insert routine + * @param CsqRemoveIrp - Remove routine + * @param CsqPeekNextIrp - Routine to paeek at the next IRP in queue + * @param CsqAcquireLock - Acquire the queue's lock + * @param CsqReleaseLock - Release the queue's lock + * @param CsqCompleteCanceledIrp - Routine to complete IRPs when they are canceled + * + * @return * - STATUS_SUCCESS in all cases - * NOTES: + * @note * - Csq must be non-paged, as the queue is manipulated with a held spinlock */ -{ - Csq->Type = IO_TYPE_CSQ_EX; - Csq->CsqInsertIrp = (PIO_CSQ_INSERT_IRP)CsqInsertIrpEx; - Csq->CsqRemoveIrp = CsqRemoveIrp; - Csq->CsqPeekNextIrp = CsqPeekNextIrp; - Csq->CsqAcquireLock = CsqAcquireLock; - Csq->CsqReleaseLock = CsqReleaseLock; - Csq->CsqCompleteCanceledIrp = CsqCompleteCanceledIrp; - Csq->ReservePointer = NULL; - - return STATUS_SUCCESS; -} - - -VOID NTAPI IoCsqInsertIrp(PIO_CSQ Csq, - PIRP Irp, - PIO_CSQ_IRP_CONTEXT Context) -/* - * FUNCTION: Insert an IRP into the CSQ - * ARGUMENTS: - * Csq: Pointer to the initialized CSQ - * Irp: Pointer to the IRP to queue - * Context: Context record to track the IRP while queued - * NOTES: +NTSTATUS +NTAPI +IoCsqInitializeEx( + _Out_ PIO_CSQ Csq, + _In_ PIO_CSQ_INSERT_IRP_EX CsqInsertIrpEx, + _In_ PIO_CSQ_REMOVE_IRP CsqRemoveIrp, + _In_ PIO_CSQ_PEEK_NEXT_IRP CsqPeekNextIrp, + _In_ PIO_CSQ_ACQUIRE_LOCK CsqAcquireLock, + _In_ PIO_CSQ_RELEASE_LOCK CsqReleaseLock, + _In_ PIO_CSQ_COMPLETE_CANCELED_IRP CsqCompleteCanceledIrp) +{ + Csq->Type = IO_TYPE_CSQ_EX; + Csq->CsqInsertIrp = (PIO_CSQ_INSERT_IRP)CsqInsertIrpEx; + Csq->CsqRemoveIrp = CsqRemoveIrp; + Csq->CsqPeekNextIrp = CsqPeekNextIrp; + Csq->CsqAcquireLock = CsqAcquireLock; + Csq->CsqReleaseLock = CsqReleaseLock; + Csq->CsqCompleteCanceledIrp = CsqCompleteCanceledIrp; + Csq->ReservePointer = NULL; + + return STATUS_SUCCESS; +} + + +/*! + * @brief Insert an IRP into the CSQ + * + * @param Csq - Pointer to the initialized CSQ + * @param Irp - Pointer to the IRP to queue + * @param Context - Context record to track the IRP while queued + * + * @return * - Just passes through to IoCsqInsertIrpEx, with no InsertContext */ -{ - IoCsqInsertIrpEx(Csq, Irp, Context, 0); -} - - -NTSTATUS NTAPI IoCsqInsertIrpEx(PIO_CSQ Csq, - PIRP Irp, - PIO_CSQ_IRP_CONTEXT Context, - PVOID InsertContext) -/* - * FUNCTION: Insert an IRP into the CSQ, with additional tracking context - * ARGUMENTS: - * Csq: Pointer to the initialized CSQ - * Irp: Pointer to the IRP to queue - * Context: Context record to track the IRP while queued - * InsertContext: additional data that is passed through to CsqInsertIrpEx - * NOTES: +VOID +NTAPI +IoCsqInsertIrp( + _Inout_ PIO_CSQ Csq, + _Inout_ PIRP Irp, + _Out_opt_ PIO_CSQ_IRP_CONTEXT Context) +{ + IoCsqInsertIrpEx(Csq, Irp, Context, 0); +} + + +/*! + * @brief Insert an IRP into the CSQ, with additional tracking context + * + * @param Csq - Pointer to the initialized CSQ + * @param Irp - Pointer to the IRP to queue + * @param Context - Context record to track the IRP while queued + * @param InsertContext - additional data that is passed through to CsqInsertIrpEx + * + * @note * - Passes the additional context through to the driver-supplied callback, * which can be used with more sophistocated queues * - Marks the IRP pending in all cases @@ -183,205 +200,222 @@ * I'm sure I have gotten the details wrong on a fine point or two, but * basically this works with the MS-supplied samples. */ -{ - NTSTATUS Retval = STATUS_SUCCESS; - KIRQL Irql; - - Csq->CsqAcquireLock(Csq, &Irql); - - do - { - /* mark all irps pending -- says so in the cancel sample */ - IoMarkIrpPending(Irp); - - /* set up the context if we have one */ - if(Context) - { - Context->Type = IO_TYPE_CSQ_IRP_CONTEXT; - Context->Irp = Irp; - Context->Csq = Csq; - Irp->Tail.Overlay.DriverContext[3] = Context; - } - else - Irp->Tail.Overlay.DriverContext[3] = Csq; - - /* - * NOTE! This is very sensitive to order. If you set the cancel routine - * *before* you queue the IRP, our cancel routine will get called back for - * an IRP that isn't in its queue. - * - * There are three possibilities: - * 1) We get an IRP, we queue it, and it is valid the whole way - * 2) We get an IRP, and the IO manager cancels it before we're done here - * 3) We get an IRP, queue it, and the IO manager cancels it. - * - * #2 is is a booger. - * - * When the IO manger receives a request to cancel an IRP, it sets the cancel - * bit in the IRP's control byte to TRUE. Then, it looks to see if a cancel - * routine is set. If it isn't, the IO manager just returns to the caller. - * If there *is* a routine, it gets called. - * - * If we test for cancel first and then set the cancel routine, there is a spot - * between test and set that the IO manager can cancel us without our knowledge, - * so we miss a cancel request. That is bad. - * - * If we set a routine first and then test for cancel, we race with our completion - * routine: We set the routine, the IO Manager sets cancel, we test cancel and find - * it is TRUE. Meanwhile the IO manager has called our cancel routine already, so - * we can't complete the IRP because it'll rip it out from under the cancel routine. - * - * The IO manager does us a favor though: it nulls out the cancel routine in the IRP - * before calling it. Therefore, if we test to see if the cancel routine is NULL - * (after we have just set it), that means our own cancel routine is already working - * on the IRP, and we can just return quietly. Otherwise, we have to de-queue the - * IRP and cancel it ourselves. - * - * We have to go through all of this mess because this API guarantees that we will - * never return having left a canceled IRP in the queue. - */ - - /* Step 1: Queue the IRP */ - if(Csq->Type == IO_TYPE_CSQ) - Csq->CsqInsertIrp(Csq, Irp); - else - { - PIO_CSQ_INSERT_IRP_EX pCsqInsertIrpEx = (PIO_CSQ_INSERT_IRP_EX)Csq->CsqInsertIrp; - Retval = pCsqInsertIrpEx(Csq, Irp, InsertContext); - if(Retval != STATUS_SUCCESS) - break; - } - - /* Step 2: Set our cancel routine */ - (void)IoSetCancelRoutine(Irp, IopCsqCancelRoutine); - - /* Step 3: Deal with an IRP that is already canceled */ - if(!Irp->Cancel) - break; - - /* - * Since we're canceled, see if our cancel routine is already running - * If this is NULL, the IO Manager has already called our cancel routine - */ - if(!IoSetCancelRoutine(Irp, NULL)) - break; - - /* OK, looks like we have to de-queue and complete this ourselves */ - Csq->CsqRemoveIrp(Csq, Irp); - Csq->CsqCompleteCanceledIrp(Csq, Irp); - - if(Context) - Context->Irp = NULL; - } - while(0); - - Csq->CsqReleaseLock(Csq, Irql); - - return Retval; -} - - -PIRP NTAPI IoCsqRemoveIrp(PIO_CSQ Csq, - PIO_CSQ_IRP_CONTEXT Context) -/* - * FUNCTION: Remove anb IRP from the queue - * ARGUMENTS: - * Csq: Queue to remove the IRP from - * Context: Context record containing the IRP to be dequeued - * RETURNS: +NTSTATUS +NTAPI +IoCsqInsertIrpEx( + _Inout_ PIO_CSQ Csq, + _Inout_ PIRP Irp, + _Out_opt_ PIO_CSQ_IRP_CONTEXT Context, + _In_opt_ PVOID InsertContext) +{ + NTSTATUS Retval = STATUS_SUCCESS; + KIRQL Irql; + + Csq->CsqAcquireLock(Csq, &Irql); + + do + { + /* mark all irps pending -- says so in the cancel sample */ + IoMarkIrpPending(Irp); + + /* set up the context if we have one */ + if(Context) + { + Context->Type = IO_TYPE_CSQ_IRP_CONTEXT; + Context->Irp = Irp; + Context->Csq = Csq; + Irp->Tail.Overlay.DriverContext[3] = Context; + } + else + Irp->Tail.Overlay.DriverContext[3] = Csq; + + /* + * NOTE! This is very sensitive to order. If you set the cancel routine + * *before* you queue the IRP, our cancel routine will get called back for + * an IRP that isn't in its queue. + * + * There are three possibilities: + * 1) We get an IRP, we queue it, and it is valid the whole way + * 2) We get an IRP, and the IO manager cancels it before we're done here + * 3) We get an IRP, queue it, and the IO manager cancels it. + * + * #2 is is a booger. + * + * When the IO manger receives a request to cancel an IRP, it sets the cancel + * bit in the IRP's control byte to TRUE. Then, it looks to see if a cancel + * routine is set. If it isn't, the IO manager just returns to the caller. + * If there *is* a routine, it gets called. + * + * If we test for cancel first and then set the cancel routine, there is a spot + * between test and set that the IO manager can cancel us without our knowledge, + * so we miss a cancel request. That is bad. + * + * If we set a routine first and then test for cancel, we race with our completion + * routine: We set the routine, the IO Manager sets cancel, we test cancel and find + * it is TRUE. Meanwhile the IO manager has called our cancel routine already, so + * we can't complete the IRP because it'll rip it out from under the cancel routine. + * + * The IO manager does us a favor though: it nulls out the cancel routine in the IRP + * before calling it. Therefore, if we test to see if the cancel routine is NULL + * (after we have just set it), that means our own cancel routine is already working + * on the IRP, and we can just return quietly. Otherwise, we have to de-queue the + * IRP and cancel it ourselves. + * + * We have to go through all of this mess because this API guarantees that we will + * never return having left a canceled IRP in the queue. + */ + + /* Step 1: Queue the IRP */ + if(Csq->Type == IO_TYPE_CSQ) + Csq->CsqInsertIrp(Csq, Irp); + else + { + PIO_CSQ_INSERT_IRP_EX pCsqInsertIrpEx = (PIO_CSQ_INSERT_IRP_EX)Csq->CsqInsertIrp; + Retval = pCsqInsertIrpEx(Csq, Irp, InsertContext); + if(Retval != STATUS_SUCCESS) + break; + } + + /* Step 2: Set our cancel routine */ + (void)IoSetCancelRoutine(Irp, IopCsqCancelRoutine); + + /* Step 3: Deal with an IRP that is already canceled */ + if(!Irp->Cancel) + break; + + /* + * Since we're canceled, see if our cancel routine is already running + * If this is NULL, the IO Manager has already called our cancel routine + */ + if(!IoSetCancelRoutine(Irp, NULL)) + break; + + /* OK, looks like we have to de-queue and complete this ourselves */ + Csq->CsqRemoveIrp(Csq, Irp); + Csq->CsqCompleteCanceledIrp(Csq, Irp); + + if(Context) + Context->Irp = NULL; + } + while(0); + + Csq->CsqReleaseLock(Csq, Irql); + + return Retval; +} + + +/*! + * @brief Remove anb IRP from the queue + * + * @param Csq - Queue to remove the IRP from + * @param Context - Context record containing the IRP to be dequeued + * + * @return * - Pointer to an IRP if we found it - * NOTES: + * + * @note * - Don't forget that we can be canceled any time up to the point * where we unset our cancel routine */ -{ - KIRQL Irql; - PIRP Irp = NULL; - - Csq->CsqAcquireLock(Csq, &Irql); - - do - { - /* It's possible that this IRP could have been canceled */ - Irp = Context->Irp; - - if(!Irp) - break; - - /* Unset the cancel routine and see if it has already been canceled */ - if(!IoSetCancelRoutine(Irp, NULL)) - { - /* - * already gone, return NULL --> NOTE that we cannot touch this IRP *or* the context, - * since the context is being simultaneously twiddled by the cancel routine - */ - Irp = NULL; - break; - } - - /* This IRP is valid and is ours. Dequeue it, fix it up, and return */ - Csq->CsqRemoveIrp(Csq, Irp); - - Context = (PIO_CSQ_IRP_CONTEXT)InterlockedExchangePointer(&Irp->Tail.Overlay.DriverContext[3], NULL); - - if(Context && Context->Type == IO_TYPE_CSQ_IRP_CONTEXT) - Context->Irp = NULL; - } - while(0); - - Csq->CsqReleaseLock(Csq, Irql); - - return Irp; -} - -PIRP NTAPI IoCsqRemoveNextIrp(PIO_CSQ Csq, - PVOID PeekContext) -/* - * FUNCTION: IoCsqRemoveNextIrp - Removes the next IRP from the queue - * ARGUMENTS: - * Csq: Queue to remove the IRP from - * PeekContext: Identifier of the IRP to be removed - * RETURNS: +PIRP +NTAPI +IoCsqRemoveIrp( + _Inout_ PIO_CSQ Csq, + _Inout_ PIO_CSQ_IRP_CONTEXT Context) +{ + KIRQL Irql; + PIRP Irp = NULL; + + Csq->CsqAcquireLock(Csq, &Irql); + + do + { + /* It's possible that this IRP could have been canceled */ + Irp = Context->Irp; + + if(!Irp) + break; + + /* Unset the cancel routine and see if it has already been canceled */ + if(!IoSetCancelRoutine(Irp, NULL)) + { + /* + * already gone, return NULL --> NOTE that we cannot touch this IRP *or* the context, + * since the context is being simultaneously twiddled by the cancel routine + */ + Irp = NULL; + break; + } + + /* This IRP is valid and is ours. Dequeue it, fix it up, and return */ + Csq->CsqRemoveIrp(Csq, Irp); + + Context = (PIO_CSQ_IRP_CONTEXT)InterlockedExchangePointer(&Irp->Tail.Overlay.DriverContext[3], NULL); + + if(Context && Context->Type == IO_TYPE_CSQ_IRP_CONTEXT) + Context->Irp = NULL; + } + while(0); + + Csq->CsqReleaseLock(Csq, Irql); + + return Irp; +} + +/*! + * @brief IoCsqRemoveNextIrp - Removes the next IRP from the queue + * + * @param Csq - Queue to remove the IRP from + * @param PeekContext - Identifier of the IRP to be removed + * + * @return * Pointer to the IRP that was removed, or NULL if one * could not be found - * NOTES: + * + * @note * - This function is sensitive to yet another race condition. * The basic idea is that we have to return the first IRP that * we get that matches the PeekContext >that is not already canceled<. * Therefore, we have to do a trick similar to the one done in Insert * above. */ -{ - KIRQL Irql; - PIRP Irp = NULL; - PIO_CSQ_IRP_CONTEXT Context; - - Csq->CsqAcquireLock(Csq, &Irql); - - while((Irp = Csq->CsqPeekNextIrp(Csq, Irp, PeekContext))) - { - /* - * If the cancel routine is gone, we're already canceled, - * and are spinning on the queue lock in our own cancel - * routine. Move on to the next candidate. It'll get - * removed by the cance routine. - */ - if(!IoSetCancelRoutine(Irp, NULL)) - continue; - - Csq->CsqRemoveIrp(Csq, Irp); - - /* Unset the context stuff and return */ - Context = (PIO_CSQ_IRP_CONTEXT)InterlockedExchangePointer(&Irp->Tail.Overlay.DriverContext[3], NULL); - - if(Context && Context->Type == IO_TYPE_CSQ_IRP_CONTEXT) - Context->Irp = NULL; - - break; - } - - Csq->CsqReleaseLock(Csq, Irql); - - return Irp; -} - +PIRP +NTAPI +IoCsqRemoveNextIrp( + _Inout_ PIO_CSQ Csq, + _In_opt_ PVOID PeekContext) +{ + KIRQL Irql; + PIRP Irp = NULL; + PIO_CSQ_IRP_CONTEXT Context; + + Csq->CsqAcquireLock(Csq, &Irql); + + while((Irp = Csq->CsqPeekNextIrp(Csq, Irp, PeekContext))) + { + /* + * If the cancel routine is gone, we're already canceled, + * and are spinning on the queue lock in our own cancel + * routine. Move on to the next candidate. It'll get + * removed by the cance routine. + */ + if(!IoSetCancelRoutine(Irp, NULL)) + continue; + + Csq->CsqRemoveIrp(Csq, Irp); + + /* Unset the context stuff and return */ + Context = (PIO_CSQ_IRP_CONTEXT)InterlockedExchangePointer(&Irp->Tail.Overlay.DriverContext[3], NULL); + + if(Context && Context->Type == IO_TYPE_CSQ_IRP_CONTEXT) + Context->Irp = NULL; + + break; + } + + Csq->CsqReleaseLock(Csq, Irql); + + return Irp; +} +

1 0

[tkreuzer] 57952: [WIN32K] Fix a bug caused by r57948
by tkreuzer＠svn.reactos.org 19 Dec '12

19 Dec '12

Author: tkreuzer Date: Wed Dec 19 22:01:54 2012 New Revision: 57952 URL: http://svn.reactos.org/svn/reactos?rev=57952&view=rev Log: [WIN32K] Fix a bug caused by r57948 Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Wed Dec 19 22:01:54 2012 @@ -3996,7 +3996,7 @@ _In_ ULONG cjBuffer, _Out_opt_bytecap_(cjBuffer) LPRGNDATA lpRgnData) { - ULONG cjSize; + ULONG cjRects, cjSize; PREGION prgn; /* Lock the region */ @@ -4007,8 +4007,9 @@ return 0; } - /* Calculate the region size */ - cjSize = prgn->rdh.nCount * sizeof(RECT) + sizeof(RGNDATAHEADER); + /* Calculate the region sizes */ + cjRects = prgn->rdh.nCount * sizeof(RECT); + cjSize = cjRects + sizeof(RGNDATAHEADER); /* Check if region data is requested */ if (lpRgnData) @@ -4021,7 +4022,7 @@ { ProbeForWrite(lpRgnData, cjSize, sizeof(ULONG)); RtlCopyMemory(lpRgnData, &prgn->rdh, sizeof(RGNDATAHEADER)); - RtlCopyMemory(lpRgnData->Buffer, prgn->Buffer, cjSize); + RtlCopyMemory(lpRgnData->Buffer, prgn->Buffer, cjRects); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

1 0

[tkreuzer] 57951: [NTOSKRNL] Formatting, no functional change
by tkreuzer＠svn.reactos.org 19 Dec '12

19 Dec '12

Author: tkreuzer Date: Wed Dec 19 11:11:34 2012 New Revision: 57951 URL: http://svn.reactos.org/svn/reactos?rev=57951&view=rev Log: [NTOSKRNL] Formatting, no functional change Modified: trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/cc/mdl.c trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/cc/view.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=579… Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=57951… Modified: trunk/reactos/ntoskrnl/cc/mdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/mdl.c?rev=5795… Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=5795… Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=579…

1 0

[hbelusca] 57950: We display a revision number (prefix: 'r')
by hbelusca＠svn.reactos.org 19 Dec '12

19 Dec '12

Author: hbelusca Date: Wed Dec 19 01:08:47 2012 New Revision: 57950 URL: http://svn.reactos.org/svn/reactos?rev=57950&view=rev Log: We display a revision number (prefix: 'r') Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=579… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Wed Dec 19 01:08:47 2012 @@ -1221,7 +1221,7 @@ /* Add the version format string */ Status = RtlStringCbPrintfA(RcEnd, Remaining, - "v. %u", + "r%u", (CmNtCSDVersion & 0xFFFF0000) >> 16); if (!NT_SUCCESS(Status)) {

1 0

[hbelusca] 57949: [REGEDIT] Add support of sorting by value. Patch by Katayama Hirofumi. CORE-4885 #resolve #comment Committed in r57949. Thanks!
by hbelusca＠svn.reactos.org 18 Dec '12

18 Dec '12

Author: hbelusca Date: Tue Dec 18 23:52:08 2012 New Revision: 57949 URL: http://svn.reactos.org/svn/reactos?rev=57949&view=rev Log: [REGEDIT] Add support of sorting by value. Patch by Katayama Hirofumi. CORE-4885 #resolve #comment Committed in r57949. Thanks! Modified: trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/listview.c Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Tue Dec 18 23:52:08 2012 @@ -288,20 +288,21 @@ return TRUE; } +#define LOADHIVE_KEYNAMELENGTH 128 + static INT_PTR CALLBACK LoadHive_KeyNameInHookProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { static LPWSTR sKey = NULL; - static INT sLength = 0; switch(uMsg) { case WM_INITDIALOG: sKey = (LPWSTR)lParam; - sLength = 128; /* FIXME: Ugly hack! */ + break; case WM_COMMAND: switch(LOWORD(wParam)) { case IDOK: - if(GetDlgItemTextW(hWndDlg, IDC_EDIT_KEY, sKey, sLength)) + if(GetDlgItemTextW(hWndDlg, IDC_EDIT_KEY, sKey, LOADHIVE_KEYNAMELENGTH)) return EndDialog(hWndDlg, -1); else return EndDialog(hWndDlg, 0); @@ -348,7 +349,7 @@ OPENFILENAME ofn; WCHAR Caption[128]; LPCWSTR pszKeyPath; - WCHAR xPath[128]; + WCHAR xPath[LOADHIVE_KEYNAMELENGTH]; HKEY hRootKey; WCHAR Filter[1024]; FILTERPAIR filter; @@ -369,7 +370,8 @@ /* now load the hive */ if (GetOpenFileName(&ofn)) { - if(DialogBoxParamW(hInst, MAKEINTRESOURCEW(IDD_LOADHIVE), hWnd, &LoadHive_KeyNameInHookProc, (LPARAM)xPath)) + if (DialogBoxParamW(hInst, MAKEINTRESOURCEW(IDD_LOADHIVE), hWnd, + &LoadHive_KeyNameInHookProc, (LPARAM)xPath)) { LONG regLoadResult; Modified: trunk/reactos/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] Tue Dec 18 23:52:08 2012 @@ -127,9 +127,10 @@ linfo = (PLINE_INFO)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LINE_INFO) + dwCount); linfo->dwValType = dwValType; linfo->val_len = dwCount; - if(dwCount > 0) + if (dwCount > 0) { memcpy(&linfo[1], ValBuf, dwCount); + linfo->val = &linfo[1]; } linfo->name = _wcsdup(Name); @@ -373,7 +374,9 @@ static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) { - LINE_INFO*l, *r; + LINE_INFO *l, *r; + DWORD dw1, dw2; + DWORDLONG qw1, qw2; UNREFERENCED_PARAMETER(lParamSort); l = (LINE_INFO*)lParam1; @@ -383,12 +386,94 @@ g_columnToSort = 0; if (g_columnToSort == 1 && l->dwValType != r->dwValType) - return g_invertSort ? (int)r->dwValType - (int)l->dwValType : (int)l->dwValType - (int)r->dwValType; + { + /* Sort by type */ + + if (g_invertSort) + return ((int)r->dwValType - (int)l->dwValType); + else + return ((int)l->dwValType - (int)r->dwValType); + } if (g_columnToSort == 2) { - /* FIXME: Sort on value */ - } - return g_invertSort ? wcsicmp(r->name, l->name) : wcsicmp(l->name, r->name); + /* Sort by value */ + + if (l->dwValType != r->dwValType) + { + if (g_invertSort) + return ((int)r->dwValType - (int)l->dwValType); + else + return ((int)l->dwValType - (int)r->dwValType); + } + + if (r->val == NULL && l->val == NULL) + return 0; + + if (g_invertSort) + { + if (r->val == NULL) + return -1; + if (l->val == NULL) + return 1; + } + else + { + if (r->val == NULL) + return 1; + if (l->val == NULL) + return -1; + } + + switch(l->dwValType) + { + case REG_DWORD: + { + dw1 = *(DWORD*)l->val; + dw2 = *(DWORD*)r->val; + if (g_invertSort) + // return (dw1 > dw2 ? -1 : 1); + return ((int)dw2 - (int)dw1); + else + // return (dw1 > dw2 ? 1 : -1); + return ((int)dw1 - (int)dw2); + } + + case REG_QWORD: + { + qw1 = *(DWORDLONG*)l->val; + qw2 = *(DWORDLONG*)r->val; + if (g_invertSort) + // return (qw1 > qw2 ? -1 : 1); + return ((int)qw2 - (int)qw1); + else + // return (qw1 > qw2 ? 1 : -1); + return ((int)qw1 - (int)qw2); + } + + default: + { + INT nCompare = 0; + + if (g_invertSort) + { + nCompare = memcmp(r->val, l->val, min(r->val_len, l->val_len)); + if (nCompare == 0) + nCompare = r->val_len - l->val_len; + } + else + { + nCompare = memcmp(l->val, r->val, min(l->val_len, r->val_len)); + if (nCompare == 0) + nCompare = l->val_len - r->val_len; + } + + return nCompare; + } + } + } + + /* Sort by name */ + return (g_invertSort ? wcsicmp(r->name, l->name) : wcsicmp(l->name, r->name)); } BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result)

1 0

[tkreuzer] 57948: [WIN32K] - Add/improve some annotations - Improve code in EngpGetPDEV and NtGdiGetRegionData - Simplify SEH exception handling - Fix possible NULL pointer dereferences - Fix wrong...
by tkreuzer＠svn.reactos.org 18 Dec '12

18 Dec '12

Author: tkreuzer Date: Tue Dec 18 21:44:58 2012 New Revision: 57948 URL: http://svn.reactos.org/svn/reactos?rev=57948&view=rev Log: [WIN32K] - Add/improve some annotations - Improve code in EngpGetPDEV and NtGdiGetRegionData - Simplify SEH exception handling - Fix possible NULL pointer dereferences - Fix wrong variable usage in UnpackParam - Fix a possible bufer overrun - Check return value of ExAllocatePool and RtlCreateUnicodeString - Fix & vs && typo All detected with VS11 analyse Modified: trunk/reactos/include/psdk/ntgdi.h trunk/reactos/win32ss/gdi/eng/pdevobj.c trunk/reactos/win32ss/gdi/eng/pdevobj.h trunk/reactos/win32ss/gdi/eng/xlateobj.c trunk/reactos/win32ss/gdi/eng/xlateobj.h trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c trunk/reactos/win32ss/gdi/ntgdi/coord.c trunk/reactos/win32ss/gdi/ntgdi/dibobj.c trunk/reactos/win32ss/gdi/ntgdi/region.c trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/class.h trunk/reactos/win32ss/user/ntuser/cursoricon.c trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/focus.c trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/kbdlayout.c trunk/reactos/win32ss/user/ntuser/keyboard.c trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/menu.h trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/monitor.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/msgqueue.h trunk/reactos/win32ss/user/ntuser/scrollbar.c trunk/reactos/win32ss/user/ntuser/sysparams.c trunk/reactos/win32ss/user/ntuser/sysparams.h trunk/reactos/win32ss/user/ntuser/timer.c trunk/reactos/win32ss/user/ntuser/windc.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -1996,6 +1996,7 @@ OUT DWORD *Result ); +_Success_(return!=FALSE) W32KAPI BOOL APIENTRY @@ -2046,6 +2047,7 @@ _In_ INT cxVirtualDevice, _In_ INT cyVirtualDevice); +_Success_(return !=FALSE) W32KAPI BOOL APIENTRY @@ -2508,6 +2510,7 @@ _In_ INT cx, _In_ INT cy); +_Success_(return!=ERROR) W32KAPI INT APIENTRY @@ -2523,6 +2526,7 @@ IN OUT LPRECT prcl ); +_Success_(return!=0) W32KAPI DWORD APIENTRY @@ -2559,13 +2563,14 @@ _In_ HDC hdc, _In_ UINT ui); -W32KAPI -DWORD +_Success_(return!=0) +W32KAPI +ULONG APIENTRY NtGdiGetRegionData( _In_ HRGN hrgn, - _In_ DWORD nCount, - _Out_opt_ LPRGNDATA lpRgnData); + _In_ ULONG cjBuffer, + _Out_opt_bytecap_(cjBuffer) LPRGNDATA lpRgnData); W32KAPI BOOL Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/pdevobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -472,7 +472,7 @@ PPDEVOBJ NTAPI EngpGetPDEV( - _In_ PUNICODE_STRING pustrDeviceName) + _In_opt_ PUNICODE_STRING pustrDeviceName) { UNICODE_STRING ustrCurrent; PPDEVOBJ ppdev; @@ -481,37 +481,39 @@ /* Acquire PDEV lock */ EngAcquireSemaphore(ghsemPDEV); - /* If no device name is given, ... */ - if (!pustrDeviceName && gppdevPrimary) - { - /* ... use the primary PDEV */ + /* Did the caller pass a device name? */ + if (pustrDeviceName) + { + /* Loop all present PDEVs */ + for (ppdev = gppdevList; ppdev; ppdev = ppdev->ppdevNext) + { + /* Get a pointer to the GRAPHICS_DEVICE */ + pGraphicsDevice = ppdev->pGraphicsDevice; + + /* Compare the name */ + RtlInitUnicodeString(&ustrCurrent, pGraphicsDevice->szWinDeviceName); + if (RtlEqualUnicodeString(pustrDeviceName, &ustrCurrent, FALSE)) + { + /* Found! */ + break; + } + } + } + else + { + /* Otherwise use the primary PDEV */ ppdev = gppdevPrimary; - - /* Reference the pdev */ + } + + /* Did we find one? */ + if (ppdev) + { + /* Yes, reference the PDEV */ InterlockedIncrement(&ppdev->cPdevRefs); - goto leave; - } - - /* Loop all present PDEVs */ - for (ppdev = gppdevList; ppdev; ppdev = ppdev->ppdevNext) - { - /* Get a pointer to the GRAPHICS_DEVICE */ - pGraphicsDevice = ppdev->pGraphicsDevice; - - /* Compare the name */ - RtlInitUnicodeString(&ustrCurrent, pGraphicsDevice->szWinDeviceName); - if (RtlEqualUnicodeString(pustrDeviceName, &ustrCurrent, FALSE)) - { - /* Found! Reference the PDEV */ - InterlockedIncrement(&ppdev->cPdevRefs); - break; - } - } - - /* Did we find one? */ - if (!ppdev) - { - /* No, create a new PDEV */ + } + else + { + /* No, create a new PDEV for the given device */ ppdev = EngpCreatePDEV(pustrDeviceName, NULL); if (ppdev) { @@ -528,7 +530,6 @@ } } -leave: /* Release PDEV lock */ EngReleaseSemaphore(ghsemPDEV); Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/pdevobj.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/pdevobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/pdevobj.h [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -161,7 +161,7 @@ PPDEVOBJ NTAPI EngpGetPDEV( - _In_ PUNICODE_STRING pustrDevice); + _In_opt_ PUNICODE_STRING pustrDevice); VOID NTAPI @@ -188,6 +188,6 @@ FASTCALL PDEVOBJ_sizl( _In_ PPDEVOBJ ppdev, - _In_ PSIZEL psizl); + _Out_ PSIZEL psizl); #endif /* !__WIN32K_PDEVOBJ_H */ Modified: trunk/reactos/win32ss/gdi/eng/xlateobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/xlateobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/xlateobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/xlateobj.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -11,6 +11,13 @@ #define NDEBUG #include <debug.h> +_Always_(_Post_satisfies_(return==iColor)) +_Function_class_(FN_XLATE) +ULONG +FASTCALL +EXLATEOBJ_iXlateTrivial( + _In_ PEXLATEOBJ pexlo, + _In_ ULONG iColor); /** Globals *******************************************************************/ @@ -31,6 +38,8 @@ /** iXlate functions **********************************************************/ +_Always_(_Post_satisfies_(return==iColor)) +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlateTrivial(PEXLATEOBJ pexlo, ULONG iColor) @@ -38,6 +47,7 @@ return iColor; } +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlateToMono(PEXLATEOBJ pexlo, ULONG iColor) @@ -45,6 +55,7 @@ return (iColor == pexlo->xlo.pulXlate[0]); } +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlateTable(PEXLATEOBJ pexlo, ULONG iColor) @@ -53,6 +64,7 @@ return pexlo->xlo.pulXlate[iColor]; } +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlateRGBtoBGR(PEXLATEOBJ pxlo, ULONG iColor) @@ -72,6 +84,7 @@ return iNewColor; } +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlateRGBto555(PEXLATEOBJ pxlo, ULONG iColor) @@ -93,6 +106,7 @@ return iNewColor; } +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlateBGRto555(PEXLATEOBJ pxlo, ULONG iColor) @@ -114,6 +128,7 @@ return iNewColor; } +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlateRGBto565(PEXLATEOBJ pxlo, ULONG iColor) @@ -135,6 +150,7 @@ return iNewColor; } +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlateBGRto565(PEXLATEOBJ pxlo, ULONG iColor) @@ -156,6 +172,7 @@ return iNewColor; } +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlateRGBtoPal(PEXLATEOBJ pexlo, ULONG iColor) @@ -163,6 +180,7 @@ return PALETTE_ulGetNearestPaletteIndex(pexlo->ppalDst, iColor); } +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlate555toRGB(PEXLATEOBJ pxlo, ULONG iColor) @@ -183,6 +201,7 @@ return iNewColor; } +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlate555toBGR(PEXLATEOBJ pxlo, ULONG iColor) @@ -203,6 +222,7 @@ return iNewColor; } +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlate555to565(PEXLATEOBJ pxlo, ULONG iColor) @@ -223,6 +243,7 @@ return iNewColor; } +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlate555toPal(PEXLATEOBJ pexlo, ULONG iColor) @@ -232,6 +253,7 @@ return PALETTE_ulGetNearestPaletteIndex(pexlo->ppalDst, iColor); } +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlate565to555(PEXLATEOBJ pxlo, ULONG iColor) @@ -248,6 +270,7 @@ return iNewColor; } +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlate565toRGB(PEXLATEOBJ pexlo, ULONG iColor) @@ -268,6 +291,7 @@ return iNewColor; } +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlate565toBGR(PEXLATEOBJ pexlo, ULONG iColor) @@ -288,6 +312,7 @@ return iNewColor; } +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlate565toPal(EXLATEOBJ *pexlo, ULONG iColor) @@ -297,6 +322,7 @@ return PALETTE_ulGetNearestPaletteIndex(pexlo->ppalDst, iColor); } +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlateShiftAndMask(PEXLATEOBJ pexlo, ULONG iColor) @@ -310,6 +336,7 @@ return iNewColor; } +_Function_class_(FN_XLATE) ULONG FASTCALL EXLATEOBJ_iXlateBitfieldsToPal(PEXLATEOBJ pexlo, ULONG iColor) Modified: trunk/reactos/win32ss/gdi/eng/xlateobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/xlateobj.h… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/xlateobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/xlateobj.h [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -11,7 +11,7 @@ _Function_class_(FN_XLATE) typedef -ULONG +ULONG (FASTCALL *PFN_XLATE)( _In_ struct _EXLATEOBJ *pexlo, _In_ ULONG iColor); @@ -84,10 +84,3 @@ EXLATEOBJ_vCleanup( _Inout_ PEXLATEOBJ pexlo); -_Always_(_Post_satisfies_(return==iColor)) -ULONG -FASTCALL -EXLATEOBJ_iXlateTrivial( - _In_ PEXLATEOBJ pexlo, - _In_ ULONG iColor); - Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/cliprgn.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -555,6 +555,11 @@ pDC->prgnRao = IntSysCreateRectpRgn(0,0,0,0); } + if (!pDC->prgnRao) + { + return ERROR; + } + if (pDC->dclevel.prgnMeta && pDC->dclevel.prgnClip) { IntGdiCombineRgn( pDC->prgnAPI, @@ -585,7 +590,6 @@ pDC->prgnAPI, RGN_AND); - // FIXME: pDC->prgnRao may be NULL RtlCopyMemory(&pDC->erclClip, &pDC->prgnRao->rdh.rcBound, sizeof(RECTL)); @@ -599,8 +603,8 @@ // With pDC->co.pClipRgn->Buffer, // pDC->co.pClipRgn = pDC->prgnRao ? pDC->prgnRao : pDC->prgnVis; - co = IntEngCreateClipRegion( ((PROSRGNDATA)pDC->prgnRao)->rdh.nCount, - ((PROSRGNDATA)pDC->prgnRao)->Buffer, + co = IntEngCreateClipRegion(pDC->prgnRao->rdh.nCount, + pDC->prgnRao->Buffer, &pDC->erclClip); if (co) { Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/coord.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -430,6 +430,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Do not set last error */ + ret = 0; } _SEH2_END; @@ -1232,7 +1233,6 @@ POINTL SafePoint; SIZE Size; PSIZEL pszlViewportExt; - NTSTATUS Status = STATUS_SUCCESS; if (!Point) { @@ -1293,15 +1293,9 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + Ret = FALSE; } _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - Ret = FALSE; - } } DC_UnlockDc(pdc); Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -867,7 +867,7 @@ } psurfDest = SURFACE_ShareLockSurface(hBmpDest); - + RECTL_vSetRect(&rcDest, 0, 0, ScanLines, psurf->SurfObj.sizlBitmap.cx); srcPoint.x = 0; @@ -1014,7 +1014,7 @@ _SEH2_TRY { /* Copy the data back */ - ProbeForWrite(pbmiUser, cjMaxInfo, 1); + ProbeForWrite(pbmiUser, cjMaxInfo, 1); RtlCopyMemory(pbmiUser, pbmi, cjMaxInfo); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -1646,7 +1646,7 @@ GreDeleteObject(res); res = 0; } - + if(ppalDIB) { PALETTE_ShareUnlockPalette(ppalDIB); @@ -1862,23 +1862,23 @@ BITMAPCOREINFO* pbmci; if(converted == orig) return; - + if(usage == -1) { /* Caller don't want any conversion */ ExFreePoolWithTag(converted, TAG_DIB); return; } - + /* Perform inverse conversion */ pbmci = (BITMAPCOREINFO*)orig; - + ASSERT(pbmci->bmciHeader.bcSize == sizeof(BITMAPCOREHEADER)); pbmci->bmciHeader.bcBitCount = converted->bmiHeader.biBitCount; pbmci->bmciHeader.bcWidth = converted->bmiHeader.biWidth; pbmci->bmciHeader.bcHeight = converted->bmiHeader.biHeight; pbmci->bmciHeader.bcPlanes = converted->bmiHeader.biPlanes; - + if(pbmci->bmciHeader.bcBitCount <= 8) { UINT numColors = converted->bmiHeader.biClrUsed; Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -3988,51 +3988,59 @@ * * If the function fails, the return value is zero." */ -DWORD APIENTRY +_Success_(return!=0) +ULONG +APIENTRY NtGdiGetRegionData( - HRGN hrgn, - DWORD count, - LPRGNDATA rgndata -) -{ - DWORD size; - PROSRGNDATA obj = RGNOBJAPI_Lock(hrgn, NULL); - NTSTATUS Status = STATUS_SUCCESS; - - if (!obj) + _In_ HRGN hrgn, + _In_ ULONG cjBuffer, + _Out_opt_bytecap_(cjBuffer) LPRGNDATA lpRgnData) +{ + ULONG cjSize; + PREGION prgn; + + /* Lock the region */ + prgn = RGNOBJAPI_Lock(hrgn, NULL); + if (!prgn) + { + EngSetLastError(ERROR_INVALID_HANDLE); return 0; - - size = obj->rdh.nCount * sizeof(RECT); - if (count < (size + sizeof(RGNDATAHEADER)) || rgndata == NULL) - { - RGNOBJAPI_Unlock(obj); - if (rgndata) /* Buffer is too small, signal it by return 0 */ - return 0; - else /* User requested buffer size with rgndata NULL */ - return size + sizeof(RGNDATAHEADER); - } - - _SEH2_TRY - { - ProbeForWrite(rgndata, count, 1); - RtlCopyMemory(rgndata, &obj->rdh, sizeof(RGNDATAHEADER)); - RtlCopyMemory(rgndata->Buffer, obj->Buffer, size); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RGNOBJAPI_Unlock(obj); - return 0; - } - - RGNOBJAPI_Unlock(obj); - return size + sizeof(RGNDATAHEADER); + } + + /* Calculate the region size */ + cjSize = prgn->rdh.nCount * sizeof(RECT) + sizeof(RGNDATAHEADER); + + /* Check if region data is requested */ + if (lpRgnData) + { + /* Check if the buffer is large enough */ + if (cjBuffer >= cjSize) + { + /* Probe the buffer and copy the data */ + _SEH2_TRY + { + ProbeForWrite(lpRgnData, cjSize, sizeof(ULONG)); + RtlCopyMemory(lpRgnData, &prgn->rdh, sizeof(RGNDATAHEADER)); + RtlCopyMemory(lpRgnData->Buffer, prgn->Buffer, cjSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + cjSize = 0; + } + _SEH2_END; + } + else + { + /* Buffer is too small */ + EngSetLastError(ERROR_INVALID_PARAMETER); + cjSize = 0; + } + } + + /* Unlock the region and return the size */ + RGNOBJAPI_Unlock(prgn); + return cjSize; } /* EOF */ Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -2024,13 +2024,14 @@ DWORD idThread, LPGUITHREADINFO lpgui); +_Success_(return!=FALSE) BOOL NTAPI NtUserGetIconInfo( _In_ HANDLE hCurIcon, _Out_opt_ PICONINFO IconInfo, - _Out_opt_ PUNICODE_STRING lpInstName, - _Out_opt_ PUNICODE_STRING lpResName, + _Inout_opt_ PUNICODE_STRING lpInstName, + _Inout_opt_ PUNICODE_STRING lpResName, _Out_opt_ LPDWORD pbpp, _In_ BOOL bInternal); @@ -2782,7 +2783,7 @@ LONG cx; LONG cy; } FINDEXISTINGCURICONPARAM; - + HICON NTAPI NtUserFindExistingCursorIcon( @@ -2799,7 +2800,7 @@ HMODULE hModule, HRSRC hRsrc, HRSRC hGroupRsrc); - + HICON NTAPI NtUserFindExistingCursorIcon( Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -125,7 +125,7 @@ NTSTATUS NTAPI ProbeAndCaptureUnicodeStringOrAtom( - _Out_ PUNICODE_STRING pustrOut, + _Out_ _When_(return>=0, _At_(pustrOut->Buffer, _Post_ _Notnull_)) PUNICODE_STRING pustrOut, __in_data_source(USER_MODE) _In_ PUNICODE_STRING pustrUnsafe) { NTSTATUS Status = STATUS_SUCCESS; Modified: trunk/reactos/win32ss/user/ntuser/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.h [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -63,7 +63,7 @@ NTSTATUS NTAPI ProbeAndCaptureUnicodeStringOrAtom( - _Out_ PUNICODE_STRING pustrOut, + _Out_ _When_(return>=0, _At_(pustrOut->Buffer, _Post_ _Notnull_)) PUNICODE_STRING pustrOut, __in_data_source(USER_MODE) _In_ PUNICODE_STRING pustrUnsafe); /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -240,7 +240,7 @@ HBITMAP bmpMask, bmpColor; BOOLEAN Ret, bListEmpty, bFound = FALSE; PCURICON_PROCESS Current = NULL; - + /* For handles created without any data (error handling) */ if(IsListEmpty(&CurIcon->ProcessList)) goto emptyList; @@ -256,7 +256,7 @@ break; } } - + if(!bFound) { /* This object doesn't belong to this process */ @@ -385,6 +385,18 @@ { ProbeForWrite(IconInfo, sizeof(ICONINFO), 1); RtlCopyMemory(IconInfo, &ii, sizeof(ICONINFO)); + + /// @todo Implement support for lpInstName + if (lpInstName) + { + RtlInitEmptyUnicodeString(lpInstName, NULL, 0); + } + + /// @todo Implement support for lpResName + if (lpResName) + { + RtlInitEmptyUnicodeString(lpResName, NULL, 0); + } if (pbpp) { @@ -1049,7 +1061,7 @@ RECTL rcDest, rcSrc; CLIPOBJ* pdcClipObj = NULL; EXLATEOBJ exlo; - + /* Stupid case */ if((diFlags & DI_NORMAL) == 0) { @@ -1059,12 +1071,12 @@ hbmMask = pIcon->IconInfo.hbmMask; hbmColor = pIcon->IconInfo.hbmColor; - + if (istepIfAniCur) ERR("NtUserDrawIconEx: istepIfAniCur is not supported!\n"); - + /* - * Get our objects. + * Get our objects. * Shared locks are enough, we are only reading those bitmaps */ psurfMask = SURFACE_ShareLockSurface(hbmMask); @@ -1073,7 +1085,7 @@ ERR("Unable to lock the mask surface.\n"); return FALSE; } - + /* Color bitmap is not mandatory */ if(hbmColor == NULL) { @@ -1087,7 +1099,7 @@ SURFACE_ShareUnlockSurface(psurfMask); return FALSE; } - + /* Set source rect */ RECTL_vSetRect(&rcSrc, 0, 0, pIcon->Size.cx, pIcon->Size.cy); @@ -1119,17 +1131,17 @@ if (!cxWidth) { if(diFlags & DI_DEFAULTSIZE) - cxWidth = pIcon->IconInfo.fIcon ? + cxWidth = pIcon->IconInfo.fIcon ? UserGetSystemMetrics(SM_CXICON) : UserGetSystemMetrics(SM_CXCURSOR); else cxWidth = pIcon->Size.cx; } - + /* Fix height parameter, if needed */ if (!cyHeight) { if(diFlags & DI_DEFAULTSIZE) - cyHeight = pIcon->IconInfo.fIcon ? + cyHeight = pIcon->IconInfo.fIcon ? UserGetSystemMetrics(SM_CYICON) : UserGetSystemMetrics(SM_CYCURSOR); else cyHeight = pIcon->Size.cy; @@ -1143,9 +1155,9 @@ /* Yes: Allocate and paint the offscreen surface */ EBRUSHOBJ eboFill; PBRUSH pbrush = BRUSH_ShareLockBrush(hbrFlickerFreeDraw); - + TRACE("Performing off-screen rendering.\n"); - + if(!pbrush) { ERR("Failed to get brush object.\n"); @@ -1171,11 +1183,11 @@ BRUSH_ShareUnlockBrush(pbrush); return FALSE; } - + /* Paint the brush */ EBRUSHOBJ_vInit(&eboFill, pbrush, psurfOffScreen, 0x00FFFFFF, 0, NULL); RECTL_vSetRect(&rcDest, 0, 0, cxWidth, cyHeight); - + Ret = IntEngBitBlt(&psurfOffScreen->SurfObj, NULL, NULL, @@ -1191,7 +1203,7 @@ /* Clean up everything */ EBRUSHOBJ_vCleanup(&eboFill); BRUSH_ShareUnlockBrush(pbrush); - + if(!Ret) { ERR("Failed to paint the off-screen surface.\n"); @@ -1200,7 +1212,7 @@ GDIOBJ_vDeleteObject(&psurfOffScreen->BaseObject); return FALSE; } - + /* We now have our destination surface */ psurfDest = psurfOffScreen; } @@ -1208,7 +1220,7 @@ { /* We directly draw to the DC */ TRACE("Performing on screen rendering.\n"); - + psurfOffScreen = NULL; pdc = DC_LockDc(hDc); if(!pdc) @@ -1222,16 +1234,16 @@ RECTL_vSetRect(&rcDest, xLeft, yTop, xLeft + cxWidth, yTop + cyHeight); IntLPtoDP(pdc, (LPPOINT)&rcDest, 2); RECTL_vOffsetRect(&rcDest, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y); - + /* Prepare the underlying surface */ DC_vPrepareDCsForBlit(pdc, rcDest, NULL, rcDest); - + /* Get the clip object */ pdcClipObj = pdc->rosdc.CombinedClip; - + /* We now have our destination surface and rectangle */ psurfDest = pdc->dclevel.pSurface; - + if(psurfDest == NULL) { /* Empty DC */ @@ -1281,10 +1293,10 @@ ptr += 4; } } - + /* Initialize color translation object */ EXLATEOBJ_vInitialize(&exlo, psurf->ppal, psurfDest->ppal, 0xFFFFFFFF, 0xFFFFFFFF, 0); - + /* Now do it */ Ret = IntEngAlphaBlend(&psurfDest->SurfObj, &psurf->SurfObj, @@ -1293,9 +1305,9 @@ &rcDest, &rcSrc, &blendobj); - + EXLATEOBJ_vCleanup(&exlo); - + CleanupAlpha: if(psurf) SURFACE_ShareUnlockSurface(psurf); if(hsurfCopy) NtGdiDeleteObjectApp(hsurfCopy); @@ -1306,9 +1318,9 @@ if (diFlags & DI_MASK) { DWORD rop4 = (diFlags & DI_IMAGE) ? ROP4_SRCAND : ROP4_SRCCOPY; - + EXLATEOBJ_vInitSrcMonoXlate(&exlo, psurfDest->ppal, 0x00FFFFFF, 0); - + Ret = IntEngStretchBlt(&psurfDest->SurfObj, &psurfMask->SurfObj, NULL, @@ -1321,7 +1333,7 @@ NULL, NULL, rop4); - + EXLATEOBJ_vCleanup(&exlo); if(!Ret) @@ -1336,9 +1348,9 @@ if (psurfColor) { DWORD rop4 = (diFlags & DI_MASK) ? ROP4_SRCINVERT : ROP4_SRCCOPY ; - + EXLATEOBJ_vInitialize(&exlo, psurfColor->ppal, psurfDest->ppal, 0x00FFFFFF, 0x00FFFFFF, 0); - + Ret = IntEngStretchBlt(&psurfDest->SurfObj, &psurfColor->SurfObj, NULL, @@ -1351,7 +1363,7 @@ NULL, NULL, rop4); - + EXLATEOBJ_vCleanup(&exlo); if(!Ret) @@ -1365,9 +1377,9 @@ /* Mask bitmap holds the information in its bottom half */ DWORD rop4 = (diFlags & DI_MASK) ? ROP4_SRCINVERT : ROP4_SRCCOPY; RECTL_vOffsetRect(&rcSrc, 0, pIcon->Size.cy); - + EXLATEOBJ_vInitSrcMonoXlate(&exlo, psurfDest->ppal, 0x00FFFFFF, 0); - + Ret = IntEngStretchBlt(&psurfDest->SurfObj, &psurfMask->SurfObj, NULL, @@ -1380,7 +1392,7 @@ NULL, NULL, rop4); - + EXLATEOBJ_vCleanup(&exlo); if(!Ret) @@ -1407,13 +1419,13 @@ RECTL_vSetRect(&rcDest, xLeft, yTop, xLeft + cxWidth, yTop + cyHeight); IntLPtoDP(pdc, (LPPOINT)&rcDest, 2); RECTL_vOffsetRect(&rcDest, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y); - + /* Prepare the underlying surface */ DC_vPrepareDCsForBlit(pdc, rcDest, NULL, rcDest); - + /* Get the clip object */ pdcClipObj = pdc->rosdc.CombinedClip; - + /* We now have our destination surface and rectangle */ psurfDest = pdc->dclevel.pSurface; if(!psurfDest) @@ -1422,10 +1434,10 @@ DC_UnlockDc(pdc); goto Cleanup2; } - + /* Color translation */ EXLATEOBJ_vInitialize(&exlo, psurfOffScreen->ppal, psurfDest->ppal, 0x00FFFFFF, 0x00FFFFFF, 0); - + /* Blt it! */ Ret = IntEngBitBlt(&psurfDest->SurfObj, &psurfOffScreen->SurfObj, @@ -1438,7 +1450,7 @@ NULL, NULL, ROP4_SRCCOPY); - + EXLATEOBJ_vCleanup(&exlo); } Cleanup: @@ -1447,12 +1459,12 @@ DC_vFinishBlit(pdc, NULL); DC_UnlockDc(pdc); } - + Cleanup2: /* Delete off screen rendering surface */ if(psurfOffScreen) GDIOBJ_vDeleteObject(&psurfOffScreen->BaseObject); - + /* Unlock other surfaces */ SURFACE_ShareUnlockSurface(psurfMask); if(psurfColor) SURFACE_ShareUnlockSurface(psurfColor); Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -65,7 +65,9 @@ /* Get the current desktop */ Desktop = CONTAINING_RECORD(NextEntry, DESKTOP, ListEntry); + /// @todo Don't mess around with the object headers! /* Get its name */ + _PRAGMA_WARNING_SUPPRESS(__WARNING_DEREF_NULL_PTR) DesktopName = GET_DESKTOP_NAME(Desktop); if (DesktopName) { @@ -1262,7 +1264,7 @@ dwDesiredAccess, (PVOID)&Context, (HANDLE*)&hdesk); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { ERR("ObOpenObjectByName failed to open/create desktop\n"); SetLastNtError(Status); @@ -1294,7 +1296,7 @@ /* Get the desktop window class. The thread desktop does not belong to any desktop * so the classes created there (including the desktop class) are allocated in the shared heap - * It would cause problems if we used a class that belongs to the caller + * It would cause problems if we used a class that belongs to the caller */ ClassName.Buffer = WC_DESKTOP; ClassName.Length = 0; @@ -1327,7 +1329,7 @@ pdesk->DesktopWindow = pWnd->head.h; pdesk->pDeskInfo->spwnd = pWnd; pWnd->fnid = FNID_DESKTOP; - + ClassName.Buffer = MAKEINTATOM(gpsi->atomSysClass[ICLS_HWNDMESSAGE]); ClassName.Length = 0; pcls = IntGetAndReferenceClass(&ClassName, 0, TRUE); Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -358,15 +358,20 @@ */ static BOOL FASTCALL -co_IntSetForegroundAndFocusWindow(PWND Wnd, BOOL MouseActivate) -{ - HWND hWnd = UserHMGetHandle(Wnd); +co_IntSetForegroundAndFocusWindow( + _In_ PWND Wnd, + _In_ BOOL MouseActivate) +{ + HWND hWnd; HWND hWndPrev = NULL; PUSER_MESSAGE_QUEUE PrevForegroundQueue; PTHREADINFO pti; BOOL fgRet = FALSE, Ret = FALSE; ASSERT_REFS_CO(Wnd); + NT_ASSERT(Wnd != NULL); + + hWnd = UserHMGetHandle(Wnd); TRACE("SetForegroundAndFocusWindow(%x, %s)\n", hWnd, (MouseActivate ? "TRUE" : "FALSE")); Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -1050,6 +1050,8 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + /* Do nothing */ + (void)0; } _SEH2_END; } @@ -1241,6 +1243,8 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + /* Do nothing */ + (void)0; } _SEH2_END; } Modified: trunk/reactos/win32ss/user/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/kbdlay… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -254,9 +254,10 @@ */ static VOID -UnloadKbdFile(PKBDFILE pkf) +UnloadKbdFile(_In_ PKBDFILE pkf) { PKBDFILE *ppkfLink = &gpkfList; + NT_ASSERT(pkf != NULL); /* Find previous object */ while (*ppkfLink) Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/keyboa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -385,7 +385,7 @@ /* If nothing has been found in layout, check if this is ASCII control character. Note: we could add it to layout table, but windows does not have it there */ if (wVirtKey >= 'A' && wVirtKey <= 'Z' && - IS_KEY_DOWN(pKeyState, VK_CONTROL) && + pKeyState && IS_KEY_DOWN(pKeyState, VK_CONTROL) && !IS_KEY_DOWN(pKeyState, VK_MENU)) { *pwcTranslatedChar = (wVirtKey - 'A') + 1; /* ASCII control character */ @@ -1097,7 +1097,7 @@ { pti->KeyboardLayout = W32kGetDefaultKeyLayout(); pti->pClientInfo->hKL = pti->KeyboardLayout ? pti->KeyboardLayout->hkl : NULL; - pKbdTbl = pti->KeyboardLayout->spkf->pKbdTbl; + pKbdTbl = pti->KeyboardLayout ? pti->KeyboardLayout->spkf->pKbdTbl : NULL; } else pKbdTbl = pti->KeyboardLayout->spkf->pKbdTbl; Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -249,8 +249,8 @@ PPROCESSINFO CurrentWin32Process; Menu = (PMENU_OBJECT)UserCreateObject( gHandleTable, - NULL, - NULL, + NULL, + NULL, Handle, otMenu, sizeof(MENU_OBJECT)); @@ -361,8 +361,8 @@ return NULL; Menu = (PMENU_OBJECT)UserCreateObject( gHandleTable, - NULL, - NULL, + NULL, + NULL, &hMenu, otMenu, sizeof(MENU_OBJECT)); @@ -803,12 +803,17 @@ } BOOL FASTCALL -IntInsertMenuItem(PMENU_OBJECT MenuObject, UINT uItem, BOOL fByPosition, - PROSMENUITEMINFO ItemInfo) +IntInsertMenuItem( + _In_ PMENU_OBJECT MenuObject, + UINT uItem, + BOOL fByPosition, + PROSMENUITEMINFO ItemInfo) { int pos; PMENU_ITEM MenuItem; PMENU_OBJECT SubMenu = NULL; + + NT_ASSERT(MenuObject != NULL); if (MAX_MENU_ITEMS <= MenuObject->MenuInfo.MenuItemCount) { Modified: trunk/reactos/win32ss/user/ntuser/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.h… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.h [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -64,7 +64,7 @@ IntCleanupMenus(struct _EPROCESS *Process, PPROCESSINFO Win32Process); BOOL FASTCALL -IntInsertMenuItem(PMENU_OBJECT MenuObject, UINT uItem, BOOL fByPosition, +IntInsertMenuItem(_In_ PMENU_OBJECT MenuObject, UINT uItem, BOOL fByPosition, PROSMENUITEMINFO ItemInfo); PMENU_OBJECT FASTCALL Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -116,7 +116,7 @@ } MSGMEMORY, *PMSGMEMORY; -static MSGMEMORY MsgMemory[] = +static MSGMEMORY g_MsgMemory[] = { { WM_CREATE, MMS_SIZE_SPECIAL, MMS_FLAG_READWRITE }, { WM_DDE_ACK, sizeof(KMDDELPARAM), MMS_FLAG_READ }, @@ -140,8 +140,8 @@ PMSGMEMORY MsgMemoryEntry; /* See if this message type is present in the table */ - for (MsgMemoryEntry = MsgMemory; - MsgMemoryEntry < MsgMemory + sizeof(MsgMemory) / sizeof(MSGMEMORY); + for (MsgMemoryEntry = g_MsgMemory; + MsgMemoryEntry < g_MsgMemory + sizeof(g_MsgMemory) / sizeof(MSGMEMORY); MsgMemoryEntry++) { if (Msg == MsgMemoryEntry->Message) @@ -225,9 +225,9 @@ UINT lParamMemorySize(UINT Msg, WPARAM wParam, LPARAM lParam) { - PMSGMEMORY MsgMemory = FindMsgMemory(Msg); - if(MsgMemory == NULL) return 0; - return MsgMemorySize(MsgMemory, wParam, lParam); + PMSGMEMORY MsgMemoryEntry = FindMsgMemory(Msg); + if(MsgMemoryEntry == NULL) return 0; + return MsgMemorySize(MsgMemoryEntry, wParam, lParam); } static NTSTATUS @@ -388,9 +388,9 @@ return STATUS_INVALID_PARAMETER; } - if (MsgMemory->Flags == MMS_FLAG_READWRITE) - { - //RtlCopyMemory((PVOID)lParam, (PVOID)lParamPacked, MsgMemory->Size); + if (MsgMemoryEntry->Flags == MMS_FLAG_READWRITE) + { + //RtlCopyMemory((PVOID)lParam, (PVOID)lParamPacked, MsgMemoryEntry->Size); } ExFreePool((PVOID) lParamPacked); return STATUS_SUCCESS; Modified: trunk/reactos/win32ss/user/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/monito… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/monitor.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -139,7 +139,7 @@ TRACE("Couldnt create monitor object\n"); return STATUS_INSUFFICIENT_RESOURCES; } - + pMonitor->hDev = hDev; pMonitor->cWndStack = 0; @@ -185,7 +185,7 @@ { if (pMonitor->hDev == hDev) break; - + pLink = &pMonitor->pMonitorNext; pMonitor = pMonitor->pMonitorNext; } Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -704,7 +704,7 @@ } BOOLEAN FASTCALL -co_MsqDispatchOneSentMessage(PUSER_MESSAGE_QUEUE MessageQueue) +co_MsqDispatchOneSentMessage(_In_ PUSER_MESSAGE_QUEUE MessageQueue) { PUSER_SENT_MESSAGE SaveMsg, Message; PLIST_ENTRY Entry; @@ -1331,7 +1331,7 @@ IntTrackMouseMove(PWND pwndTrack, PDESKTOP pDesk, PMSG msg, USHORT hittest) { // PWND pwndTrack = IntChildrenWindowFromPoint(pwndMsg, msg->pt.x, msg->pt.y); - hittest = GetNCHitEx(pwndTrack, msg->pt); + hittest = (USHORT)GetNCHitEx(pwndTrack, msg->pt); /// @todo WTF is this??? if ( pDesk->spwndTrack != pwndTrack || // Change with tracking window or msg->message != WM_MOUSEMOVE || // Mouse click changes or Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -188,7 +188,7 @@ PUSER_MESSAGE_QUEUE FASTCALL MsqCreateMessageQueue(PTHREADINFO); VOID FASTCALL MsqDestroyMessageQueue(PTHREADINFO); INIT_FUNCTION NTSTATUS NTAPI MsqInitializeImpl(VOID); -BOOLEAN FASTCALL co_MsqDispatchOneSentMessage(PUSER_MESSAGE_QUEUE MessageQueue); +BOOLEAN FASTCALL co_MsqDispatchOneSentMessage(_In_ PUSER_MESSAGE_QUEUE MessageQueue); NTSTATUS FASTCALL co_MsqWaitForNewMessages(PUSER_MESSAGE_QUEUE MessageQueue, PWND WndFilter, UINT MsgFilterMin, UINT MsgFilterMax); Modified: trunk/reactos/win32ss/user/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/scroll… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/scrollbar.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -345,7 +345,7 @@ UINT new_flags; INT action = 0; PSBDATA pSBData; - DWORD OldPos; + DWORD OldPos = 0; BOOL bChangeParams = FALSE; /* Don't show/hide scrollbar if params don't change */ ASSERT_REFS_CO(Window); Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -617,7 +617,7 @@ } /* Capture UNICODE_STRING */ - bResult = SpiMemCopy(&ustr, pvParam, sizeof(UNICODE_STRING), fl & SPIF_PROTECT, 0); + bResult = SpiMemCopy(&ustr, pvParam, sizeof(ustr), fl & SPIF_PROTECT, 0); if (!bResult) return 0; if (ustr.Length > MAX_PATH * sizeof(WCHAR)) return 0; Modified: trunk/reactos/win32ss/user/ntuser/sysparams.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.h [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -141,7 +141,7 @@ ULONG cxWallpaper, cyWallpaper; WALLPAPER_MODE WallpaperMode; UNICODE_STRING ustrWallpaper; - WCHAR awcWallpaper[MAX_PATH]; + WCHAR awcWallpaper[MAX_PATH + 1]; BOOL bHandHeld; BOOL bFastTaskSwitch; Modified: trunk/reactos/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/timer.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -359,7 +359,7 @@ StartTheTimers(VOID) { // Need to start gdi syncro timers then start timer with Hang App proc - // that calles Idle process so the screen savers will know to run...... + // that calles Idle process so the screen savers will know to run...... IntSetTimer(NULL, 0, 1000, HungAppSysTimerProc, TMRF_RIT); // Test Timers // IntSetTimer(NULL, 0, 1000, SystemTimerProc, TMRF_RIT); @@ -584,9 +584,14 @@ InitTimerImpl(VOID) { ULONG BitmapBytes; - + /* Allocate FAST_MUTEX from non paged pool */ Mutex = ExAllocatePoolWithTag(NonPagedPool, sizeof(FAST_MUTEX), TAG_INTERNAL_SYNC); + if (!Mutex) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + ExInitializeFastMutex(Mutex); BitmapBytes = ROUND_UP(NUM_WINDOW_LESS_TIMERS, sizeof(ULONG) * 8) / 8; Modified: trunk/reactos/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -852,7 +852,7 @@ { if (!pDCE->hwndCurrent) CurrentWindow = NULL; - else + else CurrentWindow = UserGetWindowObject(pDCE->hwndCurrent); if (NULL == CurrentWindow) { Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -497,6 +497,7 @@ /* flush the message queue */ MsqRemoveWindowMessagesFromQueue(Window); + NT_ASSERT(Window->head.pti); IntDereferenceMessageQueue(Window->head.pti->MessageQueue); /* from now on no messages can be sent to this window anymore */ @@ -1987,7 +1988,7 @@ PWINSTATION_OBJECT WinSta; PCLS Class = NULL; SIZE Size; - POINT MaxPos; + POINT MaxSize, MaxPos, MinTrack, MaxTrack; CBT_CREATEWNDW * pCbtCreate; LRESULT Result; USER_REFERENCE_ENTRY ParentRef, Ref; @@ -2190,8 +2191,6 @@ if ((Cs->style & WS_THICKFRAME) || !(Cs->style & (WS_POPUP | WS_CHILD))) { - POINT MaxSize, MaxPos, MinTrack, MaxTrack; - co_WinPosGetMinMaxInfo(Window, &MaxSize, &MaxPos, &MinTrack, &MaxTrack); if (Size.cx > MaxTrack.x) Size.cx = MaxTrack.x; if (Size.cy > MaxTrack.y) Size.cy = MaxTrack.y; @@ -2542,7 +2541,7 @@ TRACE("co_UserDestroyWindow \n"); - /* Check for owner thread */ + /* Check for owner thread */ if ( Window->head.pti != PsGetCurrentThreadWin32Thread()) { /* Check if we are destroying the desktop window */ @@ -2627,7 +2626,7 @@ * Check if this window is the Shell's Desktop Window. If so set hShellWindow to NULL */ - if ((ti != NULL) & (ti->pDeskInfo != NULL)) + if ((ti != NULL) && (ti->pDeskInfo != NULL)) { if (ti->pDeskInfo->hShellWindow == hWnd) { @@ -3074,8 +3073,6 @@ for (;;) { - PWND Parent; - Parent = IntGetParent(WndAncestor); if (!Parent) Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Tue Dec 18 21:44:58 2012 @@ -57,7 +57,10 @@ Peb = NtCurrentPeb(); if(Peb->SessionId == 0) { - RtlCreateUnicodeString(&gustrWindowStationsDir, WINSTA_OBJ_DIR); + if (!RtlCreateUnicodeString(&gustrWindowStationsDir, WINSTA_OBJ_DIR)) + { + return STATUS_INSUFFICIENT_RESOURCES; + } } else { @@ -67,7 +70,10 @@ Peb->SessionId, WINSTA_OBJ_DIR); - RtlCreateUnicodeString( &gustrWindowStationsDir, wstrWindowStationsDir); + if (!RtlCreateUnicodeString(&gustrWindowStationsDir, wstrWindowStationsDir)) + { + return STATUS_INSUFFICIENT_RESOURCES; + } } InitializeObjectAttributes(&ObjectAttributes, @@ -1024,27 +1030,30 @@ &ReturnLength); if (STATUS_BUFFER_TOO_SMALL == Status) { - BufferSize = ReturnLength; - Buffer = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_WINSTA); - if (NULL == Buffer) - { - ObDereferenceObject(DirectoryHandle); - return STATUS_NO_MEMORY; - } - - /* We should have a sufficiently large buffer now */ - Context = 0; - Status = ZwQueryDirectoryObject(DirectoryHandle, Buffer, BufferSize, - FALSE, TRUE, &Context, &ReturnLength); - if (! NT_SUCCESS(Status) || - STATUS_NO_MORE_ENTRIES != ZwQueryDirectoryObject(DirectoryHandle, NULL, 0, FALSE, - FALSE, &Context, NULL)) - { - /* Something went wrong, maybe someone added a directory entry? Just give up. */ - ExFreePoolWithTag(Buffer, TAG_WINSTA); - ObDereferenceObject(DirectoryHandle); - return NT_SUCCESS(Status) ? STATUS_INTERNAL_ERROR : Status; - } + ObDereferenceObject(DirectoryHandle); + return STATUS_NO_MEMORY; + } + + BufferSize = ReturnLength; + Buffer = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_WINSTA); + if (NULL == Buffer) + { + ObDereferenceObject(DirectoryHandle); + return STATUS_NO_MEMORY; + } + + /* We should have a sufficiently large buffer now */ + Context = 0; + Status = ZwQueryDirectoryObject(DirectoryHandle, Buffer, BufferSize, + FALSE, TRUE, &Context, &ReturnLength); + if (! NT_SUCCESS(Status) || + STATUS_NO_MORE_ENTRIES != ZwQueryDirectoryObject(DirectoryHandle, NULL, 0, FALSE, + FALSE, &Context, NULL)) + { + /* Something went wrong, maybe someone added a directory entry? Just give up. */ + ExFreePoolWithTag(Buffer, TAG_WINSTA); + ObDereferenceObject(DirectoryHandle); + return NT_SUCCESS(Status) ? STATUS_INTERNAL_ERROR : Status; } } @@ -1130,7 +1139,7 @@ /* * Clean up */ - if (NULL != Buffer && Buffer != InitialBuffer) + if (Buffer != InitialBuffer) { ExFreePoolWithTag(Buffer, TAG_WINSTA); } @@ -1153,6 +1162,7 @@ DWORD EntryCount; ULONG ReturnLength; WCHAR NullWchar; + PUNICODE_STRING DesktopName; Status = IntValidateWindowStationHandle(hWindowStation, KernelMode, @@ -1175,7 +1185,8 @@ DesktopEntry = DesktopEntry->Flink) { DesktopObject = CONTAINING_RECORD(DesktopEntry, DESKTOP, ListEntry); - ReturnLength += ((PUNICODE_STRING)GET_DESKTOP_NAME(DesktopObject))->Length + sizeof(WCHAR); + DesktopName = GET_DESKTOP_NAME(DesktopObject); + if (DesktopName) ReturnLength += DesktopName->Length + sizeof(WCHAR); EntryCount++; } TRACE("Required size: %d Entry count: %d\n", ReturnLength, EntryCount); @@ -1218,14 +1229,18 @@ DesktopEntry = DesktopEntry->Flink) { DesktopObject = CONTAINING_RECORD(DesktopEntry, DESKTOP, ListEntry); - Status = MmCopyToCaller(lpBuffer, ((PUNICODE_STRING)GET_DESKTOP_NAME(DesktopObject))->Buffer, ((PUNICODE_STRING)GET_DESKTOP_NAME(DesktopObject))->Length); + _PRAGMA_WARNING_SUPPRESS(__WARNING_DEREF_NULL_PTR) + DesktopName = GET_DESKTOP_NAME(DesktopObject);/// @todo Don't mess around with the object headers! + if (!DesktopName) continue; + + Status = MmCopyToCaller(lpBuffer, DesktopName->Buffer, DesktopName->Length); if (! NT_SUCCESS(Status)) { KeReleaseSpinLock(&WindowStation->Lock, OldLevel); ObDereferenceObject(WindowStation); return Status; } - lpBuffer = (PVOID) ((PCHAR) lpBuffer + ((PUNICODE_STRING)GET_DESKTOP_NAME(DesktopObject))->Length); + lpBuffer = (PVOID) ((PCHAR)lpBuffer + DesktopName->Length); Status = MmCopyToCaller(lpBuffer, &NullWchar, sizeof(WCHAR)); if (! NT_SUCCESS(Status)) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs