Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 20:03:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K]

Browse source 
* Fix some print specifiers. Dedicated to the Island.

svn path=/trunk/; revision=59960
This commit is contained in:
Amine Khaldi 2013-09-01 23:58:37 +00:00
parent 051640cf67
commit c62870b1f3
27 changed files with 183 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

40
reactos/win32ss/gdi/ntgdi/freetype.c
View file

@ -365,7 +365,7 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics)
if (Error == FT_Err_Unknown_File_Format) if (Error == FT_Err_Unknown_File_Format)
DPRINT("Unknown font file format\n"); DPRINT("Unknown font file format\n");
else else
DPRINT("Error reading font file (error code: %u)\n", Error); DPRINT("Error reading font file (error code: %d)\n", Error);
return 0; return 0;
} }
@ -400,7 +400,7 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics)
FontGDI->face = Face; FontGDI->face = Face;
DPRINT("Font loaded: %s (%s)\n", Face->family_name, Face->style_name); DPRINT("Font loaded: %s (%s)\n", Face->family_name, Face->style_name);
DPRINT("Num glyphs: %u\n", Face->num_glyphs); DPRINT("Num glyphs: %d\n", Face->num_glyphs);
/* Add this font resource to the font table */ /* Add this font resource to the font table */
@ -1127,7 +1127,7 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, PCWSTR FaceName, PFONTGDI FontGDI)
wcscpy(Info->EnumLogFontEx.elfScript, ElfScripts[i]); wcscpy(Info->EnumLogFontEx.elfScript, ElfScripts[i]);
else else
{ {
DPRINT1("Unknown elfscript for bit %d\n", i); DPRINT1("Unknown elfscript for bit %u\n", i);
} }
} }
} }
@ -1529,7 +1529,7 @@ ftGdiGetGlyphOutline(
FT_CharMap found = 0, charmap; FT_CharMap found = 0, charmap;
XFORM xForm; XFORM xForm;
DPRINT("%d, %08x, %p, %08lx, %p, %p\n", wch, iFormat, pgm, DPRINT("%u, %08x, %p, %08lx, %p, %p\n", wch, iFormat, pgm,
cjBuf, pvBuf, pmat2); cjBuf, pvBuf, pmat2);
pdcattr = dc->pdcattr; pdcattr = dc->pdcattr;
@ -1771,7 +1771,7 @@ ftGdiGetGlyphOutline(
gm.gmptGlyphOrigin.x = left >> 6; gm.gmptGlyphOrigin.x = left >> 6;
gm.gmptGlyphOrigin.y = top >> 6; gm.gmptGlyphOrigin.y = top >> 6;
DPRINT("CX %d CY %d BBX %d BBY %d GOX %d GOY %d\n", DPRINT("CX %d CY %d BBX %u BBY %u GOX %d GOY %d\n",
gm.gmCellIncX, gm.gmCellIncY, gm.gmCellIncX, gm.gmCellIncY,
gm.gmBlackBoxX, gm.gmBlackBoxY, gm.gmBlackBoxX, gm.gmBlackBoxY,
gm.gmptGlyphOrigin.x, gm.gmptGlyphOrigin.y); gm.gmptGlyphOrigin.x, gm.gmptGlyphOrigin.y);
@ -2129,11 +2129,11 @@ ftGdiGetGlyphOutline(
} }
default: default:
DPRINT1("Unsupported format %d\n", iFormat); DPRINT1("Unsupported format %u\n", iFormat);
return GDI_ERROR; return GDI_ERROR;
} }
DPRINT("ftGdiGetGlyphOutline END and needed %d\n", needed); DPRINT("ftGdiGetGlyphOutline END and needed %lu\n", needed);
return needed; return needed;
} }
@ -2211,7 +2211,7 @@ TextIntGetTextExtentPoint(PDC dc,
dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)));
if (error) if (error)
{ {
DPRINT1("Error in setting pixel sizes: %u\n", error); DPRINT1("Error in setting pixel sizes: %d\n", error);
} }
/* Get the DC's world-to-device transformation matrix */ /* Get the DC's world-to-device transformation matrix */
@ -2235,7 +2235,7 @@ TextIntGetTextExtentPoint(PDC dc,
error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
if (error) if (error)
{ {
DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", glyph_index);
break; break;
} }
@ -2248,7 +2248,7 @@ TextIntGetTextExtentPoint(PDC dc,
RenderMode); RenderMode);
if (!realglyph) if (!realglyph)
{ {
DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index);
break; break;
} }
} }
@ -2392,7 +2392,7 @@ ftGdiGetTextCharsetInfo(
} }
} }
Exit: Exit:
DPRINT("CharSet %d CodePage %d\n",csi.ciCharset, csi.ciACP); DPRINT("CharSet %u CodePage %u\n", csi.ciCharset, csi.ciACP);
return (MAKELONG(csi.ciACP, csi.ciCharset)); return (MAKELONG(csi.ciACP, csi.ciCharset));
} }
@ -3378,7 +3378,7 @@ GreExtTextOutW(
dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)));
if (error) if (error)
{ {
DPRINT1("Error in setting pixel sizes: %u\n", error); DPRINT1("Error in setting pixel sizes: %d\n", error);
IntUnLockFreeType; IntUnLockFreeType;
goto fail; goto fail;
} }
@ -3442,7 +3442,7 @@ GreExtTextOutW(
error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
if (error) if (error)
{ {
DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", glyph_index);
} }
glyph = face->glyph; glyph = face->glyph;
@ -3454,7 +3454,7 @@ GreExtTextOutW(
RenderMode); RenderMode);
if (!realglyph) if (!realglyph)
{ {
DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index);
IntUnLockFreeType; IntUnLockFreeType;
goto fail; goto fail;
} }
@ -3523,7 +3523,7 @@ GreExtTextOutW(
error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
if (error) if (error)
{ {
DPRINT1("Failed to load and render glyph! [index: %u]\n", glyph_index); DPRINT1("Failed to load and render glyph! [index: %d]\n", glyph_index);
IntUnLockFreeType; IntUnLockFreeType;
goto fail2; goto fail2;
} }
@ -3536,7 +3536,7 @@ GreExtTextOutW(
RenderMode); RenderMode);
if (!realglyph) if (!realglyph)
{ {
DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index);
IntUnLockFreeType; IntUnLockFreeType;
goto fail2; goto fail2;
} }
@ -3549,8 +3549,8 @@ GreExtTextOutW(
FT_Get_Kerning(face, previous, glyph_index, 0, &delta); FT_Get_Kerning(face, previous, glyph_index, 0, &delta);
TextLeft += delta.x; TextLeft += delta.x;
} }
DPRINT("TextLeft: %d\n", TextLeft); DPRINT("TextLeft: %I64d\n", TextLeft);
DPRINT("TextTop: %d\n", TextTop); DPRINT("TextTop: %lu\n", TextTop);
DPRINT("Advance: %d\n", realglyph->root.advance.x); DPRINT("Advance: %d\n", realglyph->root.advance.x);
if (fuOptions & ETO_OPAQUE) if (fuOptions & ETO_OPAQUE)
@ -3655,12 +3655,12 @@ GreExtTextOutW(
if (NULL == Dx) if (NULL == Dx)
{ {
TextLeft += realglyph->root.advance.x >> 10; TextLeft += realglyph->root.advance.x >> 10;
DPRINT("New TextLeft: %d\n", TextLeft); DPRINT("New TextLeft: %I64d\n", TextLeft);
} }
else else
{ {
TextLeft += Dx[i<<DxShift] << 6; TextLeft += Dx[i<<DxShift] << 6;
DPRINT("New TextLeft2: %d\n", TextLeft); DPRINT("New TextLeft2: %I64d\n", TextLeft);
} }
if (DxShift) if (DxShift)

2
reactos/win32ss/user/ntuser/class.c
View file

@ -2357,7 +2357,7 @@ NtUserGetClassInfo(
// If null instance use client. // If null instance use client.
if (!hInstance) hInstance = hModClient; if (!hInstance) hInstance = hModClient;
TRACE("GetClassInfo(%wZ, 0x%x)\n", SafeClassName, hInstance); TRACE("GetClassInfo(%wZ, %p)\n", SafeClassName, hInstance);
/* NOTE: Need exclusive lock because getting the wndproc might require the /* NOTE: Need exclusive lock because getting the wndproc might require the
creation of a call procedure handle */ creation of a call procedure handle */

4
reactos/win32ss/user/ntuser/desktop.c
View file

@ -235,12 +235,12 @@ static int GetSystemVersionString(LPWSTR buffer)
if (versionInfo.dwMajorVersion <= 4) if (versionInfo.dwMajorVersion <= 4)
len = swprintf(buffer, len = swprintf(buffer,
L"ReactOS Version %d.%d %s Build %d", L"ReactOS Version %lu.%lu %s Build %lu",
versionInfo.dwMajorVersion, versionInfo.dwMinorVersion, versionInfo.dwMajorVersion, versionInfo.dwMinorVersion,
versionInfo.szCSDVersion, versionInfo.dwBuildNumber&0xFFFF); versionInfo.szCSDVersion, versionInfo.dwBuildNumber&0xFFFF);
else else
len = swprintf(buffer, len = swprintf(buffer,
L"ReactOS %s (Build %d)", L"ReactOS %s (Build %lu)",
versionInfo.szCSDVersion, versionInfo.dwBuildNumber&0xFFFF); versionInfo.szCSDVersion, versionInfo.dwBuildNumber&0xFFFF);
return len; return len;

16
reactos/win32ss/user/ntuser/display.c
View file

@ -197,7 +197,7 @@ InitVideo()
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
{ {
iVGACompatible = _wtoi(&awcDeviceName[13]); iVGACompatible = _wtoi(&awcDeviceName[13]);
ERR("VGA adapter = %ld\n", iVGACompatible); ERR("VGA adapter = %lu\n", iVGACompatible);
} }
/* Get the maximum mumber of adapters */ /* Get the maximum mumber of adapters */
@ -206,7 +206,7 @@ InitVideo()
ERR("Could not read MaxObjectNumber, defaulting to 0.\n"); ERR("Could not read MaxObjectNumber, defaulting to 0.\n");
} }
TRACE("Found %ld devices\n", ulMaxObjectNumber + 1); TRACE("Found %lu devices\n", ulMaxObjectNumber + 1);
/* Loop through all adapters */ /* Loop through all adapters */
for (iDevNum = 0; iDevNum <= ulMaxObjectNumber; iDevNum++) for (iDevNum = 0; iDevNum <= ulMaxObjectNumber; iDevNum++)
@ -350,8 +350,8 @@ NtUserEnumDisplayDevices(
DISPLAY_DEVICEW dispdev; DISPLAY_DEVICEW dispdev;
NTSTATUS Status; NTSTATUS Status;
TRACE("Enter NtUserEnumDisplayDevices(%wZ, %ld)\n", TRACE("Enter NtUserEnumDisplayDevices(%wZ, %lu)\n",
pustrDevice, iDevNum); pustrDevice, iDevNum);
dispdev.cb = sizeof(dispdev); dispdev.cb = sizeof(dispdev);
@ -463,8 +463,8 @@ UserEnumDisplaySettings(
PDEVMODEENTRY pdmentry; PDEVMODEENTRY pdmentry;
ULONG i, iFoundMode; ULONG i, iFoundMode;
TRACE("Enter UserEnumDisplaySettings('%wZ', %ld)\n", TRACE("Enter UserEnumDisplaySettings('%wZ', %lu)\n",
pustrDevice, iModeNum); pustrDevice, iModeNum);
/* Ask GDI for the GRAPHICS_DEVICE */ /* Ask GDI for the GRAPHICS_DEVICE */
pGraphicsDevice = EngpFindGraphicsDevice(pustrDevice, 0, 0); pGraphicsDevice = EngpFindGraphicsDevice(pustrDevice, 0, 0);
@ -568,8 +568,8 @@ NtUserEnumDisplaySettings(
ULONG cbSize, cbExtra; ULONG cbSize, cbExtra;
DEVMODEW dmReg, *pdm; DEVMODEW dmReg, *pdm;
TRACE("Enter NtUserEnumDisplaySettings(%wZ, %ld, %p, 0x%lx)\n", TRACE("Enter NtUserEnumDisplaySettings(%wZ, %lu, %p, 0x%lx)\n",
pustrDevice, iModeNum, lpDevMode, dwFlags); pustrDevice, iModeNum, lpDevMode, dwFlags);
if (pustrDevice) if (pustrDevice)
{ {

6
reactos/win32ss/user/ntuser/event.c
View file

@ -136,7 +136,7 @@ IntRemoveEvent(PEVENTHOOK pEH)
{ {
if (pEH) if (pEH)
{ {
TRACE("IntRemoveEvent pEH 0x%x\n",pEH); TRACE("IntRemoveEvent pEH %p\n", pEH);
KeEnterCriticalRegion(); KeEnterCriticalRegion();
RemoveEntryList(&pEH->Chain); RemoveEntryList(&pEH->Chain);
GlobalEvents->Counts--; GlobalEvents->Counts--;
@ -224,7 +224,7 @@ IntNotifyWinEvent(
PLIST_ENTRY pLE; PLIST_ENTRY pLE;
PTHREADINFO pti, ptiCurrent; PTHREADINFO pti, ptiCurrent;
TRACE("IntNotifyWinEvent GlobalEvents = 0x%x pWnd 0x%x\n",GlobalEvents, pWnd); TRACE("IntNotifyWinEvent GlobalEvents = %p pWnd %p\n", GlobalEvents, pWnd);
if (!GlobalEvents || !GlobalEvents->Counts) return; if (!GlobalEvents || !GlobalEvents->Counts) return;
@ -334,7 +334,7 @@ NtUserSetWinEventHook(
HANDLE Handle; HANDLE Handle;
PETHREAD Thread = NULL; PETHREAD Thread = NULL;
TRACE("NtUserSetWinEventHook hmod 0x%x, pfn 0x%x\n",hmodWinEventProc, lpfnWinEventProc); TRACE("NtUserSetWinEventHook hmod %p, pfn %p\n", hmodWinEventProc, lpfnWinEventProc);
UserEnterExclusive(); UserEnterExclusive();

16
reactos/win32ss/user/ntuser/focus.c
View file

@ -373,7 +373,7 @@ co_IntSetForegroundAndFocusWindow(
hWnd = UserHMGetHandle(Wnd); hWnd = UserHMGetHandle(Wnd);
TRACE("SetForegroundAndFocusWindow(%x, %s)\n", hWnd, (MouseActivate ? "TRUE" : "FALSE")); TRACE("SetForegroundAndFocusWindow(%p, %s)\n", hWnd, (MouseActivate ? "TRUE" : "FALSE"));
PrevForegroundQueue = IntGetFocusMessageQueue(); // Use this active desktop. PrevForegroundQueue = IntGetFocusMessageQueue(); // Use this active desktop.
pti = PsGetCurrentThreadWin32Thread(); pti = PsGetCurrentThreadWin32Thread();
@ -710,7 +710,7 @@ co_UserSetFocus(PWND Window)
IntSendFocusMessages( pti, Window); IntSendFocusMessages( pti, Window);
TRACE("Focus: %d -> %d\n", hWndPrev, Window->head.h); TRACE("Focus: %p -> %p\n", hWndPrev, Window->head.h);
} }
else /* NULL hwnd passed in */ else /* NULL hwnd passed in */
{ {
@ -761,7 +761,7 @@ IntGetCapture(VOID)
RETURN( ThreadQueue ? (ThreadQueue->spwndCapture ? UserHMGetHandle(ThreadQueue->spwndCapture) : 0) : 0); RETURN( ThreadQueue ? (ThreadQueue->spwndCapture ? UserHMGetHandle(ThreadQueue->spwndCapture) : 0) : 0);
CLEANUP: CLEANUP:
TRACE("Leave IntGetCapture, ret=%i\n",_ret_); TRACE("Leave IntGetCapture, ret=%p\n", _ret_);
END_CLEANUP; END_CLEANUP;
} }
@ -962,7 +962,7 @@ NtUserGetForegroundWindow(VOID)
RETURN( UserGetForegroundWindow()); RETURN( UserGetForegroundWindow());
CLEANUP: CLEANUP:
TRACE("Leave NtUserGetForegroundWindow, ret=%i\n",_ret_); TRACE("Leave NtUserGetForegroundWindow, ret=%p\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -975,7 +975,7 @@ NtUserSetActiveWindow(HWND hWnd)
PWND Window; PWND Window;
DECLARE_RETURN(HWND); DECLARE_RETURN(HWND);
TRACE("Enter NtUserSetActiveWindow(%x)\n", hWnd); TRACE("Enter NtUserSetActiveWindow(%p)\n", hWnd);
UserEnterExclusive(); UserEnterExclusive();
Window = NULL; Window = NULL;
@ -1013,13 +1013,13 @@ NtUserSetCapture(HWND hWnd)
{ {
DECLARE_RETURN(HWND); DECLARE_RETURN(HWND);
TRACE("Enter NtUserSetCapture(%x)\n", hWnd); TRACE("Enter NtUserSetCapture(%p)\n", hWnd);
UserEnterExclusive(); UserEnterExclusive();
RETURN( co_UserSetCapture(hWnd)); RETURN( co_UserSetCapture(hWnd));
CLEANUP: CLEANUP:
TRACE("Leave NtUserSetCapture, ret=%i\n",_ret_); TRACE("Leave NtUserSetCapture, ret=%p\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -1035,7 +1035,7 @@ NtUserSetFocus(HWND hWnd)
DECLARE_RETURN(HWND); DECLARE_RETURN(HWND);
HWND ret; HWND ret;
TRACE("Enter NtUserSetFocus(%x)\n", hWnd); TRACE("Enter NtUserSetFocus(%p)\n", hWnd);
UserEnterExclusive(); UserEnterExclusive();
if (hWnd) if (hWnd)

16
reactos/win32ss/user/ntuser/hook.c
View file

@ -35,7 +35,7 @@ IntLoadHookModule(int iHookID, HHOOK hHook, BOOL Unload)
ppi = PsGetCurrentProcessWin32Process(); ppi = PsGetCurrentProcessWin32Process();
ERR("IntLoadHookModule. Client PID: %d\n", PsGetProcessId(ppi->peProcess)); ERR("IntLoadHookModule. Client PID: %p\n", PsGetProcessId(ppi->peProcess));
/* Check if this is the api hook */ /* Check if this is the api hook */
if(iHookID == WH_APIHOOK) if(iHookID == WH_APIHOOK)
@ -109,7 +109,7 @@ IntHookModuleUnloaded(PDESKTOP pdesk, int iHookID, HHOOK hHook)
{ {
if(ptiCurrent->ppi->W32PF_flags & W32PF_APIHOOKLOADED) if(ptiCurrent->ppi->W32PF_flags & W32PF_APIHOOKLOADED)
{ {
TRACE("IntHookModuleUnloaded: sending message to PID %d, ppi=0x%x\n", PsGetProcessId(ptiCurrent->ppi->peProcess), ptiCurrent->ppi); TRACE("IntHookModuleUnloaded: sending message to PID %p, ppi=%p\n", PsGetProcessId(ptiCurrent->ppi->peProcess), ptiCurrent->ppi);
co_MsqSendMessageAsync( ptiCurrent, co_MsqSendMessageAsync( ptiCurrent,
0, 0,
iHookID, iHookID,
@ -155,7 +155,7 @@ UserRegisterUserApiHook(
return FALSE; return FALSE;
} }
ERR("UserRegisterUserApiHook. Server PID: %d\n", PsGetProcessId(pti->ppi->peProcess)); ERR("UserRegisterUserApiHook. Server PID: %p\n", PsGetProcessId(pti->ppi->peProcess));
/* Register the api hook */ /* Register the api hook */
gpsi->dwSRVIFlags |= SRVINFO_APIHOOK; gpsi->dwSRVIFlags |= SRVINFO_APIHOOK;
@ -222,7 +222,7 @@ UserUnregisterUserApiHook(VOID)
return FALSE; return FALSE;
} }
ERR("UserUnregisterUserApiHook. Server PID: %d\n", PsGetProcessId(pti->ppi->peProcess)); ERR("UserUnregisterUserApiHook. Server PID: %p\n", PsGetProcessId(pti->ppi->peProcess));
/* Unregister the api hook */ /* Unregister the api hook */
gpsi->dwSRVIFlags &= ~SRVINFO_APIHOOK; gpsi->dwSRVIFlags &= ~SRVINFO_APIHOOK;
@ -1086,7 +1086,7 @@ HOOK_DestroyThreadHooks(PETHREAD Thread)
if (!pti || !pdo) if (!pti || !pdo)
{ {
ERR("Kill Thread Hooks pti 0x%x pdo 0x%x\n",pti,pdo); ERR("Kill Thread Hooks pti %p pdo %p\n", pti, pdo);
return; return;
} }
@ -1283,7 +1283,7 @@ co_HOOK_CallHooks( INT HookId,
if ( (pti->TIF_flags & TIF_DISABLEHOOKS) || (ptiHook->TIF_flags & TIF_INCLEANUP)) if ( (pti->TIF_flags & TIF_DISABLEHOOKS) || (ptiHook->TIF_flags & TIF_INCLEANUP))
{ {
TRACE("Next Hook 0x%x, 0x%x\n",ptiHook->rpdesk,pdo); TRACE("Next Hook %p, %p\n", ptiHook->rpdesk, pdo);
continue; continue;
} }
@ -1582,7 +1582,7 @@ NtUserSetWindowsHookEx( HINSTANCE Mod,
Hook->Proc = HookProc; Hook->Proc = HookProc;
Hook->Ansi = Ansi; Hook->Ansi = Ansi;
TRACE("Set Hook Desk 0x%x DeskInfo 0x%x Handle Desk 0x%x\n",pti->rpdesk, pti->pDeskInfo,Hook->head.rpdesk); TRACE("Set Hook Desk %p DeskInfo %p Handle Desk %p\n", pti->rpdesk, pti->pDeskInfo, Hook->head.rpdesk);
if (ThreadId) /* Thread-local hook */ if (ThreadId) /* Thread-local hook */
{ {
@ -1684,7 +1684,7 @@ NtUserSetWindowsHookEx( HINSTANCE Mod,
RETURN( Handle); RETURN( Handle);
CLEANUP: CLEANUP:
TRACE("Leave NtUserSetWindowsHookEx, ret=%i\n",_ret_); TRACE("Leave NtUserSetWindowsHookEx, ret=%p\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }

12
reactos/win32ss/user/ntuser/input.c
View file

@ -62,7 +62,7 @@ DoTheScreenSaver(VOID)
TO = 1000 * gspv.iScrSaverTimeout; TO = 1000 * gspv.iScrSaverTimeout;
if (Test > TO) if (Test > TO)
{ {
TRACE("Screensaver Message Start! Tick %d Timeout %d \n", Test, gspv.iScrSaverTimeout); TRACE("Screensaver Message Start! Tick %lu Timeout %d \n", Test, gspv.iScrSaverTimeout);
if (ppiScrnSaver) // We are or we are not the screensaver, prevent reentry... if (ppiScrnSaver) // We are or we are not the screensaver, prevent reentry...
{ {
@ -146,7 +146,7 @@ RawInputThreadMain()
ptiRawInput->TIF_flags |= TIF_SYSTEMTHREAD; ptiRawInput->TIF_flags |= TIF_SYSTEMTHREAD;
ptiRawInput->pClientInfo->dwTIFlags = ptiRawInput->TIF_flags; ptiRawInput->pClientInfo->dwTIFlags = ptiRawInput->TIF_flags;
TRACE("Raw Input Thread 0x%x\n", ptiRawInput); TRACE("Raw Input Thread %p\n", ptiRawInput);
KeSetPriorityThread(&PsGetCurrentThread()->Tcb, KeSetPriorityThread(&PsGetCurrentThread()->Tcb,
LOW_REALTIME_PRIORITY + 3); LOW_REALTIME_PRIORITY + 3);
@ -461,7 +461,7 @@ UserAttachThreadInput(PTHREADINFO ptiFrom, PTHREADINFO ptiTo, BOOL fAttach)
ptiFrom->MessageQueue = ptiTo->MessageQueue; ptiFrom->MessageQueue = ptiTo->MessageQueue;
ptiFrom->MessageQueue->cThreads++; ptiFrom->MessageQueue->cThreads++;
ERR("ptiTo S Share count %d\n", ptiFrom->MessageQueue->cThreads); ERR("ptiTo S Share count %lu\n", ptiFrom->MessageQueue->cThreads);
// FIXME: conditions? // FIXME: conditions?
if (ptiFrom->pqAttach == gpqForeground) if (ptiFrom->pqAttach == gpqForeground)
@ -525,7 +525,7 @@ UserAttachThreadInput(PTHREADINFO ptiFrom, PTHREADINFO ptiTo, BOOL fAttach)
if (pai->pti1 == ptiFrom) if (pai->pti1 == ptiFrom)
{ {
ptiFrom->MessageQueue->cThreads--; ptiFrom->MessageQueue->cThreads--;
ERR("ptiTo L Share count %d\n", ptiFrom->MessageQueue->cThreads); ERR("ptiTo L Share count %lu\n", ptiFrom->MessageQueue->cThreads);
/* Use the message queue of the last attachment */ /* Use the message queue of the last attachment */
ptiFrom->MessageQueue = pai->pti2->MessageQueue; ptiFrom->MessageQueue = pai->pti2->MessageQueue;
ptiFrom->MessageQueue->CursorObject = NULL; ptiFrom->MessageQueue->CursorObject = NULL;
@ -538,7 +538,7 @@ UserAttachThreadInput(PTHREADINFO ptiFrom, PTHREADINFO ptiTo, BOOL fAttach)
} }
ptiFrom->MessageQueue->cThreads--; ptiFrom->MessageQueue->cThreads--;
ERR("ptiTo E Share count %d\n", ptiFrom->MessageQueue->cThreads); ERR("ptiTo E Share count %lu\n", ptiFrom->MessageQueue->cThreads);
ptiFrom->MessageQueue = ptiFrom->pqAttach; ptiFrom->MessageQueue = ptiFrom->pqAttach;
// FIXME: conditions? // FIXME: conditions?
ptiFrom->MessageQueue->CursorObject = NULL; ptiFrom->MessageQueue->CursorObject = NULL;
@ -639,7 +639,7 @@ NtUserSendInput(
} }
cleanup: cleanup:
TRACE("Leave NtUserSendInput, ret=%i\n", uRet); TRACE("Leave NtUserSendInput, ret=%u\n", uRet);
UserLeave(); UserLeave();
return uRet; return uRet;
} }

6
reactos/win32ss/user/ntuser/kbdlayout.c
View file

@ -235,7 +235,7 @@ UserLoadKbdLayout(PUNICODE_STRING pwszKLID, HKL hKL)
pKl->iBaseCharset = cs.ciCharset; pKl->iBaseCharset = cs.ciCharset;
pKl->dwFontSigs = cs.fs.fsCsb[0]; pKl->dwFontSigs = cs.fs.fsCsb[0];
pKl->CodePage = (USHORT)cs.ciACP; pKl->CodePage = (USHORT)cs.ciACP;
TRACE("Charset %d Font Sig %d CodePage %d\n", pKl->iBaseCharset, pKl->dwFontSigs, pKl->CodePage); TRACE("Charset %u Font Sig %lu CodePage %u\n", pKl->iBaseCharset, pKl->dwFontSigs, pKl->CodePage);
} }
else else
{ {
@ -695,7 +695,7 @@ NtUserActivateKeyboardLayout(
if (!pKl) if (!pKl)
{ {
ERR("Invalid HKL %x!\n", hKl); ERR("Invalid HKL %p!\n", hKl);
goto cleanup; goto cleanup;
} }
@ -741,7 +741,7 @@ NtUserUnloadKeyboardLayout(
if (pKl) if (pKl)
bRet = UserUnloadKbl(pKl); bRet = UserUnloadKbl(pKl);
else else
ERR("Invalid HKL %x!\n", hKl); ERR("Invalid HKL %p!\n", hKl);
UserLeave(); UserLeave();
return bRet; return bRet;

14
reactos/win32ss/user/ntuser/keyboard.c
View file

@ -361,7 +361,7 @@ IntTranslateChar(WORD wVirtKey,
*pbLigature = (wch == WCH_LGTR); *pbLigature = (wch == WCH_LGTR);
*pwcTranslatedChar = wch; *pwcTranslatedChar = wch;
TRACE("%d %04x: dwModNumber %08x Char %04x\n", TRACE("%lu %04x: dwModNumber %08x Char %04x\n",
i, wVirtKey, dwModNumber, wch); i, wVirtKey, dwModNumber, wch);
if (*pbDead) if (*pbDead)
@ -614,7 +614,7 @@ NtUserGetAsyncKeyState(INT Key)
UserLeave(); UserLeave();
TRACE("Leave NtUserGetAsyncKeyState, ret=%i\n", wRet); TRACE("Leave NtUserGetAsyncKeyState, ret=%u\n", wRet);
return wRet; return wRet;
} }
@ -1257,7 +1257,7 @@ NtUserMapVirtualKeyEx(UINT uCode, UINT uType, DWORD keyboardId, HKL dwhkl)
ret = IntMapVirtualKeyEx(uCode, uType, pKbdTbl); ret = IntMapVirtualKeyEx(uCode, uType, pKbdTbl);
UserLeave(); UserLeave();
TRACE("Leave NtUserMapVirtualKeyEx, ret=%i\n", ret); TRACE("Leave NtUserMapVirtualKeyEx, ret=%u\n", ret);
return ret; return ret;
} }
@ -1315,7 +1315,7 @@ NtUserToUnicodeEx(
pwszBuff = ExAllocatePoolWithTag(NonPagedPool, sizeof(WCHAR) * cchBuff, TAG_STRING); pwszBuff = ExAllocatePoolWithTag(NonPagedPool, sizeof(WCHAR) * cchBuff, TAG_STRING);
if (!pwszBuff) if (!pwszBuff)
{ {
ERR("ExAllocatePoolWithTag(%d) failed\n", sizeof(WCHAR) * cchBuff); ERR("ExAllocatePoolWithTag(%u) failed\n", sizeof(WCHAR) * cchBuff);
return 0; return 0;
} }
RtlZeroMemory(pwszBuff, sizeof(WCHAR) * cchBuff); RtlZeroMemory(pwszBuff, sizeof(WCHAR) * cchBuff);
@ -1443,7 +1443,7 @@ NtUserGetKeyNameText(LONG lParam, LPWSTR lpString, int cchSize)
cleanup: cleanup:
UserLeave(); UserLeave();
TRACE("Leave NtUserGetKeyNameText, ret=%i\n", dwRet); TRACE("Leave NtUserGetKeyNameText, ret=%lu\n", dwRet);
return dwRet; return dwRet;
} }
@ -1489,7 +1489,7 @@ NtUserVkKeyScanEx(
PKL pKl = NULL; PKL pKl = NULL;
DWORD i, dwModBits = 0, dwModNumber = 0, Ret = (DWORD)-1; DWORD i, dwModBits = 0, dwModNumber = 0, Ret = (DWORD)-1;
TRACE("NtUserVkKeyScanEx() wch %d, KbdLayout 0x%p\n", wch, dwhkl); TRACE("NtUserVkKeyScanEx() wch %u, KbdLayout 0x%p\n", wch, dwhkl);
UserEnterShared(); UserEnterShared();
if (bUsehKL) if (bUsehKL)
@ -1523,7 +1523,7 @@ NtUserVkKeyScanEx(
if (pVkToWch->wch[dwModNumber] == wch) if (pVkToWch->wch[dwModNumber] == wch)
{ {
dwModBits = pKbdTbl->pCharModifiers->ModNumber[dwModNumber]; dwModBits = pKbdTbl->pCharModifiers->ModNumber[dwModNumber];
TRACE("i %d wC %04x: dwModBits %08x dwModNumber %08x MaxModBits %08x\n", TRACE("i %lu wC %04x: dwModBits %08x dwModNumber %08x MaxModBits %08x\n",
i, wch, dwModBits, dwModNumber, pKbdTbl->pCharModifiers->wMaxModBits); i, wch, dwModBits, dwModNumber, pKbdTbl->pCharModifiers->wMaxModBits);
Ret = (dwModBits << 8) | (pVkToWch->VirtualKey & 0xFF); Ret = (dwModBits << 8) | (pVkToWch->VirtualKey & 0xFF);
goto Exit; goto Exit;

18
reactos/win32ss/user/ntuser/menu.c
View file

@ -1514,7 +1514,7 @@ NtUserCheckMenuItem(
RETURN( IntCheckMenuItem(Menu, uIDCheckItem, uCheck)); RETURN( IntCheckMenuItem(Menu, uIDCheckItem, uCheck));
CLEANUP: CLEANUP:
TRACE("Leave NtUserCheckMenuItem, ret=%i\n",_ret_); TRACE("Leave NtUserCheckMenuItem, ret=%lu\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -1540,8 +1540,8 @@ HMENU FASTCALL UserCreateMenu(BOOL PopupMenu)
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
ERR("Validation of window station handle (0x%X) failed\n", ERR("Validation of window station handle (%p) failed\n",
CurrentProcess->Win32WindowStation); CurrentProcess->Win32WindowStation);
SetLastNtError(Status); SetLastNtError(Status);
return (HMENU)0; return (HMENU)0;
} }
@ -1647,7 +1647,7 @@ NtUserGetTitleBarInfo(
RETURN( retValue ); RETURN( retValue );
CLEANUP: CLEANUP:
TRACE("Leave NtUserGetTitleBarInfo, ret=%i\n",_ret_); TRACE("Leave NtUserGetTitleBarInfo, ret=%u\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -1728,7 +1728,7 @@ NtUserEnableMenuItem(
RETURN( IntEnableMenuItem(Menu, uIDEnableItem, uEnable)); RETURN( IntEnableMenuItem(Menu, uIDEnableItem, uEnable));
CLEANUP: CLEANUP:
TRACE("Leave NtUserEnableMenuItem, ret=%i\n",_ret_); TRACE("Leave NtUserEnableMenuItem, ret=%u\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -1993,7 +1993,7 @@ NtUserGetMenuIndex(
RETURN(0xFFFFFFFF); RETURN(0xFFFFFFFF);
CLEANUP: CLEANUP:
TRACE("Leave NtUserGetMenuIndex, ret=%i\n",_ret_); TRACE("Leave NtUserGetMenuIndex, ret=%u\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -2105,7 +2105,7 @@ NtUserHiliteMenuItem(
RETURN(FALSE); RETURN(FALSE);
CLEANUP: CLEANUP:
TRACE("Leave NtUserHiliteMenuItem, ret=%i\n",_ret_); TRACE("Leave NtUserHiliteMenuItem, ret=%u\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -2516,7 +2516,7 @@ NtUserBuildMenuItemList(
RETURN( res); RETURN( res);
CLEANUP: CLEANUP:
TRACE("Leave NtUserBuildMenuItemList, ret=%i\n",_ret_); TRACE("Leave NtUserBuildMenuItemList, ret=%lu\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -2545,7 +2545,7 @@ NtUserGetMenuDefaultItem(
RETURN( IntGetMenuDefaultItem(Menu, fByPos, gmdiFlags, &gismc)); RETURN( IntGetMenuDefaultItem(Menu, fByPos, gmdiFlags, &gismc));
CLEANUP: CLEANUP:
TRACE("Leave NtUserGetMenuDefaultItem, ret=%i\n",_ret_); TRACE("Leave NtUserGetMenuDefaultItem, ret=%u\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }

22
reactos/win32ss/user/ntuser/message.c
View file

@ -526,7 +526,7 @@ IdlePing(VOID)
} }
} }
TRACE("IdlePing ppi 0x%x\n",ppi); TRACE("IdlePing ppi %p\n", ppi);
if ( ppi && ppi->InputIdleEvent ) if ( ppi && ppi->InputIdleEvent )
{ {
TRACE("InputIdleEvent\n"); TRACE("InputIdleEvent\n");
@ -539,7 +539,7 @@ IdlePong(VOID)
{ {
PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); PPROCESSINFO ppi = PsGetCurrentProcessWin32Process();
TRACE("IdlePong ppi 0x%x\n",ppi); TRACE("IdlePong ppi %p\n", ppi);
if ( ppi && ppi->InputIdleEvent ) if ( ppi && ppi->InputIdleEvent )
{ {
KeClearEvent(ppi->InputIdleEvent); KeClearEvent(ppi->InputIdleEvent);
@ -608,7 +608,7 @@ static LRESULT handle_internal_message( PWND pWnd, UINT msg, WPARAM wparam, LPAR
pWnd == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND pWnd == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND
return 0; return 0;
TRACE("Internal Event Msg %p hWnd 0x%x\n",msg,pWnd->head.h); TRACE("Internal Event Msg %u hWnd %p\n", msg, pWnd->head.h);
switch(msg) switch(msg)
{ {
@ -1202,13 +1202,13 @@ UserPostMessage( HWND Wnd,
pti = Window->head.pti; pti = Window->head.pti;
if ( pti->TIF_flags & TIF_INCLEANUP ) if ( pti->TIF_flags & TIF_INCLEANUP )
{ {
ERR("Attempted to post message to window 0x%x when the thread is in cleanup!\n", Wnd); ERR("Attempted to post message to window %p when the thread is in cleanup!\n", Wnd);
return FALSE; return FALSE;
} }
if ( Window->state & WNDS_DESTROYED ) if ( Window->state & WNDS_DESTROYED )
{ {
ERR("Attempted to post message to window 0x%x that is being destroyed!\n", Wnd); ERR("Attempted to post message to window %p that is being destroyed!\n", Wnd);
/* FIXME: Last error code? */ /* FIXME: Last error code? */
return FALSE; return FALSE;
} }
@ -1366,7 +1366,7 @@ co_IntSendMessageTimeoutSingle( HWND hWnd,
if (Window->state & WNDS_DESTROYED) if (Window->state & WNDS_DESTROYED)
{ {
/* FIXME: Last error? */ /* FIXME: Last error? */
ERR("Attempted to send message to window 0x%x that is being destroyed!\n", hWnd); ERR("Attempted to send message to window %p that is being destroyed!\n", hWnd);
RETURN( FALSE); RETURN( FALSE);
} }
@ -1531,7 +1531,7 @@ co_IntSendMessageWithCallBack( HWND hWnd,
if (Window->state & WNDS_DESTROYED) if (Window->state & WNDS_DESTROYED)
{ {
/* FIXME: last error? */ /* FIXME: last error? */
ERR("Attempted to send message to window 0x%x that is being destroyed!\n", hWnd); ERR("Attempted to send message to window %p that is being destroyed!\n", hWnd);
RETURN(FALSE); RETURN(FALSE);
} }
@ -1900,7 +1900,7 @@ NtUserDragDetect(
ULONG wDragWidth, wDragHeight; ULONG wDragWidth, wDragHeight;
DECLARE_RETURN(BOOL); DECLARE_RETURN(BOOL);
TRACE("Enter NtUserDragDetect(%x)\n", hWnd); TRACE("Enter NtUserDragDetect(%p)\n", hWnd);
UserEnterExclusive(); UserEnterExclusive();
wDragWidth = UserGetSystemMetrics(SM_CXDRAG); wDragWidth = UserGetSystemMetrics(SM_CXDRAG);
@ -2190,7 +2190,7 @@ NtUserTranslateMessage(LPMSG lpMsg, UINT flags)
} }
else else
{ {
TRACE("No Window for Translate. hwnd 0x%p Msg %d\n",SafeMsg.hwnd,SafeMsg.message); TRACE("No Window for Translate. hwnd 0x%p Msg %u\n", SafeMsg.hwnd, SafeMsg.message);
Ret = FALSE; Ret = FALSE;
} }
UserLeave(); UserLeave();
@ -2691,7 +2691,7 @@ NtUserMessageCall( HWND hWnd,
CWP.message = Msg; CWP.message = Msg;
CWP.wParam = wParam; CWP.wParam = wParam;
CWP.lParam = lParam; CWP.lParam = lParam;
TRACE("WH_CALLWNDPROC: Hook %x NextHook %x\n", Hook, NextObj ); TRACE("WH_CALLWNDPROC: Hook %p NextHook %p\n", Hook, NextObj);
lResult = co_IntCallHookProc( Hook->HookId, lResult = co_IntCallHookProc( Hook->HookId,
HC_ACTION, HC_ACTION,
@ -2819,7 +2819,7 @@ NtUserWaitForInputIdle( IN HANDLE hProcess,
pti->pClientInfo->dwTIFlags = pti->TIF_flags; pti->pClientInfo->dwTIFlags = pti->TIF_flags;
} }
TRACE("WFII: ppi 0x%x\n",W32Process); TRACE("WFII: ppi %p\n", W32Process);
TRACE("WFII: waiting for %p\n", Handles[1] ); TRACE("WFII: waiting for %p\n", Handles[1] );
do do
{ {

4
reactos/win32ss/user/ntuser/metric.c
View file

@ -181,7 +181,7 @@ UserGetSystemMetrics(ULONG Index)
{ {
ASSERT(gpsi); ASSERT(gpsi);
ASSERT(Setup); ASSERT(Setup);
TRACE("UserGetSystemMetrics(%d)\n", Index); TRACE("UserGetSystemMetrics(%lu)\n", Index);
/* Get metrics from array */ /* Get metrics from array */
if (Index < SM_CMETRICS) if (Index < SM_CMETRICS)
@ -202,7 +202,7 @@ UserGetSystemMetrics(ULONG Index)
return 0; // FIXME return 0; // FIXME
} }
ERR("UserGetSystemMetrics() called with invalid index %d\n", Index); ERR("UserGetSystemMetrics() called with invalid index %lu\n", Index);
return 0; return 0;
} }

8
reactos/win32ss/user/ntuser/misc.c
View file

@ -273,7 +273,7 @@ NtUserGetThreadState(
break; break;
} }
TRACE("Leave NtUserGetThreadState, ret=%i\n", ret); TRACE("Leave NtUserGetThreadState, ret=%lu\n", ret);
UserLeave(); UserLeave();
return ret; return ret;
@ -318,7 +318,7 @@ NtUserGetDoubleClickTime(VOID)
// FIXME: Check if this works on non-interactive winsta // FIXME: Check if this works on non-interactive winsta
Result = gspv.iDblClickTime; Result = gspv.iDblClickTime;
TRACE("Leave NtUserGetDoubleClickTime, ret=%i\n", Result); TRACE("Leave NtUserGetDoubleClickTime, ret=%u\n", Result);
UserLeave(); UserLeave();
return Result; return Result;
} }
@ -425,7 +425,7 @@ NtUserGetGUIThreadInfo(
RETURN( TRUE); RETURN( TRUE);
CLEANUP: CLEANUP:
TRACE("Leave NtUserGetGUIThreadInfo, ret=%i\n",_ret_); TRACE("Leave NtUserGetGUIThreadInfo, ret=%u\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -491,7 +491,7 @@ NtUserGetGuiResources(
RETURN( Ret); RETURN( Ret);
CLEANUP: CLEANUP:
TRACE("Leave NtUserGetGuiResources, ret=%i\n",_ret_); TRACE("Leave NtUserGetGuiResources, ret=%lu\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }

2
reactos/win32ss/user/ntuser/monitor.c
View file

@ -700,7 +700,7 @@ NtUserGetMonitorInfo(
pMonitor = UserGetMonitorObject(hMonitor); pMonitor = UserGetMonitorObject(hMonitor);
if (!pMonitor) if (!pMonitor)
{ {
TRACE("Couldnt find monitor 0x%lx\n", hMonitor); TRACE("Couldnt find monitor %p\n", hMonitor);
goto cleanup; goto cleanup;
} }

2
reactos/win32ss/user/ntuser/mouse.c
View file

@ -402,7 +402,7 @@ IntTrackMouseEvent(
lpEventTrack->dwFlags & TME_NONCLIENT ? WM_NCMOUSELEAVE : WM_MOUSELEAVE, lpEventTrack->dwFlags & TME_NONCLIENT ? WM_NCMOUSELEAVE : WM_MOUSELEAVE,
0, 0); 0, 0);
} }
TRACE("IntTrackMouseEvent spwndTrack 0x%x pwnd 0x%x\n", pDesk->spwndTrack, pWnd); TRACE("IntTrackMouseEvent spwndTrack %p pwnd %p\n", pDesk->spwndTrack, pWnd);
return TRUE; return TRUE;
} }

10
reactos/win32ss/user/ntuser/msgqueue.c
View file

@ -260,7 +260,7 @@ UserGetKeyState(DWORD dwKey)
static VOID static VOID
UpdateKeyState(PUSER_MESSAGE_QUEUE MessageQueue, WORD wVk, BOOL bIsDown) UpdateKeyState(PUSER_MESSAGE_QUEUE MessageQueue, WORD wVk, BOOL bIsDown)
{ {
TRACE("UpdateKeyState wVk: %d, bIsDown: %d\n", wVk, bIsDown); TRACE("UpdateKeyState wVk: %u, bIsDown: %d\n", wVk, bIsDown);
if (bIsDown) if (bIsDown)
{ {
@ -282,7 +282,7 @@ UpdateKeyStateFromMsg(PUSER_MESSAGE_QUEUE MessageQueue, MSG* msg)
UCHAR key; UCHAR key;
BOOL down = FALSE; BOOL down = FALSE;
TRACE("UpdateKeyStateFromMsg message:%d\n", msg->message); TRACE("UpdateKeyStateFromMsg message:%u\n", msg->message);
switch (msg->message) switch (msg->message)
{ {
@ -626,7 +626,7 @@ co_MsqInsertMouseMessage(MSG* Msg, DWORD flags, ULONG_PTR dwExtraInfo, BOOL Hook
} }
else else
{ {
TRACE("Posting mouse message to hwnd=0x%x!\n", UserHMGetHandle(pwnd)); TRACE("Posting mouse message to hwnd=%p!\n", UserHMGetHandle(pwnd));
MsqPostMessage(pti, Msg, TRUE, QS_MOUSEBUTTON, 0); MsqPostMessage(pti, Msg, TRUE, QS_MOUSEBUTTON, 0);
} }
} }
@ -1011,7 +1011,7 @@ co_MsqSendMessage(PTHREADINFO ptirec,
if (pti->TIF_flags & TIF_INCLEANUP || ptirec->TIF_flags & TIF_INCLEANUP) if (pti->TIF_flags & TIF_INCLEANUP || ptirec->TIF_flags & TIF_INCLEANUP)
{ {
if (uResult) *uResult = -1; if (uResult) *uResult = -1;
ERR("MsqSM: Current pti %d or Rec pti %d\n",pti->TIF_flags & TIF_INCLEANUP, ptirec->TIF_flags & TIF_INCLEANUP); ERR("MsqSM: Current pti %lu or Rec pti %lu\n", pti->TIF_flags & TIF_INCLEANUP, ptirec->TIF_flags & TIF_INCLEANUP);
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
@ -1387,7 +1387,7 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, UINT first, UINT
pwndMsg = co_WinPosWindowFromPoint(NULL, &msg->pt, &hittest); pwndMsg = co_WinPosWindowFromPoint(NULL, &msg->pt, &hittest);
} }
TRACE("Got mouse message for 0x%x, hittest: 0x%x\n", msg->hwnd, hittest ); TRACE("Got mouse message for %p, hittest: 0x%x\n", msg->hwnd, hittest);
if (pwndMsg == NULL || pwndMsg->head.pti != pti) if (pwndMsg == NULL || pwndMsg->head.pti != pti)
{ {

14
reactos/win32ss/user/ntuser/object.c
View file

@ -23,7 +23,7 @@ void DbgUserDumpHandleTable()
L"Accel", L"DDEaccess", L"DDEconv", L"DDExact", L"Monitor", L"KBDlayout", L"KBDfile", L"Accel", L"DDEaccess", L"DDEconv", L"DDExact", L"Monitor", L"KBDlayout", L"KBDfile",
L"Event", L"Timer", L"InputContext", L"HidData", L"DeviceInfo", L"TouchInput",L"GestureInfo"}; L"Event", L"Timer", L"InputContext", L"HidData", L"DeviceInfo", L"TouchInput",L"GestureInfo"};
ERR("Total handles count: %d\n", gpsi->cHandleEntries); ERR("Total handles count: %lu\n", gpsi->cHandleEntries);
memset(HandleCounts, 0, sizeof(HandleCounts)); memset(HandleCounts, 0, sizeof(HandleCounts));
@ -31,13 +31,13 @@ void DbgUserDumpHandleTable()
ppiList = gppiList; ppiList = gppiList;
while (ppiList) while (ppiList)
{ {
ERR("Process %s (%d) handles count: %d\n\t", ppiList->peProcess->ImageFileName, ppiList->peProcess->UniqueProcessId, ppiList->UserHandleCount); ERR("Process %s (%p) handles count: %d\n\t", ppiList->peProcess->ImageFileName, ppiList->peProcess->UniqueProcessId, ppiList->UserHandleCount);
for (i = 1 ;i < TYPE_CTYPES; i++) for (i = 1 ;i < TYPE_CTYPES; i++)
{ {
HandleCounts[i] += ppiList->DbgHandleCount[i]; HandleCounts[i] += ppiList->DbgHandleCount[i];
DbgPrint("%S: %d, ", TypeNames[i], ppiList->DbgHandleCount[i]); DbgPrint("%S: %lu, ", TypeNames[i], ppiList->DbgHandleCount[i]);
if (i % 6 == 0) if (i % 6 == 0)
DbgPrint("\n\t"); DbgPrint("\n\t");
} }
@ -97,7 +97,7 @@ __inline static PUSER_HANDLE_ENTRY alloc_user_entry(PUSER_HANDLE_TABLE ht)
{ {
PUSER_HANDLE_ENTRY entry; PUSER_HANDLE_ENTRY entry;
PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); PPROCESSINFO ppi = PsGetCurrentProcessWin32Process();
TRACE("handles used %i\n",gpsi->cHandleEntries); TRACE("handles used %lu\n", gpsi->cHandleEntries);
if (ht->freelist) if (ht->freelist)
{ {
@ -111,7 +111,7 @@ __inline static PUSER_HANDLE_ENTRY alloc_user_entry(PUSER_HANDLE_TABLE ht)
if (ht->nb_handles >= ht->allocated_handles) /* Need to grow the array */ if (ht->nb_handles >= ht->allocated_handles) /* Need to grow the array */
{ {
ERR("Out of user handles! Used -> %i, NM_Handle -> %d\n", gpsi->cHandleEntries, ht->nb_handles); ERR("Out of user handles! Used -> %lu, NM_Handle -> %d\n", gpsi->cHandleEntries, ht->nb_handles);
#if DBG #if DBG
DbgUserDumpHandleTable(); DbgUserDumpHandleTable();
@ -420,10 +420,10 @@ UserDereferenceObject(PVOID object)
if (!entry) if (!entry)
{ {
ERR("Warning! Dereference Object without ENTRY! Obj -> 0x%x\n", object); ERR("Warning! Dereference Object without ENTRY! Obj -> %p\n", object);
return FALSE; return FALSE;
} }
TRACE("Warning! Dereference to zero! Obj -> 0x%x\n", object); TRACE("Warning! Dereference to zero! Obj -> %p\n", object);
((PHEAD)object)->cLockObj = 0; ((PHEAD)object)->cLockObj = 0;

6
reactos/win32ss/user/ntuser/painting.c
View file

@ -767,7 +767,7 @@ IntGetPaintMessage(
if (Message->hwnd == NULL) if (Message->hwnd == NULL)
{ {
ERR("PAINTING BUG: Thread marked as containing dirty windows, but no dirty windows found! Counts %d\n",Thread->cPaintsReady); ERR("PAINTING BUG: Thread marked as containing dirty windows, but no dirty windows found! Counts %u\n",Thread->cPaintsReady);
/* Hack to stop spamming the debuglog ! */ /* Hack to stop spamming the debuglog ! */
Thread->cPaintsReady = 0; Thread->cPaintsReady = 0;
return FALSE; return FALSE;
@ -1583,7 +1583,7 @@ NtUserScrollDC(
RETURN(TRUE); RETURN(TRUE);
CLEANUP: CLEANUP:
TRACE("Leave NtUserScrollDC, ret=%i\n",_ret_); TRACE("Leave NtUserScrollDC, ret=%lu\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -1819,7 +1819,7 @@ CLEANUP:
if (Window) if (Window)
UserDerefObjectCo(Window); UserDerefObjectCo(Window);
TRACE("Leave NtUserScrollWindowEx, ret=%i\n",_ret_); TRACE("Leave NtUserScrollWindowEx, ret=%lu\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }

2
reactos/win32ss/user/ntuser/prop.c
View file

@ -174,7 +174,7 @@ NtUserRemoveProp(HWND hWnd, ATOM Atom)
RETURN(Data); RETURN(Data);
CLEANUP: CLEANUP:
TRACE("Leave NtUserRemoveProp, ret=%i\n",_ret_); TRACE("Leave NtUserRemoveProp, ret=%p\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }

12
reactos/win32ss/user/ntuser/scrollbar.c
View file

@ -575,7 +575,7 @@ co_IntCreateScrollBars(PWND Window)
Size = 3 * (sizeof(SBINFOEX)); Size = 3 * (sizeof(SBINFOEX));
if(!(Window->pSBInfoex = ExAllocatePoolWithTag(PagedPool, Size, TAG_SBARINFO))) if(!(Window->pSBInfoex = ExAllocatePoolWithTag(PagedPool, Size, TAG_SBARINFO)))
{ {
ERR("Unable to allocate memory for scrollbar information for window 0x%x\n", Window->head.h); ERR("Unable to allocate memory for scrollbar information for window %p\n", Window->head.h);
return FALSE; return FALSE;
} }
@ -583,7 +583,7 @@ co_IntCreateScrollBars(PWND Window)
if(!(Window->pSBInfo = DesktopHeapAlloc( Window->head.rpdesk, sizeof(SBINFO)))) if(!(Window->pSBInfo = DesktopHeapAlloc( Window->head.rpdesk, sizeof(SBINFO))))
{ {
ERR("Unable to allocate memory for scrollbar information for window 0x%x\n", Window->head.h); ERR("Unable to allocate memory for scrollbar information for window %p\n", Window->head.h);
return FALSE; return FALSE;
} }
@ -888,7 +888,7 @@ NtUserEnableScrollBar(
if(wSBflags != SB_BOTH && !SBID_IS_VALID(wSBflags)) if(wSBflags != SB_BOTH && !SBID_IS_VALID(wSBflags))
{ {
EngSetLastError(ERROR_INVALID_PARAMETER); EngSetLastError(ERROR_INVALID_PARAMETER);
ERR("Trying to set scrollinfo for unknown scrollbar type %d", wSBflags); ERR("Trying to set scrollinfo for unknown scrollbar type %u", wSBflags);
RETURN(FALSE); RETURN(FALSE);
} }
@ -913,7 +913,7 @@ NtUserEnableScrollBar(
if(InfoH) if(InfoH)
Chg = (IntEnableScrollBar(TRUE, InfoH, wArrows) || Chg); Chg = (IntEnableScrollBar(TRUE, InfoH, wArrows) || Chg);
ERR("FIXME: EnableScrollBar wSBflags %d wArrows %d Chg %d\n",wSBflags,wArrows, Chg); ERR("FIXME: EnableScrollBar wSBflags %u wArrows %u Chg %d\n", wSBflags, wArrows, Chg);
// Done in user32: // Done in user32:
// SCROLL_RefreshScrollBar( hwnd, nBar, TRUE, TRUE ); // SCROLL_RefreshScrollBar( hwnd, nBar, TRUE, TRUE );
@ -968,7 +968,7 @@ CLEANUP:
if (Window) if (Window)
UserDerefObjectCo(Window); UserDerefObjectCo(Window);
TRACE("Leave NtUserSetScrollInfo, ret=%i\n",_ret_); TRACE("Leave NtUserSetScrollInfo, ret=%lu\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
@ -998,7 +998,7 @@ NtUserShowScrollBar(HWND hWnd, int nBar, DWORD bShow)
RETURN(ret); RETURN(ret);
CLEANUP: CLEANUP:
TRACE("Leave NtUserShowScrollBar, ret%i\n",_ret_); TRACE("Leave NtUserShowScrollBar, ret%lu\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;

6
reactos/win32ss/user/ntuser/sysparams.c
View file

@ -680,7 +680,7 @@ SpiSetWallpaper(PVOID pvParam, FLONG fl)
/* Yes, Windows really loads the current setting from the registry. */ /* Yes, Windows really loads the current setting from the registry. */
ulTile = SpiLoadInt(KEY_DESKTOP, L"TileWallpaper", 0); ulTile = SpiLoadInt(KEY_DESKTOP, L"TileWallpaper", 0);
ulStyle = SpiLoadInt(KEY_DESKTOP, L"WallpaperStyle", 0); ulStyle = SpiLoadInt(KEY_DESKTOP, L"WallpaperStyle", 0);
TRACE("SpiSetWallpaper: ulTile=%ld, ulStyle=%d\n", ulTile, ulStyle); TRACE("SpiSetWallpaper: ulTile=%lu, ulStyle=%lu\n", ulTile, ulStyle);
/* Check the values we found in the registry */ /* Check the values we found in the registry */
if(ulTile && !ulStyle) if(ulTile && !ulStyle)
@ -1544,7 +1544,7 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl)
break; break;
default: default:
ERR("Invalid SPI value: %d\n", uiAction); ERR("Invalid SPI value: %u\n", uiAction);
EngSetLastError(ERROR_INVALID_PARAMETER); EngSetLastError(ERROR_INVALID_PARAMETER);
return 0; return 0;
} }
@ -1619,7 +1619,7 @@ NtUserSystemParametersInfo(
{ {
BOOL bResult; BOOL bResult;
TRACE("Enter NtUserSystemParametersInfo(%d)\n", uiAction); TRACE("Enter NtUserSystemParametersInfo(%u)\n", uiAction);
UserEnterExclusive(); UserEnterExclusive();
// FIXME: Get rid of the flags and only use this from um. kernel can access data directly. // FIXME: Get rid of the flags and only use this from um. kernel can access data directly.

16
reactos/win32ss/user/ntuser/timer.c
View file

@ -281,8 +281,8 @@ VOID
CALLBACK CALLBACK
SystemTimerProc(HWND hwnd, SystemTimerProc(HWND hwnd,
UINT uMsg, UINT uMsg,
UINT_PTR idEvent, UINT_PTR idEvent,
DWORD dwTime) DWORD dwTime)
{ {
PDESKTOP pDesk; PDESKTOP pDesk;
PWND pWnd = NULL; PWND pWnd = NULL;
@ -292,7 +292,7 @@ SystemTimerProc(HWND hwnd,
pWnd = UserGetWindowObject(hwnd); pWnd = UserGetWindowObject(hwnd);
if (!pWnd) if (!pWnd)
{ {
ERR( "System Timer Proc has invalid window handle! 0x%x Id: %d\n", hwnd, idEvent); ERR("System Timer Proc has invalid window handle! %p Id: %u\n", hwnd, idEvent);
return; return;
} }
} }
@ -348,7 +348,7 @@ SystemTimerProc(HWND hwnd,
return; // Not this window so just return. return; // Not this window so just return.
default: default:
ERR( "System Timer Proc invalid id %d!\n", idEvent ); ERR("System Timer Proc invalid id %u!\n", idEvent);
break; break;
} }
IntKillTimer(pWnd, idEvent, TRUE); IntKillTimer(pWnd, idEvent, TRUE);
@ -561,8 +561,8 @@ BOOL FASTCALL
IntKillTimer(PWND Window, UINT_PTR IDEvent, BOOL SystemTimer) IntKillTimer(PWND Window, UINT_PTR IDEvent, BOOL SystemTimer)
{ {
PTIMER pTmr = NULL; PTIMER pTmr = NULL;
TRACE("IntKillTimer Window %x id %p systemtimer %s\n", TRACE("IntKillTimer Window %p id %p systemtimer %s\n",
Window, IDEvent, SystemTimer ? "TRUE" : "FALSE"); Window, IDEvent, SystemTimer ? "TRUE" : "FALSE");
TimerEnterExclusive(); TimerEnterExclusive();
pTmr = FindTimer(Window, IDEvent, SystemTimer ? TMRF_SYSTEM : 0); pTmr = FindTimer(Window, IDEvent, SystemTimer ? TMRF_SYSTEM : 0);
@ -633,7 +633,7 @@ NtUserSetTimer
RETURN(IntSetTimer(Window, nIDEvent, uElapse, lpTimerFunc, TMRF_TIFROMWND)); RETURN(IntSetTimer(Window, nIDEvent, uElapse, lpTimerFunc, TMRF_TIFROMWND));
CLEANUP: CLEANUP:
TRACE("Leave NtUserSetTimer, ret=%i\n", _ret_); TRACE("Leave NtUserSetTimer, ret=%u\n", _ret_);
END_CLEANUP; END_CLEANUP;
} }
@ -679,7 +679,7 @@ NtUserSetSystemTimer(
RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, NULL, TMRF_SYSTEM)); RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, NULL, TMRF_SYSTEM));
CLEANUP: CLEANUP:
TRACE("Leave NtUserSetSystemTimer, ret=%i\n", _ret_); TRACE("Leave NtUserSetSystemTimer, ret=%u\n", _ret_);
END_CLEANUP; END_CLEANUP;
} }

27
reactos/win32ss/user/ntuser/windc.c
View file

@ -98,7 +98,7 @@ DceAllocDCE(PWND Window OPTIONAL, DCE_TYPE Type)
} }
else else
{ {
TRACE("FREE DCATTR!!!! NOT DCE_WINDOW_DC!!!!! hDC-> %x\n", pDce->hDC); TRACE("FREE DCATTR!!!! NOT DCE_WINDOW_DC!!!!! hDC-> %p\n", pDce->hDC);
GreSetDCOwner(pDce->hDC, GDI_OBJ_HMGR_NONE); GreSetDCOwner(pDce->hDC, GDI_OBJ_HMGR_NONE);
pDce->ptiOwner = NULL; pDce->ptiOwner = NULL;
} }
@ -296,7 +296,7 @@ DceReleaseDC(DCE* dce, BOOL EndPaint)
} }
} }
dce->DCXFlags &= ~DCX_DCEBUSY; dce->DCXFlags &= ~DCX_DCEBUSY;
TRACE("Exit!!!!! DCX_CACHE!!!!!! hDC-> %x \n", dce->hDC); TRACE("Exit!!!!! DCX_CACHE!!!!!! hDC-> %p \n", dce->hDC);
if (!GreSetDCOwner(dce->hDC, GDI_OBJ_HMGR_NONE)) if (!GreSetDCOwner(dce->hDC, GDI_OBJ_HMGR_NONE))
return 0; return 0;
dce->ptiOwner = NULL; // Reset ownership. dce->ptiOwner = NULL; // Reset ownership.
@ -515,7 +515,7 @@ UserGetDCEx(PWND Wnd OPTIONAL, HANDLE ClipRegion, ULONG Flags)
if (!GreIsHandleValid(Dce->hDC)) if (!GreIsHandleValid(Dce->hDC))
{ {
ERR("FIXME: Got DCE with invalid hDC! 0x%x\n", Dce->hDC); ERR("FIXME: Got DCE with invalid hDC! %p\n", Dce->hDC);
Dce->hDC = DceCreateDisplayDC(); Dce->hDC = DceCreateDisplayDC();
/* FIXME: Handle error */ /* FIXME: Handle error */
} }
@ -577,7 +577,7 @@ UserGetDCEx(PWND Wnd OPTIONAL, HANDLE ClipRegion, ULONG Flags)
if (Dce->DCXFlags & DCX_CACHE) if (Dce->DCXFlags & DCX_CACHE)
{ {
TRACE("ENTER!!!!!! DCX_CACHE!!!!!! hDC-> %x\n", Dce->hDC); TRACE("ENTER!!!!!! DCX_CACHE!!!!!! hDC-> %p\n", Dce->hDC);
// Need to set ownership so Sync dcattr will work. // Need to set ownership so Sync dcattr will work.
GreSetDCOwner(Dce->hDC, GDI_OBJ_HMGR_POWNED); GreSetDCOwner(Dce->hDC, GDI_OBJ_HMGR_POWNED);
Dce->ptiOwner = GetW32ThreadInfo(); // Set the temp owning Dce->ptiOwner = GetW32ThreadInfo(); // Set the temp owning
@ -621,7 +621,7 @@ DceFreeDCE(PDCE pdce, BOOLEAN Force)
if (Force && if (Force &&
GreGetObjectOwner(pdce->hDC) != GDI_OBJ_HMGR_POWNED) GreGetObjectOwner(pdce->hDC) != GDI_OBJ_HMGR_POWNED)
{ {
TRACE("Change ownership for DCE! -> %x\n" , pdce); TRACE("Change ownership for DCE! -> %p\n" , pdce);
// NOTE: Windows sets W32PF_OWNDCCLEANUP and moves on. // NOTE: Windows sets W32PF_OWNDCCLEANUP and moves on.
if (GreIsHandleValid(pdce->hDC)) if (GreIsHandleValid(pdce->hDC))
{ {
@ -629,7 +629,8 @@ DceFreeDCE(PDCE pdce, BOOLEAN Force)
} }
else else
{ {
ERR("Attempted to change ownership of an DCEhDC 0x%x currently being destroyed!!!\n",pdce->hDC); ERR("Attempted to change ownership of an DCEhDC %p currently being destroyed!!!\n",
pdce->hDC);
Hit = TRUE; Hit = TRUE;
} }
} }
@ -651,7 +652,7 @@ DceFreeDCE(PDCE pdce, BOOLEAN Force)
if (IsListEmpty(&pdce->List)) if (IsListEmpty(&pdce->List))
{ {
ERR("List is Empty! DCE! -> %x\n" , pdce); ERR("List is Empty! DCE! -> %p\n" , pdce);
return NULL; return NULL;
} }
@ -710,10 +711,11 @@ DceFreeWindowDCE(PWND Window)
pDCE->hwndCurrent = 0; pDCE->hwndCurrent = 0;
pDCE->pwndOrg = pDCE->pwndClip = NULL; pDCE->pwndOrg = pDCE->pwndClip = NULL;
TRACE("POWNED DCE going Cheap!! DCX_CACHE!! hDC-> %x \n", pDCE->hDC); TRACE("POWNED DCE going Cheap!! DCX_CACHE!! hDC-> %p \n",
pDCE->hDC);
if (!GreSetDCOwner( pDCE->hDC, GDI_OBJ_HMGR_NONE)) if (!GreSetDCOwner( pDCE->hDC, GDI_OBJ_HMGR_NONE))
{ {
ERR("Fail Owner Switch hDC-> %x \n", pDCE->hDC); ERR("Fail Owner Switch hDC-> %p \n", pDCE->hDC);
break; break;
} }
/* Do not change owner so thread can clean up! */ /* Do not change owner so thread can clean up! */
@ -726,7 +728,8 @@ DceFreeWindowDCE(PWND Window)
} }
else else
{ {
ERR("Not POWNED or CLASSDC hwndCurrent -> %x \n", pDCE->hwndCurrent); ERR("Not POWNED or CLASSDC hwndCurrent -> %p \n",
pDCE->hwndCurrent);
// ASSERT(FALSE); /* bug 5320 */ // ASSERT(FALSE); /* bug 5320 */
} }
} }
@ -1017,7 +1020,7 @@ NtUserGetDCEx(HWND hWnd OPTIONAL, HANDLE ClipRegion, ULONG Flags)
RETURN( UserGetDCEx(Wnd, ClipRegion, Flags)); RETURN( UserGetDCEx(Wnd, ClipRegion, Flags));
CLEANUP: CLEANUP:
TRACE("Leave NtUserGetDCEx, ret=%i\n",_ret_); TRACE("Leave NtUserGetDCEx, ret=%p\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -1043,7 +1046,7 @@ NtUserGetWindowDC(HWND hWnd)
HDC APIENTRY HDC APIENTRY
NtUserGetDC(HWND hWnd) NtUserGetDC(HWND hWnd)
{ {
TRACE("NtUGetDC -> %x:%x\n", hWnd, !hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE ); TRACE("NtUGetDC -> %p:%x\n", hWnd, !hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE);
return NtUserGetDCEx(hWnd, NULL, NULL == hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE); return NtUserGetDCEx(hWnd, NULL, NULL == hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE);
} }

30
reactos/win32ss/user/ntuser/window.c
View file

@ -814,7 +814,7 @@ co_DestroyThreadWindows(struct _ETHREAD *Thread)
Current = WThread->WindowListHead.Flink; Current = WThread->WindowListHead.Flink;
Wnd = CONTAINING_RECORD(Current, WND, ThreadListEntry); Wnd = CONTAINING_RECORD(Current, WND, ThreadListEntry);
TRACE("thread cleanup: while destroy wnds, wnd=0x%x\n",Wnd); TRACE("thread cleanup: while destroy wnds, wnd=%p\n", Wnd);
/* Window removes itself from the list */ /* Window removes itself from the list */
@ -828,7 +828,7 @@ co_DestroyThreadWindows(struct _ETHREAD *Thread)
UserRefObjectCo(Wnd, &Ref); // FIXME: Temp HACK?? UserRefObjectCo(Wnd, &Ref); // FIXME: Temp HACK??
if (!co_UserDestroyWindow(Wnd)) if (!co_UserDestroyWindow(Wnd))
{ {
ERR("Unable to destroy window 0x%x at thread cleanup... This is _VERY_ bad!\n", Wnd); ERR("Unable to destroy window %p at thread cleanup... This is _VERY_ bad!\n", Wnd);
} }
UserDerefObjectCo(Wnd); // FIXME: Temp HACK?? UserDerefObjectCo(Wnd); // FIXME: Temp HACK??
} }
@ -1727,7 +1727,7 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs,
goto AllocError; goto AllocError;
} }
TRACE("Created window object with handle %X\n", hWnd); TRACE("Created window object with handle %p\n", hWnd);
if (pdeskCreated && pdeskCreated->DesktopWindow == NULL ) if (pdeskCreated && pdeskCreated->DesktopWindow == NULL )
{ /* HACK: Helper for win32csr/desktopbg.c */ { /* HACK: Helper for win32csr/desktopbg.c */
@ -1837,7 +1837,7 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs,
if (!CallProc) if (!CallProc)
{ {
EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY);
ERR("Warning: Unable to create CallProc for edit control. Control may not operate correctly! hwnd %x\n",hWnd); ERR("Warning: Unable to create CallProc for edit control. Control may not operate correctly! hwnd %p\n", hWnd);
} }
else else
{ {
@ -2330,7 +2330,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs,
} }
} }
TRACE("co_UserCreateWindowEx(): Created window %X\n", hWnd); TRACE("co_UserCreateWindowEx(): Created window %p\n", hWnd);
ret = Window; ret = Window;
cleanup: cleanup:
@ -2742,7 +2742,7 @@ NtUserDestroyWindow(HWND Wnd)
RETURN(ret); RETURN(ret);
CLEANUP: CLEANUP:
TRACE("Leave NtUserDestroyWindow, ret=%i\n",_ret_); TRACE("Leave NtUserDestroyWindow, ret=%u\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -3022,7 +3022,7 @@ NtUserFindWindowEx(HWND hwndParent,
RETURN( Ret); RETURN( Ret);
CLEANUP: CLEANUP:
TRACE("Leave NtUserFindWindowEx, ret %i\n",_ret_); TRACE("Leave NtUserFindWindowEx, ret %p\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -3119,7 +3119,7 @@ NtUserGetAncestor(HWND hWnd, UINT Type)
RETURN(Ancestor ? Ancestor->head.h : NULL); RETURN(Ancestor ? Ancestor->head.h : NULL);
CLEANUP: CLEANUP:
TRACE("Leave NtUserGetAncestor, ret=%i\n",_ret_); TRACE("Leave NtUserGetAncestor, ret=%p\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -3186,7 +3186,7 @@ NtUserGetListBoxInfo(
RETURN( (DWORD) co_IntSendMessage( Wnd->head.h, LB_GETLISTBOXINFO, 0, 0 )); RETURN( (DWORD) co_IntSendMessage( Wnd->head.h, LB_GETLISTBOXINFO, 0, 0 ));
CLEANUP: CLEANUP:
TRACE("Leave NtUserGetListBoxInfo, ret=%i\n",_ret_); TRACE("Leave NtUserGetListBoxInfo, ret=%lu\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -3231,7 +3231,7 @@ NtUserSetParent(HWND hWndChild, HWND hWndNewParent)
RETURN( co_UserSetParent(hWndChild, hWndNewParent)); RETURN( co_UserSetParent(hWndChild, hWndNewParent));
CLEANUP: CLEANUP:
TRACE("Leave NtUserSetParent, ret=%i\n",_ret_); TRACE("Leave NtUserSetParent, ret=%p\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -3418,7 +3418,7 @@ NtUserGetSystemMenu(HWND hWnd, BOOL bRevert)
RETURN(Menu->MenuInfo.Self); RETURN(Menu->MenuInfo.Self);
CLEANUP: CLEANUP:
TRACE("Leave NtUserGetSystemMenu, ret=%i\n",_ret_); TRACE("Leave NtUserGetSystemMenu, ret=%p\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -3598,7 +3598,7 @@ co_UserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi)
break; break;
default: default:
ERR("NtUserSetWindowLong(): Unsupported index %d\n", Index); ERR("NtUserSetWindowLong(): Unsupported index %lu\n", Index);
EngSetLastError(ERROR_INVALID_INDEX); EngSetLastError(ERROR_INVALID_INDEX);
OldValue = 0; OldValue = 0;
break; break;
@ -3697,7 +3697,7 @@ NtUserSetWindowWord(HWND hWnd, INT Index, WORD NewValue)
RETURN( OldValue); RETURN( OldValue);
CLEANUP: CLEANUP:
TRACE("Leave NtUserSetWindowWord, ret=%i\n",_ret_); TRACE("Leave NtUserSetWindowWord, ret=%u\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -3798,7 +3798,7 @@ NtUserQueryWindow(HWND hWnd, DWORD Index)
RETURN( Result); RETURN( Result);
CLEANUP: CLEANUP:
TRACE("Leave NtUserQueryWindow, ret=%i\n",_ret_); TRACE("Leave NtUserQueryWindow, ret=%u\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -3837,7 +3837,7 @@ NtUserRegisterWindowMessage(PUNICODE_STRING MessageNameUnsafe)
RETURN( Ret); RETURN( Ret);
CLEANUP: CLEANUP:
TRACE("Leave NtUserRegisterWindowMessage, ret=%i\n",_ret_); TRACE("Leave NtUserRegisterWindowMessage, ret=%u\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }

6
reactos/win32ss/user/ntuser/winpos.c
View file

@ -1612,7 +1612,7 @@ co_WinPosSetWindowPos(
WvrFlags = co_WinPosDoNCCALCSize(Window, &WinPos, &NewWindowRect, &NewClientRect); WvrFlags = co_WinPosDoNCCALCSize(Window, &WinPos, &NewWindowRect, &NewClientRect);
TRACE("co_WinPosDoNCCALCSize returned %d\n", WvrFlags); TRACE("co_WinPosDoNCCALCSize returned %lu\n", WvrFlags);
/* Validate link windows. (also take into account shell window in hwndShellWindow) */ /* Validate link windows. (also take into account shell window in hwndShellWindow) */
if (!(WinPos.flags & SWP_NOZORDER) && WinPos.hwnd != UserGetShellWindow()) if (!(WinPos.flags & SWP_NOZORDER) && WinPos.hwnd != UserGetShellWindow())
@ -2723,7 +2723,7 @@ NtUserDeferWindowPos(HDWP WinPosInfo,
Ret = IntDeferWindowPos(WinPosInfo, Wnd, WndInsertAfter, x, y, cx, cy, Flags); Ret = IntDeferWindowPos(WinPosInfo, Wnd, WndInsertAfter, x, y, cx, cy, Flags);
Exit: Exit:
TRACE("Leave NtUserDeferWindowPos, ret=%i\n", Ret); TRACE("Leave NtUserDeferWindowPos, ret=%p\n", Ret);
UserLeave(); UserLeave();
return Ret; return Ret;
} }
@ -3312,7 +3312,7 @@ CLEANUP:
if (Window) UserDereferenceObject(Window); if (Window) UserDereferenceObject(Window);
if (DesktopWindow) UserDerefObjectCo(DesktopWindow); if (DesktopWindow) UserDerefObjectCo(DesktopWindow);
TRACE("Leave NtUserWindowFromPoint, ret=%i\n",_ret_); TRACE("Leave NtUserWindowFromPoint, ret=%p\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }

46
reactos/win32ss/user/ntuser/winsta.c
View file

@ -65,7 +65,7 @@ UserCreateWinstaDirectory()
else else
{ {
swprintf(wstrWindowStationsDir, swprintf(wstrWindowStationsDir,
L"%ws\\%ld%ws", L"%ws\\%lu%ws",
SESSION_DIR, SESSION_DIR,
Peb->SessionId, Peb->SessionId,
WINSTA_OBJ_DIR); WINSTA_OBJ_DIR);
@ -88,7 +88,7 @@ UserCreateWinstaDirectory()
return Status; return Status;
} }
TRACE("Created directory %wZ for session %d\n", &gustrWindowStationsDir, Peb->SessionId); TRACE("Created directory %wZ for session %lu\n", &gustrWindowStationsDir, Peb->SessionId);
return Status; return Status;
} }
@ -100,7 +100,7 @@ IntWinStaObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters)
{ {
PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)Parameters->Object; PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)Parameters->Object;
TRACE("Deleting window station (0x%X)\n", WinSta); TRACE("Deleting window station (0x%p)\n", WinSta);
UserEmptyClipboardData(WinSta); UserEmptyClipboardData(WinSta);
@ -457,7 +457,7 @@ NtUserCreateWindowStation(
InitCursorImpl(); InitCursorImpl();
} }
TRACE("NtUserCreateWindowStation created object 0x%x with name %wZ handle 0x%x\n", TRACE("NtUserCreateWindowStation created object %p with name %wZ handle %p\n",
WindowStation, &WindowStationObject->Name, WindowStation); WindowStation, &WindowStationObject->Name, WindowStation);
return WindowStation; return WindowStation;
} }
@ -510,7 +510,7 @@ NtUserOpenWindowStation(
return 0; return 0;
} }
TRACE("Opened window station %wZ with handle 0x%x\n", ObjectAttributes->ObjectName, hwinsta); TRACE("Opened window station %wZ with handle %p\n", ObjectAttributes->ObjectName, hwinsta);
return hwinsta; return hwinsta;
} }
@ -544,7 +544,7 @@ NtUserCloseWindowStation(
PWINSTATION_OBJECT Object; PWINSTATION_OBJECT Object;
NTSTATUS Status; NTSTATUS Status;
TRACE("NtUserCloseWindowStation called (0x%x)\n", hWinSta); TRACE("NtUserCloseWindowStation called (%p)\n", hWinSta);
if (hWinSta == UserGetProcessWindowStation()) if (hWinSta == UserGetProcessWindowStation())
{ {
@ -560,13 +560,13 @@ NtUserCloseWindowStation(
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
ERR("Validation of window station handle (0x%x) failed\n", hWinSta); ERR("Validation of window station handle (%p) failed\n", hWinSta);
return FALSE; return FALSE;
} }
ObDereferenceObject(Object); ObDereferenceObject(Object);
TRACE("Closing window station handle (0x%x)\n", hWinSta); TRACE("Closing window station handle (%p)\n", hWinSta);
Status = ObCloseHandle(hWinSta, UserMode); Status = ObCloseHandle(hWinSta, UserMode);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
@ -633,7 +633,7 @@ NtUserGetObjectInformation(
DWORD nDataSize = 0; DWORD nDataSize = 0;
/* try windowstation */ /* try windowstation */
TRACE("Trying to open window station 0x%x\n", hObject); TRACE("Trying to open window station %p\n", hObject);
Status = ObReferenceObjectByHandle( Status = ObReferenceObjectByHandle(
hObject, hObject,
0, 0,
@ -645,7 +645,7 @@ NtUserGetObjectInformation(
if (Status == STATUS_OBJECT_TYPE_MISMATCH) if (Status == STATUS_OBJECT_TYPE_MISMATCH)
{ {
/* try desktop */ /* try desktop */
TRACE("Trying to open desktop 0x%x\n", hObject); TRACE("Trying to open desktop %p\n", hObject);
Status = IntValidateDesktopHandle( Status = IntValidateDesktopHandle(
hObject, hObject,
UserMode, UserMode,
@ -717,7 +717,7 @@ NtUserGetObjectInformation(
/* try to copy data to caller */ /* try to copy data to caller */
if (Status == STATUS_SUCCESS) if (Status == STATUS_SUCCESS)
{ {
TRACE("Trying to copy data to caller (len = %d, len needed = %d)\n", nLength, nDataSize); TRACE("Trying to copy data to caller (len = %lu, len needed = %lu)\n", nLength, nDataSize);
*nLengthNeeded = nDataSize; *nLengthNeeded = nDataSize;
if (nLength >= nDataSize) if (nLength >= nDataSize)
Status = MmCopyToCaller(pvInformation, pvData, nDataSize); Status = MmCopyToCaller(pvInformation, pvData, nDataSize);
@ -835,8 +835,8 @@ UserSetProcessWindowStation(HWINSTA hWindowStation)
&NewWinSta); &NewWinSta);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
TRACE("Validation of window station handle (0x%X) failed\n", TRACE("Validation of window station handle (%p) failed\n",
hWindowStation); hWindowStation);
SetLastNtError(Status); SetLastNtError(Status);
return FALSE; return FALSE;
} }
@ -914,8 +914,8 @@ NtUserLockWindowStation(HWINSTA hWindowStation)
PWINSTATION_OBJECT Object; PWINSTATION_OBJECT Object;
NTSTATUS Status; NTSTATUS Status;
TRACE("About to set process window station with handle (0x%X)\n", TRACE("About to set process window station with handle (%p)\n",
hWindowStation); hWindowStation);
if(PsGetCurrentProcessWin32Process() != LogonProcess) if(PsGetCurrentProcessWin32Process() != LogonProcess)
{ {
@ -931,8 +931,8 @@ NtUserLockWindowStation(HWINSTA hWindowStation)
&Object); &Object);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
TRACE("Validation of window station handle (0x%X) failed\n", TRACE("Validation of window station handle (%p) failed\n",
hWindowStation); hWindowStation);
SetLastNtError(Status); SetLastNtError(Status);
return FALSE; return FALSE;
} }
@ -959,8 +959,8 @@ NtUserUnlockWindowStation(HWINSTA hWindowStation)
NTSTATUS Status; NTSTATUS Status;
BOOL Ret; BOOL Ret;
TRACE("About to set process window station with handle (0x%X)\n", TRACE("About to set process window station with handle (%p)\n",
hWindowStation); hWindowStation);
if(PsGetCurrentProcessWin32Process() != LogonProcess) if(PsGetCurrentProcessWin32Process() != LogonProcess)
{ {
@ -976,8 +976,8 @@ NtUserUnlockWindowStation(HWINSTA hWindowStation)
&Object); &Object);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
TRACE("Validation of window station handle (0x%X) failed\n", TRACE("Validation of window station handle (%p) failed\n",
hWindowStation); hWindowStation);
SetLastNtError(Status); SetLastNtError(Status);
return FALSE; return FALSE;
} }
@ -1086,7 +1086,7 @@ BuildWindowStationNameList(
ReturnLength += DirEntry->Name.Length + sizeof(WCHAR); ReturnLength += DirEntry->Name.Length + sizeof(WCHAR);
EntryCount++; EntryCount++;
} }
TRACE("Required size: %d Entry count: %d\n", ReturnLength, EntryCount); TRACE("Required size: %lu Entry count: %lu\n", ReturnLength, EntryCount);
if (NULL != pRequiredSize) if (NULL != pRequiredSize)
{ {
Status = MmCopyToCaller(pRequiredSize, &ReturnLength, sizeof(ULONG)); Status = MmCopyToCaller(pRequiredSize, &ReturnLength, sizeof(ULONG));
@ -1205,7 +1205,7 @@ BuildDesktopNameList(
if (DesktopName) ReturnLength += DesktopName->Length + sizeof(WCHAR); if (DesktopName) ReturnLength += DesktopName->Length + sizeof(WCHAR);
EntryCount++; EntryCount++;
} }
TRACE("Required size: %d Entry count: %d\n", ReturnLength, EntryCount); TRACE("Required size: %lu Entry count: %lu\n", ReturnLength, EntryCount);
if (NULL != pRequiredSize) if (NULL != pRequiredSize)
{ {
Status = MmCopyToCaller(pRequiredSize, &ReturnLength, sizeof(ULONG)); Status = MmCopyToCaller(pRequiredSize, &ReturnLength, sizeof(ULONG));