Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-27 00:11:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.4.9][DESK] Fix handle leaks in screensaver preview and other small fixes

Browse source 
- Fix leaking two handles to avoid creating zombie processes when closing the
screensaver preview

fix is *partial* pick of 0.4.15-dev-5495-g 71123b72fa which *partially* fixes CORE-18680 (#4921)
The other part of that fix is not safe, neither on master, nor when porting back due to yet unfixed Win32K bugs.
-------------------------
*partial* pick of 0.4.15-dev-3154-g 158a479a4e "\r\n"->"\n" in desk.cpl
-------------------------
furthermore port back some EOL-whitespace cleanup and some minor translation improvements
-------------------------
also *partial* pick of 0.4.15-dev-5521-g 5ecb9e8cb5 (#4943)
only the parts that are relevant for older releases
-------------------------
0.4.14-dev-111-g 72e5c2e77c hShell32 is always non-NULL in epilogue
This commit is contained in:
Joachim Henze 2022-12-11 04:33:41 +01:00
parent f08cf7c7b9
commit a7276188a7
27 changed files with 50 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dll/cpl/desk/advmon.c
View file

@ -140,8 +140,7 @@ DisplayAdvancedSettings(HWND hWndParent, PDISPLAY_DEVICE_ENTRY DisplayDevice)
IDataObject_Release(pdo);
#ifdef _MSC_VER
if (hShell32)
FreeLibrary(hShell32);
FreeLibrary(hShell32);
#endif
return Ret;

6
dll/cpl/desk/appearance.c
View file

@ -119,11 +119,11 @@ AppearancePage_OnInit(HWND hwndDlg)
{
BOOL bLoadedTheme = FALSE;
if (g_GlobalData.pwszAction &&
g_GlobalData.pwszFile &&
if (g_GlobalData.pwszAction &&
g_GlobalData.pwszFile &&
wcscmp(g_GlobalData.pwszAction, L"OpenMSTheme") == 0)
{
bLoadedTheme = FindOrAppendTheme(g->pThemes,
bLoadedTheme = FindOrAppendTheme(g->pThemes,
g_GlobalData.pwszFile,
NULL,
NULL,

20
dll/cpl/desk/appearance.h
View file

@ -10,18 +10,18 @@
#define SIZE_SM_CAPTION_HEIGHT 6
#define SIZE_MENU_WIDTH 7
#define SIZE_MENU_HEIGHT 8
#define SIZE_ICON_SPACE_X 9
#define SIZE_ICON_SPACE_Y 10
#define SIZE_ICON 11
#define FONT_CAPTION 0
#define FONT_SMCAPTION 1
#define FONT_MENU 2
#define FONT_STATUS 3
#define FONT_MESSAGE 4
#define FONT_ICON 5
#define NUM_ELEMENTS 18
#define NUM_FONTS 6
#define NUM_SIZES 9
@ -64,12 +64,12 @@ typedef struct
EFFECTS Effects;
} COLOR_SCHEME, *PCOLOR_SCHEME;
/*
* The classic theme has several different 'colours' and every colour has
/*
* The classic theme has several different 'colours' and every colour has
* several sizes. On visual styles however a theme has different colours
* and different sizes. In other words the user can select a combination
* of colour and size.
* That means that for the classic theme THEME.SizesList is unused and
* of colour and size.
* That means that for the classic theme THEME.SizesList is unused and
* every color has some child styles that correspond its sizes.
* The themes for visual styles however will use both ColoursList and SizesList
* and ChildStyle will not be used.
@ -101,16 +101,16 @@ typedef struct _THEME_SELECTION
PTHEME_STYLE Size;
} THEME_SELECTION, *PTHEME_SELECTION;
/*
/*
* This is the global structure used to store the current values.
* A pointer of this get's passed to the functions either directly
* or by passing hwnd and getting the pointer by GetWindowLongPtr.
* or by passing hwnd and getting the pointer by GetWindowLongPtr.
*/
typedef struct tagGLOBALS
{
PTHEME pThemes;
/*
/*
* Keep a copy of the selected classic theme in order to select this
* when user selects the classic theme (and not a horrible random theme )
*/

2
dll/cpl/desk/desk.c
View file

@ -171,7 +171,7 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
ActivateThemeFile(pwszFile);
goto cleanup;
}
g_GlobalData.pwszFile = pwszFile;
g_GlobalData.pwszAction = pwszAction;
g_GlobalData.desktop_color = GetSysColor(COLOR_DESKTOP);

2
dll/cpl/desk/lang/bg-BG.rc
View file

@ -146,7 +146,7 @@ BEGIN
COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12
GROUPBOX "Съвместимост", -1, 7, 67, 237, 97
LTEXT "Някои приложения няма да работят правилно, ако не презапуснете компютъра, след като промените цветовите настройки.\r\nСлед като променя цветовите настройки", -1, 12, 78, 228, 34
LTEXT "Някои приложения няма да работят правилно, ако не презапуснете компютъра, след като промените цветовите настройки.\nСлед като променя цветовите настройки", -1, 12, 78, 228, 34
AUTORADIOBUTTON "&Презапуск преди прилагане на новите цветови настройки.", IDC_RESTART_RB, 14, 116, 228, 10
AUTORADIOBUTTON "Прилагане на новите настройки без презапуск.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
AUTORADIOBUTTON "Питане преди прилагане на новите настройки", IDC_ASKME_RB, 14, 146, 228, 10

2
dll/cpl/desk/lang/cs-CZ.rc
View file

@ -152,7 +152,7 @@ BEGIN
COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12
GROUPBOX "Kompatibilita", -1, 7, 67, 237, 97
LTEXT "Některé programy nefungují správně, pokud není počítač restartován po změně nastavení barev.\r\n\nPo změně nastavení barev:", -1, 12, 78, 228, 34
LTEXT "Některé programy nefungují správně, pokud není počítač restartován po změně nastavení barev.\n\nPo změně nastavení barev:", -1, 12, 78, 228, 34
AUTORADIOBUTTON "&Restartovat počítač před aplikováním nového nastavení barev.", IDC_RESTART_RB, 14, 116, 228, 10
AUTORADIOBUTTON "Aplikovat nové nastavení barev bez restartování.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
AUTORADIOBUTTON "Zeptat se před aplikováním nového nastavení barev.", IDC_ASKME_RB, 14, 146, 228, 10

6
dll/cpl/desk/lang/de-DE.rc
View file

@ -33,8 +33,8 @@ BEGIN
CONTROL "&Passwort nach Reaktivierung", IDC_SCREENS_USEPASSCHK, "button",
BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
GROUPBOX "&Energiesparfunktionen des Monitors", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
LTEXT "Um die Energieeinstellungen des Monitors zu editieren, wählen Sie Energieeinstellungen.", IDC_STATIC, 16, 161, 146, 27
PUSHBUTTON "Energieoptionen", IDC_SCREENS_POWER_BUTTON, 167, 166, 61, 13
LTEXT "Um die Energieoptionen des Monitors zu editieren, wählen Sie Energieoptionen.", IDC_STATIC, 16, 161, 146, 27
PUSHBUTTON "Energieoptionen...", IDC_SCREENS_POWER_BUTTON, 157, 166, 69, 13
END
IDD_APPEARANCE DIALOGEX 0, 0, 246, 202
@ -146,7 +146,7 @@ BEGIN
COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12
GROUPBOX "Kompatibilität", -1, 7, 67, 237, 97
LTEXT "Einige Programme könnten fehlerhaft arbeiten, wenn nach Änderung der Farbeinstellungen nicht neu gestartet wird.\r\n\nNach Änderung der Farbeinstellungen", -1, 12, 78, 228, 34
LTEXT "Einige Programme könnten fehlerhaft arbeiten, wenn nach Änderung der Farbeinstellungen nicht neu gestartet wird.\n\nNach Änderung der Farbeinstellungen", -1, 12, 78, 228, 34
AUTORADIOBUTTON "&Computer vor dem Anwenden der Farbeinstellungen neu starten.", IDC_RESTART_RB, 14, 116, 228, 10
AUTORADIOBUTTON "Farbeinstellungen ohne Neustart übernehmen.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
AUTORADIOBUTTON "Vor dem Anwenden der neuen Farbeinstellungen nachfragen.", IDC_ASKME_RB, 14, 146, 228, 10

2
dll/cpl/desk/lang/en-GB.rc
View file

@ -141,7 +141,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "General"
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Display:", -1, 7, 6, 237, 56, WS_GROUP
GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP
LTEXT "Font Size", -1, 14, 20, 222, 9
COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12

2
dll/cpl/desk/lang/en-US.rc
View file

@ -141,7 +141,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "General"
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Display:", -1, 7, 6, 237, 56, WS_GROUP
GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP
LTEXT "Font Size", -1, 14, 20, 222, 9
COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12

2
dll/cpl/desk/lang/et-EE.rc
View file

@ -148,7 +148,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Üldist"
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Kuva:", -1, 7, 6, 237, 56, WS_GROUP
GROUPBOX "Kuva", -1, 7, 6, 237, 56, WS_GROUP
LTEXT "Fondi suurus", -1, 14, 20, 222, 9
COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12

10
dll/cpl/desk/lang/fr-FR.rc
View file

@ -4,13 +4,13 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
IDD_BACKGROUND DIALOGEX 0, 0, 246, 202
STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Fond d'écran"
CAPTION "Bureau"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 78
LTEXT "Sélectionnez une image à utiliser comme fond d'écran", IDC_STATIC, 8, 93, 230, 9
LTEXT "Arrière-plan :", IDC_STATIC, 8, 93, 230, 9
PUSHBUTTON "&Parcourir...", IDC_BROWSE_BUTTON, 188, 104, 55, 15
PUSHBUTTON "&Couleur...", IDC_COLOR_BUTTON, 188, 167, 55, 15
LTEXT "Position", IDC_STATIC, 188, 128, 55, 9
@ -27,7 +27,7 @@ BEGIN
COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Paramè&tres", IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP
PUSHBUTTON "&Aperçu", IDC_SCREENS_TESTSC, 175, 103, 50, 13
LTEXT "Dé&lai ", IDC_WAITTEXT, 14, 125, 20, 9
LTEXT "Dé&lai", IDC_WAITTEXT, 14, 125, 20, 9
EDITTEXT IDC_SCREENS_TIMEDELAY, 31, 123, 32, 13, ES_RIGHT | WS_GROUP
CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
@ -148,7 +148,7 @@ BEGIN
COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12
GROUPBOX "Compatibilité", -1, 7, 67, 285, 97
LTEXT "Quelques programmes peuvent mal fonctionner si vous ne redémarrez pas votre ordinateur après que vous ayiez changé les paramètres des couleurs.\r\n\nAprès que j'ai changé les paramètres des couleurs", -1, 12, 78, 270, 40
LTEXT "Quelques programmes peuvent mal fonctionner si vous ne redémarrez pas votre ordinateur après que vous ayiez changé les paramètres des couleurs.\n\nAprès que j'ai changé les paramètres des couleurs", -1, 12, 78, 270, 40
AUTORADIOBUTTON "&Redémarrer l'ordinateur avant d'appliquer les nouveaux paramètres des couleurs.", IDC_RESTART_RB, 14, 116, 273, 10
AUTORADIOBUTTON "Appliquer les nouveaux paramètres des couleurs sans redémarrer.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
AUTORADIOBUTTON "Me demander avant d'appliquer les nouveaux paramètres des couleurs.", IDC_ASKME_RB, 14, 146, 243, 10
@ -193,7 +193,7 @@ END
STRINGTABLE
BEGIN
IDS_STANDARDEFFECT "Standard"
IDS_CLEARTYPEEFFECT "Anticrénelage FreeType"
IDS_CLEARTYPEEFFECT "FreeType"
END
STRINGTABLE

2
dll/cpl/desk/lang/he-IL.rc
View file

@ -125,7 +125,7 @@ BEGIN
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
LTEXT "תצוגה:", 1820, 3, 107, 70, 9
LTEXT "<none>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9
GROUPBOX "גודל תצוגה:", 1818, 3, 127, 115, 43
GROUPBOX "גודל תצוגה", 1818, 3, 127, 115, 43
CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17
LTEXT "פחות", 1815, 9, 137, 25, 9, NOT WS_GROUP
LTEXT "יותר", 1816, 93, 137, 20, 9, NOT WS_GROUP

2
dll/cpl/desk/lang/it-IT.rc
View file

@ -146,7 +146,7 @@ BEGIN
COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12
GROUPBOX "Compatibilità", -1, 7, 67, 237, 97
LTEXT "Alcuni programmi potrebbero funzionare in modo irregolare se non riavviate il computer dopo una modifica delle impostazioni dei colori.\r\n\nDopo la modifica delle impostazioni dei colori", -1, 12, 78, 228, 34
LTEXT "Alcuni programmi potrebbero funzionare in modo irregolare se non riavviate il computer dopo una modifica delle impostazioni dei colori.\n\nDopo la modifica delle impostazioni dei colori", -1, 12, 78, 228, 34
AUTORADIOBUTTON "&Riavviare il computer prima di applicare le nuove impostazioni.", IDC_RESTART_RB, 14, 116, 228, 10
AUTORADIOBUTTON "Applicare le nuove impostazioni dei colori senza riavviare.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
AUTORADIOBUTTON "Chiedere prima di applicare le nuove impostazioni dei colori.", IDC_ASKME_RB, 14, 146, 228, 10

2
dll/cpl/desk/lang/ja-JP.rc
View file

@ -146,7 +146,7 @@ BEGIN
COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12
GROUPBOX "互換性", -1, 7, 67, 237, 97
LTEXT "色の設定を変更した後にコンピュータを再起動しないと、プログラムが正常に動作しないことがあります。\r\n\n色の設定を変更した後の動作:", -1, 12, 78, 228, 34
LTEXT "色の設定を変更した後にコンピュータを再起動しないと、プログラムが正常に動作しないことがあります。\n\n色の設定を変更した後の動作:", -1, 12, 78, 228, 34
AUTORADIOBUTTON "新しい色の設定を適用する前に、コンピュータを再起動する(&R)", IDC_RESTART_RB, 14, 116, 228, 10
AUTORADIOBUTTON "再起動せずに、新しい色の設定を適用する", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
AUTORADIOBUTTON "新しい色の設定を適用する前に確認する", IDC_ASKME_RB, 14, 146, 228, 10

2
dll/cpl/desk/lang/no-NO.rc
View file

@ -146,7 +146,7 @@ BEGIN
COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12
GROUPBOX "Kompatibilitet", -1, 7, 67, 237, 97
LTEXT "Noen programmer fungerer kanskje ikke skikkelig hvis du ikke starter datamaskinen på nytt etter å ha endret skjerminnstillingene.\r\n\nGjør følgende etter at skjerminnstillingene er endret", -1, 12, 78, 228, 34
LTEXT "Noen programmer fungerer kanskje ikke skikkelig hvis du ikke starter datamaskinen på nytt etter å ha endret skjerminnstillingene.\n\nGjør følgende etter at skjerminnstillingene er endret", -1, 12, 78, 228, 34
AUTORADIOBUTTON "&Start maskinen på nytt før de nye skjerminnstillingene tas i bruk.", IDC_RESTART_RB, 14, 116, 228, 10
AUTORADIOBUTTON "Bruk de nye skjerminnstillingene uten å starte på nytt.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
AUTORADIOBUTTON "Spør før de nye skjerminnstillingene tas i bruk.", IDC_ASKME_RB, 14, 146, 228, 10

2
dll/cpl/desk/lang/pl-PL.rc
View file

@ -155,7 +155,7 @@ BEGIN
COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12
GROUPBOX "Tryb zgodności", -1, 7, 67, 237, 97
LTEXT "Niektóre programy mogą działać niepoprawnie, jeśli po zmianie ustawień ekranu nie zrestartujesz systemu.\r\n\nPo zmianie ustawień ekranu", -1, 12, 78, 228, 34
LTEXT "Niektóre programy mogą działać niepoprawnie, jeśli po zmianie ustawień ekranu nie zrestartujesz systemu.\n\nPo zmianie ustawień ekranu", -1, 12, 78, 228, 34
AUTORADIOBUTTON "&Zrestartuj system przed wprowadzeniem zmian.", IDC_RESTART_RB, 14, 116, 228, 10
AUTORADIOBUTTON "Zastosuj nowe ustawienia ekranu bez restartu systemu.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
AUTORADIOBUTTON "Pytaj przed zastosowaniem nowych ustawień ekranu.", IDC_ASKME_RB, 14, 146, 228, 10

2
dll/cpl/desk/lang/pt-BR.rc
View file

@ -25,7 +25,7 @@ BEGIN
COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "&Configurações", IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP
PUSHBUTTON "&Visualizar", IDC_SCREENS_TESTSC, 175, 103, 50, 13
LTEXT "Ag&uardar:", IDC_WAITTEXT, 14, 125, 30, 9
LTEXT "Ag&uardar", IDC_WAITTEXT, 14, 125, 30, 9
EDITTEXT IDC_SCREENS_TIMEDELAY, 46, 123, 32, 13, ES_RIGHT | WS_GROUP
CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13

2
dll/cpl/desk/lang/ro-RO.rc
View file

@ -151,7 +151,7 @@ BEGIN
COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12
GROUPBOX "Compatibilitate", -1, 7, 67, 237, 97
LTEXT "Unele programe pot funcționa anormal dacă sunt aduse modificări în configurația culorilor fără a reporni apoi calculatorul.\r\n\nDupă efectuarea unor modificări:", -1, 12, 78, 228, 34
LTEXT "Unele programe pot funcționa anormal dacă sunt aduse modificări în configurația culorilor fără a reporni apoi calculatorul.\n\nDupă efectuarea unor modificări:", -1, 12, 78, 228, 34
AUTORADIOBUTTON "&Repornește calculatorul pentru a aplica noua configurație", IDC_RESTART_RB, 14, 116, 228, 10
AUTORADIOBUTTON "Aplică noua &configurație fără a reporni calculatorul", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
AUTORADIOBUTTON "Solicită-mi &decizia la momentul aplicării noii configurații", IDC_ASKME_RB, 14, 146, 228, 10

2
dll/cpl/desk/lang/ru-RU.rc
View file

@ -146,7 +146,7 @@ BEGIN
COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12
GROUPBOX "Совместимость", -1, 7, 67, 237, 97
LTEXT "Некоторые программы могут работать неправильно, если вы не перезагрузите компьютер после изменения параметров экрана.\r\n\nПосле изменения параметров экрана следует", -1, 12, 78, 228, 34
LTEXT "Некоторые программы могут работать неправильно, если вы не перезагрузите компьютер после изменения параметров экрана.\n\nПосле изменения параметров экрана следует", -1, 12, 78, 228, 34
AUTORADIOBUTTON "Пере&загрузить компьютер с новыми параметрами экрана", IDC_RESTART_RB, 14, 116, 228, 10
AUTORADIOBUTTON "&Применить новые параметры экрана без перезагрузки", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
AUTORADIOBUTTON "З&апросить перед применением новых параметров экрана", IDC_ASKME_RB, 14, 146, 228, 10

2
dll/cpl/desk/lang/sk-SK.rc
View file

@ -148,7 +148,7 @@ BEGIN
COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12
GROUPBOX "Kompatibilita", -1, 7, 67, 237, 97
LTEXT "Niektoré programy nemusia pracovať správne, ak po zmene nastavení farieb nereštartujete počítač.\r\n\nPo zmene nastavení farieb", -1, 12, 78, 228, 34
LTEXT "Niektoré programy nemusia pracovať správne, ak po zmene nastavení farieb nereštartujete počítač.\n\nPo zmene nastavení farieb", -1, 12, 78, 228, 34
AUTORADIOBUTTON "&Reštartovať počítač pred použitím nových nastavení farieb.", IDC_RESTART_RB, 14, 116, 228, 10
AUTORADIOBUTTON "Použiť &nové nastavenia farieb bez reštartovania.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
AUTORADIOBUTTON "&Opýtať sa pred použitím nových nastavení farieb.", IDC_ASKME_RB, 14, 146, 228, 10

4
dll/cpl/desk/lang/sq-AL.rc
View file

@ -1,4 +1,4 @@
/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
* DATE OF TR: 04-01-2014
*/
@ -27,7 +27,7 @@ BEGIN
CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE
GROUPBOX "&Screensaver", IDC_SCREENS_DUMMY, 8, 92, 230, 52
COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Cilësime%t", IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP
PUSHBUTTON "Cilësime&t", IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP
PUSHBUTTON "Pre&view", IDC_SCREENS_TESTSC, 175, 103, 50, 13
LTEXT "Prit", IDC_WAITTEXT, 14, 125, 20, 9
EDITTEXT IDC_SCREENS_TIMEDELAY, 36, 123, 32, 13, ES_RIGHT | WS_GROUP

2
dll/cpl/desk/lang/tr-TR.rc
View file

@ -148,7 +148,7 @@ BEGIN
COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12
GROUPBOX "Uyumluluk", -1, 7, 67, 237, 97
LTEXT "Eğer renk ayarlarını değiştirdiğinizden sonra bilgisayarınızı yeniden başlatmazsanız birtakım izlenceler yanlış çalışır.\r\n\nRenk ayarlarını değiştirdikten sonra:", -1, 12, 78, 228, 34
LTEXT "Eğer renk ayarlarını değiştirdiğinizden sonra bilgisayarınızı yeniden başlatmazsanız birtakım izlenceler yanlış çalışır.\n\nRenk ayarlarını değiştirdikten sonra:", -1, 12, 78, 228, 34
AUTORADIOBUTTON "&yeni renk ayarları uygulanmadan önce bilgisayarı yeniden başlat.", IDC_RESTART_RB, 14, 116, 228, 10
AUTORADIOBUTTON "y&eniden başlatmadan yeni renk ayarlarını uygula.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
AUTORADIOBUTTON "ye&ni renk ayarlarıuygulanmadan önce bana sor.", IDC_ASKME_RB, 14, 146, 228, 10

2
dll/cpl/desk/lang/uk-UA.rc
View file

@ -154,7 +154,7 @@ BEGIN
COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12
GROUPBOX "Сумісність", -1, 7, 67, 237, 97
LTEXT "Деякі програми працюватимуть неправильно, якщо ви не перезавантажите комп'ютер після зміни параметрів кольору.\r\n\nПісля зміни параметрів кольору слід", -1, 12, 78, 228, 34
LTEXT "Деякі програми працюватимуть неправильно, якщо ви не перезавантажите комп'ютер після зміни параметрів кольору.\n\nПісля зміни параметрів кольору слід", -1, 12, 78, 228, 34
AUTORADIOBUTTON "&Перезавантажити комп'ютер із новими параметрами кольору.", IDC_RESTART_RB, 14, 116, 228, 10
AUTORADIOBUTTON "&Застосувати нові параметри кольору без перезавантаження.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
AUTORADIOBUTTON "Запитати перед застосуванням нових параметрів кольору.", IDC_ASKME_RB, 14, 146, 228, 10

2
dll/cpl/desk/lang/zh-CN.rc
View file

@ -154,7 +154,7 @@ BEGIN
COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12
GROUPBOX "兼容性", -1, 7, 67, 237, 97
LTEXT "如果在更改颜色设置后不立即重新启动计算机，某些程序可能无法正常工作。\r\n\n更改显示设置后:", -1, 12, 78, 228, 34
LTEXT "如果在更改颜色设置后不立即重新启动计算机，某些程序可能无法正常工作。\n\n更改显示设置后:", -1, 12, 78, 228, 34
AUTORADIOBUTTON "在应用新的颜色设置之前重新启动计算机。(&R)", IDC_RESTART_RB, 14, 116, 228, 10
AUTORADIOBUTTON "应用新的颜色设置而不重新启动。(&P)", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
AUTORADIOBUTTON "在应用新颜色设置之前询问我。(&K)", IDC_ASKME_RB, 14, 146, 228, 10

2
dll/cpl/desk/lang/zh-TW.rc
View file

@ -149,7 +149,7 @@ BEGIN
COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12
GROUPBOX "相容性", -1, 7, 67, 237, 97
LTEXT "如果在更改顏色設定後不立即重新啟動電腦，某些程式可能無法正常工作。\r\n\n更改顯示設定後:", -1, 12, 78, 228, 34
LTEXT "如果在更改顏色設定後不立即重新啟動電腦，某些程式可能無法正常工作。\n\n更改顯示設定後:", -1, 12, 78, 228, 34
AUTORADIOBUTTON "在應用新的顯示設定之前重新啟動電腦(&R)", IDC_RESTART_RB, 14, 116, 228, 10
AUTORADIOBUTTON "應用新的顯示設定而不重新啟動電腦(&P)", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
AUTORADIOBUTTON "在應用新的顯示設定之前詢問(&K)", IDC_ASKME_RB, 14, 146, 228, 10

3
dll/cpl/desk/screensaver.c
View file

@ -236,6 +236,9 @@ ScreensaverConfig(HWND hwndDlg, PDATA pData)
if (WaitForSettingsDialog(hwndDlg, pi.hProcess))
SetScreenSaverPreviewBox(hwndDlg, pData);
CloseHandle(pi.hProcess);
CloseHandle(pi.hThread);
}
}

8
dll/cpl/desk/theme.c
View file

@ -707,7 +707,7 @@ EnumThemeStyles(IN LPCWSTR pszThemeFileName, IN ENUMTHEMESTYLE pfnEnumTheme)
PTHEME LoadTheme(IN LPCWSTR pszThemeFileName,IN LPCWSTR pszThemeName)
{
PTHEME pTheme = CreateTheme(pszThemeFileName, pszThemeName);
if (pTheme == NULL)
if (pTheme == NULL)
return NULL;
pTheme->SizesList = EnumThemeStyles( pszThemeFileName, (ENUMTHEMESTYLE)EnumThemeSizes);
@ -784,11 +784,11 @@ LoadThemes(VOID)
}
/*
* FindSelectedTheme: Finds the specified theme in the list of themes
* FindSelectedTheme: Finds the specified theme in the list of themes
* or loads it if it was not loaded already.
*/
BOOL
FindOrAppendTheme(IN PTHEME pThemeList,
FindOrAppendTheme(IN PTHEME pThemeList,
IN LPCWSTR pwszThemeFileName,
IN LPCWSTR pwszColorBuff,
IN LPCWSTR pwszSizeBuff,
@ -855,7 +855,7 @@ GetActiveTheme(IN PTHEME pThemeList, OUT PTHEME_SELECTION pSelectedTheme)
MAX_PATH,
szSizeBuff,
MAX_PATH);
if (FAILED(hret))
if (FAILED(hret))
return FALSE;
return FindOrAppendTheme(pThemeList, szThemeFileName, szColorBuff, szSizeBuff, pSelectedTheme);