[USETUP] Fix the strings given to the printf-like functions (addendum to a3168373).
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Sun, 30 Dec 2018 14:15:31 +0000 (15:15 +0100)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Sun, 30 Dec 2018 14:26:44 +0000 (15:26 +0100)
base/setup/usetup/partlist.c
base/setup/usetup/usetup.c

index f0b5c9a..7ad044c 100644 (file)
@@ -313,9 +313,9 @@ PrintDiskData(
                 DiskEntry->Bus,
                 DiskEntry->Id,
                 &DiskEntry->DriverName,
-                DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" :
-                DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" :
-                                                              L"RAW");
+                DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
+                DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
+                                                              "RAW");
     }
     else
     {
@@ -327,9 +327,9 @@ PrintDiskData(
                 DiskEntry->Port,
                 DiskEntry->Bus,
                 DiskEntry->Id,
-                DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" :
-                DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" :
-                                                              L"RAW");
+                DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
+                DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
+                                                              "RAW");
     }
 
     if (ListUi->Line >= 0 && ListUi->Line <= Height)
index 6fd68b7..3199cba 100644 (file)
@@ -1983,9 +1983,9 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir)
                             DiskEntry->Bus,
                             DiskEntry->Id,
                             &DiskEntry->DriverName,
-                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" :
-                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" :
-                                                                          L"RAW");
+                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
+                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
+                                                                          "RAW");
     }
     else
     {
@@ -1997,9 +1997,9 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir)
                             DiskEntry->Port,
                             DiskEntry->Bus,
                             DiskEntry->Id,
-                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" :
-                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" :
-                                                                          L"RAW");
+                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
+                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
+                                                                          "RAW");
     }
 
     CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE));
@@ -2146,9 +2146,9 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir)
                             DiskEntry->Bus,
                             DiskEntry->Id,
                             &DiskEntry->DriverName,
-                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" :
-                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" :
-                                                                          L"RAW");
+                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
+                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
+                                                                          "RAW");
     }
     else
     {
@@ -2160,9 +2160,9 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir)
                             DiskEntry->Port,
                             DiskEntry->Bus,
                             DiskEntry->Id,
-                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" :
-                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" :
-                                                                          L"RAW");
+                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
+                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
+                                                                          "RAW");
     }
 
     CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE));
@@ -2308,9 +2308,9 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir)
                             DiskEntry->Bus,
                             DiskEntry->Id,
                             &DiskEntry->DriverName,
-                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" :
-                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" :
-                                                                          L"RAW");
+                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
+                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
+                                                                          "RAW");
     }
     else
     {
@@ -2322,9 +2322,9 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir)
                             DiskEntry->Port,
                             DiskEntry->Bus,
                             DiskEntry->Id,
-                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" :
-                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" :
-                                                                          L"RAW");
+                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
+                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
+                                                                          "RAW");
     }
 
     CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE));
@@ -2551,9 +2551,9 @@ DeletePartitionPage(PINPUT_RECORD Ir)
                             DiskEntry->Bus,
                             DiskEntry->Id,
                             &DiskEntry->DriverName,
-                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" :
-                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" :
-                                                                          L"RAW");
+                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
+                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
+                                                                          "RAW");
     }
     else
     {
@@ -2565,9 +2565,9 @@ DeletePartitionPage(PINPUT_RECORD Ir)
                             DiskEntry->Port,
                             DiskEntry->Bus,
                             DiskEntry->Id,
-                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" :
-                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" :
-                                                                          L"RAW");
+                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
+                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
+                                                                          "RAW");
     }
 
     while (TRUE)
@@ -2789,9 +2789,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
                             DiskEntry->Bus,
                             DiskEntry->Id,
                             &DiskEntry->DriverName,
-                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" :
-                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" :
-                                                                          L"RAW");
+                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
+                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
+                                                                          "RAW");
 
         CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT));
 
@@ -2852,9 +2852,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
                             DiskEntry->Bus,
                             DiskEntry->Id,
                             &DiskEntry->DriverName,
-                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" :
-                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" :
-                                                                          L"RAW");
+                            DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
+                            DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
+                                                                          "RAW");
     }
 
     if (FileSystemList == NULL)