Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 57506: [NTOSKRNL] Some ExFreePool -> ExFreePoolWithTag CORE-6725 #resolve #comment Committed in r57506.
by hbelusca＠svn.reactos.org 06 Oct '12

06 Oct '12

Author: hbelusca Date: Sat Oct 6 21:42:19 2012 New Revision: 57506 URL: http://svn.reactos.org/svn/reactos?rev=57506&view=rev Log: [NTOSKRNL] Some ExFreePool -> ExFreePoolWithTag CORE-6725 #resolve #comment Committed in r57506. Modified: trunk/reactos/ntoskrnl/mm/ARM3/ncache.c trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/ncache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/ncache.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] Sat Oct 6 21:42:19 2012 @@ -71,7 +71,7 @@ // ASSERT(PageCount > MdlPageCount); MmFreePagesFromMdl(Mdl); - ExFreePool(Mdl); + ExFreePoolWithTag(Mdl, TAG_MDL); return NULL; } @@ -86,7 +86,7 @@ // Out of memory... // MmFreePagesFromMdl(Mdl); - ExFreePool(Mdl); + ExFreePoolWithTag(Mdl, TAG_MDL); return NULL; } @@ -201,7 +201,7 @@ // Kill the MDL (and underlying pages) // MmFreePagesFromMdl(Mdl); - ExFreePool(Mdl); + ExFreePoolWithTag(Mdl, TAG_MDL); // // Now free the system PTEs for the underlying VA Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sat Oct 6 21:42:19 2012 @@ -345,7 +345,7 @@ // If we didn' tfind any pages at all, fail // DPRINT1("NO MDL PAGES!\n"); - ExFreePool(Mdl); + ExFreePoolWithTag(Mdl, TAG_MDL); return NULL; }

1 0

[tkreuzer] 57505: [WIN32K] Use ExAllocatePoolWithTag instead of ExAllocatePool
by tkreuzer＠svn.reactos.org 06 Oct '12

06 Oct '12

