[ros-diffs] [hpoussin] 25540: Fix some warnings

Author: hpoussin
Date: Sat Jan 20 16:29:04 2007
New Revision: 25540

URL: http://svn.reactos.org/svn/reactos?rev=25540&view=rev
Log:
Fix some warnings

Modified:
    trunk/reactos/base/setup/usetup/partlist.c
    trunk/reactos/base/system/winlogon/screensaver.c
    trunk/reactos/dll/win32/msgina/gui.c
    trunk/reactos/dll/win32/msgina/stubs.c
    trunk/reactos/dll/win32/msgina/tui.c
    trunk/reactos/dll/win32/newdev/newdev.c
    trunk/reactos/drivers/base/green/createclose.c
    trunk/reactos/drivers/base/green/green.h
    trunk/reactos/lib/string/wtoi.c
    trunk/reactos/subsystems/win32/csrss/init.c

Modified: trunk/reactos/base/setup/usetup/partlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist…
==============================================================================
--- trunk/reactos/base/setup/usetup/partlist.c (original)
+++ trunk/reactos/base/setup/usetup/partlist.c Sat Jan 20 16:29:04 2007
@@ -636,14 +636,14 @@
 
                       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);

Modified: trunk/reactos/base/system/winlogon/screensaver.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/scree…
==============================================================================
--- trunk/reactos/base/system/winlogon/screensaver.c (original)
+++ trunk/reactos/base/system/winlogon/screensaver.c Sat Jan 20 16:29:04 2007
@@ -275,9 +275,9 @@
 	if (bufferSize == 0)
 		goto cleanup;
 	
-    szApplicationName[bufferSize] = 0; /* Terminate the string */
-
-    if (wcslen(szApplicationName) == 0)
+	szApplicationName[bufferSize] = 0; /* Terminate the string */
+
+	if (wcslen(szApplicationName) == 0)
 		goto cleanup;
 
 	wsprintfW(szCommandLine, L"%s /s", szApplicationName);

