[weiden] 20243: don't typecast constant strings

don't typecast constant strings
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c
  _____

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c
2005-12-18 10:58:46 UTC (rev 20242)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c
2005-12-18 11:04:04 UTC (rev 20243)
@@ -237,6 +237,7 @@

#if 0
   FRLDRHKEY BusKey;
   ULONG i;
+  WCHAR szPci[] = L"PCI";
 #endif

/* Report the PCI BIOS */
@@ -345,8 +346,8 @@
      Error = RegSetValue(BusKey,
    		      L"Identifier",
    		      REG_SZ,
-			      (PUCHAR)"PCI",
-			      4 * sizeof(WCHAR));
+			      (PCSTR)szPci,
+			      sizeof(szPci));
      if (Error != ERROR_SUCCESS)
        {
          DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error
%u)\n", (int)Error));
  _____

Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
--- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
2005-12-18 10:58:46 UTC (rev 20242)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
2005-12-18 11:04:04 UTC (rev 20243)
@@ -31,6 +31,8 @@

unsigned long			reactos_memory_map_descriptor_size;
 memory_map_t			reactos_memory_map[32];		//
Memory map

+static CHAR szLoadingMsg[] = "Loading ReactOS...";
+
 static BOOL
 STDCALL
 FrLdrLoadKernel(PCHAR szFileName,
@@ -75,7 +77,7 @@
     FrLdrMapKernel(FilePointer);

/* Update Processbar and return success */
-    UiDrawProgressBarCenter(nPos, 100, (PCHAR)"Loading ReactOS...");
+    UiDrawProgressBarCenter(nPos, 100, szLoadingMsg);
     return(TRUE);
 }

@@ -331,7 +333,7 @@
     FrLdrLoadModule(FilePointer, szFileName, NULL);

/* Update status and return */
-    UiDrawProgressBarCenter(nPos, 100, (PCHAR)"Loading ReactOS...");
+    UiDrawProgressBarCenter(nPos, 100, szLoadingMsg);
     return(TRUE);
 }

@@ -687,7 +689,7 @@
    if (AcpiPresent) LoaderBlock.Flags |= MB_FLAGS_ACPI_TABLE;

UiDrawStatusText("Loading...");
-	UiDrawProgressBarCenter(0, 100, (PCHAR)"Loading ReactOS...");
+	UiDrawProgressBarCenter(0, 100, szLoadingMsg);

/*
     * Try to open system drive
@@ -821,7 +823,7 @@
     */
    RegInitCurrentControlSet(FALSE);

-	UiDrawProgressBarCenter(15, 100, (PCHAR)"Loading ReactOS...");
+	UiDrawProgressBarCenter(15, 100, szLoadingMsg);

/*
     * Export the hardware hive
@@ -830,7 +832,7 @@
    RegExportBinaryHive (L"\Registry\Machine\HARDWARE",
(PCHAR)Base, &Size);
    FrLdrCloseModule (Base, Size);

-	UiDrawProgressBarCenter(20, 100, (PCHAR)"Loading ReactOS...");
+	UiDrawProgressBarCenter(20, 100, szLoadingMsg);

/*
     * Load NLS files
@@ -840,13 +842,13 @@
            UiMessageBox(MsgBuffer);
    	return;
    }
-	UiDrawProgressBarCenter(30, 100, (PCHAR)"Loading ReactOS...");
+	UiDrawProgressBarCenter(30, 100, szLoadingMsg);

/*
     * Load kernel symbols
     */
    LoadKernelSymbols(szKernelName, 30);
-	UiDrawProgressBarCenter(40, 100, (PCHAR)"Loading ReactOS...");
+	UiDrawProgressBarCenter(40, 100, szLoadingMsg);

/*
     * Load boot drivers
  _____

Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c
--- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c
2005-12-18 10:58:46 UTC (rev 20242)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c
2005-12-18 11:04:04 UTC (rev 20243)
@@ -31,6 +31,7 @@

{
 #if 0
   FRLDRHKEY TestKey;
+  WCHAR szTestString[] = L"TestString";
 #endif

/* Create root key */
@@ -85,8 +86,8 @@
   RegSetValue (TestKey,
           L"TestValue",
           REG_SZ,
-	       (PUCHAR)"TestString",
-	       11);
+	       szTestString,
+	       sizeof(szTestString));
 #endif
 }