Author: tkreuzer Date: Sat Oct 6 20:15:36 2012 New Revision: 57505 URL: http://svn.reactos.org/svn/reactos?rev=57505&view=rev Log: [WIN32K] Use ExAllocatePoolWithTag instead of ExAllocatePool Modified: trunk/reactos/win32ss/drivers/videoprt/dispatch.c trunk/reactos/win32ss/drivers/videoprt/videoprt.h trunk/reactos/win32ss/gdi/eng/engevent.c trunk/reactos/win32ss/gdi/eng/mem.c trunk/reactos/win32ss/gdi/eng/surface.c trunk/reactos/win32ss/gdi/ntgdi/dibobj.c trunk/reactos/win32ss/gdi/ntgdi/fillshap.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c trunk/reactos/win32ss/gdi/ntgdi/region.c trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/focus.c trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/scrollbar.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/winpos.c trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/win32ss/drivers/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/d… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/dispatch.c [iso-8859-1] Sat Oct 6 20:15:36 2012 @@ -205,7 +205,9 @@ DriverExtension = DeviceExtension->DriverExtension; /* Translate the IRP to a VRP */ - vrp = ExAllocatePool(NonPagedPool, sizeof(VIDEO_REQUEST_PACKET)); + vrp = ExAllocatePoolWithTag(NonPagedPool, + sizeof(VIDEO_REQUEST_PACKET), + TAG_REQUEST_PACKET); if (NULL == vrp) { return STATUS_NO_MEMORY; @@ -228,7 +230,7 @@ vrp); /* Free the VRP */ - ExFreePool(vrp); + ExFreePoolWithTag(vrp, TAG_REQUEST_PACKET); INFO_(VIDEOPRT, "- Returned status: %x\n", Irp->IoStatus.Status); @@ -561,7 +563,7 @@ IN PIRP Irp) { PVIDEO_PORT_COMMON_EXTENSION CommonExtension = DeviceObject->DeviceExtension; - + if (CommonExtension->Fdo) return IntVideoPortDispatchFdoPnp(DeviceObject, Irp); else Modified: trunk/reactos/win32ss/drivers/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/v… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/videoprt.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/videoprt.h [iso-8859-1] Sat Oct 6 20:15:36 2012 @@ -44,6 +44,7 @@ #define TAG_VIDEO_PORT 'PDIV' #define TAG_VIDEO_PORT_BUFFER '\0mpV' +#define TAG_REQUEST_PACKET 'qRpV' typedef struct _VIDEO_PORT_ADDRESS_MAPPING { Modified: trunk/reactos/win32ss/gdi/eng/engevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engevent.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engevent.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engevent.c [iso-8859-1] Sat Oct 6 20:15:36 2012 @@ -67,7 +67,7 @@ } /* Free the allocated memory */ - ExFreePool(Event); + ExFreePoolWithTag(Event, GDITAG_ENG_EVENT); /* Return success */ return TRUE; @@ -136,7 +136,7 @@ else { /* Free the allocation */ - ExFreePool(EngEvent); + ExFreePoolWithTag(EngEvent, GDITAG_ENG_EVENT); EngEvent = NULL; } @@ -156,7 +156,7 @@ ObDereferenceObject(Event->pKEvent); /* Free the Eng object */ - ExFreePool(Event); + ExFreePoolWithTag(Event, GDITAG_ENG_EVENT); return TRUE; } Modified: trunk/reactos/win32ss/gdi/eng/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/mem.c?rev=… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/mem.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/mem.c [iso-8859-1] Sat Oct 6 20:15:36 2012 @@ -47,7 +47,8 @@ /* Windows allows to pass NULL */ if (pvBaseAddress) { - ExFreePool(pvBaseAddress); + /* Use 0 as tag, which equals a call to ExFreePool */ + ExFreePoolWithTag(pvBaseAddress, 0); } } Modified: trunk/reactos/win32ss/gdi/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] Sat Oct 6 20:15:36 2012 @@ -99,7 +99,7 @@ else if (psurf->SurfObj.fjBitmap & BMF_POOLALLOC) { /* Free a pool allocation */ - ExFreePool(pvBits); + EngFreeMem(pvBits); } } 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] Sat Oct 6 20:15:36 2012 @@ -557,7 +557,7 @@ if (hSourceBitmap) EngDeleteSurface((HSURF)hSourceBitmap); DC_UnlockDc(pDC); Exit2: - ExFreePool(pbmiSafe); + ExFreePoolWithTag(pbmiSafe, 'pmTG'); return ret; } Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Sat Oct 6 20:15:36 2012 @@ -450,14 +450,14 @@ if (!dc) { EngSetLastError(ERROR_INVALID_HANDLE); - ExFreePool(pTemp); + ExFreePoolWithTag(pTemp, TAG_SHAPE); return FALSE; } if (dc->dctype == DC_TYPE_INFO) { DC_UnlockDc(dc); - ExFreePool(pTemp); + ExFreePoolWithTag(pTemp, TAG_SHAPE); /* Yes, Windows really returns TRUE in this case */ return TRUE; } @@ -497,7 +497,7 @@ /* Cleanup and return */ DC_vFinishBlit(dc, NULL); DC_UnlockDc(dc); - ExFreePool(pTemp); + ExFreePoolWithTag(pTemp, TAG_SHAPE); return (ULONG_PTR)Ret; } Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sat Oct 6 20:15:36 2012 @@ -1402,7 +1402,7 @@ NewEntry = (PFONT_CACHE_ENTRY)FontCacheListHead.Blink; FT_Done_Glyph((FT_Glyph)NewEntry->BitmapGlyph); RemoveTailList(&FontCacheListHead); - ExFreePool(NewEntry); + ExFreePoolWithTag(NewEntry, TAG_FONT); FontCacheNumEntries--; } @@ -2584,7 +2584,7 @@ Score += 25; } - ExFreePool(Otm); + ExFreePoolWithTag(Otm, GDITAG_TEXT); return Score; } @@ -2850,7 +2850,7 @@ /* Get the full path name */ if (!IntGetFullFileName(NameInfo1, Size, FileName)) { - ExFreePool(NameInfo1); + ExFreePoolWithTag(NameInfo1, TAG_FINF); return FALSE; } @@ -2858,7 +2858,7 @@ NameInfo2 = ExAllocatePoolWithTag(PagedPool, Size, TAG_FINF); if (!NameInfo2) { - ExFreePool(NameInfo1); + ExFreePoolWithTag(NameInfo1, TAG_FINF); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -2888,7 +2888,7 @@ IntUnLockGlobalFonts; /* Free the buffers */ - ExFreePool(NameInfo1); + ExFreePoolWithTag(NameInfo1, TAG_FINF); ExFreePool(NameInfo2); if (!bFound && dwType != 5) @@ -3041,7 +3041,7 @@ if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size, &FontListHead) ) { IntUnLockGlobalFonts; - ExFreePool(Info); + ExFreePoolWithTag(Info, GDITAG_TEXT); return -1; } IntUnLockGlobalFonts; @@ -3053,7 +3053,7 @@ &Win32Process->PrivateFontListHead)) { IntUnLockProcessPrivateFonts(Win32Process); - ExFreePool(Info); + ExFreePoolWithTag(Info, GDITAG_TEXT); return -1; } IntUnLockProcessPrivateFonts(Win32Process); @@ -3061,7 +3061,7 @@ /* Enumerate font families in the registry */ if (! GetFontFamilyInfoForSubstitutes(&LogFont, Info, &Count, Size)) { - ExFreePool(Info); + ExFreePoolWithTag(Info, GDITAG_TEXT); return -1; } @@ -3072,13 +3072,13 @@ (Count < Size ? Count : Size) * sizeof(FONTFAMILYINFO)); if (! NT_SUCCESS(Status)) { - ExFreePool(Info); + ExFreePoolWithTag(Info, GDITAG_TEXT); EngSetLastError(ERROR_INVALID_PARAMETER); return -1; } } - ExFreePool(Info); + ExFreePoolWithTag(Info, GDITAG_TEXT); return Count; } @@ -3778,7 +3778,7 @@ dc = DC_LockDc(hDC); if (dc == NULL) { - ExFreePool(SafeBuff); + ExFreePoolWithTag(SafeBuff, GDITAG_TEXT); EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -3789,7 +3789,7 @@ if (TextObj == NULL) { - ExFreePool(SafeBuff); + ExFreePoolWithTag(SafeBuff, GDITAG_TEXT); EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -3812,7 +3812,7 @@ if (!found) { DPRINT1("WARNING: Could not find desired charmap!\n"); - ExFreePool(SafeBuff); + ExFreePoolWithTag(SafeBuff, GDITAG_TEXT); EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -3880,10 +3880,10 @@ if (! NT_SUCCESS(Status)) { SetLastNtError(Status); - ExFreePool(SafeBuff); + ExFreePoolWithTag(SafeBuff, GDITAG_TEXT); return FALSE; } - ExFreePool(SafeBuff); + ExFreePoolWithTag(SafeBuff, GDITAG_TEXT); DPRINT("NtGdiGetCharABCWidths Worked!\n"); return TRUE; } @@ -3945,7 +3945,7 @@ dc = DC_LockDc(hDC); if (dc == NULL) { - ExFreePool(SafeBuff); + ExFreePoolWithTag(SafeBuff, GDITAG_TEXT); EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -3956,7 +3956,7 @@ if (TextObj == NULL) { - ExFreePool(SafeBuff); + ExFreePoolWithTag(SafeBuff, GDITAG_TEXT); EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -4021,7 +4021,7 @@ IntUnLockFreeType; TEXTOBJ_UnlockText(TextObj); MmCopyToCaller(Buffer, SafeBuff, BufferSize); - ExFreePool(SafeBuff); + ExFreePoolWithTag(SafeBuff, GDITAG_TEXT); return TRUE; } @@ -4088,7 +4088,7 @@ } IntGetOutlineTextMetrics(FontGDI, Size, potm); DefChar = potm->otmTextMetrics.tmDefaultChar; // May need this. - ExFreePool(potm); + ExFreePoolWithTag(potm, GDITAG_TEXT); } IntLockFreeType; @@ -4183,7 +4183,7 @@ } IntGetOutlineTextMetrics(FontGDI, Size, potm); DefChar = potm->otmTextMetrics.tmDefaultChar; // May need this. - ExFreePool(potm); + ExFreePoolWithTag(potm, GDITAG_TEXT); } _SEH2_TRY Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] Sat Oct 6 20:15:36 2012 @@ -246,7 +246,7 @@ while (i) { pEntry = &GdiHandleTable->Entries[i]; - if (i > GDI_HANDLE_COUNT) + if (i >= GDI_HANDLE_COUNT) { DPRINT1("nDeleted=%lu\n", nDeleted); ASSERT(FALSE); 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] Sat Oct 6 20:15:36 2012 @@ -2882,7 +2882,7 @@ while (pSLLBlock) { tmpSLLBlock = pSLLBlock->next; - ExFreePool(pSLLBlock); + ExFreePoolWithTag(pSLLBlock, TAG_REGION); pSLLBlock = tmpSLLBlock; } } 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] Sat Oct 6 20:15:36 2012 @@ -1590,7 +1590,7 @@ if (Ansi && szTemp != NULL && szTemp != szStaticTemp) { - ExFreePool(szTemp); + ExFreePoolWithTag(szTemp, USERTAG_CLASS); } return Ret; Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Sat Oct 6 20:15:36 2012 @@ -69,7 +69,7 @@ lResult = MCSR_SHUTDOWNFINISHED; } } - ExFreePool(List); + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } if (List && (lResult == MCSR_DONOTSHUTDOWN)) return lResult; /* 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] Sat Oct 6 20:15:36 2012 @@ -742,7 +742,7 @@ (Message == HSHELL_LANGUAGE ? lParam : (LPARAM)wParam) ); } - ExFreePool(HwndList); + ExFreePoolWithTag(HwndList, USERTAG_WINDOWLIST); } if (ISITHOOKED(WH_SHELL)) @@ -802,7 +802,7 @@ if (Current->hWnd == hWnd) { RemoveEntryList(&Current->ListEntry); - ExFreePool(Current); + ExFreePoolWithTag(Current, TAG_WINSTA); return 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] Sat Oct 6 20:15:36 2012 @@ -153,10 +153,10 @@ List = IntWinListChildren(UserGetDesktopWindow()); if ( List ) { - if ( OldTID ) + if ( OldTID ) { ptiOld->TIF_flags |= TIF_INACTIVATEAPPMSG; - ptiOld->pClientInfo->dwTIFlags = ptiOld->TIF_flags; + ptiOld->pClientInfo->dwTIFlags = ptiOld->TIF_flags; for (phWnd = List; *phWnd; ++phWnd) { @@ -186,13 +186,13 @@ } } } - ExFreePool(List); + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } } if (WindowPrev) UserDerefObjectCo(WindowPrev); // Now allow the previous window to die. - if (Window->state & WNDS_ACTIVEFRAME) + if (Window->state & WNDS_ACTIVEFRAME) { // If already active frame do not allow NCPaint. //ERR("SendActivateMessage Is Active Frame!\n"); Window->state |= WNDS_NONCPAINT; @@ -345,7 +345,7 @@ /* MSDN: The system restricts which processes can set the foreground window. A process - can set the foreground window only if one of the following conditions is true: + can set the foreground window only if one of the following conditions is true: * The process is the foreground process. * The process was started by the foreground process. @@ -353,7 +353,7 @@ * There is no foreground process. * The foreground process is being debugged. * The foreground is not locked (see LockSetForegroundWindow). - * The foreground lock time-out has expired (see SPI_GETFOREGROUNDLOCKTIMEOUT in SystemParametersInfo). + * The foreground lock time-out has expired (see SPI_GETFOREGROUNDLOCKTIMEOUT in SystemParametersInfo). * No menus are active. */ @@ -404,7 +404,7 @@ ( CanForceFG(pti->ppi) || pti->TIF_flags & (TIF_SYSTEMTHREAD|TIF_CSRSSTHREAD|TIF_ALLOWFOREGROUNDACTIVATE) )) || pti->ppi == ppiScrnSaver ) - { + { IntSetFocusMessageQueue(Wnd->head.pti->MessageQueue); gptiForeground = Wnd->head.pti; TRACE("Set Foreground pti 0x%p Q 0x%p\n",Wnd->head.pti, Wnd->head.pti->MessageQueue); @@ -416,7 +416,7 @@ */ FindRemoveAsyncMsg(Wnd); // Do this to fix test_SFW todos! fgRet = TRUE; - } + } // Fix FG Bounce with regedit. if (hWndPrev != hWnd ) @@ -655,7 +655,7 @@ if (!pwndTop->spwndParent || pwndTop->spwndParent == UserGetDesktopWindow()) { if ((pwndTop->style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return 0; - break; + break; } if (pwndTop->spwndParent == UserGetMessageWindow()) return 0; pwndTop = pwndTop->spwndParent; @@ -781,7 +781,7 @@ return NULL; } } - + hWndPrev = MsqSetStateWindow(ThreadQueue, MSQ_STATE_CAPTURE, hWnd); if (hWndPrev) 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] Sat Oct 6 20:15:36 2012 @@ -152,7 +152,7 @@ } /* Free memory */ - ExFreePool(MenuItem); + ExFreePoolWithTag(MenuItem, TAG_MENUITEM); return TRUE; } Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Sat Oct 6 20:15:36 2012 @@ -386,7 +386,7 @@ UserDerefObjectCo(Wnd); } } - ExFreePool(List); + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } } } @@ -505,7 +505,7 @@ if (Flags & RDW_VALIDATE && RgnType != NULLREGION) { - if (Flags & RDW_NOFRAME) + if (Flags & RDW_NOFRAME) Wnd->state &= ~WNDS_SENDNCPAINT; if (Flags & RDW_NOERASE) Wnd->state &= ~(WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); @@ -1681,7 +1681,7 @@ dcxflags = DCX_USESTYLE; if (!(Window->pcls->style & (CS_OWNDC|CS_CLASSDC))) - dcxflags |= DCX_CACHE; // AH??? wine~ If not Powned or with Class go Cheap! + dcxflags |= DCX_CACHE; // AH??? wine~ If not Powned or with Class go Cheap! if (flags & SW_SCROLLCHILDREN && Window->style & WS_CLIPCHILDREN) dcxflags |= DCX_CACHE|DCX_NOCLIPCHILDREN; @@ -2053,7 +2053,7 @@ ERR("RealizePalette Desktop."); hdc = UserGetWindowDC(pWnd); IntPaintDesktop(hdc); - UserReleaseDC(pWnd,hdc,FALSE); + UserReleaseDC(pWnd,hdc,FALSE); } UserSendNotifyMessage((HWND)HWND_BROADCAST, WM_PALETTECHANGED, (WPARAM)hWnd, 0); } 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] Sat Oct 6 20:15:36 2012 @@ -90,7 +90,7 @@ lprect->bottom += UserGetSystemMetrics (SM_CYHSCROLL); if (Wnd->style & WS_BORDER) { - lprect->left--; + lprect->left--; lprect->right++; } else if (Wnd->style & WS_VSCROLL) @@ -113,7 +113,7 @@ } if (Wnd->style & WS_BORDER) { - lprect->top--; + lprect->top--; lprect->bottom++; } else if (Wnd->style & WS_HSCROLL) @@ -618,7 +618,7 @@ { DesktopHeapFree(Window->head.rpdesk, Window->pSBInfo); Window->pSBInfo = NULL; - ExFreePool(Window->pSBInfoex); + ExFreePoolWithTag(Window->pSBInfoex, TAG_SBARINFO); Window->pSBInfoex = NULL; return TRUE; } @@ -802,7 +802,7 @@ { RtlCopyMemory(&psi, lpsi, sizeof(SCROLLINFO)); if (pSBData) - { + { RtlCopyMemory(&SBDataSafe, pSBData, sizeof(SBDATA)); } } 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] Sat Oct 6 20:15:36 2012 @@ -304,7 +304,7 @@ Owner = Owner->spwndOwner; Depth++; } - return FALSE; + return FALSE; } /*********************************************************************** @@ -473,7 +473,7 @@ UserDereferenceObject(Child); } } - ExFreePool(Children); + ExFreePoolWithTag(Children, USERTAG_WINDOWLIST); } if(SendMessages) @@ -1206,7 +1206,7 @@ WndOldParent = Wnd->spwndParent; - if ( WndOldParent && + if ( WndOldParent && WndOldParent->ExStyle & WS_EX_LAYOUTRTL) pt.x = Wnd->rcWindow.right; else @@ -1224,7 +1224,7 @@ /* Set the new parent */ Wnd->spwndParent = WndNewParent; - if ( Wnd->style & WS_CHILD && + if ( Wnd->style & WS_CHILD && Wnd->spwndOwner && Wnd->spwndOwner->ExStyle & WS_EX_TOPMOST ) { @@ -1931,7 +1931,7 @@ if (!IntValidateOwnerDepth(pWnd, Owner)) { EngSetLastError(ERROR_INVALID_PARAMETER); - goto Error; + goto Error; } if ( pWnd->spwndOwner && pWnd->spwndOwner->ExStyle & WS_EX_TOPMOST ) @@ -2395,7 +2395,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Cleanup and fail */ - ExFreePool(pvBuffer); + ExFreePoolWithTag(pvBuffer, TAG_STRING); _SEH2_YIELD(return _SEH2_GetExceptionCode();) } _SEH2_END @@ -2682,7 +2682,7 @@ } } - ExFreePool(Children); + ExFreePoolWithTag(Children, USERTAG_WINDOWLIST); } if (! GotOne) { @@ -2794,7 +2794,7 @@ } } } - ExFreePool(List); + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } return Ret; @@ -2987,7 +2987,7 @@ } } - ExFreePool(List); + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } } else @@ -4158,7 +4158,7 @@ } } - ExFreePool( win_array ); + ExFreePoolWithTag(win_array, USERTAG_WINDOWLIST); TRACE("Leave ShowOwnedPopups\n"); return TRUE; } Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Sat Oct 6 20:15:36 2012 @@ -65,7 +65,7 @@ Rect->bottom = UserGetSystemMetrics(SM_CYMINIMIZED); return; } - if ( Wnd != UserGetDesktopWindow()) // Wnd->fnid != FNID_DESKTOP ) + if ( Wnd != UserGetDesktopWindow()) // Wnd->fnid != FNID_DESKTOP ) { *Rect = Wnd->rcClient; RECTL_vOffsetRect(Rect, -Wnd->rcClient.left, -Wnd->rcClient.top); @@ -177,7 +177,7 @@ BOOL FASTCALL ActivateOtherWindowMin(PWND Wnd) { BOOL ActivePrev, FindTopWnd; - PWND pWndTopMost, pWndChild, pWndSetActive, pWndTemp, pWndDesk; + PWND pWndTopMost, pWndChild, pWndSetActive, pWndTemp, pWndDesk; USER_REFERENCE_ENTRY Ref; PTHREADINFO pti = gptiCurrent; @@ -398,7 +398,7 @@ //ERR("X:%d Y:%d\n",x,y); } } - ExFreePool(List); + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); return yspacing; } @@ -431,7 +431,7 @@ //ERR("X:%d Y:%d XS:%d YS:%d\n",Pos->x,Pos->y,xspacing,yspacing); - // Set to default position when minimized. + // Set to default position when minimized. Pos->x = x + UserGetSystemMetrics(SM_CXBORDER); Pos->y = y - yspacing - UserGetSystemMetrics(SM_CYBORDER); @@ -752,7 +752,7 @@ switch (ShowFlag) { case SW_SHOWMINNOACTIVE: - case SW_SHOWMINIMIZED: + case SW_SHOWMINIMIZED: case SW_FORCEMINIMIZE: case SW_MINIMIZE: { @@ -1323,7 +1323,7 @@ hWndInsertAfter = List[i]; } } - ExFreePool(List); + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } return hWndInsertAfter; @@ -1637,7 +1637,7 @@ IntLinkWindow(Window, InsertAfterWindow); } - if ( ( WinPos.hwndInsertAfter == HWND_TOPMOST || + if ( ( WinPos.hwndInsertAfter == HWND_TOPMOST || ( Window->ExStyle & WS_EX_TOPMOST && Window->spwndPrev && Window->spwndPrev->ExStyle & WS_EX_TOPMOST ) || ( Window->spwndNext && Window->spwndNext->ExStyle & WS_EX_TOPMOST ) ) && !bNoTopMost ) @@ -1932,7 +1932,7 @@ } /* And last, send the WM_WINDOWPOSCHANGED message */ - + TRACE("\tstatus flags = %04x\n", WinPos.flags & SWP_AGG_STATUSFLAGS); if ((WinPos.flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE) @@ -2174,7 +2174,7 @@ /* We can't activate a child window */ if ((Wnd->style & WS_CHILD) && - !(Wnd->ExStyle & WS_EX_MDICHILD) && + !(Wnd->ExStyle & WS_EX_MDICHILD) && Cmd != SW_SHOWNA) { //ERR("SWP Child No active and ZOrder\n"); @@ -2297,12 +2297,12 @@ if(pwndChild != NULL) { /* We found a window. Don't send any more WM_NCHITTEST messages */ - ExFreePool(List); + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); UserDereferenceObject(ScopeWin); return pwndChild; } } - ExFreePool(List); + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } } @@ -2381,14 +2381,14 @@ if ( Child->pcls->atomClassName != gpsi->atomSysClass[ICLS_BUTTON] || (Child->style & BS_TYPEMASK) != BS_GROUPBOX ) { - ExFreePool(List); + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); return Child; } pwndHit = Child; } } } - ExFreePool(List); + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } return pwndHit ? pwndHit : Parent; } @@ -2439,7 +2439,7 @@ } } } - ExFreePool(List); + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } return pwndHit ? pwndHit : 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] Sat Oct 6 20:15:36 2012 @@ -1092,7 +1092,7 @@ { if (Buffer != InitialBuffer) { - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_WINSTA); } return Status; } @@ -1107,7 +1107,7 @@ { if (Buffer != InitialBuffer) { - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_WINSTA); } return Status; } @@ -1117,7 +1117,7 @@ { if (Buffer != InitialBuffer) { - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_WINSTA); } return Status; } @@ -1129,7 +1129,7 @@ */ if (NULL != Buffer && Buffer != InitialBuffer) { - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_WINSTA); } return STATUS_SUCCESS;

