June 2020 - Wine-Devel - list.winehq.org

WineHQ.org Downtime (2020-06-23)
by Jeremy Newman June 23, 2020

June 23, 2020

WineHQ.org and all related services and websites will be offline for about an hour today for upgrades. This will start at: 14:00 CDT (-5 GMT) I will reply to this message when services have been restored. -N

1 1

[PATCH 1/2] amstream: Store parent as struct ddraw_stream in ddraw stream sample.
by Zebediah Figura June 23, 2020

June 23, 2020

From: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Use %#x instead of %x, and break a long line. dlls/amstream/ddrawstream.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index c471a66200d..0bfbe653e7e 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -28,9 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); static const WCHAR sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; -static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawSurface *surface, - const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample); - struct ddraw_stream { IAMMediaStream IAMMediaStream_iface; @@ -51,6 +48,9 @@ struct ddraw_stream AM_MEDIA_TYPE mt; }; +static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, + const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample); + static inline struct ddraw_stream *impl_from_IAMMediaStream(IAMMediaStream *iface) { return CONTAINING_RECORD(iface, struct ddraw_stream, IAMMediaStream_iface); @@ -401,12 +401,15 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetDirectDraw(IDirectDrawMedi } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_CreateSample(IDirectDrawMediaStream *iface, - IDirectDrawSurface *surface, const RECT *rect, DWORD dwFlags, - IDirectDrawStreamSample **ppSample) + IDirectDrawSurface *surface, const RECT *rect, DWORD flags, + IDirectDrawStreamSample **sample) { - TRACE("(%p)->(%p,%s,%x,%p)\n", iface, surface, wine_dbgstr_rect(rect), dwFlags, ppSample); + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + + TRACE("stream %p, surface %p, rect %s, flags %#x, sample %p.\n", + stream, surface, wine_dbgstr_rect(rect), flags, sample); - return ddrawstreamsample_create(iface, surface, rect, ppSample); + return ddrawstreamsample_create(stream, surface, rect, sample); } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetTimePerFrame(IDirectDrawMediaStream *iface, @@ -959,7 +962,7 @@ struct ddraw_sample { IDirectDrawStreamSample IDirectDrawStreamSample_iface; LONG ref; - IMediaStream *parent; + struct ddraw_stream *parent; IDirectDrawSurface *surface; RECT rect; }; @@ -1011,7 +1014,6 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) { if (sample->surface) IDirectDrawSurface_Release(sample->surface); - IMediaStream_Release(sample->parent); HeapFree(GetProcessHeap(), 0, sample); } @@ -1102,7 +1104,7 @@ static const struct IDirectDrawStreamSampleVtbl DirectDrawStreamSample_Vtbl = ddraw_sample_SetRect }; -static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawSurface *surface, +static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample) { struct ddraw_sample *object; @@ -1116,8 +1118,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; object->ref = 1; - object->parent = (IMediaStream*)parent; - IMediaStream_AddRef(object->parent); + object->parent = parent; if (surface) { @@ -1129,7 +1130,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD DDSURFACEDESC desc; IDirectDraw *ddraw; - hr = IDirectDrawMediaStream_GetDirectDraw(parent, &ddraw); + hr = IDirectDrawMediaStream_GetDirectDraw(&parent->IDirectDrawMediaStream_iface, &ddraw); if (FAILED(hr)) { IDirectDrawStreamSample_Release(&object->IDirectDrawStreamSample_iface); -- 2.27.0

1 1

[PATCH] ieframe: IOleObject::SetExtent() should resize the Shell Embedding Window.
by Dmitry Timoshkov June 23, 2020

June 23, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/oleobject.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 5c49845aa7..b0e166897a 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -740,6 +740,22 @@ static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD dwDrawAspect, TRACE("(%p)->(%x %p)\n", This, dwDrawAspect, psizel); + if(This->shell_embedding_hwnd) { + LONG dpi_x, dpi_y, width, height; + HDC hdc; + + hdc = GetDC(0); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + + width = MulDiv(psizel->cx, dpi_x, 2540); + height = MulDiv(psizel->cy, dpi_y, 2540); + + SetWindowPos(This->shell_embedding_hwnd, NULL, + 0, 0, width, height, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); + } + /* Tests show that dwDrawAspect is ignored */ This->extent = *psizel; return S_OK; -- 2.26.2

2 3

[PATCH 1/2] amstream: Store parent as struct ddraw_stream in ddraw stream sample.
by Gijs Vermeulen June 23, 2020

