ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 04:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OLE32][SYSDM][DESK]

Browse Source 
- Fix MSVC warnings

svn path=/trunk/; revision=52451
This commit is contained in:
Rafal Harabien
2011-06-25 13:49:48 +00:00
parent a40188b18a
commit de4cc449db
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/cpl/desk/advappdlg.c
+2 -2
View File
@@ -276,8 +276,8 @@ SaveCurrentValues(HWND hwndDlg, GLOBALS *g)
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));
}
reactos/dll/cpl/desk/theme.h
+1 -1
View File
@@ -64,7 +64,7 @@ typedef struct
{
COLORREF crColor[NUM_COLORS];
LOGFONT lfFont[NUM_FONTS];
UINT64 Size[NUM_SIZES];
INT Size[NUM_SIZES];
BOOL bFlatMenus;
EFFECTS Effects;
} THEME;
reactos/dll/cpl/sysdm/precomp.h
+5 -5
View File
@@ -49,11 +49,11 @@ INT_PTR CALLBACK LicenceDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
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
reactos/dll/cpl/sysdm/virtmem.c
+4 -5
View File
@@ -206,8 +206,7 @@ WritePageFileSettings(PVIRTMEM pVirtMem)
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 @@ OnSet(PVIRTMEM pVirtMem)
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 @@ OnSelChange(HWND hwndDlg, PVIRTMEM pVirtMem)
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);
}
reactos/dll/win32/ole32/ole32.spec
+1 -1
View File
@@ -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()