1 0

[hbelusca] 57504: [NTOSKRNL] Rearrange the NtQuerySystemEnvironmentValue code to have successive logical checks.
by hbelusca＠svn.reactos.org 06 Oct '12

06 Oct '12

Author: hbelusca Date: Sat Oct 6 19:50:17 2012 New Revision: 57504 URL: http://svn.reactos.org/svn/reactos?rev=57504&view=rev Log: [NTOSKRNL] Rearrange the NtQuerySystemEnvironmentValue code to have successive logical checks. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sat Oct 6 19:50:17 2012 @@ -235,44 +235,40 @@ _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - } - - /* Allocate a buffer for the value */ - AnsiValueBuffer = ExAllocatePoolWithTag(NonPagedPool, ValueBufferLength, 'pmeT'); - if (AnsiValueBuffer == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* - * Copy the name to kernel space if necessary and convert it to ANSI. - */ + } + + /* According to NTInternals the SeSystemEnvironmentName privilege is required! */ + if (!SeSinglePrivilegeCheck(SeSystemEnvironmentPrivilege, PreviousMode)) + { + DPRINT1("NtQuerySystemEnvironmentValue: Caller requires the SeSystemEnvironmentPrivilege privilege!\n"); + return STATUS_PRIVILEGE_NOT_HELD; + } + + /* Copy the name to kernel space if necessary */ Status = ProbeAndCaptureUnicodeString(&WName, PreviousMode, VariableName); if (!NT_SUCCESS(Status)) { return Status; } - /* - * according to ntinternals the SeSystemEnvironmentName privilege is required! - */ - if (!SeSinglePrivilegeCheck(SeSystemEnvironmentPrivilege, PreviousMode)) - { - ReleaseCapturedUnicodeString(&WName, PreviousMode); - DPRINT1("NtQuerySystemEnvironmentValue: Caller requires the SeSystemEnvironmentPrivilege privilege!\n"); - return STATUS_PRIVILEGE_NOT_HELD; - } - - /* Convert the value name to ansi and release the captured unicode string */ + /* Convert the name to ANSI and release the captured UNICODE string */ Status = RtlUnicodeStringToAnsiString(&AName, &WName, TRUE); ReleaseCapturedUnicodeString(&WName, PreviousMode); if (!NT_SUCCESS(Status)) return Status; - /* Get the environment variable */ + /* Allocate a buffer for the ANSI environment variable */ + AnsiValueBuffer = ExAllocatePoolWithTag(NonPagedPool, ValueBufferLength, 'pmeT'); + if (AnsiValueBuffer == NULL) + { + RtlFreeAnsiString(&AName); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Get the environment variable and free the ANSI name */ Result = HalGetEnvironmentVariable(AName.Buffer, (USHORT)ValueBufferLength, AnsiValueBuffer); + RtlFreeAnsiString(&AName); /* Check if we had success */ if (Result == ESUCCESS) @@ -280,13 +276,13 @@ /* Copy the result back to the caller. */ _SEH2_TRY { - /* Initialize ansi string from the result */ + /* Initialize ANSI string from the result */ RtlInitAnsiString(&AValue, AnsiValueBuffer); - /* Initialize a unicode string from the callers buffer */ + /* Initialize a UNICODE string from the callers buffer */ RtlInitEmptyUnicodeString(&WValue, ValueBuffer, ValueBufferLength); - /* Convert the result to unicode */ + /* Convert the result to UNICODE */ Status = RtlAnsiStringToUnicodeString(&WValue, &AValue, FALSE); if (ReturnLength != NULL) @@ -305,8 +301,7 @@ Status = STATUS_UNSUCCESSFUL; } - /* Cleanup allocated resources. */ - RtlFreeAnsiString(&AName); + /* Free the allocated ANSI value buffer */ ExFreePoolWithTag(AnsiValueBuffer, 'pmeT'); return Status;

