July 2020 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : ieframe: Implement IOleObject::GetUserClassID().
by Alexandre Julliard July 27, 2020

July 27, 2020

Module: wine Branch: master Commit: d998bc54ce3108f8c3726c31cf7673445b7ec3cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d998bc54ce3108f8c3726c31… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 27 15:28:18 2020 +0200 ieframe: Implement IOleObject::GetUserClassID(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/oleobject.c | 9 ++++++--- dlls/ieframe/tests/webbrowser.c | 23 ++++++++++++++++++++++- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 5c49845aa7..62faaae6bd 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -719,11 +719,14 @@ static HRESULT WINAPI OleObject_IsUpToDate(IOleObject *iface) return E_NOTIMPL; } -static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID* pClsid) +static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID *pClsid) { WebBrowser *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p)\n", This, pClsid); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pClsid); + + *pClsid = This->version == 1 ? CLSID_WebBrowser_V1 : CLSID_WebBrowser; + return S_OK; } static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD dwFormOfType, diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 95d5fc4988..3ec5921a32 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2227,7 +2227,7 @@ static void test_Persist(IWebBrowser2 *wb, int version) HRESULT hr; hr = IWebBrowser2_QueryInterface(wb, &IID_IPersist, (void **)&persist); - ok(hr == S_OK, "QueryInterface(IID_IPersist failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface(IID_IPersist) failed: %08x\n", hr); hr = IPersist_GetClassID(persist, &guid); ok(hr == S_OK, "GetClassID failed: %08x\n", hr); @@ -2239,6 +2239,25 @@ static void test_Persist(IWebBrowser2 *wb, int version) IPersist_Release(persist); } +static void test_OleObject(IWebBrowser2 *wb, int version) +{ + IOleObject *oleobj; + CLSID clsid; + HRESULT hr; + + hr = IWebBrowser2_QueryInterface(wb, &IID_IOleObject, (void **)&oleobj); + ok(hr == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hr); + + hr = IOleObject_GetUserClassID(oleobj, &clsid); + ok(hr == S_OK, "GetUserClassID failed: %08x\n", hr); + if (version == 1) + ok(IsEqualGUID(&clsid, &CLSID_WebBrowser_V1), "got wrong CLSID: %s\n", wine_dbgstr_guid(&clsid)); + else + ok(IsEqualGUID(&clsid, &CLSID_WebBrowser), "got wrong CLSID: %s\n", wine_dbgstr_guid(&clsid)); + + IOleObject_Release(oleobj); +} + static void test_ie_funcs(IWebBrowser2 *wb) { IDispatch *disp; @@ -3761,6 +3780,7 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_Navigate2(webbrowser, L"about:blank"); test_QueryStatusWB(webbrowser, TRUE); test_Persist(webbrowser, 2); + test_OleObject(webbrowser, 2); if(do_download) { IHTMLDocument2 *doc, *doc2; @@ -3870,6 +3890,7 @@ static void test_WebBrowserV1(void) test_ClassInfo(wb); test_EnumVerbs(wb); test_Persist(wb, 1); + test_OleObject(wb, 1); ref = IWebBrowser2_Release(wb); ok(ref == 0, "ref=%d, expected 0\n", ref);

1 0

Zebediah Figura : kernel32/tests: Relax a timing test.
by Alexandre Julliard July 27, 2020

July 27, 2020

Module: wine Branch: master Commit: 8acf35b1547e361f7e266be296982c52e25be3c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8acf35b1547e361f7e266be2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jul 25 10:44:47 2020 -0500 kernel32/tests: Relax a timing test. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/mailslot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index da595e9714..9da960fba8 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -324,7 +324,7 @@ todo_wine ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot read\n"); ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); dwTimeout = GetTickCount() - dwTimeout; - ok( dwTimeout >= 990, "timeout too short %u\n", dwTimeout ); + ok( dwTimeout >= 900, "timeout too short %u\n", dwTimeout ); ok( CloseHandle( hSlot ), "closing the mailslot\n"); return 0;

1 0

Alistair Leslie-Hughes : ws2_32: Correct returned error code for an invalid socket.
by Alexandre Julliard July 27, 2020

July 27, 2020

Module: wine Branch: master Commit: 587732acb7834a52a2af5bb45e59899ab8ec3f5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=587732acb7834a52a2af5bb4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 27 12:51:46 2020 +1000 ws2_32: Correct returned error code for an invalid socket. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 32 +++++++------------------------- dlls/ws2_32/tests/sock.c | 7 ++----- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 12126372d5..eb21e4b4b3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1119,8 +1119,8 @@ static DWORD NtStatusToWSAError( DWORD status ) { case STATUS_SUCCESS: return 0; case STATUS_PENDING: return WSA_IO_PENDING; + case STATUS_INVALID_HANDLE: case STATUS_OBJECT_TYPE_MISMATCH: return WSAENOTSOCK; - case STATUS_INVALID_HANDLE: return WSAEBADF; case STATUS_INVALID_PARAMETER: return WSAEINVAL; case STATUS_PIPE_DISCONNECTED: return WSAESHUTDOWN; case STATUS_NETWORK_BUSY: return WSAEALREADY; @@ -2889,19 +2889,11 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW } fd = get_sock_fd( listener, FILE_READ_DATA, NULL ); - if (fd == -1) - { - SetLastError(WSAENOTSOCK); - return FALSE; - } + if (fd == -1) return FALSE; release_sock_fd( listener, fd ); fd = get_sock_fd( acceptor, FILE_READ_DATA, NULL ); - if (fd == -1) - { - SetLastError(WSAENOTSOCK); - return FALSE; - } + if (fd == -1) return FALSE; release_sock_fd( acceptor, fd ); wsa = (struct ws2_accept_async *)alloc_async_io( sizeof(*wsa), WS2_async_accept ); @@ -3147,11 +3139,8 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD buffers, flags ); fd = get_sock_fd( s, FILE_WRITE_DATA, NULL ); - if (fd == -1) - { - WSASetLastError( WSAENOTSOCK ); - return FALSE; - } + if (fd == -1) return FALSE; + if (getpeername( fd, &uaddr.addr, &uaddrlen ) != 0) { release_sock_fd( s, fd ); @@ -3497,8 +3486,6 @@ int WINAPI WS_closesocket(SOCKET s) if (CloseHandle(SOCKET2HANDLE(s))) res = 0; } - else - SetLastError(WSAENOTSOCK); } else SetLastError(WSANOTINITIALISED); @@ -3609,11 +3596,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n } fd = get_sock_fd( s, FILE_READ_DATA, NULL ); - if (fd == -1) - { - SetLastError( WSAENOTSOCK ); - return FALSE; - } + if (fd == -1) return FALSE; TRACE("socket %04lx, ptr %p %s, length %d, sendptr %p, len %d, ov %p\n", s, name, debugstr_sockaddr(name), namelen, sendBuf, sendBufLen, ov); @@ -5207,8 +5190,7 @@ int WINAPI WS_listen(SOCKET s, int backlog) SetLastError(wsaErrno()); release_sock_fd( s, fd ); } - else - SetLastError(WSAENOTSOCK); + return ret; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d9ceca98cc..b7a3fc4453 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1565,7 +1565,6 @@ todo_wine size = sizeof(i); i = 1234; err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); -todo_wine ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAENOTSOCK), "got %d with %d (expected SOCKET_ERROR with WSAENOTSOCK)\n", err, WSAGetLastError()); @@ -3850,8 +3849,7 @@ static void test_select(void) SetLastError(0xdeadbeef); ret = select(0, &readfds, NULL, &exceptfds, &select_timeout); ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); -todo_wine - ok(GetLastError() == WSAENOTSOCK, "expected 10038, got %d\n", GetLastError()); + ok(GetLastError() == WSAENOTSOCK, "got %d\n", GetLastError()); /* descriptor sets are unchanged */ ok(readfds.fd_count == 2, "expected 2, got %d\n", readfds.fd_count); ok(exceptfds.fd_count == 2, "expected 2, got %d\n", exceptfds.fd_count); @@ -3878,8 +3876,7 @@ todo_wine ret = select(0, NULL, NULL, &exceptfds, &select_timeout); todo_wine ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); -todo_wine - ok(GetLastError() == WSAENOTSOCK, "expected 10038, got %d\n", GetLastError()); + ok(GetLastError() == WSAENOTSOCK, "got %d\n", GetLastError()); WaitForSingleObject (thread_handle, 1000); closesocket(fdRead);

