Fixed some handle conversions for -DSTRICT.
diff --git a/dlls/commdlg/colordlg.c b/dlls/commdlg/colordlg.c
index 8846ab5..5c6a5ba 100644
--- a/dlls/commdlg/colordlg.c
+++ b/dlls/commdlg/colordlg.c
@@ -478,7 +478,7 @@
points[2].y = points[0].y - w;
points[2].x = points[1].x = points[0].x + w;
- FillRect(hDC, &lpp->old3angle, GetClassLongA( hwnd, GCL_HBRBACKGROUND));
+ FillRect(hDC, &lpp->old3angle, (HBRUSH)GetClassLongA( hwnd, GCL_HBRBACKGROUND));
lpp->old3angle.left = points[0].x;
lpp->old3angle.right = points[1].x + 1;
lpp->old3angle.top = points[2].y - 1;
@@ -735,7 +735,7 @@
hdc = GetDC(hwnd);
GetClientRect(hwnd, &rect);
- FillRect(hdc, &rect, GetClassLongA(hwnd, GCL_HBRBACKGROUND));
+ FillRect(hdc, &rect, (HBRUSH)GetClassLongA(hwnd, GCL_HBRBACKGROUND));
for ( j = 0; j < rows; j++ )
{
for ( i = 0; i < cols; i++ )
@@ -779,7 +779,7 @@
hdc = GetDC(hwnd);
if (hdc)
{
- FillRect(hdc, &rect, GetClassLongA(hwnd, GCL_HBRBACKGROUND) );
+ FillRect(hdc, &rect, (HBRUSH)GetClassLongA(hwnd, GCL_HBRBACKGROUND) );
for (j = 0; j < rows; j++)
{
for (i = 0; i < cols; i++)
diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c
index 066e0cd..e068f72 100644
--- a/dlls/commdlg/filedlg.c
+++ b/dlls/commdlg/filedlg.c
@@ -1045,7 +1045,7 @@
lpdis->itemAction = lpdis16->itemAction;
lpdis->itemState = lpdis16->itemState;
lpdis->hwndItem = HWND_32(lpdis16->hwndItem);
- lpdis->hDC = lpdis16->hDC;
+ lpdis->hDC = HDC_32(lpdis16->hDC);
lpdis->rcItem.right = lpdis16->rcItem.right;
lpdis->rcItem.left = lpdis16->rcItem.left;
lpdis->rcItem.top = lpdis16->rcItem.top;
diff --git a/dlls/commdlg/fontdlg.c b/dlls/commdlg/fontdlg.c
index e87a379..b3551a6 100644
--- a/dlls/commdlg/fontdlg.c
+++ b/dlls/commdlg/fontdlg.c
@@ -721,7 +721,7 @@
/* This font will be deleted by WM_COMMAND */
SendDlgItemMessageA(hDlg,stc6,WM_SETFONT,
- CreateFontA(0, 0, 1, 1, 400, 0, 0, 0, 0, 0, 0, 0, 0, NULL),FALSE);
+ (WPARAM)CreateFontA(0, 0, 1, 1, 400, 0, 0, 0, 0, 0, 0, 0, 0, NULL),FALSE);
if (!(lpcf->Flags & CF_SHOWHELP) || !IsWindow(lpcf->hwndOwner))
ShowWindow(GetDlgItem(hDlg,pshHelp),SW_HIDE);
@@ -962,7 +962,7 @@
if (GetDlgCtrlID(HWND_32(LOWORD(lParam)))==stc6)
{
SetTextColor((HDC)wParam, lpcf->rgbColors);
- return GetStockObject(WHITE_BRUSH);
+ return (LRESULT)GetStockObject(WHITE_BRUSH);
}
return 0;
}
@@ -1065,9 +1065,9 @@
hFont=CreateFontIndirectA(lpxx);
if (hFont)
{
- HFONT oldFont=SendDlgItemMessageA(hDlg, stc6,
+ HFONT oldFont=(HFONT)SendDlgItemMessageA(hDlg, stc6,
WM_GETFONT, 0, 0);
- SendDlgItemMessageA(hDlg,stc6,WM_SETFONT,hFont,TRUE);
+ SendDlgItemMessageA(hDlg,stc6,WM_SETFONT,(WPARAM)hFont,TRUE);
DeleteObject(oldFont);
}
}
@@ -1109,7 +1109,7 @@
static LRESULT CFn_WMDestroy(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- DeleteObject(SendDlgItemMessageA(hwnd, stc6, WM_GETFONT, 0, 0));
+ DeleteObject((HFONT)SendDlgItemMessageA(hwnd, stc6, WM_GETFONT, 0, 0));
return TRUE;
}
@@ -1177,7 +1177,7 @@
dis.itemAction = dis16->itemAction;
dis.itemState = dis16->itemState;
dis.hwndItem = HWND_32(dis16->hwndItem);
- dis.hDC = dis16->hDC;
+ dis.hDC = HDC_32(dis16->hDC);
dis.itemData = dis16->itemData;
CONV_RECT16TO32( &dis16->rcItem, &dis.rcItem );
res = CFn_WMDrawItem(hDlg, wParam, (LPARAM)&dis);
@@ -1185,7 +1185,7 @@
break;
case WM_CTLCOLOR:
if (HIWORD(lParam) == CTLCOLOR_STATIC)
- res=CFn_WMCtlColorStatic(hDlg, (HDC)wParam, LOWORD(lParam), lpcf32a);
+ res=CFn_WMCtlColorStatic(hDlg, wParam, LOWORD(lParam), lpcf32a);
break;
case WM_COMMAND:
res=CFn_WMCommand(hDlg, MAKEWPARAM( wParam, HIWORD(lParam) ), LOWORD(lParam), lpcf32a);
diff --git a/dlls/commdlg/printdlg.c b/dlls/commdlg/printdlg.c
index 74582dc..2087e17 100644
--- a/dlls/commdlg/printdlg.c
+++ b/dlls/commdlg/printdlg.c
@@ -2301,15 +2301,15 @@
DEVMODEA *pdm = GlobalLock16(lppd->hDevMode);
if(lppd->Flags & PD_RETURNDC) {
- lppd->hDC = CreateDCA((char*)pdn + pdn->wDriverOffset,
+ lppd->hDC = HDC_16(CreateDCA((char*)pdn + pdn->wDriverOffset,
(char*)pdn + pdn->wDeviceOffset,
(char*)pdn + pdn->wOutputOffset,
- pdm );
+ pdm ));
} else if(lppd->Flags & PD_RETURNIC) {
- lppd->hDC = CreateICA((char*)pdn + pdn->wDriverOffset,
+ lppd->hDC = HDC_16(CreateICA((char*)pdn + pdn->wDriverOffset,
(char*)pdn + pdn->wDeviceOffset,
(char*)pdn + pdn->wOutputOffset,
- pdm );
+ pdm ));
}
GlobalUnlock16(lppd->hDevNames);
GlobalUnlock16(lppd->hDevMode);
@@ -2343,7 +2343,7 @@
{
BOOL bRet = FALSE;
LPVOID ptr;
- HINSTANCE hInst = GetWindowLongA( lppd->hwndOwner, GWL_HINSTANCE );
+ HINSTANCE hInst = (HINSTANCE)GetWindowLongA( lppd->hwndOwner, GWL_HINSTANCE );
if(TRACE_ON(commdlg)) {
char flagstr[1000] = "";
@@ -2499,7 +2499,7 @@
{
BOOL bRet = FALSE;
LPVOID ptr;
- HINSTANCE hInst = GetWindowLongA( lppd->hwndOwner, GWL_HINSTANCE );
+ HINSTANCE hInst = (HINSTANCE)GetWindowLongA( lppd->hwndOwner, GWL_HINSTANCE );
if(TRACE_ON(commdlg)) {
char flagstr[1000] = "";
@@ -2666,7 +2666,7 @@
) {
BOOL bRet = FALSE;
LPVOID ptr;
- HINSTANCE hInst = GetWindowLongA( HWND_32(lppd->hwndOwner), GWL_HINSTANCE );
+ HINSTANCE hInst = (HINSTANCE)GetWindowLongA( HWND_32(lppd->hwndOwner), GWL_HINSTANCE );
if(TRACE_ON(commdlg)) {
char flagstr[1000] = "";