1 0

[ekohl] 57503: [LSASRV] - Make LsarLookupNames, LsarLookupNames2 and LsarLookupNames4 call LsapLookupNames and convert the results where this is needed. - Split the lookup code in LsapLookupSids in...
by ekohl＠svn.reactos.org 06 Oct '12

06 Oct '12

Author: ekohl Date: Sat Oct 6 19:37:10 2012 New Revision: 57503 URL: http://svn.reactos.org/svn/reactos?rev=57503&view=rev Log: [LSASRV] - Make LsarLookupNames, LsarLookupNames2 and LsarLookupNames4 call LsapLookupNames and convert the results where this is needed. - Split the lookup code in LsapLookupSids into separate functions. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/sids.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sat Oct 6 19:37:10 2012 @@ -550,89 +550,53 @@ LSAP_LOOKUP_LEVEL LookupLevel, DWORD *MappedCount) { - SID_IDENTIFIER_AUTHORITY IdentifierAuthority = {SECURITY_NT_AUTHORITY}; - static const UNICODE_STRING DomainName = RTL_CONSTANT_STRING(L"DOMAIN"); - PLSAPR_REFERENCED_DOMAIN_LIST OutputDomains = NULL; - PLSA_TRANSLATED_SID OutputSids = NULL; - ULONG OutputSidsLength; + LSAPR_TRANSLATED_SIDS_EX2 TranslatedSidsEx2; ULONG i; - PSID Sid; - ULONG SidLength; NTSTATUS Status; - TRACE("LsarLookupNames(%p, %lu, %p, %p, %p, %d, %p)\n", + TRACE("(%p %lu %p %p %p %d %p)\n", PolicyHandle, Count, Names, ReferencedDomains, TranslatedSids, LookupLevel, MappedCount); - TranslatedSids->Entries = Count; + TranslatedSids->Entries = 0; TranslatedSids->Sids = NULL; *ReferencedDomains = NULL; - OutputSidsLength = Count * sizeof(LSA_TRANSLATED_SID); - OutputSids = MIDL_user_allocate(OutputSidsLength); - if (OutputSids == NULL) - { + if (Count == 0) + return STATUS_NONE_MAPPED; + + TranslatedSidsEx2.Entries = 0; + TranslatedSidsEx2.Sids = NULL; + + Status = LsapLookupNames(Count, + Names, + ReferencedDomains, + &TranslatedSidsEx2, + LookupLevel, + MappedCount, + 0, + 0); + if (!NT_SUCCESS(Status)) + return Status; + + TranslatedSids->Entries = TranslatedSidsEx2.Entries; + TranslatedSids->Sids = MIDL_user_allocate(TranslatedSids->Entries * sizeof(LSA_TRANSLATED_SID)); + if (TranslatedSids->Sids == NULL) + { + MIDL_user_free(TranslatedSidsEx2.Sids); + MIDL_user_free(*ReferencedDomains); + *ReferencedDomains = NULL; return STATUS_INSUFFICIENT_RESOURCES; } - RtlZeroMemory(OutputSids, OutputSidsLength); - - OutputDomains = MIDL_user_allocate(sizeof(LSAPR_REFERENCED_DOMAIN_LIST)); - if (OutputDomains == NULL) - { - MIDL_user_free(OutputSids); - return STATUS_INSUFFICIENT_RESOURCES; - } - - OutputDomains->Entries = Count; - OutputDomains->Domains = MIDL_user_allocate(Count * sizeof(LSA_TRUST_INFORMATION)); - if (OutputDomains->Domains == NULL) - { - MIDL_user_free(OutputDomains); - MIDL_user_free(OutputSids); - return STATUS_INSUFFICIENT_RESOURCES; - } - - Status = RtlAllocateAndInitializeSid(&IdentifierAuthority, - 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, - &Sid); - if (!NT_SUCCESS(Status)) - { - MIDL_user_free(OutputDomains->Domains); - MIDL_user_free(OutputDomains); - MIDL_user_free(OutputSids); - return Status; - } - - SidLength = RtlLengthSid(Sid); - - for (i = 0; i < Count; i++) - { - OutputDomains->Domains[i].Sid = MIDL_user_allocate(SidLength); - RtlCopyMemory(OutputDomains->Domains[i].Sid, Sid, SidLength); - - OutputDomains->Domains[i].Name.Buffer = MIDL_user_allocate(DomainName.MaximumLength); - OutputDomains->Domains[i].Name.Length = DomainName.Length; - OutputDomains->Domains[i].Name.MaximumLength = DomainName.MaximumLength; - RtlCopyMemory(OutputDomains->Domains[i].Name.Buffer, DomainName.Buffer, DomainName.MaximumLength); - } - - for (i = 0; i < Count; i++) - { - OutputSids[i].Use = SidTypeWellKnownGroup; - OutputSids[i].RelativeId = DOMAIN_USER_RID_ADMIN; //DOMAIN_ALIAS_RID_ADMINS; - OutputSids[i].DomainIndex = i; - } - - *ReferencedDomains = OutputDomains; - - *MappedCount = Count; - - TranslatedSids->Entries = Count; - TranslatedSids->Sids = OutputSids; + for (i = 0; i < TranslatedSidsEx2.Entries; i++) + { + TranslatedSids->Sids[i].Use = TranslatedSidsEx2.Sids[i].Use; + TranslatedSids->Sids[i].RelativeId = LsapGetRelativeIdFromSid(TranslatedSidsEx2.Sids[i].Sid); + TranslatedSids->Sids[i].DomainIndex = TranslatedSidsEx2.Sids[i].DomainIndex; + } + + MIDL_user_free(TranslatedSidsEx2.Sids); return STATUS_SUCCESS; } @@ -658,14 +622,11 @@ /* FIXME: Fail, if there is an invalid SID in the SidEnumBuffer */ TranslatedNames->Entries = SidEnumBuffer->Entries; - TranslatedNames->Names = MIDL_user_allocate(SidEnumBuffer->Entries * sizeof(LSAPR_TRANSLATED_NAME)); - if (TranslatedNames->Names == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - + TranslatedNames->Names = NULL; *ReferencedDomains = NULL; TranslatedNamesEx.Entries = SidEnumBuffer->Entries; - TranslatedNamesEx.Names = NULL;; + TranslatedNamesEx.Names = NULL; Status = LsapLookupSids(SidEnumBuffer, ReferencedDomains, @@ -675,9 +636,16 @@ 0, 0); if (!NT_SUCCESS(Status)) + return Status; + + TranslatedNames->Entries = SidEnumBuffer->Entries; + TranslatedNames->Names = MIDL_user_allocate(SidEnumBuffer->Entries * sizeof(LSAPR_TRANSLATED_NAME)); + if (TranslatedNames->Names == NULL) { MIDL_user_free(TranslatedNamesEx.Names); - return Status; + MIDL_user_free(*ReferencedDomains); + *ReferencedDomains = NULL; + return STATUS_INSUFFICIENT_RESOURCES; } for (i = 0; i < TranslatedNamesEx.Entries; i++) @@ -1977,8 +1945,56 @@ DWORD LookupOptions, DWORD ClientRevision) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + LSAPR_TRANSLATED_SIDS_EX2 TranslatedSidsEx2; + ULONG i; + NTSTATUS Status; + + TRACE("(%p %lu %p %p %p %d %p %lu %lu)\n", + PolicyHandle, Count, Names, ReferencedDomains, TranslatedSids, + LookupLevel, MappedCount, LookupOptions, ClientRevision); + + TranslatedSids->Entries = 0; + TranslatedSids->Sids = NULL; + *ReferencedDomains = NULL; + + if (Count == 0) + return STATUS_NONE_MAPPED; + + TranslatedSidsEx2.Entries = 0; + TranslatedSidsEx2.Sids = NULL; + + Status = LsapLookupNames(Count, + Names, + ReferencedDomains, + &TranslatedSidsEx2, + LookupLevel, + MappedCount, + LookupOptions, + ClientRevision); + if (!NT_SUCCESS(Status)) + return Status; + + TranslatedSids->Entries = TranslatedSidsEx2.Entries; + TranslatedSids->Sids = MIDL_user_allocate(TranslatedSids->Entries * sizeof(LSA_TRANSLATED_SID)); + if (TranslatedSids->Sids == NULL) + { + MIDL_user_free(TranslatedSidsEx2.Sids); + MIDL_user_free(*ReferencedDomains); + *ReferencedDomains = NULL; + return STATUS_INSUFFICIENT_RESOURCES; + } + + for (i = 0; i < TranslatedSidsEx2.Entries; i++) + { + TranslatedSids->Sids[i].Use = TranslatedSidsEx2.Sids[i].Use; + TranslatedSids->Sids[i].RelativeId = LsapGetRelativeIdFromSid(TranslatedSidsEx2.Sids[i].Sid); + TranslatedSids->Sids[i].DomainIndex = TranslatedSidsEx2.Sids[i].DomainIndex; + TranslatedSids->Sids[i].Flags = TranslatedSidsEx2.Sids[i].Flags; + } + + MIDL_user_free(TranslatedSidsEx2.Sids); + + return STATUS_SUCCESS; } @@ -2081,7 +2097,7 @@ { NTSTATUS Status; - TRACE("LsarLookupNames3(%p, %lu, %p, %p, %p, %d, %p, %lu, %lu)\n", + TRACE("(%p %lu %p %p %p %d %p %lu %lu)\n", PolicyHandle, Count, Names, ReferencedDomains, TranslatedSids, LookupLevel, MappedCount, LookupOptions, ClientRevision); @@ -2223,8 +2239,29 @@ DWORD LookupOptions, DWORD ClientRevision) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + TRACE("(%p %lu %p %p %p %d %p %lu %lu)\n", + RpcHandle, Count, Names, ReferencedDomains, TranslatedSids, + LookupLevel, MappedCount, LookupOptions, ClientRevision); + + TranslatedSids->Entries = 0; + TranslatedSids->Sids = NULL; + *ReferencedDomains = NULL; + + if (Count == 0) + return STATUS_NONE_MAPPED; + + Status = LsapLookupNames(Count, + Names, + ReferencedDomains, + TranslatedSids, + LookupLevel, + MappedCount, + LookupOptions, + ClientRevision); + + return Status; } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sat Oct 6 19:37:10 2012 @@ -192,6 +192,9 @@ NTSTATUS LsapInitSids(VOID); +ULONG +LsapGetRelativeIdFromSid(PSID Sid); + NTSTATUS LsapLookupNames(DWORD Count, PRPC_UNICODE_STRING Names, Modified: trunk/reactos/dll/win32/lsasrv/sids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/sids.c?re… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] Sat Oct 6 19:37:10 2012 @@ -808,6 +808,18 @@ } +ULONG +LsapGetRelativeIdFromSid(PSID Sid_) +{ + PISID Sid = Sid_; + + if (Sid->SubAuthorityCount != 0) + return Sid->SubAuthority[Sid->SubAuthorityCount - 1]; + + return 0; +} + + NTSTATUS LsapLookupNames(DWORD Count, PRPC_UNICODE_STRING Names, @@ -824,10 +836,6 @@ PRPC_UNICODE_STRING AccountNames = NULL; ULONG SidsBufferLength; ULONG DomainIndex; -// ULONG DomainSidLength; -// ULONG AccountSidLength; -// PSID DomainSid; -// PSID AccountSid; ULONG i; ULONG Mapped = 0; NTSTATUS Status = STATUS_SUCCESS; @@ -1006,84 +1014,29 @@ } -NTSTATUS -LsapLookupSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, - PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, - PLSAPR_TRANSLATED_NAMES_EX TranslatedNames, - LSAP_LOOKUP_LEVEL LookupLevel, - DWORD *MappedCount, - DWORD LookupOptions, - DWORD ClientRevision) -{ - PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer = NULL; - PLSAPR_TRANSLATED_NAME_EX NamesBuffer = NULL; - ULONG NamesBufferLength; +static NTSTATUS +LsapLookupWellKnownSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, + PLSAPR_TRANSLATED_NAME_EX NamesBuffer, + PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer, + PULONG Mapped) +{ + PWELL_KNOWN_SID ptr, ptr2; + LPWSTR SidString = NULL; ULONG DomainIndex; ULONG i; - ULONG Mapped = 0; NTSTATUS Status = STATUS_SUCCESS; - PWELL_KNOWN_SID ptr, ptr2; - - SID_IDENTIFIER_AUTHORITY IdentifierAuthority = {SECURITY_NT_AUTHORITY}; - static const UNICODE_STRING DomainName = RTL_CONSTANT_STRING(L"DOMAIN"); - static const UNICODE_STRING AdminName = RTL_CONSTANT_STRING(L"Administrator"); - PSID AdminsSid = NULL; - ULONG SidLength; - - - NamesBufferLength = SidEnumBuffer->Entries * sizeof(LSAPR_TRANSLATED_NAME_EX); - NamesBuffer = MIDL_user_allocate(NamesBufferLength); - if (NamesBuffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - DomainsBuffer = MIDL_user_allocate(sizeof(LSAPR_REFERENCED_DOMAIN_LIST)); - if (DomainsBuffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - DomainsBuffer->Domains = MIDL_user_allocate(SidEnumBuffer->Entries * sizeof(LSA_TRUST_INFORMATION)); - if (DomainsBuffer->Domains == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - DomainsBuffer->Entries = 0; - DomainsBuffer->MaxEntries = SidEnumBuffer->Entries; - - /* Initialize all name entries */ for (i = 0; i < SidEnumBuffer->Entries; i++) { - NamesBuffer[i].Use = SidTypeUnknown; - NamesBuffer[i].Name.Length = 0; - NamesBuffer[i].Name.MaximumLength = 0; - NamesBuffer[i].Name.Buffer = NULL; - NamesBuffer[i].DomainIndex = -1; - NamesBuffer[i].Flags = 0; - } - - - Status = RtlAllocateAndInitializeSid(&IdentifierAuthority, - 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, - &AdminsSid); - if (!NT_SUCCESS(Status)) - goto done; - - - SidLength = RtlLengthSid(AdminsSid); - - - for (i = 0; i < SidEnumBuffer->Entries; i++) - { + /* Ignore SIDs which are already mapped */ + if (NamesBuffer[i].Use != SidTypeUnknown) + continue; + + ConvertSidToStringSidW(SidEnumBuffer->SidInfo[i].Sid, &SidString); + TRACE("Unmapped SID: %S\n", SidString); + LocalFree(SidString); + SidString = NULL; + ptr = LsapLookupWellKnownSid(SidEnumBuffer->SidInfo[i].Sid); if (ptr != NULL) { @@ -1106,13 +1059,83 @@ NamesBuffer[i].DomainIndex = DomainIndex; } - Mapped++; + TRACE("Mapped to: %wZ\n", &NamesBuffer[i].Name); + + (*Mapped)++; + } + } + + return Status; +} + + +static NTSTATUS +LsapLookupLocalDomainSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, + PLSAPR_TRANSLATED_NAME_EX NamesBuffer, + PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer, + PULONG Mapped) +{ + LPWSTR SidString = NULL; + ULONG i; + + for (i = 0; i < SidEnumBuffer->Entries; i++) + { + /* Ignore SIDs which are already mapped */ + if (NamesBuffer[i].Use != SidTypeUnknown) continue; - } + + ConvertSidToStringSidW(SidEnumBuffer->SidInfo[i].Sid, &SidString); + TRACE("Unmapped SID: %S\n", SidString); + LocalFree(SidString); + SidString = NULL; + } + + return STATUS_SUCCESS; +} + + +static NTSTATUS +LsapLookupUnknownSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, + PLSAPR_TRANSLATED_NAME_EX NamesBuffer, + PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer, + PULONG Mapped) +{ + SID_IDENTIFIER_AUTHORITY IdentifierAuthority = {SECURITY_NT_AUTHORITY}; + static const UNICODE_STRING DomainName = RTL_CONSTANT_STRING(L"DOMAIN"); + static const UNICODE_STRING AdminName = RTL_CONSTANT_STRING(L"Administrator"); + PSID AdminsSid = NULL; + LPWSTR SidString = NULL; + ULONG SidLength; + ULONG DomainIndex; + ULONG i; + NTSTATUS Status; + + Status = RtlAllocateAndInitializeSid(&IdentifierAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &AdminsSid); + if (!NT_SUCCESS(Status)) + goto done; + + SidLength = RtlLengthSid(AdminsSid); + + for (i = 0; i < SidEnumBuffer->Entries; i++) + { + /* Ignore SIDs which are already mapped */ + if (NamesBuffer[i].Use != SidTypeUnknown) + continue; + + + ConvertSidToStringSidW(SidEnumBuffer->SidInfo[i].Sid, &SidString); + TRACE("Unmapped SID: %S\n", SidString); + LocalFree(SidString); + SidString = NULL; /* Hack: Map the SID to the Admin Account if it is not a well-known SID */ - NamesBuffer[i].Use = SidTypeWellKnownGroup; + NamesBuffer[i].Use = SidTypeUser; NamesBuffer[i].Flags = 0; NamesBuffer[i].Name.Length = AdminName.Length; NamesBuffer[i].Name.MaximumLength = AdminName.MaximumLength; @@ -1126,16 +1149,103 @@ if (NT_SUCCESS(Status)) NamesBuffer[i].DomainIndex = DomainIndex; - Mapped++; - continue; - - + TRACE("Mapped to: %wZ\n", &NamesBuffer[i].Name); + + (*Mapped)++; } done: if (AdminsSid != NULL) RtlFreeSid(AdminsSid); + return Status; +} + + +NTSTATUS +LsapLookupSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, + PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + PLSAPR_TRANSLATED_NAMES_EX TranslatedNames, + LSAP_LOOKUP_LEVEL LookupLevel, + DWORD *MappedCount, + DWORD LookupOptions, + DWORD ClientRevision) +{ + PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer = NULL; + PLSAPR_TRANSLATED_NAME_EX NamesBuffer = NULL; + ULONG NamesBufferLength; + ULONG i; + ULONG Mapped = 0; + NTSTATUS Status = STATUS_SUCCESS; + + NamesBufferLength = SidEnumBuffer->Entries * sizeof(LSAPR_TRANSLATED_NAME_EX); + NamesBuffer = MIDL_user_allocate(NamesBufferLength); + if (NamesBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + DomainsBuffer = MIDL_user_allocate(sizeof(LSAPR_REFERENCED_DOMAIN_LIST)); + if (DomainsBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + DomainsBuffer->Domains = MIDL_user_allocate(SidEnumBuffer->Entries * sizeof(LSA_TRUST_INFORMATION)); + if (DomainsBuffer->Domains == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + DomainsBuffer->Entries = 0; + DomainsBuffer->MaxEntries = SidEnumBuffer->Entries; + + /* Initialize all name entries */ + for (i = 0; i < SidEnumBuffer->Entries; i++) + { + NamesBuffer[i].Use = SidTypeUnknown; + NamesBuffer[i].Name.Length = 0; + NamesBuffer[i].Name.MaximumLength = 0; + NamesBuffer[i].Name.Buffer = NULL; + NamesBuffer[i].DomainIndex = -1; + NamesBuffer[i].Flags = 0; + } + + /* Look-up all well-known SIDs */ + Status = LsapLookupWellKnownSids(SidEnumBuffer, + NamesBuffer, + DomainsBuffer, + &Mapped); + if (!NT_SUCCESS(Status)) + goto done; + + if (Mapped == SidEnumBuffer->Entries) + goto done; + + /* Look-up all Domain SIDs */ + Status = LsapLookupLocalDomainSids(SidEnumBuffer, + NamesBuffer, + DomainsBuffer, + &Mapped); + if (!NT_SUCCESS(Status)) + goto done; + + if (Mapped == SidEnumBuffer->Entries) + goto done; + + /* Map unknown SIDs */ + Status = LsapLookupUnknownSids(SidEnumBuffer, + NamesBuffer, + DomainsBuffer, + &Mapped); + if (!NT_SUCCESS(Status)) + goto done; + +done: + TRACE("done Status: %lx Mapped: %lu\n", Status, Mapped); if (!NT_SUCCESS(Status)) {

