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 0aad98943b0..9f46aed4df5 100644
Binary files a/reactos/dll/cpl/sysdm/resources/gpl.txt and b/reactos/dll/cpl/sysdm/resources/gpl.txt differ