From e415cd9e65c4214ca63013c26daa41707402ba1f Mon Sep 17 00:00:00 2001 From: Dmitry Gorbachev Date: Sun, 14 Dec 2008 20:45:16 +0000 Subject: [PATCH] - Use HEAP_ZERO_MEMORY instead of memset(). - Do not crash if no adapter found. svn path=/trunk/; revision=38083 --- reactos/dll/cpl/desk/desk.c | 2 +- reactos/dll/cpl/desk/settings.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/dll/cpl/desk/desk.c b/reactos/dll/cpl/desk/desk.c index c6784f48ade..eb136076d0d 100644 --- a/reactos/dll/cpl/desk/desk.c +++ b/reactos/dll/cpl/desk/desk.c @@ -162,7 +162,7 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) InitPropSheetPage(&psh, PropPages[i].idDlg, PropPages[i].DlgProc, PropPages[i].Callback); } - /* NOTE: Don;t call SHAddFromPropSheetExtArray here because this applet only allows + /* NOTE: Don't call SHAddFromPropSheetExtArray here because this applet only allows replacing the background page but not extending the applet by more pages */ ret = (LONG)(PropertySheet(&psh) != -1); diff --git a/reactos/dll/cpl/desk/settings.c b/reactos/dll/cpl/desk/settings.c index d508a530c3a..134f9dc1c0e 100644 --- a/reactos/dll/cpl/desk/settings.c +++ b/reactos/dll/cpl/desk/settings.c @@ -151,8 +151,7 @@ AddDisplayDevice(IN PGLOBAL_DATA pGlobalData, IN const DISPLAY_DEVICE *DisplayDe DWORD ResolutionsCount = 1; DWORD i; - newEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(DISPLAY_DEVICE_ENTRY)); - memset(newEntry, 0, sizeof(DISPLAY_DEVICE_ENTRY)); + newEntry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DISPLAY_DEVICE_ENTRY)); if (!newEntry) goto ByeBye; newEntry->Settings = GetPossibleSettings(DisplayDevice->DeviceName, &newEntry->SettingsCount, &newEntry->CurrentSettings); @@ -311,6 +310,7 @@ OnInitDialog(IN HWND hwndDlg) EnableWindow(GetDlgItem(hwndDlg, IDC_SETTINGS_RESOLUTION), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SETTINGS_RESOLUTION_TEXT), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SETTINGS_ADVANCED), FALSE); + ShowWindow(GetDlgItem(hwndDlg, IDC_SETTINGS_SPECTRUM), SW_HIDE); } else if (Result == 1) {