1 0

[tkreuzer] 57502: [WIN32K] Use ExFreePoolWithTag instead of ExFreePool in SpiNotifyNCMetricsChanged. Fixes CID 716644
by tkreuzer＠svn.reactos.org 06 Oct '12

06 Oct '12

Author: tkreuzer Date: Sat Oct 6 19:24:14 2012 New Revision: 57502 URL: http://svn.reactos.org/svn/reactos?rev=57502&view=rev Log: [WIN32K] Use ExFreePoolWithTag instead of ExFreePool in SpiNotifyNCMetricsChanged. Fixes CID 716644 Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c 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] Sat Oct 6 19:24:14 2012 @@ -741,7 +741,7 @@ UserDerefObjectCo(pwndCurrent); } - ExFreePool(ahwnd); + ExFreePoolWithTag(ahwnd, USERTAG_WINDOWLIST); return TRUE; }

1 0

[tkreuzer] 57501: [WIN32K] - Keep an additional reference while processing the message list of a message queue - CID 716808
by tkreuzer＠svn.reactos.org 06 Oct '12

06 Oct '12

Author: tkreuzer Date: Sat Oct 6 19:04:36 2012 New Revision: 57501 URL: http://svn.reactos.org/svn/reactos?rev=57501&view=rev Log: [WIN32K] - Keep an additional reference while processing the message list of a message queue - CID 716808 Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c 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] Sat Oct 6 19:04:36 2012 @@ -874,6 +874,9 @@ } } + /* Reference we message queue, so it won't get deleted */ + IntReferenceMessageQueue(MessageQueue); + /* remove the sent messages for this window */ CurrentEntry = MessageQueue->SentMessagesListHead.Flink; ListHead = &MessageQueue->SentMessagesListHead; @@ -930,6 +933,9 @@ CurrentEntry = CurrentEntry->Flink; } } + + /* Remove the reference we added */ + IntDereferenceMessageQueue(MessageQueue); } BOOL FASTCALL

