diff --git a/reactos/base/setup/usetup/partlist.c b/reactos/base/setup/usetup/partlist.c index 5184e0dfb73..3445adef7af 100644 --- a/reactos/base/setup/usetup/partlist.c +++ b/reactos/base/setup/usetup/partlist.c @@ -636,14 +636,14 @@ EnumerateBiosDiskEntries(PPARTLIST PartList) InsertTailList(&PartList->BiosDiskListHead, &BiosDiskEntry->ListEntry); - DPRINT("DiskNumber: %d\n", BiosDiskEntry->DiskNumber); - DPRINT("Signature: %08x\n", BiosDiskEntry->Signature); - DPRINT("Checksum: %08x\n", BiosDiskEntry->Checksum); - DPRINT("BytesPerSector: %d\n", BiosDiskEntry->DiskGeometry.BytesPerSector); - DPRINT("NumberOfCylinders: %d\n", BiosDiskEntry->DiskGeometry.NumberOfCylinders); - DPRINT("NumberOfHeads: %d\n", BiosDiskEntry->DiskGeometry.NumberOfHeads); + DPRINT("DiskNumber: %lu\n", BiosDiskEntry->DiskNumber); + DPRINT("Signature: %08lx\n", BiosDiskEntry->Signature); + DPRINT("Checksum: %08lx\n", BiosDiskEntry->Checksum); + DPRINT("BytesPerSector: %lu\n", BiosDiskEntry->DiskGeometry.BytesPerSector); + DPRINT("NumberOfCylinders: %lu\n", BiosDiskEntry->DiskGeometry.NumberOfCylinders); + DPRINT("NumberOfHeads: %lu\n", BiosDiskEntry->DiskGeometry.NumberOfHeads); DPRINT("DriveSelect: %02x\n", BiosDiskEntry->Int13DiskData.DriveSelect); - DPRINT("MaxCylinders: %d\n", BiosDiskEntry->Int13DiskData.MaxCylinders); + DPRINT("MaxCylinders: %lu\n", BiosDiskEntry->Int13DiskData.MaxCylinders); DPRINT("SectorsPerTrack: %d\n", BiosDiskEntry->Int13DiskData.SectorsPerTrack); DPRINT("MaxHeads: %d\n", BiosDiskEntry->Int13DiskData.MaxHeads); DPRINT("NumberDrives: %d\n", BiosDiskEntry->Int13DiskData.NumberDrives); diff --git a/reactos/base/system/winlogon/screensaver.c b/reactos/base/system/winlogon/screensaver.c index 513d8b2b17f..eeaf598bc4f 100644 --- a/reactos/base/system/winlogon/screensaver.c +++ b/reactos/base/system/winlogon/screensaver.c @@ -275,9 +275,9 @@ StartScreenSaver( if (bufferSize == 0) goto cleanup; - szApplicationName[bufferSize] = 0; /* Terminate the string */ + szApplicationName[bufferSize] = 0; /* Terminate the string */ - if (wcslen(szApplicationName) == 0) + if (wcslen(szApplicationName) == 0) goto cleanup; wsprintfW(szCommandLine, L"%s /s", szApplicationName); diff --git a/reactos/dll/win32/msgina/gui.c b/reactos/dll/win32/msgina/gui.c index be6e259df28..2cf304a33f6 100644 --- a/reactos/dll/win32/msgina/gui.c +++ b/reactos/dll/win32/msgina/gui.c @@ -35,6 +35,8 @@ StatusMessageWindowProc( IN WPARAM wParam, IN LPARAM lParam) { + UNREFERENCED_PARAMETER(wParam); + switch (uMsg) { case WM_INITDIALOG: @@ -75,7 +77,7 @@ StartupWindowThread(LPVOID lpParam) DialogBoxParam( hDllInstance, MAKEINTRESOURCE(IDD_STATUSWINDOW_DLG), - 0, + GetDesktopWindow(), StatusMessageWindowProc, (LPARAM)lpParam); SetThreadDesktop(OldDesk); @@ -113,7 +115,7 @@ GUIDisplayStatusMessage( msg->pMessage = pMessage; msg->hDesktop = hDesktop; - msg->StartupEvent = CreateEvent( + msg->StartupEvent = CreateEventW( NULL, TRUE, FALSE, @@ -161,6 +163,21 @@ GUIRemoveStatusMessage( return TRUE; } +static INT_PTR CALLBACK +EmptyWindowProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + UNREFERENCED_PARAMETER(hwndDlg); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); + + return FALSE; +} + static VOID GUIDisplaySASNotice( IN OUT PGINA_CONTEXT pgContext) @@ -173,8 +190,8 @@ GUIDisplaySASNotice( result = DialogBoxParam( pgContext->hDllInstance, MAKEINTRESOURCE(IDD_NOTICE_DLG), - NULL, - NULL, + GetDesktopWindow(), + EmptyWindowProc, (LPARAM)NULL); if (result == -1) { @@ -215,6 +232,8 @@ LoggedOnWindowProc( IN WPARAM wParam, IN LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam); + switch (uMsg) { case WM_COMMAND: @@ -274,7 +293,7 @@ GUILoggedOnSAS( pgContext->hWlx, pgContext->hDllInstance, MAKEINTRESOURCEW(IDD_LOGGEDON_DLG), - NULL, + GetDesktopWindow(), LoggedOnWindowProc, (LPARAM)pgContext); if (result >= WLX_SAS_ACTION_LOGON && @@ -315,7 +334,7 @@ LoggedOutWindowProc( if (pgContext->hBitmap) { hdc = BeginPaint(hwndDlg, &ps); - DrawState(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); + DrawStateW(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); EndPaint(hwndDlg, &ps); } return TRUE; @@ -376,7 +395,7 @@ GUILoggedOutSAS( pgContext->hWlx, pgContext->hDllInstance, MAKEINTRESOURCEW(IDD_LOGGEDOUT_DLG), - NULL, + GetDesktopWindow(), LoggedOutWindowProc, (LPARAM)pgContext); if (result >= WLX_SAS_ACTION_LOGON && @@ -396,6 +415,8 @@ GUILockedSAS( { TRACE("GUILockedSAS()\n"); + UNREFERENCED_PARAMETER(pgContext); + UNIMPLEMENTED; return WLX_SAS_ACTION_UNLOCK_WKSTA; } diff --git a/reactos/dll/win32/msgina/stubs.c b/reactos/dll/win32/msgina/stubs.c index 755ac537c95..72f535689fe 100644 --- a/reactos/dll/win32/msgina/stubs.c +++ b/reactos/dll/win32/msgina/stubs.c @@ -23,6 +23,10 @@ ShellShutdownDialog( DWORD Unknown, BOOL bHideLogoff) { + UNREFERENCED_PARAMETER(hParent); + UNREFERENCED_PARAMETER(Unknown); + UNREFERENCED_PARAMETER(bHideLogoff); + /* Return values: * 0x00: Cancelled/Help * 0x01: Log off user @@ -43,8 +47,9 @@ VOID WINAPI WlxDisplayLockedNotice( PVOID pWlxContext) { + UNREFERENCED_PARAMETER(pWlxContext); + UNIMPLEMENTED; - return; } @@ -55,6 +60,8 @@ BOOL WINAPI WlxIsLockOk( PVOID pWlxContext) { + UNREFERENCED_PARAMETER(pWlxContext); + UNIMPLEMENTED; return TRUE; } @@ -67,6 +74,8 @@ BOOL WINAPI WlxIsLogoffOk( PVOID pWlxContext) { + UNREFERENCED_PARAMETER(pWlxContext); + UNIMPLEMENTED; return TRUE; } @@ -79,8 +88,9 @@ VOID WINAPI WlxLogoff( PVOID pWlxContext) { + UNREFERENCED_PARAMETER(pWlxContext); + UNIMPLEMENTED; - return; } @@ -92,8 +102,10 @@ WlxShutdown( PVOID pWlxContext, DWORD ShutdownType) { + UNREFERENCED_PARAMETER(pWlxContext); + UNREFERENCED_PARAMETER(ShutdownType); + UNIMPLEMENTED; - return; } @@ -105,6 +117,9 @@ WlxScreenSaverNotify( PVOID pWlxContext, BOOL *pSecure) { + UNREFERENCED_PARAMETER(pWlxContext); + UNREFERENCED_PARAMETER(pSecure); + //HKLM\Software\Policies\Microsoft\Windows\Control Panel\Desktop : ScreenSaverIsSecure UNIMPLEMENTED; return TRUE; @@ -121,6 +136,11 @@ WlxGetStatusMessage( PWSTR pMessage, DWORD dwBufferSize) { + UNREFERENCED_PARAMETER(pWlxContext); + UNREFERENCED_PARAMETER(pdwOptions); + UNREFERENCED_PARAMETER(pMessage); + UNREFERENCED_PARAMETER(dwBufferSize); + UNIMPLEMENTED; return FALSE; } @@ -134,6 +154,9 @@ WlxNetworkProviderLoad( PVOID pWlxContext, PWLX_MPR_NOTIFY_INFO pNprNotifyInfo) { + UNREFERENCED_PARAMETER(pWlxContext); + UNREFERENCED_PARAMETER(pNprNotifyInfo); + UNIMPLEMENTED; return FALSE; } @@ -146,8 +169,9 @@ VOID WINAPI WlxDisconnectNotify( PVOID pWlxContext) { + UNREFERENCED_PARAMETER(pWlxContext); + UNIMPLEMENTED; - return; } @@ -159,6 +183,9 @@ WlxGetConsoleSwitchCredentials( PVOID pWlxContext, PVOID pCredInfo) { + UNREFERENCED_PARAMETER(pWlxContext); + UNREFERENCED_PARAMETER(pCredInfo); + UNIMPLEMENTED; return FALSE; } diff --git a/reactos/dll/win32/msgina/tui.c b/reactos/dll/win32/msgina/tui.c index 22f95f6d061..9f10e3e334f 100644 --- a/reactos/dll/win32/msgina/tui.c +++ b/reactos/dll/win32/msgina/tui.c @@ -32,6 +32,11 @@ TUIDisplayStatusMessage( TRACE("TUIDisplayStatusMessage(%ws)\n", pMessage); + UNREFERENCED_PARAMETER(pgContext); + UNREFERENCED_PARAMETER(hDesktop); + UNREFERENCED_PARAMETER(dwOptions); + UNREFERENCED_PARAMETER(pTitle); + return WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), @@ -51,6 +56,8 @@ static BOOL TUIRemoveStatusMessage( IN PGINA_CONTEXT pgContext) { + UNREFERENCED_PARAMETER(pgContext); + /* Nothing to do */ return TRUE; } @@ -64,7 +71,7 @@ DisplayResourceText( static LPCWSTR newLine = L"\n"; DWORD count; - if (!LoadStringW(hDllInstance, uIdResourceText, Prompt, 256)) + if (0 == LoadStringW(hDllInstance, uIdResourceText, Prompt, 256)) return FALSE; if (!WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), @@ -92,6 +99,8 @@ TUIDisplaySASNotice( { TRACE("TUIDisplaySASNotice()\n"); + UNREFERENCED_PARAMETER(pgContext); + DisplayResourceText(IDS_LOGGEDOUTSAS, TRUE); DisplayResourceText(IDS_PRESSCTRLALTDELETE, TRUE); } @@ -103,6 +112,8 @@ TUILoggedOnSAS( { TRACE("TUILoggedOnSAS()\n"); + UNREFERENCED_PARAMETER(pgContext); + if (dwSasType != WLX_SAS_TYPE_CTRL_ALT_DEL) { /* Nothing to do for WLX_SAS_TYPE_TIMEOUT */ @@ -115,7 +126,6 @@ TUILoggedOnSAS( static BOOL ReadString( - IN PGINA_CONTEXT pgContext, IN UINT uIdResourcePrompt, IN OUT PWSTR Buffer, IN DWORD BufferLength, @@ -164,6 +174,7 @@ ReadString( } Buffer[i++] = readChar; /* FIXME: buffer overflow if the user writes too many chars! */ + UNREFERENCED_PARAMETER(BufferLength); /* FIXME: handle backspace */ } Buffer[i] = UNICODE_NULL; @@ -193,9 +204,9 @@ TUILoggedOutSAS( TRACE("TUILoggedOutSAS()\n"); /* Ask the user for credentials */ - if (!ReadString(pgContext, IDS_ASKFORUSER, UserName, 256, TRUE)) + if (!ReadString(IDS_ASKFORUSER, UserName, 256, TRUE)) return WLX_SAS_ACTION_NONE; - if (!ReadString(pgContext, IDS_ASKFORPASSWORD, Password, 256, FALSE)) + if (!ReadString(IDS_ASKFORPASSWORD, Password, 256, FALSE)) return WLX_SAS_ACTION_NONE; if (DoLoginTasks(pgContext, UserName, NULL, Password)) @@ -213,13 +224,15 @@ TUILockedSAS( TRACE("TUILockedSAS()\n"); + UNREFERENCED_PARAMETER(pgContext); + if (!DisplayResourceText(IDS_LOGGEDOUTSAS, TRUE)) return WLX_SAS_ACTION_UNLOCK_WKSTA; /* Ask the user for credentials */ - if (!ReadString(pgContext, IDS_ASKFORUSER, UserName, 256, TRUE)) + if (!ReadString(IDS_ASKFORUSER, UserName, 256, TRUE)) return WLX_SAS_ACTION_NONE; - if (!ReadString(pgContext, IDS_ASKFORPASSWORD, Password, 256, FALSE)) + if (!ReadString(IDS_ASKFORPASSWORD, Password, 256, FALSE)) return WLX_SAS_ACTION_NONE; FIXME("FIXME: Check user/password\n"); diff --git a/reactos/dll/win32/newdev/newdev.c b/reactos/dll/win32/newdev/newdev.c index 7531a567cbc..dbfc926f59e 100644 --- a/reactos/dll/win32/newdev/newdev.c +++ b/reactos/dll/win32/newdev/newdev.c @@ -62,7 +62,7 @@ UpdateDriverForPlugAndPlayDevicesW( /* Check flags */ if (InstallFlags & ~(INSTALLFLAG_FORCE | INSTALLFLAG_READONLY | INSTALLFLAG_NONINTERACTIVE)) { - DPRINT("Unknown flags: 0x%08lx\n", InstallFlags & ~(INSTALLFLAG_FORCE | INSTALLFLAG_READONLY | INSTALLFLAG_NONINTERACTIVE)); + TRACE("Unknown flags: 0x%08lx\n", InstallFlags & ~(INSTALLFLAG_FORCE | INSTALLFLAG_READONLY | INSTALLFLAG_NONINTERACTIVE)); SetLastError(ERROR_INVALID_FLAGS); goto cleanup; } diff --git a/reactos/drivers/base/green/createclose.c b/reactos/drivers/base/green/createclose.c index c1dc2ecc002..ef8f6658a17 100644 --- a/reactos/drivers/base/green/createclose.c +++ b/reactos/drivers/base/green/createclose.c @@ -11,7 +11,7 @@ #define NDEBUG #include -NTSTATUS NTAPI +NTSTATUS GreenCreate( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -24,7 +24,7 @@ GreenCreate( return STATUS_SUCCESS; } -NTSTATUS NTAPI +NTSTATUS GreenClose( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) diff --git a/reactos/drivers/base/green/green.h b/reactos/drivers/base/green/green.h index 6b6260f09ce..b54fa961c2d 100644 --- a/reactos/drivers/base/green/green.h +++ b/reactos/drivers/base/green/green.h @@ -110,12 +110,12 @@ typedef struct _GREEN_DRIVER_EXTENSION /************************************ createclose.c */ -NTSTATUS NTAPI +NTSTATUS GreenCreate( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS NTAPI +NTSTATUS GreenClose( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); diff --git a/reactos/lib/string/wtoi.c b/reactos/lib/string/wtoi.c index 67fbe1a56ba..fba564c713c 100644 --- a/reactos/lib/string/wtoi.c +++ b/reactos/lib/string/wtoi.c @@ -1,5 +1,6 @@ #include #include +#include /* * @implemented diff --git a/reactos/subsystems/win32/csrss/init.c b/reactos/subsystems/win32/csrss/init.c index e84e06bd0fd..e80de4c90b5 100644 --- a/reactos/subsystems/win32/csrss/init.c +++ b/reactos/subsystems/win32/csrss/init.c @@ -168,7 +168,7 @@ CsrpCreateObjectDirectory (int argc, char ** argv, char ** envp) NULL); Status = NtOpenDirectoryObject(&CsrObjectDirectory, - 0xF000F, /* ea:??? */ + DIRECTORY_ALL_ACCESS, &Attributes); return Status; }