1 0

Gijs Vermeulen : wbemprox/tests: Fix test failures.
by Alexandre Julliard July 27, 2020

July 27, 2020

Module: wine Branch: master Commit: 850b289ce9b8b975786fb7d261ac74485296b0b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=850b289ce9b8b975786fb7d2… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jul 17 17:33:10 2020 +0200 wbemprox/tests: Fix test failures. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index da47773da2..0fa091b739 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1144,8 +1144,10 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_PhysicalMemory" ); IEnumWbemClassObject *result; IWbemClassObject *obj; - HRESULT hr; + CIMTYPE type; + VARIANT val; DWORD count; + HRESULT hr; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); if (hr != S_OK) @@ -1154,21 +1156,39 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) return; } - hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - - if (count > 0) + for (;;) { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + check_property( obj, L"BankLabel", VT_BSTR, CIM_STRING ); check_property( obj, L"Capacity", VT_BSTR, CIM_UINT64 ); check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); check_property( obj, L"DeviceLocator", VT_BSTR, CIM_STRING ); check_property( obj, L"FormFactor", VT_I4, CIM_UINT16 ); check_property( obj, L"MemoryType", VT_I4, CIM_UINT16 ); - check_property( obj, L"PartNumber", VT_NULL, CIM_STRING ); - check_property( obj, L"SerialNumber", VT_NULL, CIM_STRING ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"PartNumber", 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "PartNumber %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"SerialNumber", 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "SerialNumber %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql );

1 0

Louis Lenders : sc.exe: Fake succes for the SdSet argument.
by Alexandre Julliard July 27, 2020

July 27, 2020

Module: wine Branch: master Commit: a22b295cc30d89e446038c4e677f8ea6fef159e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a22b295cc30d89e446038c4e… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Jul 27 11:26:30 2020 +0200 sc.exe: Fake succes for the SdSet argument. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49620 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/sc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 1976c38a78..c9744afee3 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -220,6 +220,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; static const WCHAR startW[] = {'s','t','a','r','t',0}; static const WCHAR stopW[] = {'s','t','o','p',0}; + static const WCHAR sdsetW[] = {'s','d','s','e','t',0}; SC_HANDLE manager, service; SERVICE_STATUS status; BOOL ret = FALSE; @@ -328,6 +329,11 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } + else if (!wcsicmp( argv[1], sdsetW )) + { + WINE_FIXME("SdSet command not supported, faking success\n"); + ret = TRUE; + } else WINE_FIXME("command not supported\n");

1 0

Zebediah Figura : dsdmo: Implement IMediaObject::SetOutputType().
by Alexandre Julliard July 27, 2020

July 27, 2020

Module: wine Branch: master Commit: ffdc68d517ccd28f0277b7bdb45f21aa1135d80b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffdc68d517ccd28f0277b7bd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 24 19:20:24 2020 -0500 dsdmo: Implement IMediaObject::SetOutputType(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/main.c | 25 +++++++++++++++++++++++-- dlls/dsdmo/tests/dsdmo.c | 10 +++++----- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 9d4fbc5b78..1e992fe541 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -226,8 +226,29 @@ static HRESULT WINAPI effect_SetInputType(IMediaObject *iface, DWORD index, cons static HRESULT WINAPI effect_SetOutputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) { - FIXME("iface %p, index %u, type %p, flags %#x, stub!\n", iface, index, type, flags); - return E_NOTIMPL; + struct effect *effect = impl_from_IMediaObject(iface); + HRESULT hr; + + TRACE("iface %p, index %u, type %p, flags %#x.\n", iface, index, type, flags); + + if (flags & DMO_SET_TYPEF_CLEAR) + return S_OK; + + if (!IsEqualGUID(&type->majortype, &MEDIATYPE_Audio)) + return DMO_E_TYPE_NOT_ACCEPTED; + + if (!IsEqualGUID(&type->subtype, &MEDIASUBTYPE_PCM) + && !IsEqualGUID(&type->subtype, &MEDIASUBTYPE_IEEE_FLOAT)) + return DMO_E_TYPE_NOT_ACCEPTED; + + if (!IsEqualGUID(&type->formattype, &FORMAT_WaveFormatEx)) + return DMO_E_TYPE_NOT_ACCEPTED; + + EnterCriticalSection(&effect->cs); + hr = memcmp(type->pbFormat, &effect->format, sizeof(WAVEFORMATEX)) ? DMO_E_TYPE_NOT_ACCEPTED : S_OK; + LeaveCriticalSection(&effect->cs); + + return hr; } static HRESULT WINAPI effect_GetInputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index d1cf2575de..9026728f6c 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -254,22 +254,22 @@ static void test_media_types(const GUID *clsid) build_pcm_format(&wfx, depths[j].format, depths[j].depth, sample_rates[i], 3 - channels); hr = IMediaObject_SetOutputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", hr, sample_rates[i], channels, depths[j].format, depths[j].depth); build_pcm_format(&wfx, depths[j].format, depths[j].depth, 2 * sample_rates[i], channels); hr = IMediaObject_SetOutputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", hr, sample_rates[i], channels, depths[j].format, depths[j].depth); build_pcm_format(&wfx, depths[j].format, 24 - depths[j].depth, sample_rates[i], channels); hr = IMediaObject_SetOutputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", hr, sample_rates[i], channels, depths[j].format, depths[j].depth); build_pcm_format(&wfx, depths[j].format, depths[j].depth, sample_rates[i], channels); hr = IMediaObject_SetOutputType(dmo, 0, &mt, 0); - todo_wine ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", + ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", hr, sample_rates[i], channels, depths[j].format, depths[j].depth); hr = IMediaObject_SetInputType(dmo, 0, NULL, DMO_SET_TYPEF_CLEAR); @@ -277,7 +277,7 @@ static void test_media_types(const GUID *clsid) hr, sample_rates[i], channels, depths[j].format, depths[j].depth); hr = IMediaObject_SetOutputType(dmo, 0, NULL, DMO_SET_TYPEF_CLEAR); - todo_wine ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", + ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", hr, sample_rates[i], channels, depths[j].format, depths[j].depth); hr = IMediaObject_SetInputType(dmo, 0, NULL, DMO_SET_TYPEF_CLEAR);