1 0

[hbelusca] 57500: [NTOSKRNL] Use TAG_FSTUB instead of 'BtsF'
by hbelusca＠svn.reactos.org 06 Oct '12

06 Oct '12

Author: hbelusca Date: Sat Oct 6 18:49:23 2012 New Revision: 57500 URL: http://svn.reactos.org/svn/reactos?rev=57500&view=rev Log: [NTOSKRNL] Use TAG_FSTUB instead of 'BtsF' Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Sat Oct 6 18:49:23 2012 @@ -269,7 +269,7 @@ DriveLayout = ExAllocatePoolWithTag(NonPagedPool, FIELD_OFFSET(DRIVE_LAYOUT_INFORMATION, PartitionEntry) + LayoutEx->PartitionCount * sizeof(PARTITION_INFORMATION), - 'BtsF'); + TAG_FSTUB); if (!DriveLayout) { return NULL; @@ -1605,7 +1605,7 @@ DriveLayout); /* Free allocated structure and return */ - ExFreePoolWithTag(DriveLayout, 'BtsF'); + ExFreePoolWithTag(DriveLayout, TAG_FSTUB); return Status; }

1 0

[hbelusca] 57499: [NTOSKRNL] Fix Coverity defects : CID 716579, 716580 and 716582.
by hbelusca＠svn.reactos.org 06 Oct '12

