Author: akhaldi Date: Thu Aug 18 10:12:12 2016 New Revision: 72284
URL: http://svn.reactos.org/svn/reactos?rev=72284&view=rev Log: [MCIAVI32] Sync with Wine Staging 1.9.16. CORE-11866
Modified: trunk/reactos/dll/win32/mciavi32/mmoutput.c trunk/reactos/dll/win32/mciavi32/wnd.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/mciavi32/mmoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mmoutput... ============================================================================== --- trunk/reactos/dll/win32/mciavi32/mmoutput.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/mmoutput.c [iso-8859-1] Thu Aug 18 10:12:12 2016 @@ -137,11 +137,7 @@ TRACE("bih.biClrUsed=%d\n", wma->inbih->biClrUsed); TRACE("bih.biClrImportant=%d\n", wma->inbih->biClrImportant);
- wma->source.left = 0; - wma->source.top = 0; - wma->source.right = wma->inbih->biWidth; - wma->source.bottom = wma->inbih->biHeight; - + SetRect(&wma->source, 0, 0, wma->inbih->biWidth, wma->inbih->biHeight); wma->dest = wma->source;
return TRUE;
Modified: trunk/reactos/dll/win32/mciavi32/wnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/wnd.c?re... ============================================================================== --- trunk/reactos/dll/win32/mciavi32/wnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/wnd.c [iso-8859-1] Thu Aug 18 10:12:12 2016 @@ -118,9 +118,11 @@ if (dwFlags & MCI_DGV_OPEN_PARENT) hParent = lpOpenParms->hWndParent; if (dwFlags & MCI_DGV_OPEN_WS) dwStyle = lpOpenParms->dwStyle;
- rc.left = rc.top = 0; - rc.right = (wma->hic ? wma->outbih : wma->inbih)->biWidth; - rc.bottom = (wma->hic ? wma->outbih : wma->inbih)->biHeight; + if (wma->hic) + SetRect(&rc, 0, 0, wma->outbih->biWidth, wma->outbih->biHeight); + else + SetRect(&rc, 0, 0, wma->inbih->biWidth, wma->inbih->biHeight); + AdjustWindowRect(&rc, dwStyle, FALSE); if (!(dwStyle & (WS_CHILD|WS_POPUP))) /* overlapped window ? */ { @@ -157,10 +159,8 @@ if (dwFlags & MCI_DGV_RECT) { /* In MCI, RECT structure is used differently: rc.right = width & rc.bottom = height * So convert input MCI RECT into a normal RECT */ - rc.left = lpParms->rc.left; - rc.top = lpParms->rc.top; - rc.right = lpParms->rc.left + lpParms->rc.right; - rc.bottom = lpParms->rc.top + lpParms->rc.bottom; + SetRect(&rc, lpParms->rc.left, lpParms->rc.top, lpParms->rc.left + lpParms->rc.right, + lpParms->rc.top + lpParms->rc.bottom); } else { GetClientRect(wma->hWndPaint, &rc); } @@ -231,10 +231,7 @@ } if (dwFlags & MCI_DGV_WHERE_SOURCE) { if (dwFlags & MCI_DGV_WHERE_MAX) { - rc.left = 0; - rc.top = 0; - rc.right = wma->inbih->biWidth; - rc.bottom = wma->inbih->biHeight; + SetRect(&rc, 0, 0, wma->inbih->biWidth, wma->inbih->biHeight); TRACE("WHERE_SOURCE_MAX %s\n", wine_dbgstr_rect(&rc)); } else { TRACE("WHERE_SOURCE %s\n", wine_dbgstr_rect(&wma->source)); @@ -261,10 +258,7 @@
/* In MCI, RECT structure is used differently: rc.right = width & rc.bottom = height * So convert the normal RECT into a MCI RECT before returning */ - lpParms->rc.left = rc.left; - lpParms->rc.top = rc.top; - lpParms->rc.right = rc.right - rc.left; - lpParms->rc.bottom = rc.bottom - rc.top; + SetRect(&lpParms->rc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top);
LeaveCriticalSection(&wma->cs); return 0;
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 10:12:12 2016 @@ -92,7 +92,7 @@ reactos/dll/win32/localui # Synced to WineStaging-1.9.11 reactos/dll/win32/lz32 # Synced to WineStaging-1.9.11 reactos/dll/win32/mapi32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/mciavi32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/mciavi32 # Synced to WineStaging-1.9.16 reactos/dll/win32/mcicda # Synced to WineStaging-1.9.11 reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.9.11 reactos/dll/win32/mciseq # Synced to WineStaging-1.9.11
-
akhaldi＠svn.reactos.org