Author: ekohl
Date: Sat Sep 19 12:14:35 2015
New Revision: 69280
URL: http://svn.reactos.org/svn/reactos?rev=69280&view=rev
Log:
[INTL]
Implement the "Apply all settings to the current user account and to the default user profile" feature.
CORE-10172
Modified:
trunk/reactos/dll/cpl/intl/advanced.c
trunk/reactos/dll/cpl/intl/generalp.c
trunk/reactos/dll/cpl/intl/intl.c
trunk/reactos/dll/cpl/intl/intl.h
trunk/reactos/dll/cpl/intl/lang/bg-BG.rc
trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc
trunk/reactos/dll/cpl/intl/lang/de-DE.rc
trunk/reactos/dll/cpl/intl/lang/en-US.rc
trunk/reactos/dll/cpl/intl/lang/es-ES.rc
trunk/reactos/dll/cpl/intl/lang/fr-FR.rc
trunk/reactos/dll/cpl/intl/lang/he-IL.rc
trunk/reactos/dll/cpl/intl/lang/it-IT.rc
trunk/reactos/dll/cpl/intl/lang/no-NO.rc
trunk/reactos/dll/cpl/intl/lang/pl-PL.rc
trunk/reactos/dll/cpl/intl/lang/ro-RO.rc
trunk/reactos/dll/cpl/intl/lang/ru-RU.rc
trunk/reactos/dll/cpl/intl/lang/sk-SK.rc
trunk/reactos/dll/cpl/intl/lang/sq-AL.rc
trunk/reactos/dll/cpl/intl/lang/tr-TR.rc
trunk/reactos/dll/cpl/intl/lang/uk-UA.rc
trunk/reactos/dll/cpl/intl/lang/zh-CN.rc
trunk/reactos/dll/cpl/intl/resource.h
Modified: trunk/reactos/dll/cpl/intl/advanced.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/advanced.c?re…
==============================================================================
--- trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -346,28 +346,51 @@
WPARAM wParam,
LPARAM lParam)
{
- switch(uMsg)
+ PGLOBALDATA pGlobalData;
+
+ pGlobalData = (PGLOBALDATA)GetWindowLongPtr(hwndDlg, DWLP_USER);
+
+ switch (uMsg)
{
case WM_INITDIALOG:
- {
+ pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam;
+ SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData);
+
InitLanguagesList(hwndDlg);
InitCodePagesList(hwndDlg);
- }
- break;
+ break;
case WM_COMMAND:
- {
switch (LOWORD(wParam))
{
case IDC_LANGUAGE_COMBO:
- {
if (HIWORD(wParam) == CBN_SELCHANGE)
+ {
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
- }
- break;
- }
- }
- break;
+ }
+ break;
+
+ case IDC_APPLY_CUR_USER_DEF_PROFILE:
+ if (HIWORD(wParam) == BN_CLICKED)
+ {
+ if (SendDlgItemMessageW(hwndDlg, IDC_APPLY_CUR_USER_DEF_PROFILE, BM_GETCHECK, 0, 0))
+ {
+ ResourceMessageBox(hwndDlg,
+ MB_OK | MB_ICONWARNING,
+ IDS_APPLY_DEFAULT_TITLE,
+ IDS_APPLY_DEFAULT_TEXT);
+ pGlobalData->bApplyToDefaultUser = TRUE;
+ }
+ else
+ {
+ pGlobalData->bApplyToDefaultUser = FALSE;
+ }
+
+ PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
+ }
+ break;
+ }
+ break;
case WM_NOTIFY:
{
Modified: trunk/reactos/dll/cpl/intl/generalp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re…
==============================================================================
--- trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -298,6 +298,7 @@
HeapFree(GetProcessHeap(), 0, pGlobalData->pLocaleArray[i]);
}
HeapFree(GetProcessHeap(), 0, pGlobalData->pLocaleArray);
+ pGlobalData->pLocaleArray = NULL;
}
@@ -342,17 +343,51 @@
SaveCurrentLocale(
PGLOBALDATA pGlobalData)
{
- // HKCU\\Control Panel\\International\\Locale = 0409 (type=0)
- // HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","Default",0x00000000,"0409" (type=0)
- // HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","InstallLanguage",0x00000000,"0409" (type=0)
-
- // Set locale
HKEY localeKey;
DWORD ret;
WCHAR value[9];
DWORD valuesize;
DWORD i;
+ wsprintf(value, L"%08x", (DWORD)pGlobalData->lcid);
+ valuesize = (wcslen(value) + 1) * sizeof(WCHAR);
+
+ if (pGlobalData->bApplyToDefaultUser)
+ {
+ ret = RegOpenKeyExW(HKEY_USERS,
+ L".DEFAULT\\Control Panel\\International",
+ 0,
+ KEY_WRITE,
+ &localeKey);
+ if (ret != ERROR_SUCCESS)
+ {
+ PrintErrorMsgBox(IDS_ERROR_DEF_INT_KEY_REG);
+ return;
+ }
+
+ ret = RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (PBYTE)value, valuesize);
+ if (ret != ERROR_SUCCESS)
+ {
+ RegCloseKey(localeKey);
+ PrintErrorMsgBox(IDS_ERROR_INT_KEY_REG);
+ return;
+ }
+
+ for (i = 0; i < pGlobalData->dwLocaleCount; i++)
+ {
+ RegSetValueExW(localeKey,
+ LocaleKeyData[i].pKeyName,
+ 0,
+ REG_SZ,
+ (PBYTE)pGlobalData->pLocaleArray[i],
+ (wcslen(pGlobalData->pLocaleArray[i]) + 1) * sizeof(WCHAR));
+ }
+
+ /* Flush and close the locale key */
+ RegFlushKey(localeKey);
+ RegCloseKey(localeKey);
+ }
+
ret = RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\International",
0, KEY_READ | KEY_WRITE, &localeKey);
if (ret != ERROR_SUCCESS)
@@ -360,9 +395,6 @@
PrintErrorMsgBox(IDS_ERROR_INT_KEY_REG);
return;
}
-
- wsprintf(value, L"%08x", (DWORD)pGlobalData->lcid);
- valuesize = (wcslen(value) + 1) * sizeof(WCHAR);
ret = RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (PBYTE)value, valuesize);
if (ret != ERROR_SUCCESS)
@@ -488,7 +520,7 @@
switch (uMsg)
{
case WM_INITDIALOG:
- pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBALDATA));
+ pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam;
SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData);
if (pGlobalData)
@@ -611,7 +643,6 @@
if (pGlobalData)
{
FreeCurrentLocale(pGlobalData);
- HeapFree(GetProcessHeap(), 0, pGlobalData);
}
break;
}
Modified: trunk/reactos/dll/cpl/intl/intl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=69…
==============================================================================
--- trunk/reactos/dll/cpl/intl/intl.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/intl.c [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -60,8 +60,24 @@
MessageBox(NULL, szErrorText, szErrorCaption, MB_OK | MB_ICONERROR);
}
+VOID
+ResourceMessageBox(
+ HWND hwnd,
+ UINT uType,
+ UINT uCaptionId,
+ UINT uMessageId)
+{
+ WCHAR szErrorText[BUFFERSIZE];
+ WCHAR szErrorCaption[BUFFERSIZE];
+
+ LoadStringW(hApplet, uMessageId, szErrorText, sizeof(szErrorText) / sizeof(WCHAR));
+ LoadStringW(hApplet, uCaptionId, szErrorCaption, sizeof(szErrorCaption) / sizeof(WCHAR));
+
+ MessageBoxW(hwnd, szErrorText, szErrorCaption, uType);
+}
+
static VOID
-InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
+InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPARAM lParam)
{
ZeroMemory(psp, sizeof(PROPSHEETPAGE));
psp->dwSize = sizeof(PROPSHEETPAGE);
@@ -69,6 +85,7 @@
psp->hInstance = hApplet;
psp->pszTemplate = MAKEINTRESOURCE(idDlg);
psp->pfnDlgProc = DlgProc;
+ psp->lParam = lParam;
}
BOOL
@@ -135,14 +152,18 @@
static LONG APIENTRY
Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
{
+ TCHAR Caption[BUFFERSIZE];
PROPSHEETPAGE psp[3];
PROPSHEETHEADER psh;
- TCHAR Caption[BUFFERSIZE];
+ PGLOBALDATA pGlobalData;
+ LONG ret;
if (OpenSetupInf())
{
ParseSetupInf();
}
+
+ pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBALDATA));
LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR));
@@ -157,11 +178,15 @@
psh.nStartPage = 0;
psh.ppsp = psp;
- InitPropSheetPage(&psp[0], IDD_GENERALPAGE, GeneralPageProc);
- InitPropSheetPage(&psp[1], IDD_LANGUAGESPAGE, LanguagesPageProc);
- InitPropSheetPage(&psp[2], IDD_ADVANCEDPAGE, AdvancedPageProc);
-
- return (LONG)(PropertySheet(&psh) != -1);
+ InitPropSheetPage(&psp[0], IDD_GENERALPAGE, GeneralPageProc, (LPARAM)pGlobalData);
+ InitPropSheetPage(&psp[1], IDD_LANGUAGESPAGE, LanguagesPageProc, (LPARAM)pGlobalData);
+ InitPropSheetPage(&psp[2], IDD_ADVANCEDPAGE, AdvancedPageProc, (LPARAM)pGlobalData);
+
+ ret = (LONG)(PropertySheet(&psh) != -1);
+
+ HeapFree(GetProcessHeap(), 0, pGlobalData);
+
+ return ret;
}
Modified: trunk/reactos/dll/cpl/intl/intl.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=69…
==============================================================================
--- trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -54,6 +54,8 @@
typedef struct _GLOBALDATA
{
+ BOOL bApplyToDefaultUser;
+
GEOID geoid;
BOOL fGeoIdChanged;
@@ -69,6 +71,13 @@
/* intl.c */
VOID PrintErrorMsgBox(UINT msg);
+
+VOID
+ResourceMessageBox(
+ HWND hwnd,
+ UINT uType,
+ UINT uCaptionId,
+ UINT uMessageId);
/* languages.c */
INT_PTR CALLBACK
Modified: trunk/reactos/dll/cpl/intl/lang/bg-BG.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/bg-BG.rc…
==============================================================================
--- trunk/reactos/dll/cpl/intl/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/lang/bg-BG.rc [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -194,6 +194,14 @@
STRINGTABLE
BEGIN
+ IDS_APPLY_DEFAULT_TITLE "Change default settings"
+ IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+
+STRINGTABLE
+BEGIN
IDS_ERROR "Error"
IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
Modified: trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc…
==============================================================================
--- trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -199,6 +199,14 @@
STRINGTABLE
BEGIN
+ IDS_APPLY_DEFAULT_TITLE "Change default settings"
+ IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+
+STRINGTABLE
+BEGIN
IDS_ERROR "Error"
IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc…
==============================================================================
--- trunk/reactos/dll/cpl/intl/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -36,8 +36,8 @@
PUSHBUTTON "&Details...", IDC_DETAIL_BUTTON, 177, 34, 54, 14
GROUPBOX "Zusätzliche Sprachunterstützung", -1, 5, 62, 234, 82
LTEXT "Die meisten Sprachen sind standardmäÃig installiert. Um weitere Sprachen zu installieren, aktivieren Sie die unteren Kontrollkästchen.", -1, 12, 72, 220, 18
- CHECKBOX "Dateien für Sprachen mit &komplexer Schrift und Rechts-nach-Links-Schreibstil installieren.", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE
- CHECKBOX "Dateien für &ostasiatische Sprachen installieren.", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE
+ AUTOCHECKBOX "Dateien für Sprachen mit &komplexer Schrift und Rechts-nach-Links-Schreibstil installieren.", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE
+ AUTOCHECKBOX "Dateien für &ostasiatische Sprachen installieren.", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE
END
IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230
@@ -52,7 +52,7 @@
GROUPBOX "Codepage Konvertierungstabellen", -1, 5, 101, 234, 88
CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70
GROUPBOX "Standardeinstellungen für Benutzerkonten", -1, 5, 193, 234, 30
- CHECKBOX "Einstellungen &auf das aktive und das Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE
+ AUTOCHECKBOX "Einstellungen &auf das aktive und das Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE
END
IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234
@@ -194,6 +194,15 @@
STRINGTABLE
BEGIN
+ IDS_APPLY_DEFAULT_TITLE "Standardeinstellungen ändern"
+ IDS_APPLY_DEFAULT_TEXT "Die Einstellungen sollen auf das Standardbenutzerprofil angewendet werden.\n\n\
+Diese Ãnderungen gelten für den Anmeldebildschirm und alle neuen Benutzerkonten.\n\
+Der Computer muss neu gestartet werden, damit die Ãnderungen für einige Systemdienste\n\
+übernommen werden können."
+END
+
+STRINGTABLE
+BEGIN
IDS_ERROR "Fehler"
IDS_ERROR_SYMBOL_SEPARATE "Das eingegebene kurze Datumstrennzeichen enthält falsche Symbole."
IDS_ERROR_SYMBOL_FORMAT_SHORT "Das eingegebene kurze Datumsformat enthält falsche Symbole."
Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/en-US.rc…
==============================================================================
--- trunk/reactos/dll/cpl/intl/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/lang/en-US.rc [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -36,8 +36,8 @@
PUSHBUTTON "De&tails...", IDC_DETAIL_BUTTON, 177, 34, 54, 14
GROUPBOX "Additional language support", -1, 5, 62, 234, 82
LTEXT "Most languages are installed by default. To install additional languages, select the appropriate check box below.", -1, 12, 72, 220, 18
- CHECKBOX "I&nstall files for complex script and right-to-left languages", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE
- CHECKBOX "In&stall files for East Asian languages", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE
+ AUTOCHECKBOX "I&nstall files for complex script and right-to-left languages", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE
+ AUTOCHECKBOX "In&stall files for East Asian languages", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE
END
IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230
@@ -52,7 +52,7 @@
GROUPBOX "Code page conversion tables", -1, 5, 101, 234, 88
CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70
GROUPBOX "Default user account settings", -1, 5, 193, 234, 30
- CHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE
+ AUTOCHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE
END
IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234
@@ -194,6 +194,14 @@
STRINGTABLE
BEGIN
+ IDS_APPLY_DEFAULT_TITLE "Change default settings"
+ IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+
+STRINGTABLE
+BEGIN
IDS_ERROR "Error"
IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
Modified: trunk/reactos/dll/cpl/intl/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/es-ES.rc…
==============================================================================
--- trunk/reactos/dll/cpl/intl/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/lang/es-ES.rc [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -196,6 +196,14 @@
STRINGTABLE
BEGIN
+ IDS_APPLY_DEFAULT_TITLE "Change default settings"
+ IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+
+STRINGTABLE
+BEGIN
IDS_ERROR "Error"
IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
Modified: trunk/reactos/dll/cpl/intl/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/fr-FR.rc…
==============================================================================
--- trunk/reactos/dll/cpl/intl/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/lang/fr-FR.rc [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -196,6 +196,14 @@
STRINGTABLE
BEGIN
+ IDS_APPLY_DEFAULT_TITLE "Change default settings"
+ IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+
+STRINGTABLE
+BEGIN
IDS_ERROR "Error"
IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
Modified: trunk/reactos/dll/cpl/intl/lang/he-IL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/he-IL.rc…
==============================================================================
--- trunk/reactos/dll/cpl/intl/lang/he-IL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/lang/he-IL.rc [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -196,6 +196,14 @@
STRINGTABLE
BEGIN
+ IDS_APPLY_DEFAULT_TITLE "Change default settings"
+ IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+
+STRINGTABLE
+BEGIN
IDS_ERROR "Error"
IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/it-IT.rc…
==============================================================================
--- trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -196,6 +196,14 @@
STRINGTABLE
BEGIN
+ IDS_APPLY_DEFAULT_TITLE "Change default settings"
+ IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+
+STRINGTABLE
+BEGIN
IDS_ERROR "Error"
IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
Modified: trunk/reactos/dll/cpl/intl/lang/no-NO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/no-NO.rc…
==============================================================================
--- trunk/reactos/dll/cpl/intl/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/lang/no-NO.rc [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -194,6 +194,14 @@
STRINGTABLE
BEGIN
+ IDS_APPLY_DEFAULT_TITLE "Change default settings"
+ IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+
+STRINGTABLE
+BEGIN
IDS_ERROR "Error"
IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
Modified: trunk/reactos/dll/cpl/intl/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/pl-PL.rc…
==============================================================================
--- trunk/reactos/dll/cpl/intl/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/lang/pl-PL.rc [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -202,6 +202,14 @@
STRINGTABLE
BEGIN
+ IDS_APPLY_DEFAULT_TITLE "Change default settings"
+ IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+
+STRINGTABLE
+BEGIN
IDS_ERROR "BÅÄ d"
IDS_ERROR_SYMBOL_SEPARATE "Separator krótkiej daty zawiera nieprawidÅowy symbol"
IDS_ERROR_SYMBOL_FORMAT_SHORT "Format daty krótkiej zawiera nieprawidÅowe symbole"
Modified: trunk/reactos/dll/cpl/intl/lang/ro-RO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ro-RO.rc…
==============================================================================
--- trunk/reactos/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -196,6 +196,14 @@
STRINGTABLE
BEGIN
+ IDS_APPLY_DEFAULT_TITLE "Change default settings"
+ IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+
+STRINGTABLE
+BEGIN
IDS_ERROR "Eroare"
IDS_ERROR_SYMBOL_SEPARATE "Separatorul de datÄ prescurtatÄ introdus conÈine simbol(uri) incorect(e)"
IDS_ERROR_SYMBOL_FORMAT_SHORT "Formatul de datÄ prescurtatÄ introdus conÈine simbol(uri) incorect(e)"
Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc…
==============================================================================
--- trunk/reactos/dll/cpl/intl/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/lang/ru-RU.rc [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -196,6 +196,14 @@
STRINGTABLE
BEGIN
+ IDS_APPLY_DEFAULT_TITLE "Change default settings"
+ IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+
+STRINGTABLE
+BEGIN
IDS_ERROR "ÐÑибка"
IDS_ERROR_SYMBOL_SEPARATE "ÐоÑоÑкий ÑазделиÑÐµÐ»Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñов даÑÑ ÑодеÑÐ¶Ð¸Ñ Ð½ÐµÐ²ÐµÑнÑй Ñимвол(Ñ)"
IDS_ERROR_SYMBOL_FORMAT_SHORT "ÐоÑоÑкий ÑоÑÐ¼Ð°Ñ Ð´Ð°ÑÑ ÑодеÑÐ¶Ð¸Ñ Ð½ÐµÐ²ÐµÑнÑй Ñимвол(Ñ)"
Modified: trunk/reactos/dll/cpl/intl/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/sk-SK.rc…
==============================================================================
--- trunk/reactos/dll/cpl/intl/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/lang/sk-SK.rc [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -200,6 +200,14 @@
STRINGTABLE
BEGIN
+ IDS_APPLY_DEFAULT_TITLE "Change default settings"
+ IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+
+STRINGTABLE
+BEGIN
IDS_ERROR "Error"
IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
Modified: trunk/reactos/dll/cpl/intl/lang/sq-AL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/sq-AL.rc…
==============================================================================
--- trunk/reactos/dll/cpl/intl/lang/sq-AL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/lang/sq-AL.rc [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -195,3 +195,26 @@
IDS_CPLNAME "Alternativat Rajonale"
IDS_CPLDESCRIPTION "Zgjidhni gjuhën dhe formatin e numrave, monedhat, orën dhe datën."
END
+
+STRINGTABLE
+BEGIN
+ IDS_APPLY_DEFAULT_TITLE "Change default settings"
+ IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+
+STRINGTABLE
+BEGIN
+ IDS_ERROR "Error"
+ IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
+ IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
+ IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)"
+ IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page"
+ IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page"
+ IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International"
+ IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International"
+ IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"
+ IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"
+ IDS_ERROR_INPUT_DLL "Unable to start input.dll"
+END
Modified: trunk/reactos/dll/cpl/intl/lang/tr-TR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/tr-TR.rc…
==============================================================================
--- trunk/reactos/dll/cpl/intl/lang/tr-TR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/lang/tr-TR.rc [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -196,6 +196,14 @@
STRINGTABLE
BEGIN
+ IDS_APPLY_DEFAULT_TITLE "Change default settings"
+ IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+
+STRINGTABLE
+BEGIN
IDS_ERROR "YanlıÅlık"
IDS_ERROR_SYMBOL_SEPARATE "Kısa târih bileÅenleri ayıracı yanlıŠsimge(ler) içeriyor."
IDS_ERROR_SYMBOL_FORMAT_SHORT "Kısa târih biçimi yanlıŠsimge(ler) içeriyor."
Modified: trunk/reactos/dll/cpl/intl/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/uk-UA.rc…
==============================================================================
--- trunk/reactos/dll/cpl/intl/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/lang/uk-UA.rc [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -202,6 +202,14 @@
STRINGTABLE
BEGIN
+ IDS_APPLY_DEFAULT_TITLE "Change default settings"
+ IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+
+STRINGTABLE
+BEGIN
IDS_ERROR "Error"
IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
Modified: trunk/reactos/dll/cpl/intl/lang/zh-CN.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/zh-CN.rc…
==============================================================================
--- trunk/reactos/dll/cpl/intl/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/lang/zh-CN.rc [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -198,6 +198,14 @@
STRINGTABLE
BEGIN
+ IDS_APPLY_DEFAULT_TITLE "Change default settings"
+ IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+
+STRINGTABLE
+BEGIN
IDS_ERROR "é误"
IDS_ERROR_SYMBOL_SEPARATE "çæ¥æç»ä»¶åé符å å«ä¸æ£ç¡®ç符å·"
IDS_ERROR_SYMBOL_FORMAT_SHORT "çæ¥ææ ¼å¼å å«ä¸æ£ç¡®ç符å·"
Modified: trunk/reactos/dll/cpl/intl/resource.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/resource.h?re…
==============================================================================
--- trunk/reactos/dll/cpl/intl/resource.h [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/resource.h [iso-8859-1] Sat Sep 19 12:14:35 2015
@@ -88,3 +88,7 @@
#define IDS_ERROR_SYMBOL_FORMAT_SHORT 1014
#define IDS_ERROR_SYMBOL_FORMAT_LONG 1015
#define IDS_ERROR_INPUT_DLL 1016
+
+
+#define IDS_APPLY_DEFAULT_TITLE 1100
+#define IDS_APPLY_DEFAULT_TEXT 1101
Author: akhaldi
Date: Fri Sep 18 19:31:37 2015
New Revision: 69275
URL: http://svn.reactos.org/svn/reactos?rev=69275&view=rev
Log:
[AVICAP32] Order the exports and make sure the list matches our target (Windows Server 2003 Sp2). By Radek Liška, confirmed by me. CORE-8174
Modified:
trunk/reactos/dll/win32/avicap32/avicap32.spec
Modified: trunk/reactos/dll/win32/avicap32/avicap32.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avicap32/avicap3…
==============================================================================
--- trunk/reactos/dll/win32/avicap32/avicap32.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avicap32/avicap32.spec [iso-8859-1] Fri Sep 18 19:31:37 2015
@@ -1,6 +1,6 @@
-@ stdcall AppCleanup(ptr)
-@ stdcall capCreateCaptureWindowA(str long long long long long long long)
-@ stdcall capCreateCaptureWindowW(wstr long long long long long long long)
-@ stdcall capGetDriverDescriptionA(long ptr long ptr long)
-@ stdcall capGetDriverDescriptionW(long ptr long ptr long)
-@ stdcall videoThunk32(long long long long long)
+1 stdcall AppCleanup(ptr)
+2 stdcall capCreateCaptureWindowA(str long long long long long long long)
+3 stdcall capCreateCaptureWindowW(wstr long long long long long long long)
+4 stdcall capGetDriverDescriptionA(long ptr long ptr long)
+5 stdcall capGetDriverDescriptionW(long ptr long ptr long)
+6 stdcall videoThunk32(long long long long long)