06 Oct '12

Author: hbelusca Date: Sat Oct 6 18:46:13 2012 New Revision: 57499 URL: http://svn.reactos.org/svn/reactos?rev=57499&view=rev Log: [NTOSKRNL] Fix Coverity defects : CID 716579, 716580 and 716582. Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/error.c Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Sat Oct 6 18:46:13 2012 @@ -1605,7 +1605,7 @@ DriveLayout); /* Free allocated structure and return */ - ExFreePool(DriveLayout); + ExFreePoolWithTag(DriveLayout, 'BtsF'); return Status; } 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] Sat Oct 6 18:46:13 2012 @@ -1770,7 +1770,7 @@ if (!Inserted) { /* Free the entry and fail */ - ExFreePool(NewDriverExtension); + ExFreePoolWithTag(NewDriverExtension, TAG_DRIVER_EXTENSION); return STATUS_OBJECT_NAME_COLLISION; } Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/error.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] Sat Oct 6 18:46:13 2012 @@ -486,14 +486,33 @@ { PERROR_LOG_ENTRY LogEntry; ULONG LogEntrySize; + PDEVICE_OBJECT DeviceObject; PDRIVER_OBJECT DriverObject; - PDEVICE_OBJECT DeviceObject; /* Make sure we have an object */ if (!IoObject) return NULL; /* Check if we're past our buffer */ if (IopTotalLogSize > PAGE_SIZE) return NULL; + + /* Check if this is a device object or driver object */ + if (((PDEVICE_OBJECT)IoObject)->Type == IO_TYPE_DEVICE) + { + /* It's a device, get the driver */ + DeviceObject = (PDEVICE_OBJECT)IoObject; + DriverObject = DeviceObject->DriverObject; + } + else if (((PDEVICE_OBJECT)IoObject)->Type == IO_TYPE_DRIVER) + { + /* It's a driver, so we don't have a device */ + DeviceObject = NULL; + DriverObject = (PDRIVER_OBJECT)IoObject; + } + else + { + /* Fail */ + return NULL; + } /* Calculate the total size and allocate it */ LogEntrySize = sizeof(ERROR_LOG_ENTRY) + EntrySize; @@ -501,25 +520,6 @@ LogEntrySize, TAG_ERROR_LOG); if (!LogEntry) return NULL; - - /* Check if this is a device object or driver object */ - if (((PDEVICE_OBJECT)IoObject)->Type == IO_TYPE_DEVICE) - { - /* It's a device, get the driver */ - DeviceObject = (PDEVICE_OBJECT)IoObject; - DriverObject = DeviceObject->DriverObject; - } - else if (((PDEVICE_OBJECT)IoObject)->Type == IO_TYPE_DRIVER) - { - /* It's a driver, so we don' thave a device */ - DeviceObject = NULL; - DriverObject = IoObject; - } - else - { - /* Fail */ - return NULL; - } /* Reference the Objects */ if (DeviceObject) ObReferenceObject(DeviceObject);