1 0

Zebediah Figura : dsdmo: Implement IMediaObject::SetInputType().
by Alexandre Julliard July 27, 2020

July 27, 2020

Module: wine Branch: master Commit: f21d13e2bc9df80f6a6021ae0d2514469ece7354 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f21d13e2bc9df80f6a6021ae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 24 19:20:23 2020 -0500 dsdmo: Implement IMediaObject::SetInputType(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/Makefile.in | 2 +- dlls/dsdmo/main.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/dsdmo/tests/dsdmo.c | 22 ++++++++-------- 3 files changed, 78 insertions(+), 14 deletions(-) diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in index 3787415abd..d184b025ad 100644 --- a/dlls/dsdmo/Makefile.in +++ b/dlls/dsdmo/Makefile.in @@ -1,5 +1,5 @@ MODULE = dsdmo.dll -IMPORTS = dmoguids uuid +IMPORTS = dmoguids strmiids uuid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index cc06dfe6f5..9d4fbc5b78 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -20,6 +20,7 @@ #include "dmo.h" #include "mmreg.h" #include "mmsystem.h" +#include "uuids.h" #include "initguid.h" #include "dsound.h" #include "rpcproxy.h" @@ -38,6 +39,9 @@ struct effect IUnknown *outer_unk; LONG refcount; + CRITICAL_SECTION cs; + WAVEFORMATEX format; + const struct effect_ops *ops; }; @@ -92,6 +96,8 @@ static ULONG WINAPI effect_inner_Release(IUnknown *iface) if (!refcount) { + effect->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&effect->cs); effect->ops->destroy(effect); } return refcount; @@ -159,8 +165,63 @@ static HRESULT WINAPI effect_GetOutputType(IMediaObject *iface, DWORD index, DWO static HRESULT WINAPI effect_SetInputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) { - FIXME("iface %p, index %u, type %p, flags %#x, stub!\n", iface, index, type, flags); - return E_NOTIMPL; + struct effect *effect = impl_from_IMediaObject(iface); + const WAVEFORMATEX *format; + + TRACE("iface %p, index %u, type %p, flags %#x.\n", iface, index, type, flags); + + if (flags & DMO_SET_TYPEF_CLEAR) + { + EnterCriticalSection(&effect->cs); + memset(&effect->format, 0, sizeof(effect->format)); + LeaveCriticalSection(&effect->cs); + return S_OK; + } + + if (!IsEqualGUID(&type->majortype, &MEDIATYPE_Audio)) + return DMO_E_TYPE_NOT_ACCEPTED; + + if (!IsEqualGUID(&type->subtype, &MEDIASUBTYPE_PCM) + && !IsEqualGUID(&type->subtype, &MEDIASUBTYPE_IEEE_FLOAT)) + return DMO_E_TYPE_NOT_ACCEPTED; + + if (!IsEqualGUID(&type->formattype, &FORMAT_WaveFormatEx)) + return DMO_E_TYPE_NOT_ACCEPTED; + + format = (const WAVEFORMATEX *)type->pbFormat; + if (format->wFormatTag == WAVE_FORMAT_PCM) + { + if (format->wBitsPerSample != 8 && format->wBitsPerSample != 16) + { + WARN("Rejecting %u-bit integer PCM.\n", format->wBitsPerSample); + return DMO_E_TYPE_NOT_ACCEPTED; + } + } + else if (format->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) + { + if (format->wBitsPerSample != 32) + { + WARN("Rejecting %u-bit float PCM.\n", format->wBitsPerSample); + return DMO_E_TYPE_NOT_ACCEPTED; + } + } + else + { + WARN("Rejecting tag %#x.\n", format->wFormatTag); + return DMO_E_TYPE_NOT_ACCEPTED; + } + + if (format->nChannels != 1 && format->nChannels != 2) + { + WARN("Rejecting %u channels.\n", format->nChannels); + return DMO_E_TYPE_NOT_ACCEPTED; + } + + EnterCriticalSection(&effect->cs); + effect->format = *format; + LeaveCriticalSection(&effect->cs); + + return S_OK; } static HRESULT WINAPI effect_SetOutputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) @@ -346,6 +407,9 @@ static void effect_init(struct effect *effect, IUnknown *outer, const struct eff effect->IMediaObject_iface.lpVtbl = &effect_vtbl; effect->IMediaObjectInPlace_iface.lpVtbl = &effect_inplace_vtbl; + InitializeCriticalSection(&effect->cs); + effect->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": effect.cs"); + effect->ops = ops; } diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index cb6e698b6e..d1cf2575de 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -206,32 +206,32 @@ static void test_media_types(const GUID *clsid) mt.majortype = MEDIATYPE_Video; hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); mt.majortype = GUID_NULL; hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); mt.majortype = MEDIATYPE_Audio; mt.subtype = MEDIASUBTYPE_RGB8; hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); mt.subtype = GUID_NULL; hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); mt.subtype = MEDIASUBTYPE_IEEE_FLOAT; hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); mt.subtype = MEDIASUBTYPE_PCM; mt.formattype = FORMAT_VideoInfo; hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); mt.formattype = FORMAT_None; hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); mt.formattype = GUID_NULL; hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); mt.formattype = FORMAT_WaveFormatEx; for (i = 0; i < ARRAY_SIZE(sample_rates); ++i) @@ -247,7 +247,7 @@ static void test_media_types(const GUID *clsid) build_pcm_format(&wfx, depths[j].format, depths[j].depth, sample_rates[i], channels); hr = IMediaObject_SetInputType(dmo, 0, &mt, 0); - todo_wine ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", + ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", hr, sample_rates[i], channels, depths[j].format, depths[j].depth); /* The output type must match the input type. */ @@ -273,7 +273,7 @@ static void test_media_types(const GUID *clsid) hr, sample_rates[i], channels, depths[j].format, depths[j].depth); hr = IMediaObject_SetInputType(dmo, 0, NULL, DMO_SET_TYPEF_CLEAR); - todo_wine ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", + ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", hr, sample_rates[i], channels, depths[j].format, depths[j].depth); hr = IMediaObject_SetOutputType(dmo, 0, NULL, DMO_SET_TYPEF_CLEAR); @@ -281,7 +281,7 @@ static void test_media_types(const GUID *clsid) hr, sample_rates[i], channels, depths[j].format, depths[j].depth); hr = IMediaObject_SetInputType(dmo, 0, NULL, DMO_SET_TYPEF_CLEAR); - todo_wine ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", + ok(hr == S_OK, "Got hr %#x for %u Hz, %u channels, format %#x, depth %u.\n", hr, sample_rates[i], channels, depths[j].format, depths[j].depth); } }

1 0

Jacek Caban : wineconsole: Ignore ERROR_IO_INCOMPLETE error in WINECON_GrabChanges.
by Alexandre Julliard July 27, 2020

July 27, 2020

Module: wine Branch: master Commit: 928fffee8dac4a9555bbbc141d9f29483422eee1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=928fffee8dac4a9555bbbc14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 24 20:39:53 2020 +0200 wineconsole: Ignore ERROR_IO_INCOMPLETE error in WINECON_GrabChanges. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index be6ddf2000..ad3cd25bf5 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -212,6 +212,7 @@ void WINECON_GrabChanges(struct inner_data* data) if (!GetOverlappedResult(data->hSynchro, &data->overlapped, &num, FALSE)) { + if (GetLastError() == ERROR_IO_INCOMPLETE) return; ERR( "failed to get renderer events: %u\n", GetLastError() ); data->dying = TRUE; return;

1 0

Jacek Caban : wineconsole: Use ReadConsoleOutputW in WINECON_FetchCells.
by Alexandre Julliard July 27, 2020

July 27, 2020

Module: wine Branch: master Commit: 29d5c6c476faa00529fe765150d014607da48f27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29d5c6c476faa00529fe7651… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 24 20:39:58 2020 +0200 wineconsole: Use ReadConsoleOutputW in WINECON_FetchCells. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index ad3cd25bf5..75bb878bfd 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -66,19 +66,12 @@ static void WINECON_Usage(void) */ static void WINECON_FetchCells(struct inner_data* data, int upd_tp, int upd_bm) { - SERVER_START_REQ( read_console_output ) - { - req->handle = wine_server_obj_handle( data->hConOut ); - req->x = 0; - req->y = upd_tp; - req->mode = CHAR_INFO_MODE_TEXTATTR; - req->wrap = TRUE; - wine_server_set_reply( req, &data->cells[upd_tp * data->curcfg.sb_width], - (upd_bm-upd_tp+1) * data->curcfg.sb_width * sizeof(CHAR_INFO) ); - wine_server_call( req ); - } - SERVER_END_REQ; - data->fnRefresh(data, upd_tp, upd_bm); + SMALL_RECT region = { 0, upd_tp, data->curcfg.sb_width - 1, upd_bm }; + COORD size = { data->curcfg.sb_width, data->curcfg.sb_height }; + COORD coord = { 0, upd_tp }; + + if (ReadConsoleOutputW(data->hConOut, data->cells, size, coord, &region)) + data->fnRefresh(data, upd_tp, upd_bm); } /******************************************************************

1 0

Zebediah Figura : dsdmo: Stub IMediaObjectInPlace.
by Alexandre Julliard July 27, 2020

July 27, 2020

Module: wine Branch: master Commit: 2b9cbfd6269078e92691e2eb0f53a684b8dbbbbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b9cbfd6269078e92691e2eb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 24 19:20:21 2020 -0500 dsdmo: Stub IMediaObjectInPlace. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/main.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 44915ca856..f3be97177a 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -33,6 +33,7 @@ static HINSTANCE dsdmo_instance; struct effect { IMediaObject IMediaObject_iface; + IMediaObjectInPlace IMediaObjectInPlace_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -61,6 +62,8 @@ static HRESULT WINAPI effect_inner_QueryInterface(IUnknown *iface, REFIID iid, v *out = iface; else if (IsEqualGUID(iid, &IID_IMediaObject)) *out = &effect->IMediaObject_iface; + else if (IsEqualGUID(iid, &IID_IMediaObjectInPlace)) + *out = &effect->IMediaObjectInPlace_iface; else if (!(*out = effect->ops->query_interface(effect, iid))) { WARN("%s not implemented; returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -282,12 +285,66 @@ static const IMediaObjectVtbl effect_vtbl = effect_Lock, }; +static struct effect *impl_from_IMediaObjectInPlace(IMediaObjectInPlace *iface) +{ + return CONTAINING_RECORD(iface, struct effect, IMediaObjectInPlace_iface); +} + +static HRESULT WINAPI effect_inplace_QueryInterface(IMediaObjectInPlace *iface, REFIID iid, void **out) +{ + struct effect *effect = impl_from_IMediaObjectInPlace(iface); + return IUnknown_QueryInterface(effect->outer_unk, iid, out); +} + +static ULONG WINAPI effect_inplace_AddRef(IMediaObjectInPlace *iface) +{ + struct effect *effect = impl_from_IMediaObjectInPlace(iface); + return IUnknown_AddRef(effect->outer_unk); +} + +static ULONG WINAPI effect_inplace_Release(IMediaObjectInPlace *iface) +{ + struct effect *effect = impl_from_IMediaObjectInPlace(iface); + return IUnknown_Release(effect->outer_unk); +} + +static HRESULT WINAPI effect_inplace_Process(IMediaObjectInPlace *iface, ULONG size, + BYTE *data, REFERENCE_TIME start, DWORD flags) +{ + FIXME("iface %p, size %u, data %p, start %s, flags %#x, stub!\n", + iface, size, data, wine_dbgstr_longlong(start), flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_inplace_Clone(IMediaObjectInPlace *iface, IMediaObjectInPlace **out) +{ + FIXME("iface %p, out %p, stub!\n", iface, out); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_inplace_GetLatency(IMediaObjectInPlace *iface, REFERENCE_TIME *latency) +{ + FIXME("iface %p, latency %p, stub!\n", iface, latency); + return E_NOTIMPL; +} + +static const IMediaObjectInPlaceVtbl effect_inplace_vtbl = +{ + effect_inplace_QueryInterface, + effect_inplace_AddRef, + effect_inplace_Release, + effect_inplace_Process, + effect_inplace_Clone, + effect_inplace_GetLatency, +}; + static void effect_init(struct effect *effect, IUnknown *outer, const struct effect_ops *ops) { effect->outer_unk = outer ? outer : &effect->IUnknown_inner; effect->refcount = 1; effect->IUnknown_inner.lpVtbl = &effect_inner_vtbl; effect->IMediaObject_iface.lpVtbl = &effect_vtbl; + effect->IMediaObjectInPlace_iface.lpVtbl = &effect_inplace_vtbl; effect->ops = ops; }

1 0