June 23, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/ddrawstream.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index c471a66200..5c0203e76b 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -28,9 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); static const WCHAR sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; -static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawSurface *surface, - const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample); - struct ddraw_stream { IAMMediaStream IAMMediaStream_iface; @@ -51,6 +48,9 @@ struct ddraw_stream AM_MEDIA_TYPE mt; }; +static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, + const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample); + static inline struct ddraw_stream *impl_from_IAMMediaStream(IAMMediaStream *iface) { return CONTAINING_RECORD(iface, struct ddraw_stream, IAMMediaStream_iface); @@ -401,12 +401,14 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetDirectDraw(IDirectDrawMedi } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_CreateSample(IDirectDrawMediaStream *iface, - IDirectDrawSurface *surface, const RECT *rect, DWORD dwFlags, - IDirectDrawStreamSample **ppSample) + IDirectDrawSurface *surface, const RECT *rect, DWORD flags, + IDirectDrawStreamSample **sample) { - TRACE("(%p)->(%p,%s,%x,%p)\n", iface, surface, wine_dbgstr_rect(rect), dwFlags, ppSample); + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + + TRACE("stream %p, surface %p, rect %s, flags %x, sample %p.\n", stream, surface, wine_dbgstr_rect(rect), flags, sample); - return ddrawstreamsample_create(iface, surface, rect, ppSample); + return ddrawstreamsample_create(stream, surface, rect, sample); } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetTimePerFrame(IDirectDrawMediaStream *iface, @@ -959,7 +961,7 @@ struct ddraw_sample { IDirectDrawStreamSample IDirectDrawStreamSample_iface; LONG ref; - IMediaStream *parent; + struct ddraw_stream *parent; IDirectDrawSurface *surface; RECT rect; }; @@ -1011,7 +1013,6 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) { if (sample->surface) IDirectDrawSurface_Release(sample->surface); - IMediaStream_Release(sample->parent); HeapFree(GetProcessHeap(), 0, sample); } @@ -1102,7 +1103,7 @@ static const struct IDirectDrawStreamSampleVtbl DirectDrawStreamSample_Vtbl = ddraw_sample_SetRect }; -static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawSurface *surface, +static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample) { struct ddraw_sample *object; @@ -1116,8 +1117,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; object->ref = 1; - object->parent = (IMediaStream*)parent; - IMediaStream_AddRef(object->parent); + object->parent = parent; if (surface) { @@ -1129,7 +1129,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD DDSURFACEDESC desc; IDirectDraw *ddraw; - hr = IDirectDrawMediaStream_GetDirectDraw(parent, &ddraw); + hr = IDirectDrawMediaStream_GetDirectDraw(&parent->IDirectDrawMediaStream_iface, &ddraw); if (FAILED(hr)) { IDirectDrawStreamSample_Release(&object->IDirectDrawStreamSample_iface); -- 2.27.0

1 1

[PATCH 2/2] msscript.ocx: Keep script host running as long as any script module is alive.
by Jacek Caban June 23, 2020

June 23, 2020

Based on patch by Gabriel Ivăncescu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msscript.ocx/msscript.c | 93 +++++++++++++++++++++--------------- 1 file changed, 55 insertions(+), 38 deletions(-)

1 0

[PATCH 1/2] msscript.ocx: Move modules_count to the Script Host.
by Jacek Caban June 23, 2020

June 23, 2020

Based on patch by Gabriel Ivăncescu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msscript.ocx/msscript.c | 40 +++++++++++++++--------------- dlls/msscript.ocx/tests/msscript.c | 9 +++++++ 2 files changed, 29 insertions(+), 20 deletions(-)

1 0

[PATCH 1/2] user32/tests: Add test of ShowWindow with SW_SHOWNOACTIVATE
by Haidong Yu June 23, 2020

June 23, 2020

3 2

[PATCH] user32: Use a default name for winstations created or opened with no name.
by Huw Davies June 23, 2020

June 23, 2020

The default is of the form "Service-0x<luid high>-<luid low>$" where the luid in question is the logon session luid. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/tests/winstation.c | 24 +++++++++++++++++++----- dlls/user32/winstation.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 4aa5565b96c..d239ead6e98 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -118,9 +118,10 @@ static void test_handles(void) HANDLE hthread; DWORD id, flags, le; ATOM atom; - char buffer[20]; + char buffer[29], default_name[29] = ""; DWORD size; BOOL ret; + TOKEN_STATISTICS token_stats; /* win stations */ @@ -215,7 +216,6 @@ static void test_handles(void) SetLastError( 0xdeadbeef ); w2 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS ); ok( !w2, "open station succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); @@ -225,16 +225,30 @@ static void test_handles(void) memset( buffer, 0, sizeof(buffer) ); ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size ); ok( ret, "GetUserObjectInformationA failed with error %u\n", GetLastError() ); - todo_wine ok( !memcmp(buffer, "Service-0x0-", 12), "unexpected window station name '%s'\n", buffer ); - todo_wine ok( buffer[strlen(buffer) - 1] == '$', "unexpected window station name '%s'\n", buffer ); + /* Get the logon session LUID */ + ret = GetTokenInformation( GetCurrentProcessToken(), TokenStatistics, &token_stats, sizeof(token_stats), NULL ); + if (ret) + sprintf( default_name, "Service-0x%x-%x$", token_stats.AuthenticationId.HighPart, + token_stats.AuthenticationId.LowPart ); + if (*default_name) + ok( !strcmp( buffer, default_name ), "unexpected window station name '%s' expected '%s'\n", buffer, default_name ); SetLastError( 0xdeadbeef ); w3 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS ); - todo_wine ok( w3 != 0, "open station failed err %u\n", GetLastError() ); CloseWindowStation( w3 ); CloseWindowStation( w2 ); + w2 = CreateWindowStationA( NULL, 0, WINSTA_ALL_ACCESS, NULL ); + ok( w2 != 0, "create station failed err %u\n", GetLastError() ); + + memset( buffer, 0, sizeof(buffer) ); + ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size ); + ok( ret, "GetUserObjectInformationA failed with error %u\n", GetLastError() ); + if (*default_name) + ok( !strcmp( buffer, default_name ), "unexpected window station name '%s' expected '%s'\n", buffer, default_name ); + CloseWindowStation( w2 ); + SetLastError( 0xdeadbeef ); w2 = CreateWindowStationA( "foo\\bar", 0, WINSTA_ALL_ACCESS, NULL ); ok( !w2, "create station succeeded\n" ); diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 4f53b43bd6c..b5d5a372faf 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -80,6 +80,30 @@ static HANDLE get_winstations_dir_handle(void) return handle; } +static BOOL WINAPI winstation_default_name_once( INIT_ONCE *once, void *param, void **context ) +{ + static const WCHAR fmt[] = {'S','e','r','v','i','c','e','-','0','x','%','x','-','%','x','$',0}; + WCHAR *name = (WCHAR *)param; + TOKEN_STATISTICS stats; + BOOL ret; + + ret = GetTokenInformation( GetCurrentProcessToken(), TokenStatistics, &stats, sizeof(stats), NULL ); + if (ret) + sprintfW( name, fmt, stats.AuthenticationId.HighPart, stats.AuthenticationId.LowPart ); + + return ret; +} + +static const WCHAR *get_winstation_default_name( void ) +{ + static INIT_ONCE once = INIT_ONCE_STATIC_INIT; + static WCHAR name[29]; + BOOL ret; + + ret = InitOnceExecuteOnce( &once, winstation_default_name_once, name, NULL ); + return ret ? name : NULL; +} + /*********************************************************************** * CreateWindowStationA (USER32.@) */ @@ -113,6 +137,11 @@ HWINSTA WINAPI CreateWindowStationW( LPCWSTR name, DWORD flags, ACCESS_MASK acce SetLastError( ERROR_FILENAME_EXCED_RANGE ); return 0; } + if (!len) + { + name = get_winstation_default_name(); + len = strlenW( name ); + } SERVER_START_REQ( create_winstation ) { req->flags = 0; @@ -160,6 +189,11 @@ HWINSTA WINAPI OpenWindowStationW( LPCWSTR name, BOOL inherit, ACCESS_MASK acces SetLastError( ERROR_FILENAME_EXCED_RANGE ); return 0; } + if (!len) + { + name = get_winstation_default_name(); + len = strlenW( name ); + } SERVER_START_REQ( open_winstation ) { req->access = access; -- 2.23.0

2 1

[PATCH] shell32: Only consider copy operation multidest if the number of dst files is greater than one.
by Paul Gofman June 23, 2020

June 23, 2020

Fixes crash on start in Worms World Party Remastered. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/shell32/shlfileop.c | 2 +- dlls/shell32/tests/shlfileop.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index b941db39144..38c582be091 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1207,7 +1207,7 @@ static int copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *fl fileDest = &flTo->feFiles[0]; } - if (op->req->fFlags & FOF_MULTIDESTFILES) + if (op->req->fFlags & FOF_MULTIDESTFILES && flTo->dwNumFiles > 1) { if (flFrom->bAnyFromWildcard) return ERROR_CANCELLED; diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 27c72440425..36602f335d6 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1816,6 +1816,15 @@ static void test_copy(void) CreateDirectoryA("one", NULL); CreateDirectoryA("two", NULL); + /* Test with FOF_MULTIDESTFILES with a wildcard in pFrom and single output directory. */ + shfo.pFrom = "a*.txt\0"; + shfo.pTo = "one\0"; + shfo.fFlags |= FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI | FOF_MULTIDESTFILES; + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(DeleteFileA("one\\aa.txt"), "Expected file to exist\n"); + ok(DeleteFileA("one\\ab.txt"), "Expected file to exist\n"); + /* pFrom has a glob, pTo has more than one dest */ shfo.pFrom = "a*.txt\0"; shfo.pTo = "one\0two\0"; -- 2.26.2

1 0

[PATCH] dxva2: Implement DXVA2CreateVideoService().
by Nikolay Sivov June 23, 2020

June 23, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 38 +++++++++++++++++++++++----------- dlls/dxva2/tests/dxva2.c | 44 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 13 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 7ba8d9806b1..bbee697674f 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -101,6 +101,7 @@ static HRESULT WINAPI device_manager_processor_service_QueryInterface(IDirectXVi REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IDirectXVideoProcessorService) || + IsEqualIID(riid, &IID_IDirectXVideoAccelerationService) || IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; @@ -401,16 +402,9 @@ static HRESULT WINAPI device_manager_GetVideoService(IDirect3DDeviceManager9 *if hr = DXVA2_E_NEW_VIDEO_DEVICE; else if (!(flags & HANDLE_FLAG_OPEN)) hr = E_HANDLE; - else if (IsEqualIID(riid, &IID_IDirectXVideoProcessorService)) - { - *obj = &manager->IDirectXVideoProcessorService_iface; - IUnknown_AddRef((IUnknown *)*obj); - } else - { - WARN("Unsupported service %s.\n", debugstr_guid(riid)); - hr = E_UNEXPECTED; - } + hr = IDirectXVideoProcessorService_QueryInterface(&manager->IDirectXVideoProcessorService_iface, + riid, obj); } LeaveCriticalSection(&manager->cs); @@ -462,11 +456,31 @@ HRESULT WINAPI DXVA2CreateDirect3DDeviceManager9(UINT *token, IDirect3DDeviceMan return S_OK; } -HRESULT WINAPI DXVA2CreateVideoService( IDirect3DDevice9 *device, REFIID riid, void **ppv ) +HRESULT WINAPI DXVA2CreateVideoService(IDirect3DDevice9 *device, REFIID riid, void **obj) { - FIXME("(%p, %s, %p): stub\n", device, debugstr_guid(riid), ppv); + IDirect3DDeviceManager9 *manager; + HANDLE handle; + HRESULT hr; + UINT token; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", device, debugstr_guid(riid), obj); + + if (FAILED(hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager))) + return hr; + + if (FAILED(hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token))) + goto done; + + if (FAILED(hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle))) + goto done; + + hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, riid, obj); + IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); + +done: + IDirect3DDeviceManager9_Release(manager); + + return hr; } BOOL WINAPI DegaussMonitor( HMONITOR monitor ) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 65771fb5874..e3e8dd2e66c 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -62,8 +62,10 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window) static void test_device_manager(void) { IDirectXVideoProcessorService *processor_service; - IDirect3DDevice9 *device, *device2; + IDirectXVideoAccelerationService *accel_service; + IDirect3DDevice9 *device, *device2, *device3; IDirect3DDeviceManager9 *manager; + IDirect3DSurface9 *surface; int refcount, refcount2; HANDLE handle, handle1; IDirect3D9 *d3d; @@ -148,6 +150,46 @@ static void test_device_manager(void) hr = IDirect3DDeviceManager9_TestDevice(manager, handle); ok(hr == DXVA2_E_NEW_VIDEO_DEVICE, "Unexpected hr %#x.\n", hr); + /* Acceleration service. */ + hr = DXVA2CreateVideoService(device, &IID_IDirectXVideoAccelerationService, (void **)&accel_service); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 1, D3DFMT_X8R8G8B8, + D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL); +todo_wine + ok(hr == S_OK, "Failed to create a surface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IDirect3DSurface9_Release(surface); + + IDirectXVideoAccelerationService_Release(accel_service); + + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoAccelerationService, + (void **)&accel_service); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 1, D3DFMT_X8R8G8B8, + D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL); +todo_wine + ok(hr == S_OK, "Failed to create a surface, hr %#x.\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_GetDevice(surface, &device3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(device2 == device3, "Unexpected device.\n"); + IDirect3DDevice9_Release(device3); + + IDirect3DSurface9_Release(surface); + } + + IDirectXVideoAccelerationService_Release(accel_service); + IDirect3DDevice9_Release(device); IDirect3DDevice9_Release(device2); -- 2.27.0

1 0