[WINHTTP] Sync with Wine Staging 3.9. CORE-14656

[reactos.git] / dll / cpl / intl / intl.c

diff --git a/dll/cpl/intl/intl.c b/dll/cpl/intl/intl.c
index d390375..440e344 100644 (file)
--- a/dll/cpl/intl/intl.c
+++ b/dll/cpl/intl/intl.c
@@ -51,16 +51,16 @@ APPLET Applets[NUM_APPLETS] =
 VOID
 PrintErrorMsgBox(UINT msg)
 {
-    TCHAR szErrorText[BUFFERSIZE];
-    TCHAR szErrorCaption[BUFFERSIZE];
+    WCHAR szErrorText[BUFFERSIZE];
+    WCHAR szErrorCaption[BUFFERSIZE];
 
-    LoadString(hApplet, msg, szErrorText, sizeof(szErrorText)/sizeof(TCHAR));
-    LoadString(hApplet, IDS_ERROR, szErrorCaption, sizeof(szErrorCaption)/sizeof(TCHAR));
+    LoadStringW(hApplet, msg, szErrorText, sizeof(szErrorText) / sizeof(WCHAR));
+    LoadStringW(hApplet, IDS_ERROR, szErrorCaption, sizeof(szErrorCaption) / sizeof(WCHAR));
 
-    MessageBox(NULL, szErrorText, szErrorCaption, MB_OK | MB_ICONERROR);
+    MessageBoxW(NULL, szErrorText, szErrorCaption, MB_OK | MB_ICONERROR);
 }
 
-VOID
+INT
 ResourceMessageBox(
     HWND hwnd,
     UINT uType,
@@ -73,11 +73,11 @@ ResourceMessageBox(
     LoadStringW(hApplet, uMessageId, szErrorText, sizeof(szErrorText) / sizeof(WCHAR));
     LoadStringW(hApplet, uCaptionId, szErrorCaption, sizeof(szErrorCaption) / sizeof(WCHAR));
 
-    MessageBoxW(hwnd, szErrorText, szErrorCaption, uType);
+    return MessageBoxW(hwnd, szErrorText, szErrorCaption, uType);
 }
 
 static VOID
-InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPARAM lParam)
+InitIntlPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPARAM lParam)
 {
     ZeroMemory(psp, sizeof(PROPSHEETPAGE));
     psp->dwSize = sizeof(PROPSHEETPAGE);
@@ -183,14 +183,14 @@ Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
     psh.nStartPage = 0;
     psh.ppsp = psp;
 
-    InitPropSheetPage(&psp[0], IDD_GENERALPAGE, GeneralPageProc, (LPARAM)pGlobalData);
+    InitIntlPropSheetPage(&psp[0], IDD_GENERALPAGE, GeneralPageProc, (LPARAM)pGlobalData);
     psh.nPages++;
-    InitPropSheetPage(&psp[1], IDD_LANGUAGESPAGE, LanguagesPageProc, (LPARAM)pGlobalData);
+    InitIntlPropSheetPage(&psp[1], IDD_LANGUAGESPAGE, LanguagesPageProc, (LPARAM)pGlobalData);
     psh.nPages++;
 
     if (pGlobalData->bIsUserAdmin)
     {
-        InitPropSheetPage(&psp[2], IDD_ADVANCEDPAGE, AdvancedPageProc, (LPARAM)pGlobalData);
+        InitIntlPropSheetPage(&psp[2], IDD_ADVANCEDPAGE, AdvancedPageProc, (LPARAM)pGlobalData);
         psh.nPages++;
     }