1 0

[hbelusca] 57498: [NTDLL_APITEST] Initialize Length to default value.
by hbelusca＠svn.reactos.org 06 Oct '12

06 Oct '12

Author: hbelusca Date: Sat Oct 6 14:50:18 2012 New Revision: 57498 URL: http://svn.reactos.org/svn/reactos?rev=57498&view=rev Log: [NTDLL_APITEST] Initialize Length to default value. Modified: trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c Modified: trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDosSear… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c [iso-8859-1] Sat Oct 6 14:50:18 2012 @@ -101,7 +101,7 @@ START_TEST(RtlDosSearchPath_U) { NTSTATUS ExceptionStatus; - ULONG Length; + ULONG Length = 0; WCHAR Buffer[MAX_PATH]; PWSTR PartName; BOOLEAN Okay;

1 0

[tkreuzer] 57497: [BMFD] - Remove a pointless check (CID 731583) - Add a comment - Simplify code
by tkreuzer＠svn.reactos.org 06 Oct '12

06 Oct '12

Author: tkreuzer Date: Sat Oct 6 14:35:52 2012 New Revision: 57497 URL: http://svn.reactos.org/svn/reactos?rev=57497&view=rev Log: [BMFD] - Remove a pointless check (CID 731583) - Add a comment - Simplify code Modified: trunk/reactos/win32ss/drivers/font/bmfd/font.c trunk/reactos/win32ss/drivers/font/bmfd/glyph.c Modified: trunk/reactos/win32ss/drivers/font/bmfd/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/bmfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/bmfd/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/bmfd/font.c [iso-8859-1] Sat Oct 6 14:35:52 2012 @@ -65,7 +65,7 @@ pface->wA = GETVAL(pFontInfo->dfAspace); pface->wB = GETVAL(pFontInfo->dfBspace); pface->wC = GETVAL(pFontInfo->dfCspace); - pface->pCharTable = pface->pFontInfo->dfCharTable; + pface->pCharTable = pFontInfo->dfCharTable; pface->cjEntrySize = sizeof(GLYPHENTRY30); } else @@ -74,7 +74,7 @@ pface->wA = 0; pface->wB = 0; pface->wC = 0; - pface->pCharTable = &pface->pFontInfo->dfReserved + 1; + pface->pCharTable = &pFontInfo->dfReserved + 1; pface->cjEntrySize = sizeof(GLYPHENTRY20); } Modified: trunk/reactos/win32ss/drivers/font/bmfd/glyph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/bmfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/bmfd/glyph.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/bmfd/glyph.c [iso-8859-1] Sat Oct 6 14:35:52 2012 @@ -80,18 +80,15 @@ ULONG cjSize) { PBMFD_FACE pface = pfont->pface; - PGLYPHENTRY pge = (PGLYPHENTRY)(pface->pCharTable + hg); + PGLYPHENTRY pge; ULONG xSrc, ySrc, cxSrc, cySrc; ULONG xDst, yDst, cxDst, cyDst; ULONG xScale, yScale; ULONG ulGlyphOffset, cjDstRow, color; PVOID pvSrc0, pvDst0; - if (!pge) - { - DbgPrint("no glyph handle given!\n"); - return FD_ERROR; - } + /* The glyph handle is the byte offset to the glyph in the table */ + pge = (PGLYPHENTRY)(pface->pCharTable + hg); /* Get the bitmap offset depending on file version */ if (pface->ulVersion >= 0x300) @@ -151,7 +148,7 @@ /* Verify that the buffer is big enough */ if (cjSize < FIELD_OFFSET(GLYPHBITS, aj) + cyDst * cjDstRow) { - DbgPrint("Buffer too small (%ld), %ld,%ld\n", + DbgPrint("Buffer too small (%ld), %ld,%ld\n", cjSize, cxSrc, cySrc); return FD_ERROR; } @@ -245,7 +242,7 @@ } pFontInfo = pfont->pface->pFontInfo; - + xScale = pfont->xScale; yScale = pfont->yScale; @@ -329,7 +326,7 @@ PBMFD_FACE pface = &pfile->aface[pfo->iFace - 1]; PBMFD_FONT pfont= BmfdGetFontInstance(pfo, pface); - DbgPrint("BmfdQueryFontData(pfo=%p, iMode=%ld, hg=%p, pgd=%p, pv=%p, cjSize=%ld)\n", + DbgPrint("BmfdQueryFontData(pfo=%p, iMode=%ld, hg=%p, pgd=%p, pv=%p, cjSize=%ld)\n", pfo, iMode, hg, pgd, pv, cjSize); // __debugbreak(); @@ -340,7 +337,7 @@ case QFD_MAXEXTENTS: /* 3 */ return BmfdQueryMaxExtents(pfont, pv, cjSize); - + /* we support nothing else */ default: return FD_ERROR;

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