Prepare dlls/{comctl32,gdi,msvideo,setupapi,shell32,twain,winmm} for
the conversion of HWND to a void*.
diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index d560457..5967a0e 100644
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -459,7 +459,7 @@
static inline BOOL COMBOEX_HasEdit(COMBOEX_INFO *infoPtr)
{
- return infoPtr->hwndEdit;
+ return infoPtr->hwndEdit ? TRUE : FALSE;
}
@@ -921,7 +921,7 @@
infoPtr->unicode = IsWindowUnicode (hwnd);
- i = SendMessageW(GetParent (hwnd), WM_NOTIFYFORMAT, hwnd, NF_QUERY);
+ i = SendMessageW(GetParent (hwnd), WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY);
if ((i != NFR_ANSI) && (i != NFR_UNICODE)) {
WARN("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n", i);
i = NFR_ANSI;
@@ -1571,7 +1571,7 @@
{
if (lParam == NF_REQUERY) {
INT i = SendMessageW(GetParent (infoPtr->hwndSelf),
- WM_NOTIFYFORMAT, infoPtr->hwndSelf, NF_QUERY);
+ WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY);
infoPtr->NtfUnicode = (i == NFR_UNICODE) ? 1 : 0;
}
return infoPtr->NtfUnicode ? NFR_UNICODE : NFR_ANSI;
@@ -2057,7 +2057,7 @@
SendMessageW ( GetParent(infoPtr->hwndSelf), WM_COMMAND,
MAKEWPARAM(GetDlgCtrlID (infoPtr->hwndSelf),
CBN_EDITCHANGE),
- infoPtr->hwndSelf);
+ (LPARAM)infoPtr->hwndSelf);
return 0;
}
@@ -2125,10 +2125,10 @@
return COMBOEX_DeleteItem (infoPtr, wParam);
case CBEM_GETCOMBOCONTROL:
- return infoPtr->hwndCombo;
+ return (LRESULT)infoPtr->hwndCombo;
case CBEM_GETEDITCONTROL:
- return infoPtr->hwndEdit;
+ return (LRESULT)infoPtr->hwndEdit;
case CBEM_GETEXTENDEDSTYLE:
return infoPtr->dwExtStyle;