[ros-diffs] [rharabien] 52451: [OLE32][SYSDM][DESK] - Fix MSVC warnings

[rharabien at svn.reactos.org]

Author: rharabien
Date: Sat Jun 25 13:49:48 2011
New Revision: 52451

URL: http://svn.reactos.org/svn/reactos?rev=52451&view=rev
Log:
[OLE32][SYSDM][DESK]
- Fix MSVC warnings

Modified:
    trunk/reactos/dll/cpl/desk/advappdlg.c
    trunk/reactos/dll/cpl/desk/theme.h
    trunk/reactos/dll/cpl/sysdm/precomp.h
    trunk/reactos/dll/cpl/sysdm/virtmem.c
    trunk/reactos/dll/win32/ole32/ole32.spec

Modified: trunk/reactos/dll/cpl/desk/advappdlg.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?rev=52451&r1=52450&r2=52451&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/advappdlg.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/advappdlg.c [iso-8859-1] Sat Jun 25 13:49:48 2011
@@ -276,8 +276,8 @@
 	if (g_Assignment[g->CurrentElement].Font != -1)
 	{
 		g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfHeight = -MulDiv(GetDlgItemInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E, &bTranslated, FALSE), GetDeviceCaps(hdcDlg, LOGPIXELSY), 72);
-		g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfWeight = (SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTBOLD, BM_GETCHECK, 0, 0) == 1)?FW_BOLD:FW_NORMAL;
-		g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfItalic = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC, BM_GETCHECK, 0, 0);
+		g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfWeight = (SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTBOLD, BM_GETCHECK, 0, 0) == 1) ? FW_BOLD : FW_NORMAL;
+		g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfItalic = (BYTE)SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC, BM_GETCHECK, 0, 0);
 		GetDlgItemText(hwndDlg, IDC_ADVAPPEARANCE_FONT_C, g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfFaceName, LF_FACESIZE * sizeof(TCHAR));
 	}
 

Modified: trunk/reactos/dll/cpl/desk/theme.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/theme.h?rev=52451&r1=52450&r2=52451&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/theme.h [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/theme.h [iso-8859-1] Sat Jun 25 13:49:48 2011
@@ -64,7 +64,7 @@
 {
 	COLORREF crColor[NUM_COLORS];
 	LOGFONT lfFont[NUM_FONTS];
-	UINT64 Size[NUM_SIZES];
+	INT Size[NUM_SIZES];
 	BOOL bFlatMenus;
 	EFFECTS Effects;
 } THEME;

Modified: trunk/reactos/dll/cpl/sysdm/precomp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/precomp.h?rev=52451&r1=52450&r2=52451&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/precomp.h [iso-8859-1] Sat Jun 25 13:49:48 2011
@@ -49,11 +49,11 @@
 
 typedef struct _PAGEFILE
 {
-    TCHAR szDrive[3];
-    INT   InitialSize;
-    INT   MaximumSize;
-    INT   FreeSize;
-    BOOL  bUsed;
+    TCHAR  szDrive[3];
+    UINT   InitialSize;
+    UINT   MaximumSize;
+    UINT   FreeSize;
+    BOOL   bUsed;
 } PAGEFILE, *PPAGEFILE;
 
 typedef struct _VIRTMEM

Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?rev=52451&r1=52450&r2=52451&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/virtmem.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/virtmem.c [iso-8859-1] Sat Jun 25 13:49:48 2011
@@ -206,8 +206,7 @@
     HKEY hk = NULL;
     TCHAR szPagingFiles[2048];
     TCHAR szText[256];
-    INT i;
-    INT nPos = 0;
+    INT i, nPos = 0;
     BOOL bErr = TRUE;
 
     for (i = 0; i < pVirtMem->Count; ++i)
@@ -312,7 +311,7 @@
                                      LB_GETCURSEL,
                                      0,
                                      0);
-    if (Index < pVirtMem->Count)
+    if (Index >= 0 && Index < pVirtMem->Count)
     {
         /* check if custom settings are checked */
         if (IsDlgButtonChecked(pVirtMem->hSelf,
@@ -463,8 +462,8 @@
         if (GetDiskFreeSpaceEx(pVirtMem->Pagefile[Index].szDrive,
                                NULL, NULL, &FreeBytes))
         {
-            pVirtMem->Pagefile[Index].FreeSize = FreeBytes.QuadPart >> 20;
-            _stprintf(szBuffer, _T("%I64u MB"), FreeBytes.QuadPart / (1024 * 1024));
+            pVirtMem->Pagefile[Index].FreeSize = (UINT)(FreeBytes.QuadPart / (1024 * 1024));
+            _stprintf(szBuffer, _T("%I64u MB"), pVirtMem->Pagefile[Index].FreeSize);
             SetDlgItemText(hwndDlg, IDC_SPACEAVAIL, szBuffer);
         }
 

Modified: trunk/reactos/dll/win32/ole32/ole32.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec?rev=52451&r1=52450&r2=52451&view=diff
==============================================================================
--- trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] Sat Jun 25 13:49:48 2011
@@ -98,7 +98,7 @@
 @ stdcall CreatePointerMoniker(ptr ptr)
 @ stdcall CreateStreamOnHGlobal(ptr long ptr)
 @ stdcall DllDebugObjectRPCHook(long ptr)
-@ stdcall DllGetClassObject (ptr ptr ptr)
+@ stdcall -private DllGetClassObject (ptr ptr ptr)
 @ stub DllGetClassObjectWOW
 @ stdcall -private DllRegisterServer()
 @ stdcall -private DllUnregisterServer()