Skip to content

W
wine-winehq
Commit 6eac2953 authored by Christian Costa's avatar Christian Costa Committed by Alexandre Julliard
Browse files
Options

Added support for MCI_DGV_WHERE_MAX flag in MCIAVI_mciWhere.

Fixed WHERE_WINDOW.
parent 76240a36
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 16 deletions
dlls/winmm/mciavi/wnd.c
View file @ 6eac2953
...@@ -207,35 +207,55 @@ DWORD MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms) ...@@ -207,35 +207,55 @@ DWORD MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms)
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; if (wma == NULL) return MCIERR_INVALID_DEVICE_ID;
if (dwFlags & MCI_DGV_WHERE_MAX)
{
FIXME("WHERE_MAX\n");
return MCIERR_UNRECOGNIZED_COMMAND;
}
EnterCriticalSection(&wma->cs); EnterCriticalSection(&wma->cs);
if (dwFlags & MCI_DGV_WHERE_DESTINATION) { if (dwFlags & MCI_DGV_WHERE_DESTINATION) {
TRACE("WHERE_DESTINATION %s\n", wine_dbgstr_rect(&wma->dest)); if (dwFlags & MCI_DGV_WHERE_MAX) {
lpParms->rc = wma->dest; GetClientRect(wma->hWndPaint, &lpParms->rc);
TRACE("WHERE_DESTINATION_MAX %s\n", wine_dbgstr_rect(&lpParms->rc));
} else {
TRACE("WHERE_DESTINATION %s\n", wine_dbgstr_rect(&wma->dest));
lpParms->rc = wma->dest;
}
} }
if (dwFlags & MCI_DGV_WHERE_FRAME) { if (dwFlags & MCI_DGV_WHERE_FRAME) {
FIXME("MCI_DGV_WHERE_FRAME\n"); if (dwFlags & MCI_DGV_WHERE_MAX)
LeaveCriticalSection(&wma->cs); FIXME("MCI_DGV_WHERE_FRAME_MAX\n");
else
FIXME("MCI_DGV_WHERE_FRAME\n");
LeaveCriticalSection(&wma->cs);
return MCIERR_UNRECOGNIZED_COMMAND; return MCIERR_UNRECOGNIZED_COMMAND;
} }
if (dwFlags & MCI_DGV_WHERE_SOURCE) { if (dwFlags & MCI_DGV_WHERE_SOURCE) {
TRACE("WHERE_SOURCE %s\n", wine_dbgstr_rect(&wma->source)); if (dwFlags & MCI_DGV_WHERE_MAX) {
lpParms->rc = wma->source; RECT rect;
rect.left = 0;
rect.top = 0;
rect.right = wma->inbih->biWidth;
rect.bottom = wma->inbih->biHeight;
TRACE("WHERE_SOURCE_MAX %s\n", wine_dbgstr_rect(&rect));
lpParms->rc = rect;
} else {
TRACE("WHERE_SOURCE %s\n", wine_dbgstr_rect(&wma->source));
lpParms->rc = wma->source;
}
} }
if (dwFlags & MCI_DGV_WHERE_VIDEO) { if (dwFlags & MCI_DGV_WHERE_VIDEO) {
FIXME("WHERE_VIDEO\n"); if (dwFlags & MCI_DGV_WHERE_MAX)
LeaveCriticalSection(&wma->cs); FIXME("WHERE_VIDEO_MAX\n");
else
FIXME("WHERE_VIDEO\n");
LeaveCriticalSection(&wma->cs);
return MCIERR_UNRECOGNIZED_COMMAND; return MCIERR_UNRECOGNIZED_COMMAND;
} }
if (dwFlags & MCI_DGV_WHERE_WINDOW) { if (dwFlags & MCI_DGV_WHERE_WINDOW) {
GetClientRect(wma->hWndPaint, &lpParms->rc); if (dwFlags & MCI_DGV_WHERE_MAX) {
TRACE("WHERE_WINDOW %s\n", wine_dbgstr_rect(&lpParms->rc)); GetWindowRect(GetDesktopWindow(), &lpParms->rc);
TRACE("WHERE_WINDOW_MAX %s\n", wine_dbgstr_rect(&lpParms->rc));
} else {
GetWindowRect(wma->hWndPaint, &lpParms->rc);
TRACE("WHERE_WINDOW %s\n", wine_dbgstr_rect(&lpParms->rc));
}
} }
LeaveCriticalSection(&wma->cs); LeaveCriticalSection(&wma->cs);
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment