From 5252fd982387af9662aca07eaafff66d114a72d0 Mon Sep 17 00:00:00 2001 From: Colin Finck Date: Mon, 23 Jul 2007 11:48:55 +0000 Subject: [PATCH] - Get rid of an unneeded variable in GetSystemInformation - Minor changes to the GetProcNameString function - Fix unselecting the license text. EM_SETSEL only works after the edit control has been drawn, so we cannot send this message in the WM_INITDIALOG message handler. Instead we use PostMessage now. See KB96674 for more details. - Downloaded the latest GPL 2.0 text from the GNU website and use that as the "gpl.txt" now. Now we don't have these annoying "box" characters in the license dialog box anymore. svn path=/trunk/; revision=27786 --- reactos/dll/cpl/sysdm/general.c | 43 ++++++++++-------------- reactos/dll/cpl/sysdm/licence.c | 9 +++-- reactos/dll/cpl/sysdm/resources/gpl.txt | Bin 37328 -> 36652 bytes 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/reactos/dll/cpl/sysdm/general.c b/reactos/dll/cpl/sysdm/general.c index c31dbddf694..99b916cb61d 100644 --- a/reactos/dll/cpl/sysdm/general.c +++ b/reactos/dll/cpl/sysdm/general.c @@ -193,11 +193,9 @@ SetProcNameString(HWND hwnd, HeapFree(GetProcessHeap(), 0, lpBuf); - - return Ret; } - return 0; + return Ret; } static VOID @@ -251,7 +249,6 @@ GetSystemInformation(HWND hwnd) TCHAR ProcKey[] = _T("HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0"); MEMORYSTATUSEX MemStat; TCHAR Buf[32]; - INT Ret = 0; INT CurMachineLine = IDC_MACHINELINE1; @@ -266,22 +263,21 @@ GetSystemInformation(HWND hwnd) KEY_READ, &hKey) == ERROR_SUCCESS) { - SetRegTextData(hwnd, - hKey, - _T("VendorIdentifier"), + SetRegTextData(hwnd, + hKey, + _T("VendorIdentifier"), CurMachineLine); CurMachineLine++; - Ret = SetProcNameString(hwnd, - hKey, - _T("ProcessorNameString"), - CurMachineLine, - CurMachineLine+1); - CurMachineLine += Ret; + CurMachineLine += SetProcNameString(hwnd, + hKey, + _T("ProcessorNameString"), + CurMachineLine, + CurMachineLine + 1); - SetProcSpeed(hwnd, - hKey, - _T("~MHz"), + SetProcSpeed(hwnd, + hKey, + _T("~MHz"), CurMachineLine); CurMachineLine++; } @@ -316,7 +312,6 @@ GetSystemInformation(HWND hwnd) if (MemStat.ullTotalPhys > 1024 * 1024) { /* We're dealing with PBs or more */ - MemStat.ullTotalPhys /= 1024; i++; @@ -336,16 +331,14 @@ GetSystemInformation(HWND hwnd) if (LoadString(hApplet, uStrId[i], szStr, sizeof(szStr) / sizeof(szStr[0]))) { - Ret = _stprintf(Buf, _T("%.2f %s"), dTotalPhys, szStr); + if( _stprintf(Buf, _T("%.2f %s"), dTotalPhys, szStr) ) + { + SetDlgItemText(hwnd, + CurMachineLine, + Buf); + } } } - - if (Ret) - { - SetDlgItemText(hwnd, - CurMachineLine, - Buf); - } } diff --git a/reactos/dll/cpl/sysdm/licence.c b/reactos/dll/cpl/sysdm/licence.c index 13dadbc3db7..946e709897f 100644 --- a/reactos/dll/cpl/sysdm/licence.c +++ b/reactos/dll/cpl/sysdm/licence.c @@ -55,11 +55,10 @@ LicenceDlgProc(HWND hDlg, IDC_LICENCEEDIT, LicenseText); - SendDlgItemMessage(hDlg, - IDC_LICENCEEDIT, - EM_SETSEL, - -1, - 0); + PostMessage(GetDlgItem(hDlg, IDC_LICENCEEDIT), + EM_SETSEL, + -1, + 0); return TRUE; } diff --git a/reactos/dll/cpl/sysdm/resources/gpl.txt b/reactos/dll/cpl/sysdm/resources/gpl.txt index 0aad98943b080d4e74d3ebe498ccbe5ce478e3a8..9f46aed4df54e421d48a2e07c9a92a9692ae12d7 100644 GIT binary patch delta 1928 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