diff --git a/reactos/win32ss/gdi/eng/clip.c b/reactos/win32ss/gdi/eng/clip.c index cdfe2fdf9b0..28166230c78 100644 --- a/reactos/win32ss/gdi/eng/clip.c +++ b/reactos/win32ss/gdi/eng/clip.c @@ -309,7 +309,7 @@ CLIPOBJ_cEnumStart( break; default: - DPRINT1("Invalid BuildOrder %d\n", BuildOrder); + DPRINT1("Invalid BuildOrder %lu\n", BuildOrder); BuildOrder = ClipGDI->EnumOrder; CompareFunc = NULL; break; diff --git a/reactos/win32ss/gdi/eng/device.c b/reactos/win32ss/gdi/eng/device.c index da22999c8cd..61445b29250 100644 --- a/reactos/win32ss/gdi/eng/device.c +++ b/reactos/win32ss/gdi/eng/device.c @@ -206,7 +206,7 @@ EngpRegisterGraphicsDevice( { pGraphicsDevice->iDefaultMode = i; pGraphicsDevice->iCurrentMode = i; - DPRINT("Found default entry: %ld '%ls'\n", i, pdm->dmDeviceName); + DPRINT("Found default entry: %lu '%ls'\n", i, pdm->dmDeviceName); } /* Initialize the entry */ @@ -232,7 +232,7 @@ EngpRegisterGraphicsDevice( /* Unlock loader */ EngReleaseSemaphore(ghsemGraphicsDeviceList); - DPRINT("Prepared %ld modes for %ls\n", cModes, pGraphicsDevice->pwszDescription); + DPRINT("Prepared %lu modes for %ls\n", cModes, pGraphicsDevice->pwszDescription); return pGraphicsDevice; } @@ -248,7 +248,7 @@ EngpFindGraphicsDevice( UNICODE_STRING ustrCurrent; PGRAPHICS_DEVICE pGraphicsDevice; ULONG i; - DPRINT("EngpFindGraphicsDevice('%wZ', %ld, 0x%lx)\n", + DPRINT("EngpFindGraphicsDevice('%wZ', %lu, 0x%lx)\n", pustrDevice, iDevNum, dwFlags); /* Lock list */ diff --git a/reactos/win32ss/gdi/eng/engwindow.c b/reactos/win32ss/gdi/eng/engwindow.c index 34e3147bb5f..cbb7f7c6099 100644 --- a/reactos/win32ss/gdi/eng/engwindow.c +++ b/reactos/win32ss/gdi/eng/engwindow.c @@ -45,7 +45,7 @@ IntEngWndCallChangeProc( pwo = NULL; } - DPRINT("Calling WNDOBJCHANGEPROC (0x%x), Changed = 0x%x\n", + DPRINT("Calling WNDOBJCHANGEPROC (0x%p), Changed = 0x%x\n", WndObjInt->ChangeProc, flChanged); WndObjInt->ChangeProc(pwo, flChanged); } @@ -77,7 +77,7 @@ IntEngWndUpdateClipObj( { ClipObj = IntEngCreateClipRegion(visRgn->rdh.nCount, visRgn->Buffer, &visRgn->rdh.rcBound); - DPRINT("Created visible region with %d rects\n", visRgn->rdh.nCount); + DPRINT("Created visible region with %lu rects\n", visRgn->rdh.nCount); DPRINT(" BoundingRect: %d, %d %d, %d\n", visRgn->rdh.rcBound.left, visRgn->rdh.rcBound.top, visRgn->rdh.rcBound.right, visRgn->rdh.rcBound.bottom); @@ -85,7 +85,7 @@ IntEngWndUpdateClipObj( ULONG i; for (i = 0; i < visRgn->rdh.nCount; i++) { - DPRINT(" Rect #%d: %d,%d %d,%d\n", i+1, + DPRINT(" Rect #%lu: %ld,%ld %ld,%ld\n", i+1, visRgn->Buffer[i].left, visRgn->Buffer[i].top, visRgn->Buffer[i].right, visRgn->Buffer[i].bottom); } @@ -195,7 +195,7 @@ EngCreateWnd( BOOL calledFromUser; DECLARE_RETURN(WNDOBJ*); - DPRINT("EngCreateWnd: pso = 0x%x, hwnd = 0x%x, pfn = 0x%x, fl = 0x%x, pixfmt = %d\n", + DPRINT("EngCreateWnd: pso = 0x%p, hwnd = 0x%p, pfn = 0x%p, fl = 0x%lx, pixfmt = %d\n", pso, hWnd, pfn, fl, iPixelFormat); calledFromUser = UserIsEntered(); @@ -267,7 +267,7 @@ EngDeleteWnd( PWND Window; BOOL calledFromUser; - DPRINT("EngDeleteWnd: pwo = 0x%x\n", pwo); + DPRINT("EngDeleteWnd: pwo = 0x%p\n", pwo); calledFromUser = UserIsEntered(); if (!calledFromUser){ @@ -310,7 +310,7 @@ WNDOBJ_bEnum( WNDGDI *WndObjInt = ObjToGDI(pwo, WND); BOOL Ret; - DPRINT("WNDOBJ_bEnum: pwo = 0x%x, cj = %d, pul = 0x%x\n", pwo, cj, pul); + DPRINT("WNDOBJ_bEnum: pwo = 0x%p, cj = %lu, pul = 0x%p\n", pwo, cj, pul); Ret = CLIPOBJ_bEnum(WndObjInt->ClientClipObj, cj, pul); DPRINT("WNDOBJ_bEnum: Returning %s\n", Ret ? "True" : "False"); @@ -332,13 +332,13 @@ WNDOBJ_cEnumStart( WNDGDI *WndObjInt = ObjToGDI(pwo, WND); ULONG Ret; - DPRINT("WNDOBJ_cEnumStart: pwo = 0x%x, iType = %d, iDirection = %d, cLimit = %d\n", + DPRINT("WNDOBJ_cEnumStart: pwo = 0x%p, iType = %lu, iDirection = %lu, cLimit = %lu\n", pwo, iType, iDirection, cLimit); /* FIXME: Should we enumerate all rectangles or not? */ Ret = CLIPOBJ_cEnumStart(WndObjInt->ClientClipObj, FALSE, iType, iDirection, cLimit); - DPRINT("WNDOBJ_cEnumStart: Returning 0x%x\n", Ret); + DPRINT("WNDOBJ_cEnumStart: Returning 0x%lx\n", Ret); return Ret; } @@ -354,7 +354,7 @@ WNDOBJ_vSetConsumer( { BOOL Hack; - DPRINT("WNDOBJ_vSetConsumer: pwo = 0x%x, pvConsumer = 0x%x\n", pwo, pvConsumer); + DPRINT("WNDOBJ_vSetConsumer: pwo = 0x%p, pvConsumer = 0x%p\n", pwo, pvConsumer); Hack = (pwo->pvConsumer == NULL); pwo->pvConsumer = pvConsumer; diff --git a/reactos/win32ss/gdi/eng/ldevobj.c b/reactos/win32ss/gdi/eng/ldevobj.c index b78bda012e4..f00c01bcb26 100644 --- a/reactos/win32ss/gdi/eng/ldevobj.c +++ b/reactos/win32ss/gdi/eng/ldevobj.c @@ -142,7 +142,7 @@ LDEVOBJ_pdmiGetModes( if (!cbSize) { /* Could not get modes */ - DPRINT1("returned size %ld(%ld)\n", cbSize, pdminfo->cbdevmode); + DPRINT1("returned size %lu(%lu)\n", cbSize, pdminfo->cbdevmode); ExFreePoolWithTag(pdminfo, GDITAG_DEVMODE); pdminfo = NULL; } @@ -327,7 +327,7 @@ EngLoadImageEx( ULONG cwcLength; LPWSTR pwsz; - DPRINT("EngLoadImageEx(%ls, %ld)\n", pwszDriverName, ldevtype); + DPRINT("EngLoadImageEx(%ls, %lu)\n", pwszDriverName, ldevtype); ASSERT(pwszDriverName); /* Initialize buffer for the the driver name */ diff --git a/reactos/win32ss/gdi/eng/mapping.c b/reactos/win32ss/gdi/eng/mapping.c index 0b163cee4c7..4556f9984c0 100644 --- a/reactos/win32ss/gdi/eng/mapping.c +++ b/reactos/win32ss/gdi/eng/mapping.c @@ -188,7 +188,7 @@ EngMapSection( } else { - DPRINT1("Failed to unmap a section @ &p Status=0x%x\n", + DPRINT1("Failed to unmap a section @ %p Status=0x%x\n", pSection->pvMappedBase, Status); } } diff --git a/reactos/win32ss/gdi/eng/paint.c b/reactos/win32ss/gdi/eng/paint.c index 61481229b15..61f25314188 100644 --- a/reactos/win32ss/gdi/eng/paint.c +++ b/reactos/win32ss/gdi/eng/paint.c @@ -1,4 +1,4 @@ -/* +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: GDI Driver Paint Functions @@ -19,7 +19,7 @@ BOOL APIENTRY FillSolid(SURFOBJ *pso, PRECTL pRect, ULONG iColor) ASSERT(pso); ASSERT(pRect); LineWidth = pRect->right - pRect->left; - DPRINT(" LineWidth: %d, top: %d, bottom: %d\n", LineWidth, pRect->top, pRect->bottom); + DPRINT(" LineWidth: %lu, top: %ld, bottom: %ld\n", LineWidth, pRect->top, pRect->bottom); for (y = pRect->top; y < pRect->bottom; y++) { DibFunctionsForBitmapFormat[pso->iBitmapFormat].DIB_HLine( @@ -39,7 +39,7 @@ EngPaintRgn(SURFOBJ *pso, CLIPOBJ *ClipRegion, ULONG iColor, MIX Mix, ASSERT(pso); ASSERT(ClipRegion); - DPRINT("ClipRegion->iMode:%d, ClipRegion->iDComplexity: %d\n Color: %d", ClipRegion->iMode, ClipRegion->iDComplexity, iColor); + DPRINT("ClipRegion->iMode:%u, ClipRegion->iDComplexity: %u\n Color: %lu", ClipRegion->iMode, ClipRegion->iDComplexity, iColor); switch(ClipRegion->iMode) { case TC_RECTANGLES: @@ -99,7 +99,7 @@ IntEngPaint(IN SURFOBJ *pso, SURFACE *psurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); BOOL ret; - DPRINT("pso->iType == %d\n", pso->iType); + DPRINT("pso->iType == %u\n", pso->iType); /* Is the surface's Paint function hooked? */ if((pso->iType!=STYPE_BITMAP) && (psurf->flags & HOOK_PAINT)) { diff --git a/reactos/win32ss/gdi/eng/stubs.c b/reactos/win32ss/gdi/eng/stubs.c index f44d832b7ca..24a61135ada 100644 --- a/reactos/win32ss/gdi/eng/stubs.c +++ b/reactos/win32ss/gdi/eng/stubs.c @@ -622,7 +622,8 @@ EngDitherColor( IN ULONG rgb, OUT ULONG *pul) { - return DCR_SOLID; + *pul = 0; + return DCR_SOLID; } /* diff --git a/reactos/win32ss/gdi/eng/surface.c b/reactos/win32ss/gdi/eng/surface.c index 8b54446f93b..9519b9468bd 100644 --- a/reactos/win32ss/gdi/eng/surface.c +++ b/reactos/win32ss/gdi/eng/surface.c @@ -134,7 +134,7 @@ SURFACE_AllocSurface( /* Verify format */ if ((iFormat < BMF_1BPP) || (iFormat > BMF_PNG)) { - DPRINT1("Invalid bitmap format: %ld\n", iFormat); + DPRINT1("Invalid bitmap format: %lu\n", iFormat); return NULL; } diff --git a/reactos/win32ss/gdi/eng/xlateobj.c b/reactos/win32ss/gdi/eng/xlateobj.c index 39872023dc2..f9c27d84b36 100644 --- a/reactos/win32ss/gdi/eng/xlateobj.c +++ b/reactos/win32ss/gdi/eng/xlateobj.c @@ -642,7 +642,7 @@ XLATEOBJ_cGetPalette(XLATEOBJ *pxlo, ULONG iPal, ULONG cPal, ULONG *pPalOut) if (iPal > 5) { - DPRINT1("XLATEOBJ_cGetPalette called with wrong iPal: %d\n", iPal); + DPRINT1("XLATEOBJ_cGetPalette called with wrong iPal: %lu\n", iPal); return 0; } diff --git a/reactos/win32ss/gdi/ntgdi/bezier.c b/reactos/win32ss/gdi/ntgdi/bezier.c index 56756caa691..1975960ade6 100644 --- a/reactos/win32ss/gdi/ntgdi/bezier.c +++ b/reactos/win32ss/gdi/ntgdi/bezier.c @@ -98,7 +98,7 @@ static BOOL FASTCALL BezierCheck( int level, POINT *Points) return TRUE; } else - { + { /* Steep line */ /* Check that control points are between begin and end */ if(Points[1].y < Points[0].y) diff --git a/reactos/win32ss/gdi/ntgdi/bitmaps.c b/reactos/win32ss/gdi/ntgdi/bitmaps.c index 5318e1d15e4..584dde5dbf1 100644 --- a/reactos/win32ss/gdi/ntgdi/bitmaps.c +++ b/reactos/win32ss/gdi/ntgdi/bitmaps.c @@ -158,7 +158,7 @@ NtGdiCreateBitmap( if ((iFormat == 0) || (nWidth <= 0) || (nWidth >= 0x8000000) || (nHeight <= 0) || (cBitsPixel > 32) || (cPlanes > 32) || (cjSize >= 0x100000000ULL)) { - DPRINT1("Invalid bitmap format! Width=%d, Height=%d, Bpp=%d, Planes=%d\n", + DPRINT1("Invalid bitmap format! Width=%d, Height=%d, Bpp=%u, Planes=%u\n", nWidth, nHeight, cBitsPixel, cPlanes); EngSetLastError(ERROR_INVALID_PARAMETER); return NULL; @@ -365,7 +365,7 @@ NtGdiCreateCompatibleBitmap( Dc = DC_LockDc(hDC); - DPRINT("NtGdiCreateCompatibleBitmap(%04x,%d,%d, bpp:%d) = \n", + DPRINT("NtGdiCreateCompatibleBitmap(%p,%d,%d, bpp:%u) = \n", hDC, Width, Height, Dc->ppdev->gdiinfo.cBitsPixel); if (NULL == Dc) @@ -376,7 +376,6 @@ NtGdiCreateCompatibleBitmap( Bmp = IntCreateCompatibleBitmap(Dc, Width, Height); - DPRINT("\t\t%04x\n", Bmp); DC_UnlockDc(Dc); return Bmp; } diff --git a/reactos/win32ss/gdi/ntgdi/cliprgn.c b/reactos/win32ss/gdi/ntgdi/cliprgn.c index 20ce4e3e64b..41689bf91b6 100644 --- a/reactos/win32ss/gdi/ntgdi/cliprgn.c +++ b/reactos/win32ss/gdi/ntgdi/cliprgn.c @@ -325,7 +325,7 @@ int APIENTRY NtGdiIntersectClipRect(HDC hDC, HRGN NewRgn; PDC dc = DC_LockDc(hDC); - DPRINT("NtGdiIntersectClipRect(%x, %d,%d-%d,%d)\n", + DPRINT("NtGdiIntersectClipRect(%p, %d,%d-%d,%d)\n", hDC, LeftRect, TopRect, RightRect, BottomRect); if (!dc) @@ -541,6 +541,8 @@ NEW_CLIPPING_UpdateGCRegion(PDC pDC) /* Must have VisRgn set to a valid state! */ ASSERT (pDC->prgnVis); +// FIXME: this seems to be broken! + if (pDC->prgnAPI) { REGION_Delete(pDC->prgnAPI); @@ -583,8 +585,9 @@ NEW_CLIPPING_UpdateGCRegion(PDC pDC) pDC->prgnAPI, RGN_AND); + // FIXME: pDC->prgnRao may be NULL RtlCopyMemory(&pDC->erclClip, - &((PROSRGNDATA)pDC->prgnRao)->rdh.rcBound, + &pDC->prgnRao->rdh.rcBound, sizeof(RECTL)); pDC->fs &= ~DC_FLAG_DIRTY_RAO; diff --git a/reactos/win32ss/gdi/ntgdi/dclife.c b/reactos/win32ss/gdi/ntgdi/dclife.c index 32bbfc2dd25..261cb16c343 100644 --- a/reactos/win32ss/gdi/ntgdi/dclife.c +++ b/reactos/win32ss/gdi/ntgdi/dclife.c @@ -268,7 +268,7 @@ DC_vInitDc( pdc->dclevel.ptlBrushOrigin.x = 0; pdc->dclevel.ptlBrushOrigin.y = 0; pdc->dcattr.ptlBrushOrigin = pdc->dclevel.ptlBrushOrigin; - + /* Initialize EBRUSHOBJs */ EBRUSHOBJ_vInit(&pdc->eboFill, pdc->dclevel.pbrFill, pdc); EBRUSHOBJ_vInit(&pdc->eboLine, pdc->dclevel.pbrLine, pdc); @@ -337,6 +337,7 @@ DC_vInitDc( if (defaultDCstate == NULL) { defaultDCstate = ExAllocatePoolWithTag(PagedPool, sizeof(DC), TAG_DC); + ASSERT(defaultDCstate); RtlZeroMemory(defaultDCstate, sizeof(DC)); defaultDCstate->pdcattr = &defaultDCstate->dcattr; DC_vCopyState(pdc, defaultDCstate, TRUE); @@ -599,7 +600,7 @@ GreOpenDCW( PDC pdc; HDC hdc; - DPRINT("GreOpenDCW(%S, iType=%ld)\n", + DPRINT("GreOpenDCW(%S, iType=%lu)\n", pustrDevice ? pustrDevice->Buffer : NULL, iType); /* Get a PDEVOBJ for the device */ @@ -725,6 +726,7 @@ NtGdiOpenDCW( _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Ignore error */ + (void)0; } _SEH2_END } @@ -848,7 +850,7 @@ IntGdiDeleteDC(HDC hDC, BOOL Force) } else { - DPRINT1("Attempted to Delete 0x%x currently being destroyed!!!\n", hDC); + DPRINT1("Attempted to Delete 0x%p currently being destroyed!!!\n", hDC); } return TRUE; diff --git a/reactos/win32ss/gdi/ntgdi/dcobjs.c b/reactos/win32ss/gdi/ntgdi/dcobjs.c index 6637742fed8..370953f0c9d 100644 --- a/reactos/win32ss/gdi/ntgdi/dcobjs.c +++ b/reactos/win32ss/gdi/ntgdi/dcobjs.c @@ -159,6 +159,7 @@ DC_vSetBrushOrigin(PDC pdc, LONG x, LONG y) * * @implemented */ +_Success_(return != FALSE) BOOL APIENTRY NtGdiSetBrushOrg( diff --git a/reactos/win32ss/gdi/ntgdi/fillshap.c b/reactos/win32ss/gdi/ntgdi/fillshap.c index 551bea4f74b..4a16d1e2b6f 100644 --- a/reactos/win32ss/gdi/ntgdi/fillshap.c +++ b/reactos/win32ss/gdi/ntgdi/fillshap.c @@ -820,7 +820,7 @@ NtGdiRoundRect( DC *dc = DC_LockDc(hDC); BOOL ret = FALSE; /* Default to failure */ - DPRINT("NtGdiRoundRect(0x%x,%i,%i,%i,%i,%i,%i)\n",hDC,LeftRect,TopRect,RightRect,BottomRect,Width,Height); + DPRINT("NtGdiRoundRect(0x%p,%i,%i,%i,%i,%i,%i)\n",hDC,LeftRect,TopRect,RightRect,BottomRect,Width,Height); if ( !dc ) { DPRINT1("NtGdiRoundRect() - hDC is invalid\n"); diff --git a/reactos/win32ss/gdi/ntgdi/gdidbg.c b/reactos/win32ss/gdi/ntgdi/gdidbg.c index 5172a5eabb5..0d423e05e7f 100644 --- a/reactos/win32ss/gdi/ntgdi/gdidbg.c +++ b/reactos/win32ss/gdi/ntgdi/gdidbg.c @@ -248,7 +248,7 @@ DbgGdiHTIntegrityCheck() pEntry = &GdiHandleTable->Entries[i]; if (i > GDI_HANDLE_COUNT) { - DPRINT1("nDeleted=%ld\n", nDeleted); + DPRINT1("nDeleted=%lu\n", nDeleted); ASSERT(FALSE); } @@ -332,7 +332,7 @@ DbgGdiHTIntegrityCheck() if (((POBJ)(pEntry->KernelData))->hHmgr != Handle) { r = 0; - DPRINT1("Used entry %ld, has invalid hHmg %p (expected: %p)\n", + DPRINT1("Used entry %lu, has invalid hHmg %p (expected: %p)\n", i, ((POBJ)(pEntry->KernelData))->hHmgr, Handle); } nUsed++; @@ -342,7 +342,7 @@ DbgGdiHTIntegrityCheck() if (RESERVE_ENTRIES_COUNT + nDeleted + nFree + nUsed != GDI_HANDLE_COUNT) { r = 0; - DPRINT1("Number of all entries incorrect: RESERVE_ENTRIES_COUNT = %ld, nDeleted = %ld, nFree = %ld, nUsed = %ld\n", + DPRINT1("Number of all entries incorrect: RESERVE_ENTRIES_COUNT = %lu, nDeleted = %lu, nFree = %lu, nUsed = %lu\n", RESERVE_ENTRIES_COUNT, nDeleted, nFree, nUsed); } @@ -441,12 +441,12 @@ DbgPrintEvent(PLOGENTRY pLogEntry) default: pstr = "Unknown"; break; } - DbgPrint("[%ld] %03x:%03x %.8s val=%p <%lx,%lx,%lx,%lx>\n", + DbgPrint("[%lu] %03x:%03x %.8s val=%p <%lx,%lx,%lx,%lx>\n", pLogEntry->ulUnique, pLogEntry->dwProcessId, pLogEntry->dwThreadId, pstr, - pLogEntry->lParam, + (PVOID)pLogEntry->lParam, REL_ADDR(pLogEntry->apvBackTrace[2]), REL_ADDR(pLogEntry->apvBackTrace[3]), REL_ADDR(pLogEntry->apvBackTrace[4]), @@ -489,7 +489,7 @@ GdiDbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments) PTHREADINFO pti = (PTHREADINFO)PsGetCurrentThreadWin32Thread(); if (pti && pti->cExclusiveLocks != 0) { - DbgPrint("FATAL: Win32DbgPreServiceHook(0x%lx): There are %ld exclusive locks!\n", + DbgPrint("FATAL: Win32DbgPreServiceHook(0x%lx): There are %lu exclusive locks!\n", ulSyscallId, pti->cExclusiveLocks); DbgDumpLockedGdiHandles(); ASSERT(FALSE); @@ -504,7 +504,7 @@ GdiDbgPostServiceHook(ULONG ulSyscallId, ULONG_PTR ulResult) PTHREADINFO pti = (PTHREADINFO)PsGetCurrentThreadWin32Thread(); if (pti && pti->cExclusiveLocks != 0) { - DbgPrint("FATAL: Win32DbgPostServiceHook(0x%lx): There are %ld exclusive locks!\n", + DbgPrint("FATAL: Win32DbgPostServiceHook(0x%lx): There are %lu exclusive locks!\n", ulSyscallId, pti->cExclusiveLocks); DbgDumpLockedGdiHandles(); ASSERT(FALSE); @@ -521,7 +521,7 @@ QueryEnvironmentVariable(PUNICODE_STRING Name, UNICODE_STRING var; PWSTR val; PPEB Peb; - PWSTR Environment; + PWSTR Environment; /* Ugly HACK for ReactOS system threads */ if(!NtCurrentTeb()) @@ -531,7 +531,7 @@ QueryEnvironmentVariable(PUNICODE_STRING Name, Peb = NtCurrentPeb(); - if (Peb == NULL) + if (Peb == NULL) { return(STATUS_VARIABLE_NOT_FOUND); } @@ -595,10 +595,10 @@ DbgAddDebugChannel(PPROCESSINFO ppi, WCHAR* channel, WCHAR* level, WCHAR op) DBG_CHANNEL *ChannelEntry; UINT iLevel, iChannel; - ChannelEntry = (DBG_CHANNEL*)bsearch(channel, - DbgChannels, - DbgChCount, - sizeof(DBG_CHANNEL), + ChannelEntry = (DBG_CHANNEL*)bsearch(channel, + DbgChannels, + DbgChCount, + sizeof(DBG_CHANNEL), DbgCompareChannels); if(ChannelEntry == NULL) { @@ -620,7 +620,7 @@ DbgAddDebugChannel(PPROCESSINFO ppi, WCHAR* channel, WCHAR* level, WCHAR op) iLevel = TRACE_LEVEL; else return FALSE; - + if(op==L'+') { DBG_ENABLE_CHANNEL(ppi, iChannel, iLevel); @@ -629,11 +629,11 @@ DbgAddDebugChannel(PPROCESSINFO ppi, WCHAR* channel, WCHAR* level, WCHAR op) { DBG_DISABLE_CHANNEL(ppi, iChannel, iLevel); } - + return TRUE; } -static BOOL +static BOOL DbgParseDebugChannels(PPROCESSINFO ppi, PUNICODE_STRING Value) { WCHAR *str, *separator, *c, op; @@ -676,8 +676,8 @@ BOOL DbgInitDebugChannels() /* Initialize all channels to ERROR */ ppi = PsGetCurrentProcessWin32Process(); - RtlFillMemory( ppi->DbgChannelLevel, - sizeof(ppi->DbgChannelLevel), + RtlFillMemory( ppi->DbgChannelLevel, + sizeof(ppi->DbgChannelLevel), ERR_LEVEL); /* Find DEBUGCHANNEL env var */ diff --git a/reactos/win32ss/gdi/ntgdi/gdidebug.h b/reactos/win32ss/gdi/ntgdi/gdidebug.h index d59d367d75f..9a656bc36ac 100644 --- a/reactos/win32ss/gdi/ntgdi/gdidebug.h +++ b/reactos/win32ss/gdi/ntgdi/gdidebug.h @@ -70,7 +70,7 @@ GdiDbgAssertNoLocks(char * pszFile, ULONG nLine) PTHREADINFO pti = (PTHREADINFO)PsGetCurrentThreadWin32Thread(); if (pti && pti->cExclusiveLocks != 0) { - DbgPrint("(%s:%ld) There are %ld exclusive locks!\n", + DbgPrint("(%s:%lu) There are %lu exclusive locks!\n", pszFile, nLine, pti->cExclusiveLocks); ASSERT(FALSE); } diff --git a/reactos/win32ss/gdi/ntgdi/gdiobj.c b/reactos/win32ss/gdi/ntgdi/gdiobj.c index 5f7b41e704d..7e4aa730b39 100644 --- a/reactos/win32ss/gdi/ntgdi/gdiobj.c +++ b/reactos/win32ss/gdi/ntgdi/gdiobj.c @@ -361,7 +361,7 @@ ENTRY_ReferenceEntryByHandle(HGDIOBJ hobj, FLONG fl) if (pentry->FullUnique != (USHORT)((ULONG_PTR)hobj >> 16)) { DPRINT("GDIOBJ: Wrong unique value. Handle: 0x%4x, entry: 0x%4x\n", - (USHORT)((ULONG_PTR)hobj >> 16, pentry->FullUnique)); + (USHORT)((ULONG_PTR)hobj >> 16), pentry->FullUnique); return NULL; } @@ -1286,7 +1286,7 @@ GDI_CleanupForProcess(struct _EPROCESS *Process) DWORD dwProcessId; PPROCESSINFO ppi; - DPRINT("CleanupForProcess prochandle %x Pid %d\n", + DPRINT("CleanupForProcess prochandle %p Pid %p\n", Process, Process->UniqueProcessId); ASSERT(Process == PsGetCurrentProcess()); @@ -1317,7 +1317,7 @@ GDI_CleanupForProcess(struct _EPROCESS *Process) #endif ppi = PsGetCurrentProcessWin32Process(); - DPRINT("Completed cleanup for process %d\n", Process->UniqueProcessId); + DPRINT("Completed cleanup for process %p\n", Process->UniqueProcessId); if (ppi->GDIHandleCount != 0) { DPRINT1("Leaking %d handles!\n", ppi->GDIHandleCount); diff --git a/reactos/win32ss/gdi/ntgdi/gdipool.c b/reactos/win32ss/gdi/ntgdi/gdipool.c index adb5b678532..57305d7eeda 100644 --- a/reactos/win32ss/gdi/ntgdi/gdipool.c +++ b/reactos/win32ss/gdi/ntgdi/gdipool.c @@ -100,7 +100,7 @@ GdiPoolDeleteSection(PGDI_POOL pPool, PGDI_POOL_SECTION pSection) /* Should not have any allocations */ if (pSection->cAllocCount != 0) { - DPRINT1("There are %ld allocations left, section=%p, pool=%p\n", + DPRINT1("There are %lu allocations left, section=%p, pool=%p\n", pSection->cAllocCount, pSection, pPool); DBG_DUMP_EVENT_LIST(&pPool->slhLog); ASSERT(FALSE); @@ -140,7 +140,7 @@ GdiPoolAllocate( pSection = CONTAINING_RECORD(ple, GDI_POOL_SECTION, leReadyLink); if (pSection->cAllocCount >= pPool->cSlotsPerSection) { - DPRINT1("pSection->cAllocCount=%ld, pPool->cSlotsPerSection=%ld\n", + DPRINT1("pSection->cAllocCount=%lu, pPool->cSlotsPerSection=%lu\n", pSection->cAllocCount, pPool->cSlotsPerSection); DBG_DUMP_EVENT_LIST(&pPool->slhLog); ASSERT(FALSE); @@ -293,7 +293,7 @@ GdiPoolFree( } DbgPrint("failed to free. pvAlloc=%p, base=%p, size=%lx\n", - pvAlloc, pSection->pvBaseAddress, pPool->cjSectionSize); + pvAlloc, pSection ? pSection->pvBaseAddress : NULL, pPool->cjSectionSize); ASSERT(FALSE); // KeBugCheck() diff --git a/reactos/win32ss/gdi/ntgdi/line.c b/reactos/win32ss/gdi/ntgdi/line.c index d0ca325c06e..f8e1370a32a 100644 --- a/reactos/win32ss/gdi/ntgdi/line.c +++ b/reactos/win32ss/gdi/ntgdi/line.c @@ -409,6 +409,7 @@ NtGdiLineTo(HDC hDC, return Ret; } +// FIXME: This function is completely broken BOOL APIENTRY NtGdiPolyDraw( @@ -539,7 +540,7 @@ NtGdiPolyDraw( /* * @implemented */ -BOOL +BOOL _Success_(return != FALSE) APIENTRY NtGdiMoveTo( IN HDC hdc, @@ -547,30 +548,31 @@ NtGdiMoveTo( IN INT y, OUT OPTIONAL LPPOINT pptOut) { - PDC dc; + PDC pdc; BOOL Ret; POINT Point; - dc = DC_LockDc(hdc); - if (!dc) return FALSE; + pdc = DC_LockDc(hdc); + if (!pdc) return FALSE; - Ret = IntGdiMoveToEx(dc, x, y, &Point, TRUE); + Ret = IntGdiMoveToEx(pdc, x, y, &Point, TRUE); - if (pptOut) + if (Ret && pptOut) { _SEH2_TRY { - ProbeForWrite( pptOut, sizeof(POINT), 1); - RtlCopyMemory( pptOut, &Point, sizeof(POINT)); + ProbeForWrite(pptOut, sizeof(POINT), 1); + RtlCopyMemory(pptOut, &Point, sizeof(POINT)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastNtError(_SEH2_GetExceptionCode()); - Ret = FALSE; + Ret = FALSE; // CHECKME: is this correct? } _SEH2_END; } - DC_UnlockDc(dc); + + DC_UnlockDc(pdc); return Ret; } diff --git a/reactos/win32ss/gdi/ntgdi/palette.c b/reactos/win32ss/gdi/ntgdi/palette.c index ff600d7ce38..bba741d4ed3 100644 --- a/reactos/win32ss/gdi/ntgdi/palette.c +++ b/reactos/win32ss/gdi/ntgdi/palette.c @@ -208,7 +208,7 @@ NTAPI PALETTE_AllocPalWithHandle( _In_ ULONG iMode, _In_ ULONG cColors, - _In_ PULONG pulColors, + _In_opt_ PULONG pulColors, _In_ FLONG flRed, _In_ FLONG flGreen, _In_ FLONG flBlue) diff --git a/reactos/win32ss/gdi/ntgdi/palette.h b/reactos/win32ss/gdi/ntgdi/palette.h index 4eae7c893a8..8ff54a252c1 100644 --- a/reactos/win32ss/gdi/ntgdi/palette.h +++ b/reactos/win32ss/gdi/ntgdi/palette.h @@ -75,7 +75,7 @@ NTAPI PALETTE_AllocPalWithHandle( _In_ ULONG iMode, _In_ ULONG cColors, - _In_ PULONG pulColors, + _In_opt_ PULONG pulColors, _In_ FLONG flRed, _In_ FLONG flGreen, _In_ FLONG flBlue); diff --git a/reactos/win32ss/gdi/ntgdi/path.c b/reactos/win32ss/gdi/ntgdi/path.c index bfafeec9bee..bac0c81ccd1 100644 --- a/reactos/win32ss/gdi/ntgdi/path.c +++ b/reactos/win32ss/gdi/ntgdi/path.c @@ -1166,9 +1166,11 @@ PATH_PathToRegion ( PPATH pPath, INT nPolyFillMode, HRGN *pHrgn ) if((pPath->pFlags[i] & ~PT_CLOSEFIGURE) == PT_MOVETO) { iStroke++; + _PRAGMA_WARNING_SUPPRESS(6386) pNumPointsInStroke[iStroke]=0; } + _PRAGMA_WARNING_SUPPRESS(6385) pNumPointsInStroke[iStroke]++; } @@ -1684,6 +1686,10 @@ PATH_WidenPath(DC *dc) } if (!pStrokes) return FALSE; pStrokes[numStrokes - 1] = ExAllocatePoolWithTag(PagedPool, sizeof(PATH), TAG_PATH); + if (!pStrokes[numStrokes - 1]) + { + ASSERT(FALSE); // FIXME + } PATH_InitGdiPath(pStrokes[numStrokes - 1]); pStrokes[numStrokes - 1]->state = PATH_Open; @@ -1704,6 +1710,10 @@ PATH_WidenPath(DC *dc) } pNewPath = ExAllocatePoolWithTag(PagedPool, sizeof(PATH), TAG_PATH); + if (!pNewPath) + { + ASSERT(FALSE); // FIXME + } PATH_InitGdiPath(pNewPath); pNewPath->state = PATH_Open; @@ -2021,7 +2031,7 @@ PATH_add_outline(PDC dc, INT x, INT y, TTPOLYGONHEADER *header, DWORD size) if (header->dwType != TT_POLYGON_TYPE) { - DPRINT1("Unknown header type %d\n", header->dwType); + DPRINT1("Unknown header type %lu\n", header->dwType); goto cleanup; } @@ -2219,7 +2229,7 @@ NtGdiBeginPath( HDC hDC ) if ( dc->dclevel.hPath ) { - DPRINT("BeginPath 1 0x%x\n", dc->dclevel.hPath); + DPRINT("BeginPath 1 0x%p\n", dc->dclevel.hPath); if ( !(dc->dclevel.flPath & DCPATH_SAVE) ) { // Remove previous handle. if (!PATH_Delete(dc->dclevel.hPath)) @@ -2244,7 +2254,7 @@ NtGdiBeginPath( HDC hDC ) dc->dclevel.hPath = pPath->BaseObject.hHmgr; - DPRINT("BeginPath 2 h 0x%x p 0x%x\n", dc->dclevel.hPath, pPath); + DPRINT("BeginPath 2 h 0x%p p 0x%p\n", dc->dclevel.hPath, pPath); // Path handles are shared. Also due to recursion with in the same thread. GDIOBJ_vUnlockObject((POBJ)pPath); // Unlock pPath = PATH_LockPath(dc->dclevel.hPath); // Share Lock. @@ -2323,14 +2333,14 @@ NtGdiEndPath(HDC hDC) /* Check that path is currently being constructed */ if ( (pPath->state != PATH_Open) || !(dc->dclevel.flPath & DCPATH_ACTIVE) ) { - DPRINT1("EndPath ERROR! 0x%x\n", dc->dclevel.hPath); + DPRINT1("EndPath ERROR! 0x%p\n", dc->dclevel.hPath); EngSetLastError(ERROR_CAN_NOT_COMPLETE); ret = FALSE; } /* Set flag to indicate that path is finished */ else { - DPRINT("EndPath 0x%x\n", dc->dclevel.hPath); + DPRINT("EndPath 0x%p\n", dc->dclevel.hPath); pPath->state = PATH_Closed; dc->dclevel.flPath &= ~DCPATH_ACTIVE; } @@ -2418,16 +2428,15 @@ NtGdiFlattenPath(HDC hDC) return Ret; } - +_Success_(return != FALSE) BOOL APIENTRY NtGdiGetMiterLimit( - IN HDC hdc, - OUT PDWORD pdwOut) + _In_ HDC hdc, + _Out_ PDWORD pdwOut) { DC *pDc; - gxf_long worker; - NTSTATUS Status = STATUS_SUCCESS; + BOOL bResult = TRUE; if (!(pDc = DC_LockDc(hdc))) { @@ -2435,32 +2444,20 @@ NtGdiGetMiterLimit( return FALSE; } - worker.f = pDc->dclevel.laPath.eMiterLimit; - - if (pdwOut) + _SEH2_TRY { - _SEH2_TRY - { - ProbeForWrite(pdwOut, - sizeof(DWORD), - 1); - *pdwOut = worker.l; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - DC_UnlockDc(pDc); - return FALSE; - } + ProbeForWrite(pdwOut, sizeof(DWORD), 1); + *pdwOut = pDc->dclevel.laPath.eMiterLimit; } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + bResult = FALSE; + } + _SEH2_END; DC_UnlockDc(pDc); - return TRUE; + return bResult; } diff --git a/reactos/win32ss/gdi/ntgdi/print.c b/reactos/win32ss/gdi/ntgdi/print.c index 136390963b6..1398e2f8cb9 100644 --- a/reactos/win32ss/gdi/ntgdi/print.c +++ b/reactos/win32ss/gdi/ntgdi/print.c @@ -3,9 +3,9 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: subsystems/win32/win32k/objects/print.c * PURPOSE: Print functions - * PROGRAMMER: + * PROGRAMMER: */ - + #include #define NDEBUG @@ -88,14 +88,14 @@ IntGdiExtEscape( SURFACE *psurf = dc->dclevel.pSurface; INT Result; - if (!dc->ppdev->DriverFunctions.Escape) + if (!dc->ppdev->DriverFunctions.Escape || !psurf) { Result = 0; } else { Result = dc->ppdev->DriverFunctions.Escape( - psurf ? &psurf->SurfObj : NULL, + &psurf->SurfObj, Escape, InSize, (PVOID)InData, diff --git a/reactos/win32ss/gdi/ntgdi/region.c b/reactos/win32ss/gdi/ntgdi/region.c index d2e9245aa20..f6f341e145a 100644 --- a/reactos/win32ss/gdi/ntgdi/region.c +++ b/reactos/win32ss/gdi/ntgdi/region.c @@ -493,7 +493,7 @@ REGION_Complexity( PROSRGNDATA obj ) if (!obj) return NULLREGION; switch(obj->rdh.nCount) { - DPRINT("Region Complexity -> %d",obj->rdh.nCount); + DPRINT("Region Complexity -> %lu",obj->rdh.nCount); case 0: return NULLREGION; case 1: return SIMPLEREGION; default: return COMPLEXREGION; @@ -1782,7 +1782,7 @@ REGION_CreateSimpleFrameRgn( RECTL rc[4]; PRECTL prc; - if (x != 0 || y != 0) + if ((x != 0) || (y != 0)) { prc = rc; @@ -1841,6 +1841,7 @@ REGION_CreateSimpleFrameRgn( return FALSE; } + _PRAGMA_WARNING_SUPPRESS(28199) // rc is initialized COPY_RECTS(rgn->Buffer, rc, rgn->rdh.nCount); } } @@ -2162,6 +2163,7 @@ REGION_vSyncRegion(PREGION pRgn) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + (void)0; } _SEH2_END; } @@ -2210,6 +2212,7 @@ RGNOBJAPI_Unlock(PROSRGNDATA pRgn) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + (void)0; } _SEH2_END; } @@ -3829,7 +3832,7 @@ NtGdiOffsetRgn( PROSRGNDATA rgn = RGNOBJAPI_Lock(hRgn, NULL); INT ret; - DPRINT("NtGdiOffsetRgn: hRgn %d Xoffs %d Yoffs %d rgn %x\n", hRgn, XOffset, YOffset, rgn ); + DPRINT("NtGdiOffsetRgn: hRgn %p Xoffs %d Yoffs %d rgn %p\n", hRgn, XOffset, YOffset, rgn ); if (!rgn) { diff --git a/reactos/win32ss/reactx/ntddraw/ddraw.c b/reactos/win32ss/reactx/ntddraw/ddraw.c index 278e122c41d..9d8beb86756 100644 --- a/reactos/win32ss/reactx/ntddraw/ddraw.c +++ b/reactos/win32ss/reactx/ntddraw/ddraw.c @@ -382,7 +382,7 @@ NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal) return FALSE; } - DPRINT1("hDirectDrawLocal = %lx \n",hDirectDrawLocal); + DPRINT1("hDirectDrawLocal = %p \n", hDirectDrawLocal); DPRINT1("Calling dxg.sys pfnDdDeleteDirectDrawObject\n"); return pfnDdDeleteDirectDrawObject(hDirectDrawLocal); @@ -466,7 +466,7 @@ NtGdiDdReenableDirectDrawObject(HANDLE hDirectDrawLocal, #if DXDBG status = pfnDdReenableDirectDrawObject(hDirectDrawLocal, pubNewMode); DPRINT1("end Calling dxg.sys pfnDdReenableDirectDrawObject\n"); - DPRINT1("return value : 0x%08x\n",status); + DPRINT1("return value : 0x%08x\n", status); return status; #else return pfnDdReenableDirectDrawObject(hDirectDrawLocal, pubNewMode); @@ -668,7 +668,7 @@ NtGdiDdSetGammaRamp(HANDLE hDirectDraw, /* Internal debug API */ void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl) { - DPRINT1("0x%08lx 0x000 PEDD_DIRECTDRAW_GLOBAL->dhpdev : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, dhpdev), pEddgbl->dhpdev); + DPRINT1("0x%08lx 0x000 PEDD_DIRECTDRAW_GLOBAL->dhpdev : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, dhpdev), pEddgbl->dhpdev); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->dwReserved1 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, dwReserved1),pEddgbl->dwReserved1); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->dwReserved2 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, dwReserved2),pEddgbl->dwReserved2); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_000c[0] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_000c[0]),pEddgbl->unk_000c[0]); @@ -681,13 +681,13 @@ void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl) DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_024 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_024),pEddgbl->unk_024); - DPRINT1("0x%08lx 0x028 PEDD_DIRECTDRAW_GLOBAL->llAssertModeTimeout : 0x%x\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, llAssertModeTimeout),pEddgbl->llAssertModeTimeout); + DPRINT1("0x%08lx 0x028 PEDD_DIRECTDRAW_GLOBAL->llAssertModeTimeout : 0x%llx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, llAssertModeTimeout),pEddgbl->llAssertModeTimeout.QuadPart); DPRINT1("0x%08lx 0x030 PEDD_DIRECTDRAW_GLOBAL->dwNumHeaps : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, dwNumHeaps),pEddgbl->dwNumHeaps); // VIDEOMEMORY *pvmList; - DPRINT1("0x%08lx 0x034 PEDD_DIRECTDRAW_GLOBAL->pvmList : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, pvmList),pEddgbl->pvmList); + DPRINT1("0x%08lx 0x034 PEDD_DIRECTDRAW_GLOBAL->pvmList : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, pvmList),pEddgbl->pvmList); DPRINT1("0x%08lx 0x038 PEDD_DIRECTDRAW_GLOBAL->dwNumFourCC : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, dwNumFourCC),pEddgbl->dwNumFourCC); - DPRINT1("0x%08lx 0x03C PEDD_DIRECTDRAW_GLOBAL->pdwFourCC : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, pdwFourCC),pEddgbl->pdwFourCC); + DPRINT1("0x%08lx 0x03C PEDD_DIRECTDRAW_GLOBAL->pdwFourCC : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, pdwFourCC),pEddgbl->pdwFourCC); // DD_HALINFO ddHalInfo; DPRINT1("0x%08lx 0x040 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.dwSize),pEddgbl->ddHalInfo.dwSize); @@ -710,7 +710,7 @@ void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl) DPRINT1("0x%08lx 0x080 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwTextureAlign : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.dwTextureAlign),pEddgbl->ddHalInfo.vmiData.dwTextureAlign); DPRINT1("0x%08lx 0x084 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwZBufferAlign : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.dwZBufferAlign),pEddgbl->ddHalInfo.vmiData.dwZBufferAlign); DPRINT1("0x%08lx 0x088 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwAlphaAlign : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.dwAlphaAlign),pEddgbl->ddHalInfo.vmiData.dwAlphaAlign); - DPRINT1("0x%08lx 0x08C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.pvPrimary : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.pvPrimary),pEddgbl->ddHalInfo.vmiData.pvPrimary); + DPRINT1("0x%08lx 0x08C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.pvPrimary : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.pvPrimary),pEddgbl->ddHalInfo.vmiData.pvPrimary); DPRINT1("0x%08lx 0x08C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.ddCaps.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.ddCaps.dwSize),pEddgbl->ddHalInfo.ddCaps.dwSize); DPRINT1("0x%08lx 0x08C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.ddCaps.dwCaps : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.ddCaps.dwCaps),pEddgbl->ddHalInfo.ddCaps.dwCaps); @@ -765,37 +765,37 @@ void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl) DPRINT1("0x%08lx 0x298 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.dwSize),pEddgbl->ddCallbacks.dwSize); DPRINT1("0x%08lx 0x29C PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.dwFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.dwFlags),pEddgbl->ddCallbacks.dwFlags); - DPRINT1("0x%08lx 0x2A0 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.DestroyDriver : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.DestroyDriver),pEddgbl->ddCallbacks.DestroyDriver); - DPRINT1("0x%08lx 0x2A4 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.CreateSurface : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.CreateSurface),pEddgbl->ddCallbacks.CreateSurface); - DPRINT1("0x%08lx 0x2A8 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.SetColorKey : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.SetColorKey),pEddgbl->ddCallbacks.SetColorKey); - DPRINT1("0x%08lx 0x2AC PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.SetMode : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.SetMode),pEddgbl->ddCallbacks.SetMode); - DPRINT1("0x%08lx 0x2B0 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.WaitForVerticalBlank : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.WaitForVerticalBlank),pEddgbl->ddCallbacks.WaitForVerticalBlank); - DPRINT1("0x%08lx 0x2B4 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.CanCreateSurface : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.CanCreateSurface),pEddgbl->ddCallbacks.CanCreateSurface); - DPRINT1("0x%08lx 0x2B8 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.CreatePalette : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.CreatePalette),pEddgbl->ddCallbacks.CreatePalette); - DPRINT1("0x%08lx 0x2BC PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.GetScanLine : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.GetScanLine),pEddgbl->ddCallbacks.GetScanLine); - DPRINT1("0x%08lx 0x2C0 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.MapMemory : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.MapMemory),pEddgbl->ddCallbacks.MapMemory); + DPRINT1("0x%08lx 0x2A0 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.DestroyDriver : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.DestroyDriver),pEddgbl->ddCallbacks.DestroyDriver); + DPRINT1("0x%08lx 0x2A4 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.CreateSurface : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.CreateSurface),pEddgbl->ddCallbacks.CreateSurface); + DPRINT1("0x%08lx 0x2A8 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.SetColorKey : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.SetColorKey),pEddgbl->ddCallbacks.SetColorKey); + DPRINT1("0x%08lx 0x2AC PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.SetMode : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.SetMode),pEddgbl->ddCallbacks.SetMode); + DPRINT1("0x%08lx 0x2B0 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.WaitForVerticalBlank : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.WaitForVerticalBlank),pEddgbl->ddCallbacks.WaitForVerticalBlank); + DPRINT1("0x%08lx 0x2B4 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.CanCreateSurface : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.CanCreateSurface),pEddgbl->ddCallbacks.CanCreateSurface); + DPRINT1("0x%08lx 0x2B8 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.CreatePalette : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.CreatePalette),pEddgbl->ddCallbacks.CreatePalette); + DPRINT1("0x%08lx 0x2BC PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.GetScanLine : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.GetScanLine),pEddgbl->ddCallbacks.GetScanLine); + DPRINT1("0x%08lx 0x2C0 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.MapMemory : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.MapMemory),pEddgbl->ddCallbacks.MapMemory); DPRINT1("0x%08lx 0x2C4 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.dwSize),pEddgbl->ddSurfaceCallbacks.dwSize); DPRINT1("0x%08lx 0x2C8 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.dwFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.dwFlags),pEddgbl->ddSurfaceCallbacks.dwFlags); - DPRINT1("0x%08lx 0x2CC PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.DestroySurface : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.DestroySurface),pEddgbl->ddSurfaceCallbacks.DestroySurface); - DPRINT1("0x%08lx 0x2D0 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.Flip : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.Flip),pEddgbl->ddSurfaceCallbacks.Flip); - DPRINT1("0x%08lx 0x2D4 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.SetClipList : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.SetClipList),pEddgbl->ddSurfaceCallbacks.SetClipList); - DPRINT1("0x%08lx 0x2D8 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.Lock : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.Lock),pEddgbl->ddSurfaceCallbacks.Lock); - DPRINT1("0x%08lx 0x2DC PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.Unlock : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.Unlock),pEddgbl->ddSurfaceCallbacks.Unlock); - DPRINT1("0x%08lx 0x2E0 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.Blt : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.Blt),pEddgbl->ddSurfaceCallbacks.Blt); - DPRINT1("0x%08lx 0x2E4 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.SetColorKey : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.SetColorKey),pEddgbl->ddSurfaceCallbacks.SetColorKey); - DPRINT1("0x%08lx 0x2E8 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.AddAttachedSurface : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.AddAttachedSurface),pEddgbl->ddSurfaceCallbacks.AddAttachedSurface); - DPRINT1("0x%08lx 0x2EC PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.GetBltStatus : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.GetBltStatus),pEddgbl->ddSurfaceCallbacks.GetBltStatus); - DPRINT1("0x%08lx 0x2F0 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.GetFlipStatus : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.GetFlipStatus),pEddgbl->ddSurfaceCallbacks.GetFlipStatus); - DPRINT1("0x%08lx 0x2F4 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.UpdateOverlay : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.UpdateOverlay),pEddgbl->ddSurfaceCallbacks.UpdateOverlay); - DPRINT1("0x%08lx 0x2F8 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.SetOverlayPosition : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.SetOverlayPosition),pEddgbl->ddSurfaceCallbacks.SetOverlayPosition); - DPRINT1("0x%08lx 0x2FC PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.reserved4 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.reserved4),pEddgbl->ddSurfaceCallbacks.reserved4); + DPRINT1("0x%08lx 0x2CC PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.DestroySurface : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.DestroySurface),pEddgbl->ddSurfaceCallbacks.DestroySurface); + DPRINT1("0x%08lx 0x2D0 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.Flip : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.Flip),pEddgbl->ddSurfaceCallbacks.Flip); + DPRINT1("0x%08lx 0x2D4 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.SetClipList : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.SetClipList),pEddgbl->ddSurfaceCallbacks.SetClipList); + DPRINT1("0x%08lx 0x2D8 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.Lock : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.Lock),pEddgbl->ddSurfaceCallbacks.Lock); + DPRINT1("0x%08lx 0x2DC PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.Unlock : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.Unlock),pEddgbl->ddSurfaceCallbacks.Unlock); + DPRINT1("0x%08lx 0x2E0 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.Blt : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.Blt),pEddgbl->ddSurfaceCallbacks.Blt); + DPRINT1("0x%08lx 0x2E4 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.SetColorKey : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.SetColorKey),pEddgbl->ddSurfaceCallbacks.SetColorKey); + DPRINT1("0x%08lx 0x2E8 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.AddAttachedSurface : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.AddAttachedSurface),pEddgbl->ddSurfaceCallbacks.AddAttachedSurface); + DPRINT1("0x%08lx 0x2EC PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.GetBltStatus : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.GetBltStatus),pEddgbl->ddSurfaceCallbacks.GetBltStatus); + DPRINT1("0x%08lx 0x2F0 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.GetFlipStatus : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.GetFlipStatus),pEddgbl->ddSurfaceCallbacks.GetFlipStatus); + DPRINT1("0x%08lx 0x2F4 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.UpdateOverlay : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.UpdateOverlay),pEddgbl->ddSurfaceCallbacks.UpdateOverlay); + DPRINT1("0x%08lx 0x2F8 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.SetOverlayPosition : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.SetOverlayPosition),pEddgbl->ddSurfaceCallbacks.SetOverlayPosition); + DPRINT1("0x%08lx 0x2FC PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.reserved4 : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.reserved4),pEddgbl->ddSurfaceCallbacks.reserved4); DPRINT1("0x%08lx 0x300 PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddPaletteCallbacks.dwSize),pEddgbl->ddPaletteCallbacks.dwSize); DPRINT1("0x%08lx 0x304 PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks.dwFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddPaletteCallbacks.dwFlags),pEddgbl->ddPaletteCallbacks.dwFlags); - DPRINT1("0x%08lx 0x308 PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks.DestroyPalette : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddPaletteCallbacks.DestroyPalette),pEddgbl->ddPaletteCallbacks.DestroyPalette); - DPRINT1("0x%08lx 0x30C PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks.SetEntries : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddPaletteCallbacks.SetEntries),pEddgbl->ddPaletteCallbacks.SetEntries); + DPRINT1("0x%08lx 0x308 PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks.DestroyPalette : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddPaletteCallbacks.DestroyPalette),pEddgbl->ddPaletteCallbacks.DestroyPalette); + DPRINT1("0x%08lx 0x30C PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks.SetEntries : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddPaletteCallbacks.SetEntries),pEddgbl->ddPaletteCallbacks.SetEntries); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[0] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[0]),pEddgbl->unk_314[0]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[1] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[1]),pEddgbl->unk_314[1]); @@ -844,7 +844,7 @@ void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl) DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[44] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[44]),pEddgbl->unk_314[44]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[45] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[45]),pEddgbl->unk_314[45]); // D3DNTHAL_CALLBACKS d3dNtHalCallbacks; - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dNtHalCallbacks),pEddgbl->d3dNtHalCallbacks); + //DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dNtHalCallbacks),pEddgbl->d3dNtHalCallbacks); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[0] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_460[0]),pEddgbl->unk_460[0]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[1] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_460[1]),pEddgbl->unk_460[1]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[2] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_460[2]),pEddgbl->unk_460[2]); @@ -855,37 +855,37 @@ void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl) DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[7] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_460[7]),pEddgbl->unk_460[7]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[8] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_460[8]),pEddgbl->unk_460[8]); // D3DNTHAL_CALLBACKS2 d3dNtHalCallbacks2; - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks2 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dNtHalCallbacks2),pEddgbl->d3dNtHalCallbacks2); + //DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks2 : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dNtHalCallbacks2),pEddgbl->d3dNtHalCallbacks2); DPRINT1("0x%08lx 0x498 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.dwSize),pEddgbl->ddVideoPortCallback.dwSize); DPRINT1("0x%08lx 0x49C PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.dwFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.dwFlags),pEddgbl->ddVideoPortCallback.dwFlags); - DPRINT1("0x%08lx 0x4A0 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.CanCreateVideoPort : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.CanCreateVideoPort),pEddgbl->ddVideoPortCallback.CanCreateVideoPort); - DPRINT1("0x%08lx 0x4A4 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.CreateVideoPort : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.CreateVideoPort),pEddgbl->ddVideoPortCallback.CreateVideoPort); - DPRINT1("0x%08lx 0x4A8 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.FlipVideoPort : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.FlipVideoPort),pEddgbl->ddVideoPortCallback.FlipVideoPort); - DPRINT1("0x%08lx 0x4AC PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortBandwidth : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortBandwidth),pEddgbl->ddVideoPortCallback.GetVideoPortBandwidth); - DPRINT1("0x%08lx 0x4B0 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortInputFormats : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortInputFormats),pEddgbl->ddVideoPortCallback.GetVideoPortInputFormats); - DPRINT1("0x%08lx 0x4B4 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortOutputFormats : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortOutputFormats),pEddgbl->ddVideoPortCallback.GetVideoPortOutputFormats); - DPRINT1("0x%08lx 0x4B8 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.lpReserved1 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.lpReserved1),pEddgbl->ddVideoPortCallback.lpReserved1); - DPRINT1("0x%08lx 0x4BC PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortField : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortField),pEddgbl->ddVideoPortCallback.GetVideoPortField); - DPRINT1("0x%08lx 0x4C0 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortLine : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortLine),pEddgbl->ddVideoPortCallback.GetVideoPortLine); - DPRINT1("0x%08lx 0x4C4 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortConnectInfo : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortConnectInfo),pEddgbl->ddVideoPortCallback.GetVideoPortConnectInfo); - DPRINT1("0x%08lx 0x4C8 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.DestroyVideoPort : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.DestroyVideoPort),pEddgbl->ddVideoPortCallback.DestroyVideoPort); - DPRINT1("0x%08lx 0x4CC PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortFlipStatus : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortFlipStatus),pEddgbl->ddVideoPortCallback.GetVideoPortFlipStatus); - DPRINT1("0x%08lx 0x4D0 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.UpdateVideoPort : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.UpdateVideoPort),pEddgbl->ddVideoPortCallback.UpdateVideoPort); - DPRINT1("0x%08lx 0x4D4 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.WaitForVideoPortSync : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.WaitForVideoPortSync),pEddgbl->ddVideoPortCallback.WaitForVideoPortSync); - DPRINT1("0x%08lx 0x4D8 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoSignalStatus : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoSignalStatus),pEddgbl->ddVideoPortCallback.GetVideoSignalStatus); - DPRINT1("0x%08lx 0x4DC PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.ColorControl : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.ColorControl),pEddgbl->ddVideoPortCallback.ColorControl); + DPRINT1("0x%08lx 0x4A0 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.CanCreateVideoPort : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.CanCreateVideoPort),pEddgbl->ddVideoPortCallback.CanCreateVideoPort); + DPRINT1("0x%08lx 0x4A4 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.CreateVideoPort : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.CreateVideoPort),pEddgbl->ddVideoPortCallback.CreateVideoPort); + DPRINT1("0x%08lx 0x4A8 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.FlipVideoPort : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.FlipVideoPort),pEddgbl->ddVideoPortCallback.FlipVideoPort); + DPRINT1("0x%08lx 0x4AC PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortBandwidth : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortBandwidth),pEddgbl->ddVideoPortCallback.GetVideoPortBandwidth); + DPRINT1("0x%08lx 0x4B0 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortInputFormats : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortInputFormats),pEddgbl->ddVideoPortCallback.GetVideoPortInputFormats); + DPRINT1("0x%08lx 0x4B4 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortOutputFormats : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortOutputFormats),pEddgbl->ddVideoPortCallback.GetVideoPortOutputFormats); + DPRINT1("0x%08lx 0x4B8 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.lpReserved1 : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.lpReserved1),pEddgbl->ddVideoPortCallback.lpReserved1); + DPRINT1("0x%08lx 0x4BC PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortField : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortField),pEddgbl->ddVideoPortCallback.GetVideoPortField); + DPRINT1("0x%08lx 0x4C0 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortLine : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortLine),pEddgbl->ddVideoPortCallback.GetVideoPortLine); + DPRINT1("0x%08lx 0x4C4 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortConnectInfo : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortConnectInfo),pEddgbl->ddVideoPortCallback.GetVideoPortConnectInfo); + DPRINT1("0x%08lx 0x4C8 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.DestroyVideoPort : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.DestroyVideoPort),pEddgbl->ddVideoPortCallback.DestroyVideoPort); + DPRINT1("0x%08lx 0x4CC PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortFlipStatus : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortFlipStatus),pEddgbl->ddVideoPortCallback.GetVideoPortFlipStatus); + DPRINT1("0x%08lx 0x4D0 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.UpdateVideoPort : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.UpdateVideoPort),pEddgbl->ddVideoPortCallback.UpdateVideoPort); + DPRINT1("0x%08lx 0x4D4 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.WaitForVideoPortSync : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.WaitForVideoPortSync),pEddgbl->ddVideoPortCallback.WaitForVideoPortSync); + DPRINT1("0x%08lx 0x4D8 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoSignalStatus : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoSignalStatus),pEddgbl->ddVideoPortCallback.GetVideoSignalStatus); + DPRINT1("0x%08lx 0x4DC PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.ColorControl : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.ColorControl),pEddgbl->ddVideoPortCallback.ColorControl); DPRINT1("0x%08lx 0x4E0 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanousCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanousCallbacks.dwSize),pEddgbl->ddMiscellanousCallbacks.dwSize); DPRINT1("0x%08lx 0x4E4 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanousCallbacks.dwFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanousCallbacks.dwFlags),pEddgbl->ddMiscellanousCallbacks.dwFlags); - DPRINT1("0x%08lx 0x4E8 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanousCallbacks.GetAvailDriverMemory : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanousCallbacks.GetAvailDriverMemory),pEddgbl->ddMiscellanousCallbacks.GetAvailDriverMemory); + DPRINT1("0x%08lx 0x4E8 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanousCallbacks.GetAvailDriverMemory : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanousCallbacks.GetAvailDriverMemory),pEddgbl->ddMiscellanousCallbacks.GetAvailDriverMemory); DPRINT1("0x%08lx 0x4EC PEDD_DIRECTDRAW_GLOBAL->ddMiscellanous2Callbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanous2Callbacks.dwSize),pEddgbl->ddMiscellanous2Callbacks.dwSize); DPRINT1("0x%08lx 0x4F0 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanous2Callbacks.dwFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanous2Callbacks.dwFlags),pEddgbl->ddMiscellanous2Callbacks.dwFlags); - DPRINT1("0x%08lx 0x4F4 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanous2Callbacks.AlphaBlt : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanous2Callbacks.AlphaBlt),pEddgbl->ddMiscellanous2Callbacks.AlphaBlt); - DPRINT1("0x%08lx 0x4F8 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanous2Callbacks.CreateSurfaceEx : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanous2Callbacks.CreateSurfaceEx),pEddgbl->ddMiscellanous2Callbacks.CreateSurfaceEx); - DPRINT1("0x%08lx 0x4FC PEDD_DIRECTDRAW_GLOBAL->ddMiscellanous2Callbacks.GetDriverState : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanous2Callbacks.GetDriverState),pEddgbl->ddMiscellanous2Callbacks.GetDriverState); - DPRINT1("0x%08lx 0x500 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanous2Callbacks.DestroyDDLocal : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanous2Callbacks.DestroyDDLocal),pEddgbl->ddMiscellanous2Callbacks.DestroyDDLocal); + DPRINT1("0x%08lx 0x4F4 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanous2Callbacks.AlphaBlt : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanous2Callbacks.AlphaBlt),pEddgbl->ddMiscellanous2Callbacks.AlphaBlt); + DPRINT1("0x%08lx 0x4F8 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanous2Callbacks.CreateSurfaceEx : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanous2Callbacks.CreateSurfaceEx),pEddgbl->ddMiscellanous2Callbacks.CreateSurfaceEx); + DPRINT1("0x%08lx 0x4FC PEDD_DIRECTDRAW_GLOBAL->ddMiscellanous2Callbacks.GetDriverState : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanous2Callbacks.GetDriverState),pEddgbl->ddMiscellanous2Callbacks.GetDriverState); + DPRINT1("0x%08lx 0x500 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanous2Callbacks.DestroyDDLocal : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanous2Callbacks.DestroyDDLocal),pEddgbl->ddMiscellanous2Callbacks.DestroyDDLocal); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[0] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_504[0]),pEddgbl->unk_504[0]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[1] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_504[1]),pEddgbl->unk_504[1]); @@ -899,7 +899,7 @@ void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl) DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[9] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_504[9]),pEddgbl->unk_504[9]); // D3DNTHAL_CALLBACKS3 d3dNtHalCallbacks3; - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks3 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dNtHalCallbacks3),pEddgbl->d3dNtHalCallbacks3); + //DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks3 : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dNtHalCallbacks3),pEddgbl->d3dNtHalCallbacks3); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_544 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_544), pEddgbl->unk_544); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_548 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_548), pEddgbl->unk_548); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[0] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[0]),pEddgbl->unk_54c[0]); @@ -926,17 +926,17 @@ void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl) DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[21] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[21]),pEddgbl->unk_54c[21]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[22] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[22]),pEddgbl->unk_54c[22]); // EDD_DIRECTDRAW_LOCAL* peDirectDrawLocalList; - DPRINT1("0x%08lx 0x5A8 PEDD_DIRECTDRAW_GLOBAL->peDirectDrawLocalList : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, peDirectDrawLocalList), pEddgbl->peDirectDrawLocalList); + DPRINT1("0x%08lx 0x5A8 PEDD_DIRECTDRAW_GLOBAL->peDirectDrawLocalList : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, peDirectDrawLocalList), pEddgbl->peDirectDrawLocalList); // EDD_SURFACE* peSurface_LockList; - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->peSurface_LockList : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, peSurface_LockList), pEddgbl->peSurface_LockList); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->peSurface_LockList : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, peSurface_LockList), pEddgbl->peSurface_LockList); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->fl : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, fl), pEddgbl->fl); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->cSurfaceLocks : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, cSurfaceLocks), pEddgbl->cSurfaceLocks); // PKEVENT pAssertModeEvent; - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->pAssertModeEvent : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, pAssertModeEvent), pEddgbl->pAssertModeEvent); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->pAssertModeEvent : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, pAssertModeEvent), pEddgbl->pAssertModeEvent); // EDD_SURFACE *peSurfaceCurrent; - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->peSurfaceCurrent : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, peSurfaceCurrent), pEddgbl->peSurfaceCurrent); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->peSurfaceCurrent : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, peSurfaceCurrent), pEddgbl->peSurfaceCurrent); // EDD_SURFACE *peSurfacePrimary; - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->peSurfacePrimary : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, peSurfacePrimary),pEddgbl->peSurfacePrimary); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->peSurfacePrimary : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, peSurfacePrimary),pEddgbl->peSurfacePrimary); DPRINT1("0x%08lx 0x5C4 PEDD_DIRECTDRAW_GLOBAL->bSuspended : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, bSuspended),pEddgbl->bSuspended); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_5c8[0] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_5c8[0]),pEddgbl->unk_5c8[0]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_5c8[1] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_5c8[1]),pEddgbl->unk_5c8[1]); @@ -951,9 +951,9 @@ void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl) DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_5c8[10] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_5c8[10]),pEddgbl->unk_5c8[10]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_5c8[11] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_5c8[11]),pEddgbl->unk_5c8[11]); // RECTL rcbounds; - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->rcbounds : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, rcbounds),pEddgbl->rcbounds); + //DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->rcbounds : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, rcbounds),pEddgbl->rcbounds); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_608 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_608), pEddgbl->unk_608); - DPRINT1("0x%08lx 0x60C PEDD_DIRECTDRAW_GLOBAL->hDev : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, hDev), pEddgbl->hDev); + DPRINT1("0x%08lx 0x60C PEDD_DIRECTDRAW_GLOBAL->hDev : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, hDev), pEddgbl->hDev); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[0] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[0]), pEddgbl->unk_610[0]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[1] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[1]), pEddgbl->unk_610[1]); @@ -1023,22 +1023,22 @@ void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl) void dump_edd_directdraw_local(PEDD_DIRECTDRAW_LOCAL pEddlcl) { - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->pobj : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, pobj), pEddlcl->pobj); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->peDirectDrawGlobal : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, peDirectDrawGlobal), pEddlcl->peDirectDrawGlobal); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->peSurface_DdList : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, peSurface_DdList), pEddlcl->peSurface_DdList); + //DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->pobj : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, pobj), pEddlcl->pobj); + DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->peDirectDrawGlobal : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, peDirectDrawGlobal), pEddlcl->peDirectDrawGlobal); + DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->peSurface_DdList : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, peSurface_DdList), pEddlcl->peSurface_DdList); DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_018 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_018), pEddlcl->unk_018); DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_01c : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_01c), pEddlcl->unk_01c); DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_020 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_020), pEddlcl->unk_020); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->peDirectDrawGlobal2 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, peDirectDrawGlobal2), pEddlcl->peDirectDrawGlobal2); + DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->peDirectDrawGlobal2 : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, peDirectDrawGlobal2), pEddlcl->peDirectDrawGlobal2); DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->fpProcess : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, fpProcess), pEddlcl->fpProcess); DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->fl : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, fl), pEddlcl->fl); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->peDirectDrawLocal_prev : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, peDirectDrawLocal_prev), pEddlcl->peDirectDrawLocal_prev); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->Process : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, Process), pEddlcl->Process); + DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->peDirectDrawLocal_prev : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, peDirectDrawLocal_prev), pEddlcl->peDirectDrawLocal_prev); + DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->Process : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, Process), pEddlcl->Process); DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_038 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_038), pEddlcl->unk_038); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->UniqueProcess : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, UniqueProcess), pEddlcl->UniqueProcess); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_040 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_040), pEddlcl->unk_040); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_044 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_044), pEddlcl->unk_044); + DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->UniqueProcess : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, UniqueProcess), pEddlcl->UniqueProcess); + DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_040 : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_040), pEddlcl->unk_040); + DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_044 : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_044), pEddlcl->unk_044); DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_048 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_048), pEddlcl->unk_048); DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_04C : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_04C), pEddlcl->unk_04C); DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_050 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_050), pEddlcl->unk_050); diff --git a/reactos/win32ss/user/ntuser/accelerator.c b/reactos/win32ss/user/ntuser/accelerator.c index 97e083c6f22..c09782390a8 100644 --- a/reactos/win32ss/user/ntuser/accelerator.c +++ b/reactos/win32ss/user/ntuser/accelerator.c @@ -57,7 +57,7 @@ co_IntTranslateAccelerator( hWnd = Window->head.h; - TRACE("IntTranslateAccelerator(hwnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x)\n", + TRACE("IntTranslateAccelerator(hwnd %p, message %x, wParam %x, lParam %x, fVirt 0x%x, key %x, cmd %x)\n", hWnd, pMsg->message, pMsg->wParam, pMsg->lParam, pAccel->fVirt, pAccel->key, pAccel->cmd); if (UserGetKeyState(VK_CONTROL) & 0x8000) Mask |= FCONTROL; @@ -143,7 +143,7 @@ co_IntTranslateAccelerator( if (hSubMenu) { nPos = IntFindSubMenu(&hMenu, hSubMenu); - TRACE("hSysMenu = %p, hSubMenu = %p, nPos = %d\n", hMenu, hSubMenu, nPos); + TRACE("hSysMenu = %p, hSubMenu = %p, nPos = %u\n", hMenu, hSubMenu, nPos); co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, TRUE)); } } @@ -247,7 +247,7 @@ NtUserCreateAcceleratorTable( NTSTATUS Status = STATUS_SUCCESS; DECLARE_RETURN(HACCEL); - TRACE("Enter NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d)\n", + TRACE("Enter NtUserCreateAcceleratorTable(Entries %p, EntriesCount %u)\n", Entries, EntriesCount); UserEnterExclusive(); @@ -318,7 +318,7 @@ NtUserCreateAcceleratorTable( RETURN(hAccel); CLEANUP: - TRACE("Leave NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d) = %x\n", + TRACE("Leave NtUserCreateAcceleratorTable(Entries %p, EntriesCount %u) = %p\n", Entries, EntriesCount, _ret_); UserLeave(); END_CLEANUP; @@ -337,7 +337,7 @@ NtUserDestroyAcceleratorTable( FIXME: Destroy only tables created using CreateAcceleratorTable. */ - TRACE("NtUserDestroyAcceleratorTable(Table %x)\n", hAccel); + TRACE("NtUserDestroyAcceleratorTable(Table %p)\n", hAccel); UserEnterExclusive(); if (!(Accel = UserGetAccelObject(hAccel))) @@ -356,7 +356,7 @@ NtUserDestroyAcceleratorTable( RETURN( TRUE); CLEANUP: - TRACE("Leave NtUserDestroyAcceleratorTable(Table %x) = %i\n", hAccel, _ret_); + TRACE("Leave NtUserDestroyAcceleratorTable(Table %p) = %u\n", hAccel, _ret_); UserLeave(); END_CLEANUP; } @@ -375,7 +375,7 @@ NtUserTranslateAccelerator( USER_REFERENCE_ENTRY AccelRef, WindowRef; DECLARE_RETURN(int); - TRACE("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p)\n", + TRACE("NtUserTranslateAccelerator(hWnd %p, hAccel %p, Message %p)\n", hWnd, hAccel, pUnsafeMessage); UserEnterShared(); diff --git a/reactos/win32ss/user/ntuser/callback.c b/reactos/win32ss/user/ntuser/callback.c index b9d95b39fbd..295f0205bd0 100644 --- a/reactos/win32ss/user/ntuser/callback.c +++ b/reactos/win32ss/user/ntuser/callback.c @@ -658,7 +658,7 @@ co_IntCallHookProc(INT HookId, } else { - ERR("ERROR: Hook ResultPointer 0x%x ResultLength %d\n",ResultPointer,ResultLength); + ERR("ERROR: Hook ResultPointer 0x%p ResultLength %u\n",ResultPointer,ResultLength); } if (!NT_SUCCESS(Status)) diff --git a/reactos/win32ss/user/ntuser/cursoricon.c b/reactos/win32ss/user/ntuser/cursoricon.c index b786b2b7596..91f41666181 100644 --- a/reactos/win32ss/user/ntuser/cursoricon.c +++ b/reactos/win32ss/user/ntuser/cursoricon.c @@ -38,7 +38,7 @@ InitCursorImpl() pgProcessLookasideList = ExAllocatePool(NonPagedPool, sizeof(PAGED_LOOKASIDE_LIST)); if(!pgProcessLookasideList) return FALSE; - + ExInitializePagedLookasideList(pgProcessLookasideList, NULL, NULL, @@ -692,7 +692,7 @@ NtUserFindExistingCursorIcon( RETURN((HANDLE)0); CLEANUP: - TRACE("Leave NtUserFindExistingCursorIcon, ret=%i\n",_ret_); + TRACE("Leave NtUserFindExistingCursorIcon, ret=%p\n",_ret_); UserLeave(); END_CLEANUP; } diff --git a/reactos/win32ss/user/ntuser/desktop.c b/reactos/win32ss/user/ntuser/desktop.c index e05e54864a1..1eecd9694fc 100644 --- a/reactos/win32ss/user/ntuser/desktop.c +++ b/reactos/win32ss/user/ntuser/desktop.c @@ -135,7 +135,7 @@ IntDesktopObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters) { PDESKTOP Desktop = (PDESKTOP)Parameters->Object; - TRACE("Deleting desktop object 0x%x\n", Desktop); + TRACE("Deleting desktop object 0x%p\n", Desktop); /* Remove the desktop from the window station's list of associcated desktops */ RemoveEntryList(&Desktop->ListEntry); @@ -305,7 +305,7 @@ IntParseDesktopPath(PEPROCESS Process, if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - ERR("Failed to reference window station %wZ PID: %d!\n", &ObjectName ); + ERR("Failed to reference window station %wZ PID: ??!\n", &ObjectName ); return Status; } } @@ -337,7 +337,7 @@ IntParseDesktopPath(PEPROCESS Process, NtClose(*hWinSta); *hWinSta = NULL; SetLastNtError(Status); - ERR("Failed to reference desktop %wZ PID: %d!\n", &ObjectName); + ERR("Failed to reference desktop %wZ PID: ??!\n", &ObjectName); return Status; } } @@ -371,7 +371,7 @@ IntValidateDesktopHandle( (PVOID*)Object, NULL); - TRACE("IntValidateDesktopHandle: handle:0x%x obj:0x%x access:0x%x Status:0x%x\n", + TRACE("IntValidateDesktopHandle: handle:0x%p obj:0x%p access:0x%x Status:0x%lx\n", Desktop, *Object, DesiredAccess, Status); if (!NT_SUCCESS(Status)) @@ -419,7 +419,7 @@ IntGetDesktopObjectHandle(PDESKTOP DesktopObject) } else { - ERR("Got handle: %lx\n", Ret); + ERR("Got handle: %p\n", Ret); } return Ret; @@ -550,7 +550,7 @@ HWND FASTCALL IntGetCurrentThreadDesktopWindow(VOID) LRESULT FASTCALL DesktopWindowProc(PWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - switch (Msg) + switch (Msg) { case WM_NCCREATE: if (!Wnd->fnid) @@ -1125,7 +1125,7 @@ NtUserCreateDesktop( RETURN(NULL); } - TRACE("NtUserCreateDesktop created desktop 0x%x with name %wZ\n", DesktopObject, &DesktopName); + TRACE("NtUserCreateDesktop created desktop 0x%p with name %wZ\n", DesktopObject, &DesktopName); DesktopObject->hsectionDesktop = NULL; DesktopObject->pheapDesktop = UserCreateHeap(&DesktopObject->hsectionDesktop, @@ -1195,7 +1195,7 @@ NtUserCreateDesktop( RETURN( NULL); } //#endif - if (!ptiCurrent->rpdesk) IntSetThreadDesktop(Desktop,FALSE); + if (ptiCurrent && !ptiCurrent->rpdesk) IntSetThreadDesktop(Desktop,FALSE); /* Based on wine/server/window.c in get_desktop_window. @@ -1280,7 +1280,7 @@ CLEANUP: ptiCurrent->TIF_flags &= ~TIF_DISABLEHOOKS; ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; } - TRACE("Leave NtUserCreateDesktop, ret=%i\n",_ret_); + TRACE("Leave NtUserCreateDesktop, ret=%p\n",_ret_); UserLeave(); END_CLEANUP; } @@ -1332,7 +1332,7 @@ NtUserOpenDesktop( return 0; } - TRACE("Opened desktop %S with handle 0x%x\n", ObjectAttributes->ObjectName->Buffer, Desktop); + TRACE("Opened desktop %S with handle 0x%p\n", ObjectAttributes->ObjectName->Buffer, Desktop); return Desktop; } @@ -1370,13 +1370,13 @@ NtUserOpenInputDesktop( HDESK hdesk = NULL; UserEnterExclusive(); - TRACE("Enter NtUserOpenInputDesktop InputDesktopHandle 0x%x\n",InputDesktopHandle); + TRACE("Enter NtUserOpenInputDesktop InputDesktopHandle 0x%p\n",InputDesktopHandle); /* Get a pointer to the desktop object */ Status = IntValidateDesktopHandle(InputDesktopHandle, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { - ERR("Validation of input desktop handle (0x%X) failed\n", InputDesktopHandle); + ERR("Validation of input desktop handle (0x%p) failed\n", InputDesktopHandle); goto Exit; } @@ -1399,7 +1399,7 @@ NtUserOpenInputDesktop( goto Exit; } Exit: - TRACE("NtUserOpenInputDesktop returning 0x%x\n",hdesk); + TRACE("NtUserOpenInputDesktop returning 0x%p\n",hdesk); UserLeave(); return hdesk; } @@ -1433,7 +1433,7 @@ NtUserCloseDesktop(HDESK hDesktop) NTSTATUS Status; DECLARE_RETURN(BOOL); - TRACE("NtUserCloseDesktop called (0x%x)\n", hDesktop); + TRACE("NtUserCloseDesktop called (0x%p)\n", hDesktop); UserEnterExclusive(); if( hDesktop == gptiCurrent->hdesk || hDesktop == gptiCurrent->ppi->hdeskStartup) @@ -1446,7 +1446,7 @@ NtUserCloseDesktop(HDESK hDesktop) Status = IntValidateDesktopHandle( hDesktop, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { - ERR("Validation of desktop handle (0x%X) failed\n", hDesktop); + ERR("Validation of desktop handle (0x%p) failed\n", hDesktop); RETURN(FALSE); } @@ -1455,7 +1455,7 @@ NtUserCloseDesktop(HDESK hDesktop) Status = ZwClose(hDesktop); if (!NT_SUCCESS(Status)) { - ERR("Failed to close desktop handle 0x%x\n", hDesktop); + ERR("Failed to close desktop handle 0x%p\n", hDesktop); SetLastNtError(Status); RETURN(FALSE); } @@ -1519,12 +1519,12 @@ NtUserSwitchDesktop(HDESK hdesk) DECLARE_RETURN(BOOL); UserEnterExclusive(); - TRACE("Enter NtUserSwitchDesktop(0x%x)\n", hdesk); + TRACE("Enter NtUserSwitchDesktop(0x%p)\n", hdesk); Status = IntValidateDesktopHandle( hdesk, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { - ERR("Validation of desktop handle (0x%X) failed\n", hdesk); + ERR("Validation of desktop handle (0x%p) failed\n", hdesk); RETURN(FALSE); } @@ -1536,14 +1536,14 @@ NtUserSwitchDesktop(HDESK hdesk) LogonProcess != PsGetCurrentProcessWin32Process()) { ObDereferenceObject(pdesk); - ERR("Switching desktop 0x%x denied because the window station is locked!\n", hdesk); + ERR("Switching desktop 0x%p denied because the window station is locked!\n", hdesk); RETURN(FALSE); } if(pdesk->rpwinstaParent != InputWindowStation) { ObDereferenceObject(pdesk); - ERR("Switching desktop 0x%x denied because desktop doesn't belong to the interactive winsta!\n", hdesk); + ERR("Switching desktop 0x%p denied because desktop doesn't belong to the interactive winsta!\n", hdesk); RETURN(FALSE); } @@ -1557,7 +1557,7 @@ NtUserSwitchDesktop(HDESK hdesk) /* Set the global state. */ InputDesktop = pdesk; InputDesktopHandle = hdesk; - TRACE("SwitchDesktop InputDesktopHandle 0x%x\n",InputDesktopHandle); + TRACE("SwitchDesktop InputDesktopHandle 0x%p\n",InputDesktopHandle); ObDereferenceObject(pdesk); RETURN(TRUE); @@ -1649,7 +1649,7 @@ NtUserGetThreadDesktop(DWORD dwThreadId, DWORD Unknown1) RETURN(Ret); CLEANUP: - TRACE("Leave NtUserGetThreadDesktop, ret=%i\n",_ret_); + TRACE("Leave NtUserGetThreadDesktop, ret=%p\n",_ret_); UserLeave(); END_CLEANUP; } @@ -1676,7 +1676,7 @@ IntUnmapDesktopView(IN PDESKTOP pdesk) { *PrevLink = HeapMapping->Next; - TRACE("ppi 0x%x unmapped heap of desktop 0x%x\n", ppi, pdesk); + TRACE("ppi 0x%p unmapped heap of desktop 0x%p\n", ppi, pdesk); Status = MmUnmapViewOfSection(PsGetCurrentProcess(), HeapMapping->UserMapping); @@ -1704,7 +1704,7 @@ IntMapDesktopView(IN PDESKTOP pdesk) LARGE_INTEGER Offset; NTSTATUS Status; - TRACE("IntMapDesktopView called for desktop object 0x%x\n", pdesk); + TRACE("IntMapDesktopView called for desktop object 0x%p\n", pdesk); ppi = PsGetCurrentProcessWin32Process(); PrevLink = &ppi->HeapMappings.Next; @@ -1741,7 +1741,7 @@ IntMapDesktopView(IN PDESKTOP pdesk) return Status; } - TRACE("ppi 0x%x mapped heap of desktop 0x%x\n", ppi, pdesk); + TRACE("ppi 0x%p mapped heap of desktop 0x%p\n", ppi, pdesk); /* Add the mapping */ HeapMapping = UserHeapAlloc(sizeof(W32HEAP_USER_MAPPING)); @@ -1777,7 +1777,7 @@ IntSetThreadDesktop(IN HDESK hDesktop, ASSERT(NtCurrentTeb()); - TRACE("IntSetThreadDesktop hDesktop:0x%x, FOF:%d\n",hDesktop, FreeOnFailure); + TRACE("IntSetThreadDesktop hDesktop:0x%p, FOF:%i\n",hDesktop, FreeOnFailure); pti = PsGetCurrentThreadWin32Thread(); pci = pti->pClientInfo; @@ -1789,7 +1789,7 @@ IntSetThreadDesktop(IN HDESK hDesktop, Status = IntValidateDesktopHandle( hDesktop, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { - ERR("Validation of desktop handle (0x%X) failed\n", hDesktop); + ERR("Validation of desktop handle (0x%p) failed\n", hDesktop); return FALSE; } @@ -1914,7 +1914,7 @@ IntSetThreadDesktop(IN HDESK hDesktop, InsertTailList(&pdesk->PtiList, &pti->PtiLink); } - TRACE("IntSetThreadDesktop: pti 0x%x ppi 0x%x switched from object 0x%x to 0x%x\n", pti, pti->ppi, pdeskOld, pdesk); + TRACE("IntSetThreadDesktop: pti 0x%p ppi 0x%p switched from object 0x%p to 0x%p\n", pti, pti->ppi, pdeskOld, pdesk); return TRUE; } diff --git a/reactos/win32ss/user/ntuser/main.c b/reactos/win32ss/user/ntuser/main.c index ba132052306..ef8330d3a39 100644 --- a/reactos/win32ss/user/ntuser/main.c +++ b/reactos/win32ss/user/ntuser/main.c @@ -77,7 +77,7 @@ Win32kProcessCallback(struct _EPROCESS *Process, if (ppiCurrent == NULL) { - ERR_CH(UserProcess, "Failed to allocate ppi for PID:%d\n", Process->UniqueProcessId); + ERR_CH(UserProcess, "Failed to allocate ppi for PID:0x%lx\n", HandleToUlong(Process->UniqueProcessId)); RETURN( STATUS_NO_MEMORY); } @@ -89,7 +89,7 @@ Win32kProcessCallback(struct _EPROCESS *Process, DbgInitDebugChannels(); #endif - TRACE_CH(UserProcess,"Allocated ppi 0x%x for PID:%d\n", ppiCurrent, Process->UniqueProcessId); + TRACE_CH(UserProcess,"Allocated ppi 0x%p for PID:0x%lx\n", ppiCurrent, HandleToUlong(Process->UniqueProcessId)); /* map the global heap into the process */ Offset.QuadPart = 0; @@ -125,7 +125,11 @@ Win32kProcessCallback(struct _EPROCESS *Process, ExInitializeFastMutex(&ppiCurrent->DriverObjListLock); ppiCurrent->KeyboardLayout = W32kGetDefaultKeyLayout(); - EngCreateEvent((PEVENT *)&ppiCurrent->InputIdleEvent); + if (!EngCreateEvent((PEVENT *)&ppiCurrent->InputIdleEvent)) + { + KeBugCheck(0); + } + KeInitializeEvent(ppiCurrent->InputIdleEvent, NotificationEvent, FALSE); @@ -160,7 +164,7 @@ Win32kProcessCallback(struct _EPROCESS *Process, ASSERT(ppiCurrent); - TRACE_CH(UserProcess, "Destroying ppi 0x%x\n", ppiCurrent); + TRACE_CH(UserProcess, "Destroying ppi 0x%p\n", ppiCurrent); ppiCurrent->W32PF_flags |= W32PF_TERMINATED; if (ppiScrnSaver == ppiCurrent) @@ -204,7 +208,7 @@ Win32kProcessCallback(struct _EPROCESS *Process, if (gppiInputProvider == ppiCurrent) gppiInputProvider = NULL; - TRACE_CH(UserProcess,"Freeing ppi 0x%x\n", ppiCurrent); + TRACE_CH(UserProcess,"Freeing ppi 0x%p\n", ppiCurrent); /* Ftee the PROCESSINFO */ PsSetProcessWin32Process(Process, NULL); @@ -239,7 +243,7 @@ UserCreateThreadInfo(struct _ETHREAD *Thread) USERTAG_THREADINFO); if (ptiCurrent == NULL) { - ERR_CH(UserThread, "Failed to allocate pti for TID %d\n", Thread->Cid.UniqueThread); + ERR_CH(UserThread, "Failed to allocate pti for TID %p\n", Thread->Cid.UniqueThread); return STATUS_NO_MEMORY; } @@ -249,7 +253,7 @@ UserCreateThreadInfo(struct _ETHREAD *Thread) pTeb->Win32ThreadInfo = ptiCurrent; ptiCurrent->pClientInfo = (PCLIENTINFO)pTeb->Win32ClientInfo; - TRACE_CH(UserThread, "Allocated pti 0x%x for TID %d\n", ptiCurrent, Thread->Cid.UniqueThread); + TRACE_CH(UserThread, "Allocated pti 0x%p for TID %p\n", ptiCurrent, Thread->Cid.UniqueThread); /* Initialize the THREADINFO */ InitializeListHead(&ptiCurrent->WindowListHead); @@ -365,7 +369,7 @@ UserCreateThreadInfo(struct _ETHREAD *Thread) return STATUS_SUCCESS; error: - ERR_CH(UserThread,"UserCreateThreadInfo failed! Freeing pti 0x%x for TID %d\n", ptiCurrent, Thread->Cid.UniqueThread); + ERR_CH(UserThread,"UserCreateThreadInfo failed! Freeing pti 0x%p for TID %p\n", ptiCurrent, Thread->Cid.UniqueThread); UserDestroyThreadInfo(Thread); return Status; } @@ -387,12 +391,13 @@ UserDestroyThreadInfo(struct _ETHREAD *Thread) ASSERT(ptiCurrent); - TRACE_CH(UserThread,"Destroying pti 0x%x\n", ptiCurrent); + TRACE_CH(UserThread,"Destroying pti 0x%p\n", ptiCurrent); - ppiCurrent = ptiCurrent->ppi; ptiCurrent->TIF_flags |= TIF_INCLEANUP; ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; + ppiCurrent = ptiCurrent->ppi; + ASSERT(ppiCurrent); /* Decrement thread count and check if its 0 */ ppiCurrent->cThreads--; @@ -416,7 +421,7 @@ UserDestroyThreadInfo(struct _ETHREAD *Thread) { DWORD ExitCode = PsGetProcessExitStatus(Process); - TRACE_CH(UserProcess, "Shell process is exiting (%d)\n", ExitCode); + TRACE_CH(UserProcess, "Shell process is exiting (%lu)\n", ExitCode); UserPostMessage(hwndSAS, WM_LOGONNOTIFY, @@ -458,7 +463,7 @@ UserDestroyThreadInfo(struct _ETHREAD *Thread) while (psle) { PUSER_REFERENCE_ENTRY ref = CONTAINING_RECORD(psle, USER_REFERENCE_ENTRY, Entry); - TRACE_CH(UserThread,"thread clean: remove reference obj 0x%x\n",ref->obj); + TRACE_CH(UserThread,"thread clean: remove reference obj 0x%p\n",ref->obj); UserDereferenceObject(ref->obj); psle = PopEntryList(&ptiCurrent->ReferencesList); @@ -497,7 +502,7 @@ UserDestroyThreadInfo(struct _ETHREAD *Thread) IntSetThreadDesktop(NULL, TRUE); - TRACE_CH(UserThread,"Freeing pti 0x%x\n", ptiCurrent); + TRACE_CH(UserThread,"Freeing pti 0x%p\n", ptiCurrent); /* Free the THREADINFO */ PsSetThreadWin32Thread(Thread, NULL); @@ -577,7 +582,7 @@ DriverEntry( } hModuleWin = MmPageEntireDriver(DriverEntry); - DPRINT("Win32k hInstance 0x%x!\n",hModuleWin); + DPRINT("Win32k hInstance 0x%p!\n",hModuleWin); /* Register Object Manager Callbacks */ CalloutData.WindowStationParseProcedure = IntWinStaObjectParse; @@ -617,7 +622,7 @@ DriverEntry( } RtlZeroMemory(gpsi, sizeof(SERVERINFO)); - DPRINT("Global Server Data -> %x\n", gpsi); + DPRINT("Global Server Data -> %p\n", gpsi); NT_ROF(InitGdiHandleTable()); NT_ROF(InitPaletteImpl()); diff --git a/reactos/win32ss/user/ntuser/misc/file.c b/reactos/win32ss/user/ntuser/misc/file.c index 6ad25a65274..abc5a0ca651 100644 --- a/reactos/win32ss/user/ntuser/misc/file.c +++ b/reactos/win32ss/user/ntuser/misc/file.c @@ -71,7 +71,7 @@ W32kOpenFile(PCWSTR pwszFileName, DWORD dwDesiredAccess) hFile = NULL; } - DPRINT("Leaving W32kOpenFile, Status=0x%x, hFile=0x%x\n", Status, hFile); + DPRINT("Leaving W32kOpenFile, Status=0x%lx, hFile=0x%p\n", Status, hFile); return hFile; } @@ -109,7 +109,7 @@ W32kCreateFileSection(HANDLE hFile, SetLastNtError(Status); } - DPRINT("Leaving W32kCreateFileSection, Status=0x%x, hSection=0x%x\n", Status, hSection); + DPRINT("Leaving W32kCreateFileSection, Status=0x%lx, hSection=0x%p\n", Status, hSection); /* Return section handle */ return hSection; @@ -143,7 +143,7 @@ W32kMapViewOfSection( SetLastNtError(Status); } - DPRINT("Leaving W32kMapViewOfSection, Status=0x%x, pvBase=0x%x\n", Status, pvBase); + DPRINT("Leaving W32kMapViewOfSection, Status=0x%lx, pvBase=0x%p\n", Status, pvBase); return pvBase; } diff --git a/reactos/win32ss/user/ntuser/misc/registry.c b/reactos/win32ss/user/ntuser/misc/registry.c index b7401a1e08f..81dff489ebf 100644 --- a/reactos/win32ss/user/ntuser/misc/registry.c +++ b/reactos/win32ss/user/ntuser/misc/registry.c @@ -292,7 +292,7 @@ RegWriteUserSetting( Status = RtlAppendUnicodeToString(&usKeyName, pwszKeyName); if (!NT_SUCCESS(Status)) { - DPRINT1("RtlAppendUnicodeToString failed with Status=%lx, buf:%d,%d\n", + DPRINT1("RtlAppendUnicodeToString failed with Status=0x%lx, buf:%u,%u\n", Status, usKeyName.Length, usKeyName.MaximumLength); return FALSE; } diff --git a/reactos/win32ss/user/ntuser/misc/usrheap.c b/reactos/win32ss/user/ntuser/misc/usrheap.c index 702b096e98e..92889b1b4a7 100644 --- a/reactos/win32ss/user/ntuser/misc/usrheap.c +++ b/reactos/win32ss/user/ntuser/misc/usrheap.c @@ -23,10 +23,15 @@ #include -static NTSTATUS APIENTRY -IntUserHeapCommitRoutine(IN PVOID Base, - IN OUT PVOID *CommitAddress, - IN OUT PSIZE_T CommitSize) +_Function_class_(RTL_HEAP_COMMIT_ROUTINE) +_IRQL_requires_same_ +static +NTSTATUS +NTAPI +IntUserHeapCommitRoutine( + _In_ PVOID Base, + _Inout_ PVOID *CommitAddress, + _Inout_ PSIZE_T CommitSize) { PPROCESSINFO W32Process; PW32HEAP_USER_MAPPING Mapping; diff --git a/reactos/win32ss/user/ntuser/msgqueue.h b/reactos/win32ss/user/ntuser/msgqueue.h index 318d87f22f8..ff8ba3bbef4 100644 --- a/reactos/win32ss/user/ntuser/msgqueue.h +++ b/reactos/win32ss/user/ntuser/msgqueue.h @@ -247,7 +247,7 @@ VOID APIENTRY MsqRemoveWindowMessagesFromQueue(PVOID pWindow); /* F*(&$ headers, do { \ if(InterlockedDecrement(&(MsgQueue)->References) == 0) \ { \ - TRACE("Free message queue 0x%x\n", (MsgQueue)); \ + TRACE("Free message queue 0x%p\n", (MsgQueue)); \ if ((MsgQueue)->NewMessages != NULL) \ ObDereferenceObject((MsgQueue)->NewMessages); \ ExFreePoolWithTag((MsgQueue), USERTAG_Q); \ diff --git a/reactos/win32ss/user/ntuser/ntstubs.c b/reactos/win32ss/user/ntuser/ntstubs.c index 9e7460e500d..f2eab323e1f 100644 --- a/reactos/win32ss/user/ntuser/ntstubs.c +++ b/reactos/win32ss/user/ntuser/ntstubs.c @@ -241,7 +241,7 @@ NtUserInitializeClientPfnArrays( HINSTANCE hmodUser) { NTSTATUS Status = STATUS_SUCCESS; - TRACE("Enter NtUserInitializeClientPfnArrays User32 0x%x\n",hmodUser); + TRACE("Enter NtUserInitializeClientPfnArrays User32 0x%p\n", hmodUser); if (ClientPfnInit) return Status; diff --git a/reactos/win32ss/user/ntuser/simplecall.c b/reactos/win32ss/user/ntuser/simplecall.c index 94a2f7dfc36..9dfe1ec601e 100644 --- a/reactos/win32ss/user/ntuser/simplecall.c +++ b/reactos/win32ss/user/ntuser/simplecall.c @@ -137,7 +137,7 @@ NtUserCallNoParam(DWORD Routine) RETURN(Result); CLEANUP: - TRACE("Leave NtUserCallNoParam, ret=%i\n",_ret_); + TRACE("Leave NtUserCallNoParam, ret=%p\n",(PVOID)_ret_); UserLeave(); END_CLEANUP; } @@ -400,7 +400,7 @@ NtUserCallOneParam( RETURN( 0); CLEANUP: - TRACE("Leave NtUserCallOneParam, ret=%i\n",_ret_); + TRACE("Leave NtUserCallOneParam, ret=%p\n", (PVOID)_ret_); UserLeave(); END_CLEANUP; } @@ -497,7 +497,7 @@ NtUserCallTwoParam( RETURN( 0); CLEANUP: - TRACE("Leave NtUserCallTwoParam, ret=%i\n",_ret_); + TRACE("Leave NtUserCallTwoParam, ret=%p\n", (PVOID)_ret_); UserLeave(); END_CLEANUP; } @@ -593,7 +593,7 @@ NtUserCallHwndLock( RETURN( Ret); CLEANUP: - TRACE("Leave NtUserCallHwndLock, ret=%i\n",_ret_); + TRACE("Leave NtUserCallHwndLock, ret=%u\n",_ret_); UserLeave(); END_CLEANUP; } @@ -816,7 +816,7 @@ NtUserCallHwndParamLock( RETURN( Ret); CLEANUP: - TRACE("Leave NtUserCallHwndParamLock, ret=%i\n",_ret_); + TRACE("Leave NtUserCallHwndParamLock, ret=%lu\n",_ret_); UserLeave(); END_CLEANUP; diff --git a/reactos/win32ss/user/ntuser/userfuncs.h b/reactos/win32ss/user/ntuser/userfuncs.h index 1bfc8f8328f..60c78dd6c92 100644 --- a/reactos/win32ss/user/ntuser/userfuncs.h +++ b/reactos/win32ss/user/ntuser/userfuncs.h @@ -6,7 +6,7 @@ PMENU_OBJECT FASTCALL UserGetMenuObject(HMENU hMenu); { \ LONG ref = ((PHEAD)_obj_)->cLockObj;\ if (!(ref >= 1)){ \ - ERR_CH(UserObj, "ASSERT: obj 0x%x, refs %i\n", _obj_, ref); \ + ERR_CH(UserObj, "ASSERT: obj 0x%p, refs %ld\n", _obj_, ref); \ ASSERT(FALSE); \ } \ } @@ -18,7 +18,7 @@ PMENU_OBJECT FASTCALL UserGetMenuObject(HMENU hMenu); BOOL gotit=FALSE; \ LONG ref = ((PHEAD)_obj_)->cLockObj;\ if (!(ref >= 1)){ \ - ERR_CH(UserObj, "obj 0x%x, refs %i\n", _obj_, ref); \ + ERR_CH(UserObj, "obj 0x%p, refs %i\n", _obj_, ref); \ ASSERT(FALSE); \ } \ \