From: Akihiro Sagawa sagawa.aki@gmail.com
Signed-off-by: Akihiro Sagawa sagawa.aki@gmail.com --- dlls/mciqtz32/mciqtz.c | 6 ++++++ dlls/winmm/tests/mci.c | 8 +------- 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 118f8d28f2d..02e5e1546a8 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -919,6 +919,12 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS MCI_FORMAT_RETURN_BASE + wma->time_format); ret = MCI_RESOURCE_RETURNED; break; + case MCI_DGV_STATUS_HWND: + if (wma->window) + lpParms->dwReturn = (DWORD_PTR)wma->parent; + else + ret = MCIERR_UNSUPPORTED_FUNCTION; + break; case MCI_STATUS_READY: FIXME("MCI_STATUS_READY not implemented yet\n"); return MCIERR_UNRECOGNIZED_COMMAND; diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 57fd6932986..6f17d6ddd4f 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1480,12 +1480,7 @@ static void test_video_window(HWND hwnd) parm.status.dwItem = MCI_DGV_STATUS_HWND; parm.status.dwReturn = 0xdeadbeef; err = mciSendCommandW(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM, (DWORD_PTR)&parm); - todo_wine ok(!err,"mciCommand status hwnd returned %s\n", dbg_mcierr(err)); - if (err) - { - skip("MCI_DGV_STATUS_HWND got an error\n"); - goto close; - } + ok(!err,"mciCommand status hwnd returned %s\n", dbg_mcierr(err)); video_window = (HWND)parm.status.dwReturn;
ok(IsWindow(video_window), "video window %p doesn't exist.\n", video_window); @@ -1495,7 +1490,6 @@ static void test_video_window(HWND hwnd) expected = (WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW) & ~WS_MAXIMIZEBOX; ok(style == expected, "expected style %08lx, got %08lx\n", expected, style);
-close: err = mciSendCommandW(wDeviceID, MCI_CLOSE, 0, 0); ok(!err,"mciCommand close returned %s\n", dbg_mcierr(err));