From 03422451b3b4a7df96a9e9af5ce7533fd6cb55d9 Mon Sep 17 00:00:00 2001 From: Serge Gautherie Date: Mon, 2 May 2022 14:26:10 +0200 Subject: [PATCH] [REACTOS] Add '\n' to debug logs on TRACE, WARN, FIXME and ERR calls. Plus a few nit picks. --- base/shell/cmd/choice.c | 2 +- base/shell/cmd/timer.c | 2 +- base/system/userinit/userinit.c | 2 +- dll/appcompat/apphelp/hsdb.c | 6 +++--- dll/appcompat/apphelp/sdbstringtable.c | 2 +- dll/opengl/opengl32/swimpl.c | 2 +- dll/win32/advapi32/reg/hkcr.c | 2 +- dll/win32/advapi32/sec/misc.c | 2 +- dll/win32/advapi32/service/sctrl.c | 2 +- dll/win32/imm32/ime.c | 4 ++-- dll/win32/imm32/regword.c | 4 ++-- dll/win32/iphlpapi/ipstats_reactos.c | 2 +- dll/win32/lsasrv/privileges.c | 2 +- dll/win32/lsasrv/srm.c | 2 +- dll/win32/msafd/misc/dllmain.c | 4 ++-- dll/win32/msafd/misc/event.c | 2 +- dll/win32/msgina/shutdown.c | 2 +- dll/win32/msv1_0/lsa.c | 2 +- dll/win32/netapi32/dssetup.c | 2 +- dll/win32/samlib/samlib.c | 2 +- dll/win32/shell32/CDefView.cpp | 2 +- dll/win32/shell32/CDefaultContextMenu.cpp | 7 ++++--- dll/win32/shell32/COpenWithMenu.cpp | 4 ++-- dll/win32/shell32/CShellLink.cpp | 2 +- dll/win32/shell32/dialogs/folder_options.cpp | 2 +- dll/win32/shell32/shellmenu/CMenuFocusManager.cpp | 2 +- dll/win32/shell32/shellmenu/CStartMenu.cpp | 2 +- modules/rostests/apitests/shell32/ShellState.cpp | 2 +- win32ss/gdi/ntgdi/palette.c | 2 +- win32ss/printing/base/winspool/printers.c | 2 +- win32ss/printing/monitors/localmon/ports.c | 2 +- win32ss/printing/providers/localspl/printers.c | 2 +- win32ss/user/ntuser/input.c | 2 +- win32ss/user/ntuser/msgqueue.c | 5 ++--- win32ss/user/ntuser/painting.c | 2 +- win32ss/user/ntuser/scrollbar.c | 4 ++-- win32ss/user/ntuser/winpos.c | 4 ++-- win32ss/user/user32/misc/usrapihk.c | 2 +- win32ss/user/user32/windows/cursoricon.c | 2 +- win32ss/user/user32/windows/window.c | 2 +- 40 files changed, 52 insertions(+), 52 deletions(-) diff --git a/base/shell/cmd/choice.c b/base/shell/cmd/choice.c index 8cf7c5e665a..c48d0c42c83 100644 --- a/base/shell/cmd/choice.c +++ b/base/shell/cmd/choice.c @@ -282,7 +282,7 @@ loop: case GC_KEYREAD: TRACE ("GC_KEYREAD\n"); TRACE ("elapsed %d msecs\n", GetTickCount () - clk); - TRACE ("read %c", Ch); + TRACE ("read %c\n", Ch); if ((val=IsKeyInString(lpOptions,Ch,bCaseSensitive))==-1) { Beep (440, 50); diff --git a/base/shell/cmd/timer.c b/base/shell/cmd/timer.c index d1051b97874..0c70f9adffa 100644 --- a/base/shell/cmd/timer.c +++ b/base/shell/cmd/timer.c @@ -32,7 +32,7 @@ PrintElapsedTime (DWORD time,INT format) { DWORD h,m,s,ms; - TRACE ("PrintElapsedTime(%d,%d)",time,format); + TRACE("PrintElapsedTime(%lu, %d)\n", time, format); switch (format) { diff --git a/base/system/userinit/userinit.c b/base/system/userinit/userinit.c index 182c823dce7..701e6032016 100644 --- a/base/system/userinit/userinit.c +++ b/base/system/userinit/userinit.c @@ -281,7 +281,7 @@ StartShell(VOID) } else { - WARN("Alternate shell in Safe Mode required but not specified."); + WARN("Alternate shell in Safe Mode required but not specified.\n"); } } } diff --git a/dll/appcompat/apphelp/hsdb.c b/dll/appcompat/apphelp/hsdb.c index 89eb6284e8c..236394e6ad0 100644 --- a/dll/appcompat/apphelp/hsdb.c +++ b/dll/appcompat/apphelp/hsdb.c @@ -474,7 +474,7 @@ BOOL WINAPI SdbGetMatchingExe(HSDB hsdb, LPCWSTR path, LPCWSTR module_name, RtlInitBuffer(&DosApplicationName.ByteBuffer, (PUCHAR)DosPathBuffer, sizeof(DosPathBuffer)); if (!NT_SUCCESS(RtlEnsureBufferSize(RTL_SKIP_BUFFER_COPY, &DosApplicationName.ByteBuffer, DosApplicationName.String.MaximumLength))) { - SHIM_ERR("Failed to convert allocate buffer."); + SHIM_ERR("Failed to convert allocate buffer.\n"); goto Cleanup; } /* Update the internal buffer to contain the string */ @@ -485,7 +485,7 @@ BOOL WINAPI SdbGetMatchingExe(HSDB hsdb, LPCWSTR path, LPCWSTR module_name, if (!NT_SUCCESS(RtlNtPathNameToDosPathName(0, &DosApplicationName, &PathType, NULL))) { - SHIM_ERR("Failed to convert %S to DOS Path.", path); + SHIM_ERR("Failed to convert %S to DOS Path.\n", path); goto Cleanup; } @@ -494,7 +494,7 @@ BOOL WINAPI SdbGetMatchingExe(HSDB hsdb, LPCWSTR path, LPCWSTR module_name, file_name = wcsrchr(DosApplicationName.String.Buffer, '\\'); if (!file_name) { - SHIM_ERR("Failed to find Exe name in %wZ.", &DosApplicationName.String); + SHIM_ERR("Failed to find Exe name in %wZ.\n", &DosApplicationName.String); goto Cleanup; } diff --git a/dll/appcompat/apphelp/sdbstringtable.c b/dll/appcompat/apphelp/sdbstringtable.c index ae88c51aee8..4d9771eeed6 100644 --- a/dll/appcompat/apphelp/sdbstringtable.c +++ b/dll/appcompat/apphelp/sdbstringtable.c @@ -157,7 +157,7 @@ static BOOL HashAddString(struct SdbStringHashTable* table, struct SdbHashEntry* entry = (*position) = SdbAlloc(size); if (!entry) { - SHIM_ERR("Failed to allocate %u bytes.", size); + SHIM_ERR("Failed to allocate %u bytes.\n", size); return FALSE; } entry->Tagid = tagid; diff --git a/dll/opengl/opengl32/swimpl.c b/dll/opengl/opengl32/swimpl.c index bdd60facb4f..504a9bb9848 100644 --- a/dll/opengl/opengl32/swimpl.c +++ b/dll/opengl/opengl32/swimpl.c @@ -1028,7 +1028,7 @@ WRITE_COLOR_SPAN(32, ULONG, 4) static void write_monocolor_span_frontbuffer(struct sw_framebuffer* fb, GLuint n, GLint x, GLint y, const GLubyte mask[], COLORREF Color) { - TRACE("Writing monocolor span at %u %u (%u), Color 0x%08x", x, y, n, Color); + TRACE("Writing monocolor span at %u %u (%u), Color 0x%08x\n", x, y, n, Color); if (mask) { diff --git a/dll/win32/advapi32/reg/hkcr.c b/dll/win32/advapi32/reg/hkcr.c index 65fc9e7c92d..f55a783eb5d 100644 --- a/dll/win32/advapi32/reg/hkcr.c +++ b/dll/win32/advapi32/reg/hkcr.c @@ -39,7 +39,7 @@ GetKeyName(HKEY hKey, PUNICODE_STRING KeyName) NameInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, InfoLength); if (NameInformation == NULL) { - ERR("Failed to allocate %lu bytes", InfoLength); + ERR("Failed to allocate %lu bytes\n", InfoLength); return ERROR_NOT_ENOUGH_MEMORY; } diff --git a/dll/win32/advapi32/sec/misc.c b/dll/win32/advapi32/sec/misc.c index 0e58a8994cf..9dc75a5e27d 100644 --- a/dll/win32/advapi32/sec/misc.c +++ b/dll/win32/advapi32/sec/misc.c @@ -98,7 +98,7 @@ CheckNtMartaPresent(VOID) #if DBG else { - ERR("Failed to initialize ntmarta.dll! Error: 0x%x", ErrorCode); + ERR("Failed to initialize ntmarta.dll! Error: 0x%x\n", ErrorCode); } #endif } diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c index f437d8e6ecc..d13c1ce8380 100644 --- a/dll/win32/advapi32/service/sctrl.c +++ b/dll/win32/advapi32/service/sctrl.c @@ -671,7 +671,7 @@ ScServiceDispatcher(HANDLE hPipe, break; default: - TRACE("Command %lu received", ControlPacket->dwControl); + TRACE("Command %lu received\n", ControlPacket->dwControl); dwError = ScControlService(lpService, ControlPacket); break; } diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index a13f59dd498..2703a1e3cad 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -1690,7 +1690,7 @@ BOOL WINAPI ImmConfigureIMEA(HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) REGISTERWORDW RegWordW; LPREGISTERWORDA pRegWordA; - TRACE("(%p, %p, 0x%lX, %p)", hKL, hWnd, dwMode, lpData); + TRACE("(%p, %p, 0x%lX, %p)\n", hKL, hWnd, dwMode, lpData); if (!ValidateHwnd(hWnd) || Imm32IsCrossProcessAccess(hWnd)) return FALSE; @@ -1744,7 +1744,7 @@ BOOL WINAPI ImmConfigureIMEW(HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) REGISTERWORDA RegWordA; LPREGISTERWORDW pRegWordW; - TRACE("(%p, %p, 0x%lX, %p)", hKL, hWnd, dwMode, lpData); + TRACE("(%p, %p, 0x%lX, %p)\n", hKL, hWnd, dwMode, lpData); if (!ValidateHwnd(hWnd) || Imm32IsCrossProcessAccess(hWnd)) return FALSE; diff --git a/dll/win32/imm32/regword.c b/dll/win32/imm32/regword.c index ecbc4cb35ef..8aec56aa2d2 100644 --- a/dll/win32/imm32/regword.c +++ b/dll/win32/imm32/regword.c @@ -99,7 +99,7 @@ ImmEnumRegisterWordA(HKL hKL, REGISTERWORDENUMPROCA lpfnEnumProc, ENUM_WORD_W2A EnumDataW2A; PIMEDPI pImeDpi; - TRACE("(%p, %p, %s, 0x%lX, %s, %p)", hKL, lpfnEnumProc, debugstr_a(lpszReading), + TRACE("(%p, %p, %s, 0x%lX, %s, %p)\n", hKL, lpfnEnumProc, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszRegister), lpData); pImeDpi = Imm32FindOrLoadImeDpi(hKL); @@ -155,7 +155,7 @@ ImmEnumRegisterWordW(HKL hKL, REGISTERWORDENUMPROCW lpfnEnumProc, ENUM_WORD_A2W EnumDataA2W; PIMEDPI pImeDpi; - TRACE("(%p, %p, %s, 0x%lX, %s, %p)", hKL, lpfnEnumProc, debugstr_w(lpszReading), + TRACE("(%p, %p, %s, 0x%lX, %s, %p)\n", hKL, lpfnEnumProc, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister), lpData); pImeDpi = Imm32FindOrLoadImeDpi(hKL); diff --git a/dll/win32/iphlpapi/ipstats_reactos.c b/dll/win32/iphlpapi/ipstats_reactos.c index b3cda7eb64a..535264caeee 100644 --- a/dll/win32/iphlpapi/ipstats_reactos.c +++ b/dll/win32/iphlpapi/ipstats_reactos.c @@ -392,7 +392,7 @@ DWORD getNumRoutes(void) memset( &isnmp, 0, sizeof( isnmp ) ); status = tdiGetMibForIpEntity( tcpFile, &entitySet[i], &isnmp ); if( !NT_SUCCESS(status) ) { - ERR("tdiGetMibForIpEntity returned 0x%08lx, for i = %d", status, i); + ERR("tdiGetMibForIpEntity returned 0x%08lx, for i = %d\n", status, i); numRoutes = 0; break; } diff --git a/dll/win32/lsasrv/privileges.c b/dll/win32/lsasrv/privileges.c index 5f6314481af..317c60c2bc6 100644 --- a/dll/win32/lsasrv/privileges.c +++ b/dll/win32/lsasrv/privileges.c @@ -133,7 +133,7 @@ LsarpLookupPrivilegeDisplayName(PRPC_UNICODE_STRING Name, ULONG Index; UINT nLength; - TRACE("LsarpLookupPrivilegeDisplayName(%p 0x%04hu 0x%04hu %p %p)", + TRACE("LsarpLookupPrivilegeDisplayName(%p 0x%04hu 0x%04hu %p %p)\n", Name, ClientLanguage, ClientSystemDefaultLanguage, DisplayName, LanguageReturned); if (Name->Length == 0 || Name->Buffer == NULL) diff --git a/dll/win32/lsasrv/srm.c b/dll/win32/lsasrv/srm.c index 68929e6343f..368f1f76dc2 100644 --- a/dll/win32/lsasrv/srm.c +++ b/dll/win32/lsasrv/srm.c @@ -106,7 +106,7 @@ LsapRmServerThread( &Message.Header); if (!NT_SUCCESS(Status)) { - ERR("LsapRmServerThread - Failed to get message: 0x%lx", Status); + ERR("LsapRmServerThread - Failed to get message: 0x%lx\n", Status); ReplyMessage = NULL; continue; } diff --git a/dll/win32/msafd/misc/dllmain.c b/dll/win32/msafd/misc/dllmain.c index c9e443641b8..7723b93d236 100644 --- a/dll/win32/msafd/misc/dllmain.c +++ b/dll/win32/msafd/misc/dllmain.c @@ -649,7 +649,7 @@ WSPCloseSocket(IN SOCKET Handle, if(!NT_SUCCESS(Status)) { - ERR("NtCreateEvent failed: 0x%08x", Status); + ERR("NtCreateEvent failed: 0x%08x\n", Status); return SOCKET_ERROR; } @@ -664,7 +664,7 @@ WSPCloseSocket(IN SOCKET Handle, if (Status) { if (lpErrno) *lpErrno = Status; - ERR("WSHNotify failed. Error 0x%#x", Status); + ERR("WSHNotify failed. Error 0x%#x\n", Status); NtClose(SockEvent); return SOCKET_ERROR; } diff --git a/dll/win32/msafd/misc/event.c b/dll/win32/msafd/misc/event.c index 581e4ee195d..b3b0da2c743 100644 --- a/dll/win32/msafd/misc/event.c +++ b/dll/win32/msafd/misc/event.c @@ -189,7 +189,7 @@ WSPEnumNetworkEvents( if (Status != STATUS_SUCCESS) { - ERR("Status 0x%08x", Status); + ERR("Status 0x%08x\n", Status); return MsafdReturnWithErrno(Status, lpErrno, 0, NULL); } diff --git a/dll/win32/msgina/shutdown.c b/dll/win32/msgina/shutdown.c index 95b890ba589..559b6c5b243 100644 --- a/dll/win32/msgina/shutdown.c +++ b/dll/win32/msgina/shutdown.c @@ -1408,7 +1408,7 @@ ShellShutdownDialog( /* Help file is called directly here */ else if (dlgValue == IDHELP) { - FIXME("Help is not implemented yet."); + FIXME("Help is not implemented yet.\n"); MessageBoxW(hParent, L"Help is not implemented yet.", L"Message", MB_OK | MB_ICONEXCLAMATION); } else if (dlgValue == -1) diff --git a/dll/win32/msv1_0/lsa.c b/dll/win32/msv1_0/lsa.c index e8e4da8854e..064bbc98323 100644 --- a/dll/win32/msv1_0/lsa.c +++ b/dll/win32/msv1_0/lsa.c @@ -81,7 +81,7 @@ NTAPI LsaSpFreeCredentialsHandle( _In_ LSA_SEC_HANDLE CredentialHandle) { - TRACE("LsaSpFreeCredentialsHandle(0x%p)", CredentialHandle); + TRACE("LsaSpFreeCredentialsHandle(0x%p)\n", CredentialHandle); return STATUS_NOT_IMPLEMENTED; } diff --git a/dll/win32/netapi32/dssetup.c b/dll/win32/netapi32/dssetup.c index 18b93039b56..ced7cfa7889 100644 --- a/dll/win32/netapi32/dssetup.c +++ b/dll/win32/netapi32/dssetup.c @@ -113,7 +113,7 @@ DsRoleGetPrimaryDomainInformation( status = DsSetupBind((LPWSTR)lpServer, &hBinding); if (status) { - TRACE("DsSetupBind() failed (Status %lu\n)", status); + TRACE("DsSetupBind() failed (Status %lu\n)\n", status); return status; } diff --git a/dll/win32/samlib/samlib.c b/dll/win32/samlib/samlib.c index 8df3582e0e4..cd22fecc38a 100644 --- a/dll/win32/samlib/samlib.c +++ b/dll/win32/samlib/samlib.c @@ -93,7 +93,7 @@ PSAMPR_SERVER_NAME_bind(PSAMPR_SERVER_NAME pszSystemName) (nLength - nNameLength != 2)) || (nNameLength == 0)) { - WARN("Invalid server name %S", pszSystemName); + WARN("Invalid server name %S\n", pszSystemName); RpcRaiseException(STATUS_OBJECT_NAME_INVALID); } } diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 67889f4aedc..a152ac6c263 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1220,7 +1220,7 @@ LRESULT CDefView::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl if (SUCCEEDED(QueryInterface(IID_PPV_ARG(IDropTarget, &pdt)))) { if (FAILED(RegisterDragDrop(m_hWnd, pdt))) - ERR("Registering Drag Drop Failed"); + ERR("Registering Drag Drop Failed\n"); } /* register for receiving notifications */ diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index 05978136e62..62740118a6c 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -720,8 +720,9 @@ HRESULT CDefaultContextMenu::DoPaste(LPCMINVOKECOMMANDINFO lpcmi, BOOL bLink) else dwKey = MK_SHIFT; } - else { - ERR("No drop effect obtained"); + else + { + ERR("No drop effect obtained\n"); } GlobalUnlock(medium2.hGlobal); } @@ -850,7 +851,7 @@ CDefaultContextMenu::DoProperties( HRESULT CDefaultContextMenu::DoUndo(LPCMINVOKECOMMANDINFO lpcmi) { - ERR("TODO: Undo"); + ERR("TODO: Undo\n"); return E_NOTIMPL; } diff --git a/dll/win32/shell32/COpenWithMenu.cpp b/dll/win32/shell32/COpenWithMenu.cpp index 5409f449bd2..a7783eaf912 100644 --- a/dll/win32/shell32/COpenWithMenu.cpp +++ b/dll/win32/shell32/COpenWithMenu.cpp @@ -697,7 +697,7 @@ BOOL COpenWithList::SetDefaultHandler(SApp *pApp, LPCWSTR pwszFilename) /* Create file extension key */ if (RegCreateKeyExW(HKEY_CLASSES_ROOT, pwszExt, 0, NULL, 0, KEY_READ|KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) { - ERR("Cannot open ext key"); + ERR("Cannot open ext key\n"); return FALSE; } @@ -851,7 +851,7 @@ BOOL COpenWithDialog::IsNoOpen(HWND hwnd) return TRUE; else if (dReturnValue == -1) { - ERR("IsNoOpen failed to load the dialog box."); + ERR("IsNoOpen failed to load the dialog box.\n"); return TRUE; } } diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index 5fc8ab41867..dfb67d102ae 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -2572,7 +2572,7 @@ HRESULT STDMETHODCALLTYPE CShellLink::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) HRESULT hr = Resolve(lpici->hwnd, 0); if (FAILED(hr)) { - TRACE("failed to resolve component with error 0x%08x", hr); + TRACE("failed to resolve component with error 0x%08x\n", hr); return hr; } diff --git a/dll/win32/shell32/dialogs/folder_options.cpp b/dll/win32/shell32/dialogs/folder_options.cpp index 527a359e0c8..bad8fc484c8 100644 --- a/dll/win32/shell32/dialogs/folder_options.cpp +++ b/dll/win32/shell32/dialogs/folder_options.cpp @@ -283,7 +283,7 @@ Options_RunDLLCommon(HWND hWnd, HINSTANCE hInst, int fOptions, DWORD nCmdShow) case 1: // show taskbar options dialog - FIXME("notify explorer to show taskbar options dialog"); + FIXME("notify explorer to show taskbar options dialog\n"); //PostMessage(GetShellWindow(), WM_USER+22, fOptions, 0); break; diff --git a/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp b/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp index 615b7091c56..77b7b8edfaa 100644 --- a/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp +++ b/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp @@ -338,7 +338,7 @@ LRESULT CMenuFocusManager::ProcessMouseMove(MSG* msg) StackEntry * entry = NULL; if (IsTrackedWindow(child, &entry) == S_OK) { - TRACE("MouseMove"); + TRACE("MouseMove\n"); } BOOL isTracking = FALSE; diff --git a/dll/win32/shell32/shellmenu/CStartMenu.cpp b/dll/win32/shell32/shellmenu/CStartMenu.cpp index d701013f160..e21bf851ada 100644 --- a/dll/win32/shell32/shellmenu/CStartMenu.cpp +++ b/dll/win32/shell32/shellmenu/CStartMenu.cpp @@ -530,7 +530,7 @@ RSHELL_CStartMenu_CreateInstance(REFIID riid, void **ppv) hr = SHGetSpecialFolderLocation(NULL, CSIDL_PROGRAMS, &pidlProgramsAbsolute); if (FAILED_UNEXPECTEDLY(hr)) { - WARN("USER Programs folder not found."); + WARN("USER Programs folder not found.\n"); hr = SHGetSpecialFolderLocation(NULL, CSIDL_COMMON_PROGRAMS, &pidlProgramsAbsolute); if (FAILED_UNEXPECTEDLY(hr)) return hr; diff --git a/modules/rostests/apitests/shell32/ShellState.cpp b/modules/rostests/apitests/shell32/ShellState.cpp index d2d26355338..7c50806d2fd 100644 --- a/modules/rostests/apitests/shell32/ShellState.cpp +++ b/modules/rostests/apitests/shell32/ShellState.cpp @@ -165,7 +165,7 @@ START_TEST(ShellState) LPBYTE pb; int ret; - trace("GetVersion(): 0x%08lX", GetVersion()); + trace("GetVersion(): 0x%08lX\n", GetVersion()); osinfo.dwOSVersionInfoSize = sizeof(osinfo); GetVersionEx(&osinfo); diff --git a/win32ss/gdi/ntgdi/palette.c b/win32ss/gdi/ntgdi/palette.c index a36dbf90777..de0fe9c66c8 100644 --- a/win32ss/gdi/ntgdi/palette.c +++ b/win32ss/gdi/ntgdi/palette.c @@ -615,7 +615,7 @@ NtGdiResizePalette( XLATEOBJ *NewXlateObj = (int*) HeapReAlloc(GetProcessHeap(), 0, XlateObj, cEntries * sizeof(int)); if(NewXlateObj == NULL) { - ERR("Can not resize logicalToSystem -- out of memory!"); + ERR("Can not resize logicalToSystem -- out of memory!\n"); GDI_ReleaseObj( hPal ); return FALSE; } diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index f3567d2e650..285696d6a33 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -2726,7 +2726,7 @@ QueryColorProfile( { if (!IsValidDevmodeNoSizeW( pdevmode ) ) { - ERR("DeviceCapabilitiesW : Devode Invalid"); + ERR("QueryColorProfile : Devode Invalid\n"); return FALSE; } } diff --git a/win32ss/printing/monitors/localmon/ports.c b/win32ss/printing/monitors/localmon/ports.c index a1f527a548f..47ebc61cf37 100644 --- a/win32ss/printing/monitors/localmon/ports.c +++ b/win32ss/printing/monitors/localmon/ports.c @@ -266,7 +266,7 @@ _CreateNonspooledPort(PLOCALMON_PORT pPort) if (!*p) { // We reached the end of the list without finding a mapping. - ERR("Can't find a suitable mapping for the port \"%S\"!", pPort->pwszPortName); + ERR("Can't find a suitable mapping for the port \"%S\"!\n", pPort->pwszPortName); goto Cleanup; } diff --git a/win32ss/printing/providers/localspl/printers.c b/win32ss/printing/providers/localspl/printers.c index a7865a2d9ef..9bab1ba22ff 100644 --- a/win32ss/printing/providers/localspl/printers.c +++ b/win32ss/printing/providers/localspl/printers.c @@ -1219,7 +1219,7 @@ _LocalOpenPrinterHandle(PWSTR pwszPrinterName, PWSTR pwszJobParameter, PHANDLE p if (pPrinterHandle->hSPLFile == INVALID_HANDLE_VALUE) { dwErrorCode = GetLastError(); - ERR("CreateFileW failed with error %lu for \"%S\"!", dwErrorCode, wszFullPath); + ERR("CreateFileW failed with error %lu for \"%S\"!\n", dwErrorCode, wszFullPath); goto Failure; } diff --git a/win32ss/user/ntuser/input.c b/win32ss/user/ntuser/input.c index cc0c8cf047f..9c2c69b353c 100644 --- a/win32ss/user/ntuser/input.c +++ b/win32ss/user/ntuser/input.c @@ -764,7 +764,7 @@ NtUserSendInput( uRet++; break; case INPUT_HARDWARE: - FIXME("INPUT_HARDWARE not supported!"); + FIXME("INPUT_HARDWARE not supported!\n"); break; default: ERR("SendInput(): Invalid input type: 0x%x\n", SafeInput.type); diff --git a/win32ss/user/ntuser/msgqueue.c b/win32ss/user/ntuser/msgqueue.c index c82245f6d2d..a674f806e8a 100644 --- a/win32ss/user/ntuser/msgqueue.c +++ b/win32ss/user/ntuser/msgqueue.c @@ -766,7 +766,7 @@ AllocateUserMessage(BOOL KEvent) if(!(Message = ExAllocateFromPagedLookasideList(pgSendMsgLookasideList))) { - ERR("AllocateUserMessage(): Not enough memory to allocate a message"); + ERR("AllocateUserMessage(): Not enough memory to allocate a message\n"); return NULL; } RtlZeroMemory(Message, sizeof(USER_SENT_MESSAGE)); @@ -1021,13 +1021,12 @@ co_MsqSendMessageAsync(PTHREADINFO ptiReceiver, BOOL HasPackedLParam, INT HookMessage) { - PTHREADINFO ptiSender; PUSER_SENT_MESSAGE Message; if(!(Message = AllocateUserMessage(FALSE))) { - ERR("MsqSendMessageAsync(): Not enough memory to allocate a message"); + ERR("MsqSendMessageAsync(): Not enough memory to allocate a message\n"); return FALSE; } diff --git a/win32ss/user/ntuser/painting.c b/win32ss/user/ntuser/painting.c index 352c934564d..57e006b7312 100644 --- a/win32ss/user/ntuser/painting.c +++ b/win32ss/user/ntuser/painting.c @@ -2363,7 +2363,7 @@ UserRealizePalette(HDC hdc) if ( hWndDesktop != hWnd ) { PWND pWnd = UserGetWindowObject(hWndDesktop); - ERR("RealizePalette Desktop."); + ERR("RealizePalette Desktop.\n"); hdc = UserGetWindowDC(pWnd); IntPaintDesktop(hdc); UserReleaseDC(pWnd,hdc,FALSE); diff --git a/win32ss/user/ntuser/scrollbar.c b/win32ss/user/ntuser/scrollbar.c index 9d5e4005dcb..c4a6f2f1d8b 100644 --- a/win32ss/user/ntuser/scrollbar.c +++ b/win32ss/user/ntuser/scrollbar.c @@ -503,7 +503,7 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) if(!SBID_IS_VALID(nBar)) /* Assures nBar is 0, 1, or 2 */ { EngSetLastError(ERROR_INVALID_PARAMETER); - ERR("Trying to set scrollinfo for unknown scrollbar type %d", nBar); + ERR("Trying to set scrollinfo for unknown scrollbar type %d\n", nBar); return FALSE; } @@ -1409,7 +1409,7 @@ NtUserEnableScrollBar( if(wSBflags != SB_BOTH && !SBID_IS_VALID(wSBflags)) { EngSetLastError(ERROR_INVALID_PARAMETER); - ERR("Trying to set scrollinfo for unknown scrollbar type %u", wSBflags); + ERR("Trying to set scrollinfo for unknown scrollbar type %u\n", wSBflags); RETURN(FALSE); } diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 27f594e554c..7795f0293b6 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -1747,8 +1747,8 @@ co_WinPosSetWindowPos( ASSERT_REFS_CO(Window); - TRACE("pwnd %p, after %p, %d,%d (%dx%d), flags 0x%x", - Window, WndInsertAfter, x, y, cx, cy, flags); + TRACE("pwnd %p, after %p, %d,%d (%dx%d), flags 0x%x\n", + Window, WndInsertAfter, x, y, cx, cy, flags); #if DBG dump_winpos_flags(flags); #endif diff --git a/win32ss/user/user32/misc/usrapihk.c b/win32ss/user/user32/misc/usrapihk.c index c2e91d5f3d9..515fab6c7bd 100644 --- a/win32ss/user/user32/misc/usrapihk.c +++ b/win32ss/user/user32/misc/usrapihk.c @@ -380,7 +380,7 @@ BOOL WINAPI RegisterUserApiHook(PUSERAPIHOOKINFO puah) if (puah->m_size == sizeof(USERAPIHOOKINFO)) { - WARN("RegisterUserApiHook: %S and %S",puah->m_dllname1, puah->m_funname1); + WARN("RegisterUserApiHook: %S and %S\n", puah->m_dllname1, puah->m_funname1); RtlInitUnicodeString(&m_dllname1, puah->m_dllname1); RtlInitUnicodeString(&m_funname1, puah->m_funname1); return NtUserRegisterUserApiHook( &m_dllname1, &m_funname1, 0, 0); diff --git a/win32ss/user/user32/windows/cursoricon.c b/win32ss/user/user32/windows/cursoricon.c index cdca65767c6..1f6b71714aa 100644 --- a/win32ss/user/user32/windows/cursoricon.c +++ b/win32ss/user/user32/windows/cursoricon.c @@ -2474,7 +2474,7 @@ HICON WINAPI CreateIconFromResourceEx( /* Check we were given the right type of resource */ if((fIcon && pCurIconDir->idType == 2) || (!fIcon && pCurIconDir->idType == 1)) { - WARN("Got a %s directory pointer, but called for a %s", fIcon ? "cursor" : "icon", fIcon ? "icon" : "cursor"); + WARN("Got a %s directory pointer, but called for a %s\n", fIcon ? "cursor" : "icon", fIcon ? "icon" : "cursor"); return NULL; } diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index cf7f5c9ccc0..0946c5b68ca 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -1975,7 +1975,7 @@ ScrollWindowEx(HWND hWnd, { if (flags & SW_SMOOTHSCROLL) { - FIXME("SW_SMOOTHSCROLL not supported."); + FIXME("SW_SMOOTHSCROLL not supported.\n"); // Fall through.... } return NtUserScrollWindowEx(hWnd,