mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-06 09:35:52 +00:00
mciqtz32: Fix MCI_DGV_WINDOW_HWND error handling.
This commit is contained in:
parent
ebd1b7ab81
commit
3ba2c69457
|
@ -1000,8 +1000,13 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS
|
||||||
if (dwFlags & MCI_TEST)
|
if (dwFlags & MCI_TEST)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (dwFlags & MCI_DGV_WINDOW_HWND && (IsWindow(lpParms->hWnd) || !lpParms->hWnd)) {
|
if (dwFlags & MCI_DGV_WINDOW_HWND) {
|
||||||
HWND hwnd = lpParms->hWnd ? lpParms->hWnd : wma->window;
|
HWND hwnd;
|
||||||
|
if (lpParms->hWnd && !IsWindow(lpParms->hWnd))
|
||||||
|
return MCIERR_NO_WINDOW;
|
||||||
|
if (!wma->parent)
|
||||||
|
return MCIERR_INTERNAL;
|
||||||
|
hwnd = lpParms->hWnd ? lpParms->hWnd : wma->window;
|
||||||
TRACE("Setting parent window to %p.\n", hwnd);
|
TRACE("Setting parent window to %p.\n", hwnd);
|
||||||
if (wma->parent != hwnd)
|
if (wma->parent != hwnd)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1432,11 +1432,11 @@ static void test_asyncWaveTypeMpegvideo(HWND hwnd)
|
||||||
|
|
||||||
sprintf(buf, "window mysound handle %lu", PtrToUlong(GetDesktopWindow()));
|
sprintf(buf, "window mysound handle %lu", PtrToUlong(GetDesktopWindow()));
|
||||||
err = mciSendStringA(buf, NULL, 0, NULL);
|
err = mciSendStringA(buf, NULL, 0, NULL);
|
||||||
todo_wine ok(err == MCIERR_INTERNAL, "mci window handle (desktop) returned %s\n", dbg_mcierr(err));
|
ok(err == MCIERR_INTERNAL, "mci window handle (desktop) returned %s\n", dbg_mcierr(err));
|
||||||
|
|
||||||
sprintf(buf, "window mysound handle %lu", (unsigned long)0xdeadbeef);
|
sprintf(buf, "window mysound handle %lu", (unsigned long)0xdeadbeef);
|
||||||
err = mciSendStringA(buf, NULL, 0, NULL);
|
err = mciSendStringA(buf, NULL, 0, NULL);
|
||||||
todo_wine ok(err == MCIERR_NO_WINDOW, "mci window handle (deadbeef) returned %s\n", dbg_mcierr(err));
|
ok(err == MCIERR_NO_WINDOW, "mci window handle (deadbeef) returned %s\n", dbg_mcierr(err));
|
||||||
|
|
||||||
err = mciSendStringA("close mysound wait", NULL, 0, NULL);
|
err = mciSendStringA("close mysound wait", NULL, 0, NULL);
|
||||||
ok(!err,"mci close wait returned %s\n", dbg_mcierr(err));
|
ok(!err,"mci close wait returned %s\n", dbg_mcierr(err));
|
||||||
|
@ -1659,7 +1659,7 @@ static void test_video_window(void)
|
||||||
/* Test MCI_DGV_WINDOW_HWND. */
|
/* Test MCI_DGV_WINDOW_HWND. */
|
||||||
parm.win.hWnd = (HWND)0xdeadbeef;
|
parm.win.hWnd = (HWND)0xdeadbeef;
|
||||||
err = mciSendCommandW(id, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&parm);
|
err = mciSendCommandW(id, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&parm);
|
||||||
todo_wine ok(err == MCIERR_NO_WINDOW, "Got %s.\n", dbg_mcierr(err));
|
ok(err == MCIERR_NO_WINDOW, "Got %s.\n", dbg_mcierr(err));
|
||||||
|
|
||||||
parm.win.hWnd = main_window;
|
parm.win.hWnd = main_window;
|
||||||
err = mciSendCommandW(id, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&parm);
|
err = mciSendCommandW(id, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&parm);
|
||||||
|
|
Loading…
Reference in a new issue