Hello,
License: LGPL, X11
Changelog:
Michael Stefaniuc <mstefani@redhat.com>
- prepare dlls/{comctl32,gdi,msvideo,setupapi,shell32,twain,winmm}
for the conversion of HWND to a void*
bye
michael
--
Michael Stefaniuc Tel.: +49-711-96437-199
System Administration Fax.: +49-711-96437-111
Red Hat GmbH Email: mstefani@redhat.com
Hauptstaetterstr. 58 http://www.redhat.de/
D-70178 Stuttgart
Index: dlls/comctl32/animate.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/animate.c,v
retrieving revision 1.39
diff -u -r1.39 animate.c
--- dlls/comctl32/animate.c 16 Jul 2002 01:23:59 -0000 1.39
+++ dlls/comctl32/animate.c 5 Sep 2002 00:07:05 -0000
@@ -385,7 +385,9 @@
hDC = GetDC(infoPtr->hWnd);
/* sometimes the animation window will be destroyed in between
* by the main program, so a ReleaseDC() error msg is possible */
- infoPtr->hbrushBG = SendMessageA(GetParent(infoPtr->hWnd),WM_CTLCOLORSTATIC,hDC, infoPtr->hWnd);
+ infoPtr->hbrushBG = SendMessageA(GetParent(infoPtr->hWnd),
+ WM_CTLCOLORSTATIC, hDC,
+ (LPARAM)infoPtr->hWnd);
ReleaseDC(infoPtr->hWnd,hDC);
}
@@ -814,7 +816,8 @@
if(GetWindowLongA(hWnd, GWL_STYLE) & ACS_TRANSPARENT)
{
- hBrush = SendMessageA(GetParent(hWnd),WM_CTLCOLORSTATIC,(HDC)wParam, hWnd);
+ hBrush = SendMessageA(GetParent(hWnd),WM_CTLCOLORSTATIC,(HDC)wParam,
+ (LPARAM)hWnd);
}
GetClientRect(hWnd, &rect);
@@ -871,7 +874,8 @@
if (GetWindowLongA(hWnd, GWL_STYLE) & ACS_TRANSPARENT)
{
ANIMATE_INFO* infoPtr = ANIMATE_GetInfoPtr(hWnd);
- infoPtr->hbrushBG = SendMessageA(GetParent(hWnd),WM_CTLCOLORSTATIC,(HDC)wParam, hWnd);
+ infoPtr->hbrushBG = SendMessageA(GetParent(hWnd), WM_CTLCOLORSTATIC,
+ (HDC)wParam, (LPARAM)hWnd);
}
return ANIMATE_DrawFrame(ANIMATE_GetInfoPtr(hWnd));
@@ -890,7 +894,7 @@
if (GetWindowLongA(hWnd, GWL_STYLE) & ACS_TRANSPARENT)
infoPtr->hbrushBG = SendMessageA(GetParent(hWnd), WM_CTLCOLORSTATIC,
- (HDC)wParam, hWnd);
+ (HDC)wParam, (LPARAM)hWnd);
if (wParam)
{
Index: dlls/comctl32/comboex.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comboex.c,v
retrieving revision 1.52
diff -u -r1.52 comboex.c
--- dlls/comctl32/comboex.c 30 Aug 2002 00:02:20 -0000 1.52
+++ dlls/comctl32/comboex.c 5 Sep 2002 00:07:06 -0000
@@ -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;
Index: dlls/comctl32/comctl32undoc.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl32undoc.c,v
retrieving revision 1.65
diff -u -r1.65 comctl32undoc.c
--- dlls/comctl32/comctl32undoc.c 16 Aug 2002 01:43:11 -0000 1.65
+++ dlls/comctl32/comctl32undoc.c 5 Sep 2002 00:07:07 -0000
@@ -2318,7 +2318,7 @@
if (!lpNotify->hwndTo)
return 0;
- if (lpNotify->hwndFrom == -1) {
+ if (lpNotify->hwndFrom == (HWND)-1) {
lpNmh = lpHdr;
idFrom = lpHdr->idFrom;
}
Index: dlls/comctl32/commctrl.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/commctrl.c,v
retrieving revision 1.53
diff -u -r1.53 commctrl.c
--- dlls/comctl32/commctrl.c 9 Aug 2002 01:07:29 -0000 1.53
+++ dlls/comctl32/commctrl.c 5 Sep 2002 00:07:07 -0000
@@ -559,7 +559,7 @@
CreateWindowA (UPDOWN_CLASSA, 0, style, x, y, cx, cy,
parent, id, inst, 0);
if (hUD) {
- SendMessageA (hUD, UDM_SETBUDDY, buddy, 0);
+ SendMessageA (hUD, UDM_SETBUDDY, (WPARAM)buddy, 0);
SendMessageA (hUD, UDM_SETRANGE, 0, MAKELONG(maxVal, minVal));
SendMessageA (hUD, UDM_SETPOS, 0, MAKELONG(curVal, 0));
}
Index: dlls/comctl32/datetime.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/datetime.c,v
retrieving revision 1.30
diff -u -r1.30 datetime.c
--- dlls/comctl32/datetime.c 16 Jul 2002 01:23:59 -0000 1.30
+++ dlls/comctl32/datetime.c 5 Sep 2002 00:07:08 -0000
@@ -200,7 +200,7 @@
DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
TRACE("\n");
- return infoPtr->hMonthCal;
+ return (LRESULT)infoPtr->hMonthCal;
}
Index: dlls/comctl32/listview.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/listview.c,v
retrieving revision 1.137
diff -u -r1.137 listview.c
--- dlls/comctl32/listview.c 29 Aug 2002 23:58:42 -0000 1.137
+++ dlls/comctl32/listview.c 5 Sep 2002 00:07:12 -0000
@@ -4395,7 +4395,7 @@
static LRESULT LISTVIEW_GetEditControl(HWND hwnd)
{
LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
- return infoPtr->hwndEdit;
+ return (LRESULT)infoPtr->hwndEdit;
}
@@ -5221,7 +5221,7 @@
{
LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
- return infoPtr->hwndHeader;
+ return (LRESULT)infoPtr->hwndHeader;
}
/* LISTVIEW_GetHotCursor */
@@ -7024,7 +7024,7 @@
member. See comments for LISTVIEW_InsertCompare() for greater detail */
nItem = DPA_InsertPtr( infoPtr->hdpaItems,
GETITEMCOUNT( infoPtr ) + 1, hdpaSubItems );
- DPA_Sort( infoPtr->hdpaItems, LISTVIEW_InsertCompare, hwnd );
+ DPA_Sort( infoPtr->hdpaItems, LISTVIEW_InsertCompare, (LPARAM)hwnd );
nItem = DPA_GetPtrIndex( infoPtr->hdpaItems, hdpaSubItems );
}
else
@@ -8135,7 +8135,7 @@
infoPtr->pfnCompare = pfnCompare;
infoPtr->lParamSort = lParamSort;
- DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompare, hwnd);
+ DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompare, (LPARAM)hwnd);
/* Adjust selections and indices so that they are the way they should
* be after the sort (otherwise, the list items move around, but
@@ -9737,10 +9737,10 @@
return LISTVIEW_DeleteItem(hwnd, (INT)wParam);
case LVM_EDITLABELW:
- return LISTVIEW_EditLabelT(hwnd, (INT)wParam, TRUE);
+ return (LRESULT)LISTVIEW_EditLabelT(hwnd, (INT)wParam, TRUE);
case LVM_EDITLABELA:
- return LISTVIEW_EditLabelT(hwnd, (INT)wParam, FALSE);
+ return (LRESULT)LISTVIEW_EditLabelT(hwnd, (INT)wParam, FALSE);
case LVM_ENSUREVISIBLE:
return LISTVIEW_EnsureVisible(hwnd, (INT)wParam, (BOOL)lParam);
Index: dlls/comctl32/propsheet.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/propsheet.c,v
retrieving revision 1.68
diff -u -r1.68 propsheet.c
--- dlls/comctl32/propsheet.c 26 Aug 2002 21:47:06 -0000 1.68
+++ dlls/comctl32/propsheet.c 5 Sep 2002 00:07:13 -0000
@@ -583,7 +583,7 @@
(LPDLGTEMPLATEW) temp,
psInfo->ppshheader.hwndParent,
(DLGPROC) PROPSHEET_DialogProc,
- (LPARAM)psInfo);
+ (LPARAM)psInfo) ? TRUE : FALSE;
COMCTL32_Free(temp);
@@ -2668,7 +2668,7 @@
if (psInfo->activeValid && psInfo->active_page != -1)
hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
- SetWindowLongW(hwnd, DWL_MSGRESULT, hwndPage);
+ SetWindowLongW(hwnd, DWL_MSGRESULT, (LONG)hwndPage);
return TRUE;
}
@@ -2685,7 +2685,7 @@
{
HWND hwndTabCtrl = GetDlgItem(hwnd, IDC_TABCONTROL);
- SetWindowLongW(hwnd, DWL_MSGRESULT, hwndTabCtrl);
+ SetWindowLongW(hwnd, DWL_MSGRESULT, (LONG)hwndTabCtrl);
return TRUE;
}
Index: dlls/comctl32/rebar.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/rebar.c,v
retrieving revision 1.63
diff -u -r1.63 rebar.c
--- dlls/comctl32/rebar.c 16 Jul 2002 01:23:59 -0000 1.63
+++ dlls/comctl32/rebar.c 5 Sep 2002 00:07:15 -0000
@@ -2915,7 +2915,7 @@
inline static LRESULT
REBAR_GetToolTips (REBAR_INFO *infoPtr)
{
- return infoPtr->hwndToolTip;
+ return (LRESULT)infoPtr->hwndToolTip;
}
@@ -3878,7 +3878,7 @@
/* issue WM_NOTIFYFORMAT to get unicode status of parent */
i = SendMessageA(REBAR_GetNotifyParent (infoPtr),
- WM_NOTIFYFORMAT, hwnd, NF_QUERY);
+ WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY);
if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
i);
@@ -4001,7 +4001,7 @@
if (lParam == NF_REQUERY) {
i = SendMessageA(REBAR_GetNotifyParent (infoPtr),
- WM_NOTIFYFORMAT, infoPtr->hwndSelf, NF_QUERY);
+ WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY);
if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
i);
Index: dlls/comctl32/status.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/status.c,v
retrieving revision 1.49
diff -u -r1.49 status.c
--- dlls/comctl32/status.c 16 Jul 2002 01:23:59 -0000 1.49
+++ dlls/comctl32/status.c 5 Sep 2002 00:07:15 -0000
@@ -813,7 +813,7 @@
infoPtr->clrBk = CLR_DEFAULT;
infoPtr->hFont = 0;
- i = SendMessageW(GetParent (hwnd), WM_NOTIFYFORMAT, hwnd, NF_QUERY);
+ i = SendMessageW(GetParent (hwnd), WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY);
infoPtr->NtfUnicode = (i == NFR_UNICODE);
GetClientRect (hwnd, &rect);
@@ -1067,7 +1067,7 @@
STATUSBAR_NotifyFormat (STATUSWINDOWINFO *infoPtr, HWND from, INT cmd)
{
if (cmd == NF_REQUERY) {
- INT i = SendMessageW(from, WM_NOTIFYFORMAT, infoPtr->Self, NF_QUERY);
+ INT i = SendMessageW(from, WM_NOTIFYFORMAT, (WPARAM)infoPtr->Self, NF_QUERY);
infoPtr->NtfUnicode = (i == NFR_UNICODE);
}
return infoPtr->NtfUnicode ? NFR_UNICODE : NFR_ANSI;
Index: dlls/comctl32/tab.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/tab.c,v
retrieving revision 1.70
diff -u -r1.70 tab.c
--- dlls/comctl32/tab.c 16 Jul 2002 01:23:59 -0000 1.70
+++ dlls/comctl32/tab.c 5 Sep 2002 00:07:16 -0000
@@ -199,7 +199,7 @@
TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
if (infoPtr == NULL) return 0;
- return infoPtr->hwndToolTip;
+ return (LRESULT)infoPtr->hwndToolTip;
}
static LRESULT
@@ -499,7 +499,7 @@
return DefWindowProcA (hwnd, uMsg, wParam, lParam);
}
-static HWND TAB_InternalHitTest (
+static INT TAB_InternalHitTest (
HWND hwnd,
TAB_INFO* infoPtr,
POINT pt,
@@ -507,7 +507,7 @@
{
RECT rect;
- int iCount;
+ INT iCount;
for (iCount = 0; iCount < infoPtr->uNumItem; iCount++)
{
Index: dlls/comctl32/toolbar.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/toolbar.c,v
retrieving revision 1.119
diff -u -r1.119 toolbar.c
--- dlls/comctl32/toolbar.c 16 Jul 2002 01:23:59 -0000 1.119
+++ dlls/comctl32/toolbar.c 5 Sep 2002 00:07:18 -0000
@@ -3274,7 +3274,7 @@
if (infoPtr == NULL)
return 0;
- return infoPtr->hwndToolTip;
+ return (LRESULT)infoPtr->hwndToolTip;
}
@@ -4239,7 +4239,7 @@
hwndOldNotify = infoPtr->hwndNotify;
infoPtr->hwndNotify = (HWND)wParam;
- return hwndOldNotify;
+ return (LRESULT)hwndOldNotify;
}
@@ -5285,7 +5285,7 @@
if (lParam == NF_REQUERY) {
i = SendMessageA(GetParent(infoPtr->hwndSelf),
- WM_NOTIFYFORMAT, infoPtr->hwndSelf, NF_QUERY);
+ WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY);
if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
i);
Index: dlls/comctl32/tooltips.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/tooltips.c,v
retrieving revision 1.46
diff -u -r1.46 tooltips.c
--- dlls/comctl32/tooltips.c 13 Aug 2002 18:08:15 -0000 1.46
+++ dlls/comctl32/tooltips.c 5 Sep 2002 00:07:19 -0000
@@ -632,7 +632,7 @@
INT nTool;
GetCursorPos (&pt);
- hwndTool = SendMessageA (hwnd, TTM_WINDOWFROMPOINT, 0, (LPARAM)&pt);
+ hwndTool = (HWND)SendMessageA (hwnd, TTM_WINDOWFROMPOINT, 0, (LPARAM)&pt);
if (hwndTool == 0)
return -1;
@@ -1974,7 +1974,7 @@
static LRESULT
TOOLTIPS_WindowFromPoint (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- return WindowFromPoint (*((LPPOINT)lParam));
+ return (LRESULT)WindowFromPoint (*((LPPOINT)lParam));
}
Index: dlls/comctl32/treeview.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/treeview.c,v
retrieving revision 1.102
diff -u -r1.102 treeview.c
--- dlls/comctl32/treeview.c 16 Jul 2002 01:23:59 -0000 1.102
+++ dlls/comctl32/treeview.c 5 Sep 2002 00:07:21 -0000
@@ -1603,7 +1603,7 @@
TREEVIEW_GetToolTips(TREEVIEW_INFO *infoPtr)
{
TRACE("\n");
- return infoPtr->hwndToolTip;
+ return (LRESULT)infoPtr->hwndToolTip;
}
static LRESULT
@@ -1615,7 +1615,7 @@
prevToolTip = infoPtr->hwndToolTip;
infoPtr->hwndToolTip = hwndTT;
- return prevToolTip;
+ return (LRESULT)prevToolTip;
}
@@ -3382,7 +3382,7 @@
static LRESULT
TREEVIEW_GetEditControl(TREEVIEW_INFO *infoPtr)
{
- return infoPtr->hwndEdit;
+ return (LRESULT)infoPtr->hwndEdit;
}
static LRESULT CALLBACK
@@ -5029,7 +5029,7 @@
if (lParam == NF_REQUERY) {
i = SendMessageA(GetParent (infoPtr->hwnd),
- WM_NOTIFYFORMAT, infoPtr->hwnd, NF_QUERY);
+ WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwnd, NF_QUERY);
if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
i);
@@ -5146,7 +5146,7 @@
return TREEVIEW_DeleteItem(infoPtr, (HTREEITEM)lParam);
case TVM_EDITLABELA:
- return TREEVIEW_EditLabelA(infoPtr, (HTREEITEM)lParam);
+ return (LRESULT)TREEVIEW_EditLabelA(infoPtr, (HTREEITEM)lParam);
case TVM_EDITLABELW:
FIXME("Unimplemented msg TVM_EDITLABELW\n");
Index: dlls/comctl32/updown.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/updown.c,v
retrieving revision 1.43
diff -u -r1.43 updown.c
--- dlls/comctl32/updown.c 4 Sep 2002 18:45:42 -0000 1.43
+++ dlls/comctl32/updown.c 5 Sep 2002 00:07:22 -0000
@@ -569,7 +569,8 @@
/* Also, notify it. This message is sent in any case. */
SendMessageW( GetParent(infoPtr->Self),
dwStyle & UDS_HORZ ? WM_HSCROLL : WM_VSCROLL,
- MAKELONG(SB_THUMBPOSITION, infoPtr->CurVal), infoPtr->Self);
+ MAKELONG(SB_THUMBPOSITION, infoPtr->CurVal),
+ (LPARAM)infoPtr->Self);
}
/***********************************************************************
@@ -791,7 +792,8 @@
SendMessageW( GetParent(hwnd),
dwStyle & UDS_HORZ ? WM_HSCROLL : WM_VSCROLL,
- MAKELONG(SB_ENDSCROLL, infoPtr->CurVal), hwnd);
+ MAKELONG(SB_ENDSCROLL, infoPtr->CurVal),
+ (LPARAM)hwnd);
if (UPDOWN_IsBuddyEdit(infoPtr))
SendMessageW(infoPtr->Buddy, EM_SETSEL, 0, MAKELONG(0, -1));
}
@@ -857,12 +859,12 @@
case UDM_GETBUDDY:
if (wParam || lParam) UNKNOWN_PARAM(UDM_GETBUDDY, wParam, lParam);
- return infoPtr->Buddy;
+ return (LRESULT)infoPtr->Buddy;
case UDM_SETBUDDY:
if (lParam) UNKNOWN_PARAM(UDM_SETBUDDY, wParam, lParam);
- temp = infoPtr->Buddy;
- UPDOWN_SetBuddy (infoPtr, wParam);
+ temp = (int)infoPtr->Buddy;
+ UPDOWN_SetBuddy (infoPtr, (HWND)wParam);
return temp;
case UDM_GETPOS:
Index: dlls/gdi/win16drv/prtdrv.c
===================================================================
RCS file: /home/wine/wine/dlls/gdi/win16drv/prtdrv.c,v
retrieving revision 1.3
diff -u -r1.3 prtdrv.c
--- dlls/gdi/win16drv/prtdrv.c 17 Aug 2002 00:43:16 -0000 1.3
+++ dlls/gdi/win16drv/prtdrv.c 5 Sep 2002 00:07:22 -0000
@@ -63,6 +63,8 @@
/* ### stop build ### */
+#define HWND_16(h32) (LOWORD(h32))
+
#define MAX_PRINTER_DRIVERS 16
static LOADED_PRINTER_DRIVER *gapLoadedPrinterDrivers[MAX_PRINTER_DRIVERS];
@@ -775,7 +777,8 @@
lpSegProfile = MapLS(lpszProfile);
lpSegOut = MapLS(lpdmOutput);
lpSegIn = MapLS(lpdmInput);
- wRet = PRTDRV_CallTo16_word_wwlllllw( pLPD->fn[FUNC_EXTDEVICEMODE], hwnd, pLPD->hInst,
+ wRet = PRTDRV_CallTo16_word_wwlllllw( pLPD->fn[FUNC_EXTDEVICEMODE],
+ HWND_16(hwnd), pLPD->hInst,
lpSegOut, lpSegDevice, lpSegPort, lpSegIn,
lpSegProfile, dwMode );
UnMapLS(lpSegOut);
Index: dlls/msvideo/msvideo_main.c
===================================================================
RCS file: /home/wine/wine/dlls/msvideo/msvideo_main.c,v
retrieving revision 1.37
diff -u -r1.37 msvideo_main.c
--- dlls/msvideo/msvideo_main.c 29 Aug 2002 01:55:55 -0000 1.37
+++ dlls/msvideo/msvideo_main.c 5 Sep 2002 00:07:23 -0000
@@ -47,6 +47,7 @@
LRESULT MSVIDEO_SendMessage(HIC hic, UINT msg, DWORD lParam1, DWORD lParam2, BOOL bFrom32);
#define HDRVR_16(h32) (LOWORD(h32))
+#define HWND_32(h16) ((HWND)(ULONG_PTR)(h16))
/***********************************************************************
@@ -673,7 +674,7 @@
COPY(icdb,dwFlags);
icdb->hpal = HPALETTE_32(icdb16->hpal);
- COPY(icdb,hwnd);
+ icdb->hwnd = HWND_32(icdb16->hwnd);
COPY(icdb,hdc);
COPY(icdb,xDst);
COPY(icdb,yDst);
Index: dlls/setupapi/queue.c
===================================================================
RCS file: /home/wine/wine/dlls/setupapi/queue.c,v
retrieving revision 1.2
diff -u -r1.2 queue.c
--- dlls/setupapi/queue.c 13 Jun 2002 23:54:55 -0000 1.2
+++ dlls/setupapi/queue.c 5 Sep 2002 00:07:23 -0000
@@ -955,7 +955,7 @@
if (!queue->copy_queue.count && !queue->delete_queue.count && !queue->rename_queue.count)
return TRUE; /* nothing to do */
- if (!handler( context, SPFILENOTIFY_STARTQUEUE, owner, 0 )) return FALSE;
+ if (!handler( context, SPFILENOTIFY_STARTQUEUE, (UINT)owner, 0 )) return FALSE;
/* perform deletes */
Index: dlls/setupapi/setupx_main.c
===================================================================
RCS file: /home/wine/wine/dlls/setupapi/setupx_main.c,v
retrieving revision 1.21
diff -u -r1.21 setupx_main.c
--- dlls/setupapi/setupx_main.c 23 May 2002 02:41:46 -0000 1.21
+++ dlls/setupapi/setupx_main.c 5 Sep 2002 00:07:24 -0000
@@ -69,6 +69,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
+#define HWND_32(h16) ((HWND)(ULONG_PTR)(h16))
+
/***********************************************************************
* SURegOpenKey (SETUPX.47)
*/
@@ -202,7 +204,7 @@
break;
case HOW_ALWAYS_PROMPT_REBOOT:
case HOW_PROMPT_REBOOT:
- if (MessageBoxA(hwnd, "You must restart Wine before the new settings will take effect.\n\nDo you want to exit Wine now ?", "Systems Settings Change", MB_YESNO|MB_ICONQUESTION) == IDYES)
+ if (MessageBoxA(HWND_32(hwnd), "You must restart Wine before the new settings will take effect.\n\nDo you want to exit Wine now ?", "Systems Settings Change", MB_YESNO|MB_ICONQUESTION) == IDYES)
reboot = TRUE;
break;
default:
Index: dlls/shell32/shell.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shell.c,v
retrieving revision 1.44
diff -u -r1.44 shell.c
--- dlls/shell32/shell.c 28 Aug 2002 23:42:34 -0000 1.44
+++ dlls/shell32/shell.c 5 Sep 2002 00:07:24 -0000
@@ -114,7 +114,7 @@
*/
void WINAPI DragAcceptFiles16(HWND16 hWnd, BOOL16 b)
{
- DragAcceptFiles(hWnd, b);
+ DragAcceptFiles(HWND_32(hWnd), b);
}
/*************************************************************************
@@ -198,7 +198,7 @@
*/
BOOL16 WINAPI AboutDlgProc16( HWND16 hWnd, UINT16 msg, WPARAM16 wParam,
LPARAM lParam )
-{ return AboutDlgProc( hWnd, msg, wParam, lParam );
+{ return AboutDlgProc( HWND_32(hWnd), msg, wParam, lParam );
}
@@ -207,7 +207,7 @@
*/
BOOL16 WINAPI ShellAbout16( HWND16 hWnd, LPCSTR szApp, LPCSTR szOtherStuff,
HICON16 hIcon )
-{ return ShellAboutA( hWnd, szApp, szOtherStuff, hIcon );
+{ return ShellAboutA( HWND_32(hWnd), szApp, szOtherStuff, hIcon );
}
/*************************************************************************
@@ -495,7 +495,7 @@
case HSHELL_WINDOWDESTROYED: uMsg = uMsgWndDestroyed; break;
case HSHELL_ACTIVATESHELLWINDOW: uMsg = uMsgShellActivate;
}
- PostMessageA( SHELL_hWnd, uMsg, wParam, 0 );
+ PostMessageA( HWND_32(SHELL_hWnd), uMsg, wParam, 0 );
}
return CallNextHookEx16( SHELL_hHook, code, wParam, lParam );
}
Index: dlls/shell32/shell32_main.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shell32_main.c,v
retrieving revision 1.98
diff -u -r1.98 shell32_main.c
--- dlls/shell32/shell32_main.c 17 Aug 2002 00:21:06 -0000 1.98
+++ dlls/shell32/shell32_main.c 5 Sep 2002 00:07:25 -0000
@@ -759,7 +759,7 @@
break;
case WM_DROPOBJECT:
- if( wParam == hWnd )
+ if( wParam == (WPARAM)hWnd )
{ LPDRAGINFO16 lpDragInfo = MapSL((SEGPTR)lParam);
if( lpDragInfo && lpDragInfo->wFlags == DRAGOBJ_DATA && lpDragInfo->hList )
{ char* pstr = (char*)GlobalLock16( (HGLOBAL16)(lpDragInfo->hList) );
Index: dlls/shell32/shell32_main.h
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shell32_main.h,v
retrieving revision 1.51
diff -u -r1.51 shell32_main.h
--- dlls/shell32/shell32_main.h 13 Aug 2002 03:21:53 -0000 1.51
+++ dlls/shell32/shell32_main.h 5 Sep 2002 00:07:25 -0000
@@ -196,4 +196,7 @@
WideCharToMultiByte(CP_ACP, 0, source, -1, *target, len, NULL, NULL);
}
+/* handle conversions */
+#define HWND_32(h16) ((HWND)(ULONG_PTR)(h16))
+
#endif
Index: dlls/shell32/shlexec.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shlexec.c,v
retrieving revision 1.6
diff -u -r1.6 shlexec.c
--- dlls/shell32/shlexec.c 17 Aug 2002 00:43:17 -0000 1.6
+++ dlls/shell32/shlexec.c 5 Sep 2002 00:07:25 -0000
@@ -680,7 +680,7 @@
sei.cbSize = sizeof(sei);
sei.fMask = 0;
- sei.hwnd = hWnd;
+ sei.hwnd = HWND_32(hWnd);
sei.lpVerb = lpOperation;
sei.lpFile = lpFile;
sei.lpParameters = lpParameters;
Index: dlls/twain/dsm_ctrl.c
===================================================================
RCS file: /home/wine/wine/dlls/twain/dsm_ctrl.c,v
retrieving revision 1.3
diff -u -r1.3 dsm_ctrl.c
--- dlls/twain/dsm_ctrl.c 31 May 2002 23:40:53 -0000 1.3
+++ dlls/twain/dsm_ctrl.c 5 Sep 2002 00:07:25 -0000
@@ -364,7 +364,7 @@
DSM_currentDevice = 0;
DSM_sourceId = 0;
}
- DSM_parentHWND = *(HWND*)pData;
+ DSM_parentHWND = (TW_HANDLE)pData;
DSM_currentState = 3; /* transition to state 3 */
DSM_twCC = TWCC_SUCCESS;
twRC = TWRC_SUCCESS;
Index: dlls/twain/twain_i.h
===================================================================
RCS file: /home/wine/wine/dlls/twain/twain_i.h,v
retrieving revision 1.2
diff -u -r1.2 twain_i.h
--- dlls/twain/twain_i.h 31 May 2002 23:40:53 -0000 1.2
+++ dlls/twain/twain_i.h 5 Sep 2002 00:07:25 -0000
@@ -47,7 +47,7 @@
TW_UINT16 DSM_initialized; /* whether Source Manager is initialized */
TW_UINT16 DSM_currentState; /* current state of Source Manager */
TW_UINT16 DSM_twCC; /* current condition code of Source Manager */
-TW_INT32 DSM_parentHWND; /* window handle of the Source's "parent" */
+TW_HANDLE DSM_parentHWND; /* window handle of the Source's "parent" */
TW_UINT32 DSM_sourceId; /* source id generator */
TW_UINT16 DSM_currentDevice; /* keep track of device during enumeration */
#ifdef HAVE_SANE
Index: dlls/winmm/mci.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mci.c,v
retrieving revision 1.31
diff -u -r1.31 mci.c
--- dlls/winmm/mci.c 28 Jul 2002 23:48:27 -0000 1.31
+++ dlls/winmm/mci.c 5 Sep 2002 00:07:26 -0000
@@ -1090,7 +1090,7 @@
DWORD WINAPI mciSendString16(LPCSTR lpstrCommand, LPSTR lpstrRet,
UINT16 uRetLen, HWND16 hwndCallback)
{
- return mciSendStringA(lpstrCommand, lpstrRet, uRetLen, hwndCallback);
+ return mciSendStringA(lpstrCommand, lpstrRet, uRetLen, HWND_32(hwndCallback));
}
/**************************************************************************
@@ -1284,7 +1284,7 @@
if (mbp32) {
mbp32->dwCallback = mbp16->dwCallback;
mbp32->nVirtKey = mbp16->nVirtKey;
- mbp32->hwndBreak = mbp16->hwndBreak;
+ mbp32->hwndBreak = HWND_32(mbp16->hwndBreak);
} else {
return MCI_MAP_NOMEM;
}
Index: dlls/winmm/mmsystem.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mmsystem.c,v
retrieving revision 1.67
diff -u -r1.67 mmsystem.c
--- dlls/winmm/mmsystem.c 9 Aug 2002 01:02:25 -0000 1.67
+++ dlls/winmm/mmsystem.c 5 Sep 2002 00:07:28 -0000
@@ -1688,7 +1688,7 @@
{
TRACE("(%04X, %04x, %04X)\n", hWndCallBack, wDevID, wStatus);
- return PostMessageA(hWndCallBack, MM_MCINOTIFY, wStatus, wDevID);
+ return PostMessageA(HWND_32(hWndCallBack), MM_MCINOTIFY, wStatus, wDevID);
}
/**************************************************************************
@@ -1840,15 +1840,15 @@
TRACE("(0x%04x, 0x%08lx)\n", wDevID, data);
- if ((HIWORD(data) != 0 && GetActiveWindow() != HIWORD(data)) ||
+ if ((HIWORD(data) != 0 && HWND_16(GetActiveWindow()) != HIWORD(data)) ||
(GetAsyncKeyState(LOWORD(data)) & 1) == 0) {
UserYield16();
ret = 0;
} else {
MSG msg;
- msg.hwnd = HIWORD(data);
- while (!PeekMessageA(&msg, HIWORD(data), WM_KEYFIRST, WM_KEYLAST, PM_REMOVE));
+ msg.hwnd = HWND_32(HIWORD(data));
+ while (!PeekMessageA(&msg, msg.hwnd, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE));
ret = -1;
}
return ret;
Index: dlls/winmm/winemm.h
===================================================================
RCS file: /home/wine/wine/dlls/winmm/winemm.h,v
retrieving revision 1.20
diff -u -r1.20 winemm.h
--- dlls/winmm/winemm.h 9 Aug 2002 19:51:01 -0000 1.20
+++ dlls/winmm/winemm.h 5 Sep 2002 00:07:28 -0000
@@ -239,6 +239,7 @@
#define HWAVE_32(h16) ((HWAVE)(ULONG_PTR)(h16))
#define HWAVEIN_32(h16) ((HWAVEIN)(ULONG_PTR)(h16))
#define HWAVEOUT_32(h16) ((HWAVEOUT)(ULONG_PTR)(h16))
+#define HWND_32(h16) ((HWND)(ULONG_PTR)(h16))
/* HANDLE -> HANDLE16 conversions */
#define HDRVR_16(h32) (LOWORD(h32))
@@ -252,3 +253,4 @@
#define HWAVE_16(h32) (LOWORD(h32))
#define HWAVEIN_16(h32) (LOWORD(h32))
#define HWAVEOUT_16(h32) (LOWORD(h32))
+#define HWND_16(h32) (LOWORD(h32))
Index: dlls/winmm/mcianim/mcianim.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mcianim/mcianim.c,v
retrieving revision 1.13
diff -u -r1.13 mcianim.c
--- dlls/winmm/mcianim/mcianim.c 31 May 2002 23:40:56 -0000 1.13
+++ dlls/winmm/mcianim/mcianim.c 5 Sep 2002 00:07:28 -0000
@@ -33,6 +33,8 @@
#define ANIMFRAMES_PERMIN 1800
#define SECONDS_PERMIN 60
+#define HWND_32(h16) ((HWND)(ULONG_PTR)(h16))
+
typedef struct {
UINT16 wDevID;
int nUseCount; /* Incremented for each shared open */
@@ -402,7 +404,7 @@
if (dwFlags & MCI_NOTIFY) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
if (dwFlags & MCI_STATUS_ITEM) {
@@ -502,7 +504,7 @@
if (dwFlags & MCI_NOTIFY) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n",
lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
@@ -524,7 +526,7 @@
if (dwFlags & MCI_NOTIFY) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
@@ -543,7 +545,7 @@
if (dwFlags & MCI_NOTIFY) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND16)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
@@ -562,7 +564,7 @@
if (dwFlags & MCI_NOTIFY) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
@@ -598,7 +600,7 @@
if (dwFlags & MCI_NOTIFY) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return dwRet;
@@ -642,7 +644,7 @@
if (dwFlags & MCI_SET_OFF) return MCIERR_UNSUPPORTED_FUNCTION;
if (dwFlags & MCI_NOTIFY) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
Index: dlls/winmm/mciavi/info.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mciavi/info.c,v
retrieving revision 1.3
diff -u -r1.3 info.c
--- dlls/winmm/mciavi/info.c 31 May 2002 23:40:56 -0000 1.3
+++ dlls/winmm/mciavi/info.c 5 Sep 2002 00:07:29 -0000
@@ -401,7 +401,7 @@
TRACE("MCI_DGV_STATUS_HPAL => %lx\n", lpParms->dwReturn);
break;
case MCI_DGV_STATUS_HWND:
- lpParms->dwReturn = wma->hWnd;
+ lpParms->dwReturn = (DWORD)wma->hWnd;
TRACE("MCI_DGV_STATUS_HWND => %u\n", wma->hWnd);
break;
#if 0
@@ -444,7 +444,7 @@
}
if (dwFlags & MCI_NOTIFY) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wma->openParms.wDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
Index: dlls/winmm/mciavi/mciavi.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mciavi/mciavi.c,v
retrieving revision 1.12
diff -u -r1.12 mciavi.c
--- dlls/winmm/mciavi/mciavi.c 31 May 2002 23:40:56 -0000 1.12
+++ dlls/winmm/mciavi/mciavi.c 5 Sep 2002 00:07:29 -0000
@@ -324,7 +324,7 @@
MCIAVI_CleanUp(wma);
if ((dwFlags & MCI_NOTIFY) && lpParms) {
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wma->openParms.wDeviceID,
MCI_NOTIFY_SUCCESSFUL);
}
@@ -444,7 +444,7 @@
if (lpParms && (dwFlags & MCI_NOTIFY)) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wma->openParms.wDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
@@ -501,7 +501,7 @@
}
if ((dwFlags & MCI_NOTIFY) && lpParms) {
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wma->openParms.wDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
@@ -572,7 +572,7 @@
TRACE("Seeking to frame=%lu bytes\n", wma->dwCurrVideoFrame);
if (dwFlags & MCI_NOTIFY) {
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wma->openParms.wDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
Index: dlls/winmm/mciavi/private_mciavi.h
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mciavi/private_mciavi.h,v
retrieving revision 1.3
diff -u -r1.3 private_mciavi.h
--- dlls/winmm/mciavi/private_mciavi.h 31 May 2002 23:40:56 -0000 1.3
+++ dlls/winmm/mciavi/private_mciavi.h 5 Sep 2002 00:07:29 -0000
@@ -100,3 +100,6 @@
DWORD MCIAVI_mciPut(UINT wDevID, DWORD dwFlags, LPMCI_DGV_PUT_PARMS lpParms);
DWORD MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms);
DWORD MCIAVI_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMSA lpParms);
+
+/* handle conversions */
+#define HWND_32(h16) ((HWND)(ULONG_PTR)(h16))
Index: dlls/winmm/mcicda/mcicda.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mcicda/mcicda.c,v
retrieving revision 1.24
diff -u -r1.24 mcicda.c
--- dlls/winmm/mcicda/mcicda.c 31 May 2002 23:40:56 -0000 1.24
+++ dlls/winmm/mcicda/mcicda.c 5 Sep 2002 00:07:29 -0000
@@ -42,6 +42,8 @@
#define FRAME_OF_ADDR(a) ((a)[1] * CDFRAMES_PERMIN + (a)[2] * CDFRAMES_PERSEC + (a)[3])
#define FRAME_OF_TOC(toc, idx) FRAME_OF_ADDR((toc).TrackData[idx - (toc).FirstTrack].Address)
+#define HWND_32(h16) ((HWND)(ULONG_PTR)(h16))
+
typedef struct {
UINT wDevID;
int nUseCount; /* Incremented for each shared open */
@@ -528,7 +530,7 @@
if (dwFlags & MCI_NOTIFY) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
if (dwFlags & MCI_STATUS_ITEM) {
@@ -732,7 +734,7 @@
} else if (dwFlags & MCI_NOTIFY) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
/*
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
*/
}
@@ -756,7 +758,7 @@
if (lpParms && (dwFlags & MCI_NOTIFY)) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
@@ -779,7 +781,7 @@
if (lpParms && (dwFlags & MCI_NOTIFY)) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
@@ -802,7 +804,7 @@
if (lpParms && (dwFlags & MCI_NOTIFY)) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
@@ -861,7 +863,7 @@
if (dwFlags & MCI_NOTIFY) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
@@ -934,7 +936,7 @@
if (dwFlags & MCI_NOTIFY) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n",
lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
Index: dlls/winmm/mciseq/mcimidi.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mciseq/mcimidi.c,v
retrieving revision 1.17
diff -u -r1.17 mcimidi.c
--- dlls/winmm/mciseq/mcimidi.c 1 Aug 2002 18:17:51 -0000 1.17
+++ dlls/winmm/mciseq/mcimidi.c 5 Sep 2002 00:07:30 -0000
@@ -42,6 +42,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(mcimidi);
+#define HWND_32(h16) ((HWND)(ULONG_PTR)(h16))
+
#define MIDI_NOTEOFF 0x80
#define MIDI_NOTEON 0x90
@@ -830,7 +832,7 @@
if (lpParms && (dwFlags & MCI_NOTIFY)) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmm->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
@@ -869,7 +871,7 @@
if (lpParms && (dwFlags & MCI_NOTIFY)) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmm->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
@@ -1171,7 +1173,7 @@
if (lpParms && (dwFlags & MCI_NOTIFY)) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmm->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
@@ -1234,7 +1236,7 @@
wmm->dwStatus = MCI_MODE_STOP;
if (lpParms && (dwFlags & MCI_NOTIFY)) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmm->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
@@ -1260,7 +1262,7 @@
}
if (lpParms && (dwFlags & MCI_NOTIFY)) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmm->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
@@ -1284,7 +1286,7 @@
}
if (lpParms && (dwFlags & MCI_NOTIFY)) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmm->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
@@ -1478,7 +1480,7 @@
}
if (dwFlags & MCI_NOTIFY) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmm->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return ret;
@@ -1635,7 +1637,7 @@
if (dwFlags & MCI_NOTIFY) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmm->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
}
Index: dlls/winmm/mciwave/mciwave.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mciwave/mciwave.c,v
retrieving revision 1.22
diff -u -r1.22 mciwave.c
--- dlls/winmm/mciwave/mciwave.c 31 May 2002 23:40:57 -0000 1.22
+++ dlls/winmm/mciwave/mciwave.c 5 Sep 2002 00:07:31 -0000
@@ -32,6 +32,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(mciwave);
+#define HWND_32(h16) ((HWND)(ULONG_PTR)(h16))
+
typedef struct {
UINT wDevID;
HANDLE hWave;
@@ -577,7 +579,7 @@
wmw->dwStatus = MCI_MODE_STOP;
if ((dwFlags & MCI_NOTIFY) && lpParms) {
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmw->openParms.wDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
@@ -623,7 +625,7 @@
wmw->lpWaveFormat = NULL;
if ((dwFlags & MCI_NOTIFY) && lpParms) {
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmw->openParms.wDeviceID,
(dwRet == 0) ? MCI_NOTIFY_SUCCESSFUL : MCI_NOTIFY_FAILURE);
}
@@ -850,7 +852,7 @@
CloseHandle(wmw->hEvent);
if (lpParms && (dwFlags & MCI_NOTIFY)) {
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmw->openParms.wDeviceID,
dwRet ? MCI_NOTIFY_FAILURE : MCI_NOTIFY_SUCCESSFUL);
}
@@ -1076,7 +1078,7 @@
}
if (lpParms && (dwFlags & MCI_NOTIFY)) {
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmw->openParms.wDeviceID,
dwRet ? MCI_NOTIFY_FAILURE : MCI_NOTIFY_SUCCESSFUL);
}
@@ -1162,7 +1164,7 @@
TRACE("Seeking to position=%lu bytes\n", wmw->dwPosition);
if (dwFlags & MCI_NOTIFY) {
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmw->openParms.wDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
}
@@ -1308,7 +1310,7 @@
if (dwFlags & MCI_NOTIFY) {
if (ret == ERROR_SUCCESS) wparam = MCI_NOTIFY_SUCCESSFUL;
- mciDriverNotify( (HWND) LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmw->openParms.wDeviceID, wparam);
}
@@ -1455,7 +1457,7 @@
}
}
if (dwFlags & MCI_NOTIFY) {
- mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
wmw->openParms.wDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return ret;
Attachment:
pgp00046.pgp
Description: PGP signature