Modified: trunk/reactos/dll/win32/msgina/gui.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/msgina/gui.c (original)
+++ trunk/reactos/dll/win32/msgina/gui.c Sat Jan 20 16:29:04 2007
@@ -35,6 +35,8 @@
 	IN WPARAM wParam,
 	IN LPARAM lParam)
 {
+	UNREFERENCED_PARAMETER(wParam);
+
 	switch (uMsg)
 	{
 		case WM_INITDIALOG:
@@ -75,7 +77,7 @@
 	DialogBoxParam(
 		hDllInstance, 
 		MAKEINTRESOURCE(IDD_STATUSWINDOW_DLG),
-		0,
+		GetDesktopWindow(),
 		StatusMessageWindowProc,
 		(LPARAM)lpParam);
 	SetThreadDesktop(OldDesk);
@@ -113,7 +115,7 @@
 		msg->pMessage = pMessage;
 		msg->hDesktop = hDesktop;
 
-		msg->StartupEvent = CreateEvent(
+		msg->StartupEvent = CreateEventW(
 			NULL,
 			TRUE,
 			FALSE,
@@ -161,6 +163,21 @@
 	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 @@
 	result = DialogBoxParam(
 		pgContext->hDllInstance,
 		MAKEINTRESOURCE(IDD_NOTICE_DLG),
-		NULL,
-		NULL,
+		GetDesktopWindow(),
+		EmptyWindowProc,
 		(LPARAM)NULL);
 	if (result == -1)
 	{
@@ -215,6 +232,8 @@
 	IN WPARAM wParam,
 	IN LPARAM lParam)
 {
+	UNREFERENCED_PARAMETER(lParam);
+
 	switch (uMsg)
 	{
 		case WM_COMMAND:
@@ -274,7 +293,7 @@
 		pgContext->hWlx,
 		pgContext->hDllInstance,
 		MAKEINTRESOURCEW(IDD_LOGGEDON_DLG),
-		NULL,
+		GetDesktopWindow(),
 		LoggedOnWindowProc,
 		(LPARAM)pgContext);
 	if (result >= WLX_SAS_ACTION_LOGON &&
@@ -315,7 +334,7 @@
 			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 @@
 		pgContext->hWlx,
 		pgContext->hDllInstance,
 		MAKEINTRESOURCEW(IDD_LOGGEDOUT_DLG),
-		NULL,
+		GetDesktopWindow(),
 		LoggedOutWindowProc,
 		(LPARAM)pgContext);
 	if (result >= WLX_SAS_ACTION_LOGON &&
@@ -395,6 +414,8 @@
 	IN OUT PGINA_CONTEXT pgContext)
 {
 	TRACE("GUILockedSAS()\n");
+
+	UNREFERENCED_PARAMETER(pgContext);
 
 	UNIMPLEMENTED;
 	return WLX_SAS_ACTION_UNLOCK_WKSTA;

Modified: trunk/reactos/dll/win32/msgina/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/stubs.c?r…
==============================================================================
--- trunk/reactos/dll/win32/msgina/stubs.c (original)
+++ trunk/reactos/dll/win32/msgina/stubs.c Sat Jan 20 16:29:04 2007
@@ -23,6 +23,10 @@
     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 @@
 WlxDisplayLockedNotice(
 	PVOID pWlxContext)
 {
+  UNREFERENCED_PARAMETER(pWlxContext);
+
   UNIMPLEMENTED;
-  return;
 }
 
 
@@ -55,6 +60,8 @@
 WlxIsLockOk(
 	PVOID pWlxContext)
 {
+  UNREFERENCED_PARAMETER(pWlxContext);
+
   UNIMPLEMENTED;
   return TRUE;
 }
@@ -67,6 +74,8 @@
 WlxIsLogoffOk(
 	PVOID pWlxContext)
 {
+  UNREFERENCED_PARAMETER(pWlxContext);
+
   UNIMPLEMENTED;
   return TRUE;
 }
@@ -79,8 +88,9 @@
 WlxLogoff(
 	PVOID pWlxContext)
 {
+  UNREFERENCED_PARAMETER(pWlxContext);
+
   UNIMPLEMENTED;
-  return;
 }
 
 
@@ -92,8 +102,10 @@
 	PVOID pWlxContext,
 	DWORD ShutdownType)
 {
+  UNREFERENCED_PARAMETER(pWlxContext);
+  UNREFERENCED_PARAMETER(ShutdownType);
+
   UNIMPLEMENTED;
-  return;
 }
 
 
@@ -105,6 +117,9 @@
 	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 @@
 	PWSTR pMessage,
 	DWORD dwBufferSize)
 {
+  UNREFERENCED_PARAMETER(pWlxContext);
+  UNREFERENCED_PARAMETER(pdwOptions);
+  UNREFERENCED_PARAMETER(pMessage);
+  UNREFERENCED_PARAMETER(dwBufferSize);
+
   UNIMPLEMENTED;
   return FALSE;
 }
@@ -134,6 +154,9 @@
 	PVOID                pWlxContext,
 	PWLX_MPR_NOTIFY_INFO pNprNotifyInfo)
 {
+  UNREFERENCED_PARAMETER(pWlxContext);
+  UNREFERENCED_PARAMETER(pNprNotifyInfo);
+
   UNIMPLEMENTED;
   return FALSE;
 }
@@ -146,8 +169,9 @@
 WlxDisconnectNotify(
 	PVOID pWlxContext)
 {
+  UNREFERENCED_PARAMETER(pWlxContext);
+
   UNIMPLEMENTED;
-  return;
 }
 
 
@@ -159,6 +183,9 @@
 	PVOID pWlxContext,
 	PVOID pCredInfo)
 {
+  UNREFERENCED_PARAMETER(pWlxContext);
+  UNREFERENCED_PARAMETER(pCredInfo);
+
   UNIMPLEMENTED;
   return FALSE;
 }

Modified: trunk/reactos/dll/win32/msgina/tui.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/tui.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/msgina/tui.c (original)
+++ trunk/reactos/dll/win32/msgina/tui.c Sat Jan 20 16:29:04 2007
@@ -32,6 +32,11 @@
 
 	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 @@
 TUIRemoveStatusMessage(
 	IN PGINA_CONTEXT pgContext)
 {
+	UNREFERENCED_PARAMETER(pgContext);
+
 	/* Nothing to do */
 	return TRUE;
 }
@@ -64,7 +71,7 @@
 	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 @@
 {
 	TRACE("TUIDisplaySASNotice()\n");
 
+	UNREFERENCED_PARAMETER(pgContext);
+
 	DisplayResourceText(IDS_LOGGEDOUTSAS, TRUE);
 	DisplayResourceText(IDS_PRESSCTRLALTDELETE, TRUE);
 }
@@ -103,6 +112,8 @@
 {
 	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 @@
 
 static BOOL
 ReadString(
-	IN PGINA_CONTEXT pgContext,
 	IN UINT uIdResourcePrompt,
 	IN OUT PWSTR Buffer,
 	IN DWORD BufferLength,
@@ -164,6 +174,7 @@
 		}
 		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 @@
 	TRACE("TUILoggedOutSAS()\n");
 
 	/* Ask the user for credentials */
-	if (!ReadString(pgContext, IDS_ASKFORUSER, UserName, 256, TRUE))
-		return WLX_SAS_ACTION_NONE;
-	if (!ReadString(pgContext, IDS_ASKFORPASSWORD, Password, 256, FALSE))
+	if (!ReadString(IDS_ASKFORUSER, UserName, 256, TRUE))
+		return WLX_SAS_ACTION_NONE;
+	if (!ReadString(IDS_ASKFORPASSWORD, Password, 256, FALSE))
 		return WLX_SAS_ACTION_NONE;
 
 	if (DoLoginTasks(pgContext, UserName, NULL, Password))
@@ -213,13 +224,15 @@
 
 	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))
-		return WLX_SAS_ACTION_NONE;
-	if (!ReadString(pgContext, IDS_ASKFORPASSWORD, Password, 256, FALSE))
+	if (!ReadString(IDS_ASKFORUSER, UserName, 256, TRUE))
+		return WLX_SAS_ACTION_NONE;
+	if (!ReadString(IDS_ASKFORPASSWORD, Password, 256, FALSE))
 		return WLX_SAS_ACTION_NONE;
 
 	FIXME("FIXME: Check user/password\n");

Modified: trunk/reactos/dll/win32/newdev/newdev.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?…
==============================================================================
--- trunk/reactos/dll/win32/newdev/newdev.c (original)
+++ trunk/reactos/dll/win32/newdev/newdev.c Sat Jan 20 16:29:04 2007
@@ -62,7 +62,7 @@
 	/* 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;
 	}

Modified: trunk/reactos/drivers/base/green/createclose.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/green/createc…
==============================================================================
--- trunk/reactos/drivers/base/green/createclose.c (original)
+++ trunk/reactos/drivers/base/green/createclose.c Sat Jan 20 16:29:04 2007
@@ -11,7 +11,7 @@
 #define NDEBUG
 #include <debug.h>
 
-NTSTATUS NTAPI
+NTSTATUS
 GreenCreate(
 	IN PDEVICE_OBJECT DeviceObject,
 	IN PIRP Irp)
@@ -24,7 +24,7 @@
 	return STATUS_SUCCESS;
 }
 
-NTSTATUS NTAPI
+NTSTATUS
 GreenClose(
 	IN PDEVICE_OBJECT DeviceObject,
 	IN PIRP Irp)

Modified: trunk/reactos/drivers/base/green/green.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/green/green.h…
==============================================================================
--- trunk/reactos/drivers/base/green/green.h (original)
+++ trunk/reactos/drivers/base/green/green.h Sat Jan 20 16:29:04 2007
@@ -110,12 +110,12 @@
 
 /************************************ createclose.c */
 
-NTSTATUS NTAPI
+NTSTATUS
 GreenCreate(
 	IN PDEVICE_OBJECT DeviceObject,
 	IN PIRP Irp);
 
-NTSTATUS NTAPI
+NTSTATUS
 GreenClose(
 	IN PDEVICE_OBJECT DeviceObject,
 	IN PIRP Irp);

Modified: trunk/reactos/lib/string/wtoi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/string/wtoi.c?rev=2554…
==============================================================================
--- trunk/reactos/lib/string/wtoi.c (original)
+++ trunk/reactos/lib/string/wtoi.c Sat Jan 20 16:29:04 2007
@@ -1,5 +1,6 @@
 #include <string.h>
 #include <stdlib.h>
+#include <ctype.h>
 
 /*
  * @implemented

Modified: trunk/reactos/subsystems/win32/csrss/init.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/ini…
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/init.c (original)
+++ trunk/reactos/subsystems/win32/csrss/init.c Sat Jan 20 16:29:04 2007
@@ -168,7 +168,7 @@
 	                            NULL);
 
 	Status = NtOpenDirectoryObject(&CsrObjectDirectory,
-	                               0xF000F, /* ea:??? */
+	                               DIRECTORY_ALL_ACCESS,
 	                               &Attributes);
 	return Status;
 }