wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Nikolay Sivov : mfplat: Implement MFCreateMFVideoFormatFromMFMediaType().
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 8140604763f679d8ea223c71ace077b9152d7d30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8140604763f679d8ea223c71… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 22 17:20:36 2020 +0300 mfplat: Implement MFCreateMFVideoFormatFromMFMediaType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 20 ++++++++++ include/mfapi.h | 1 + 4 files changed, 120 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index ca806a899f..66722a84b6 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2640,3 +2640,101 @@ HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMe return S_OK; } + +static void media_type_get_ratio(UINT64 value, UINT32 *numerator, UINT32 *denominator) +{ + *numerator = value >> 32; + *denominator = value; +} + +/*********************************************************************** + * MFCreateMFVideoFormatFromMFMediaType (mfplat.@) + */ +HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MFVIDEOFORMAT **video_format, UINT32 *size) +{ + UINT32 flags, palette_size = 0, avgrate; + MFVIDEOFORMAT *format; + UINT64 value; + INT32 stride; + GUID guid; + + TRACE("%p, %p, %p.\n", media_type, video_format, size); + + *size = sizeof(*format); + + if (SUCCEEDED(IMFMediaType_GetBlobSize(media_type, &MF_MT_PALETTE, &palette_size))) + *size += palette_size; + + if (!(format = CoTaskMemAlloc(*size))) + return E_OUTOFMEMORY; + + *video_format = format; + + memset(format, 0, sizeof(*format)); + format->dwSize = *size; + + if (SUCCEEDED(IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &guid))) + { + memcpy(&format->guidFormat, &guid, sizeof(guid)); + format->surfaceInfo.Format = guid.Data1; + } + + if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &value))) + media_type_get_ratio(value, &format->videoInfo.dwWidth, &format->videoInfo.dwHeight); + + if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_PIXEL_ASPECT_RATIO, &value))) + { + media_type_get_ratio(value, &format->videoInfo.PixelAspectRatio.Numerator, + &format->videoInfo.PixelAspectRatio.Denominator); + } + + IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_CHROMA_SITING, &format->videoInfo.SourceChromaSubsampling); + IMFMediaType_GetUINT32(media_type, &MF_MT_INTERLACE_MODE, &format->videoInfo.InterlaceMode); + IMFMediaType_GetUINT32(media_type, &MF_MT_TRANSFER_FUNCTION, &format->videoInfo.TransferFunction); + IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_PRIMARIES, &format->videoInfo.ColorPrimaries); + IMFMediaType_GetUINT32(media_type, &MF_MT_YUV_MATRIX, &format->videoInfo.TransferMatrix); + IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_LIGHTING, &format->videoInfo.SourceLighting); + + if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_RATE, &value))) + { + media_type_get_ratio(value, &format->videoInfo.FramesPerSecond.Numerator, + &format->videoInfo.FramesPerSecond.Denominator); + } + + IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_NOMINAL_RANGE, &format->videoInfo.NominalRange); + IMFMediaType_GetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&format->videoInfo.GeometricAperture, + sizeof(format->videoInfo.GeometricAperture), NULL); + IMFMediaType_GetBlob(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (UINT8 *)&format->videoInfo.MinimumDisplayAperture, + sizeof(format->videoInfo.MinimumDisplayAperture), NULL); + + /* Video flags. */ + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_PAD_CONTROL_FLAGS, &flags))) + format->videoInfo.VideoFlags |= flags; + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_SOURCE_CONTENT_HINT, &flags))) + format->videoInfo.VideoFlags |= flags; + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_DRM_FLAGS, &flags))) + format->videoInfo.VideoFlags |= flags; + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_PAN_SCAN_ENABLED, &flags)) && !!flags) + { + format->videoInfo.VideoFlags |= MFVideoFlag_PanScanEnabled; + IMFMediaType_GetBlob(media_type, &MF_MT_PAN_SCAN_APERTURE, (UINT8 *)&format->videoInfo.PanScanAperture, + sizeof(format->videoInfo.PanScanAperture), NULL); + } + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, (UINT32 *)&stride)) && stride < 0) + format->videoInfo.VideoFlags |= MFVideoFlag_BottomUpLinearRep; + + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BITRATE, &avgrate))) + format->compressedInfo.AvgBitrate = avgrate; + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BIT_ERROR_RATE, &avgrate))) + format->compressedInfo.AvgBitErrorRate = avgrate; + IMFMediaType_GetUINT32(media_type, &MF_MT_MAX_KEYFRAME_SPACING, &format->compressedInfo.MaxKeyFrameSpacing); + + /* Palette. */ + if (palette_size) + { + format->surfaceInfo.PaletteEntries = palette_size / sizeof(*format->surfaceInfo.Palette); + IMFMediaType_GetBlob(media_type, &MF_MT_PALETTE, (UINT8 *)format->surfaceInfo.Palette, palette_size, NULL); + } + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 01f9efaeca..e6069424fc 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -52,7 +52,7 @@ @ stdcall MFCreateMFByteStreamOnStream(ptr ptr) @ stdcall MFCreateMFByteStreamOnStreamEx(ptr ptr) @ stdcall MFCreateMFByteStreamWrapper(ptr ptr) -@ stub MFCreateMFVideoFormatFromMFMediaType +@ stdcall MFCreateMFVideoFormatFromMFMediaType(ptr ptr ptr) @ stdcall MFCreateMediaBufferFromMediaType(ptr int64 long long ptr) @ stub MFCreateMediaBufferWrapper @ stdcall MFCreateMediaEvent(long ptr long ptr ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 8a52279a08..aac6f73458 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5262,6 +5262,25 @@ static void test_MFInitMediaTypeFromWaveFormatEx(void) IMFMediaType_Release(mediatype); } +static void test_MFCreateMFVideoFormatFromMFMediaType(void) +{ + MFVIDEOFORMAT *video_format; + IMFMediaType *media_type; + UINT32 size; + HRESULT hr; + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &video_format, &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!video_format, "Unexpected format.\n"); + ok(video_format->dwSize == size && size == sizeof(*video_format), "Unexpected size %u.\n", size); + CoTaskMemFree(video_format); + + IMFMediaType_Release(media_type); +} + START_TEST(mfplat) { char **argv; @@ -5317,6 +5336,7 @@ START_TEST(mfplat) test_MFCreate2DMediaBuffer(); test_MFCreateMediaBufferFromMediaType(); test_MFInitMediaTypeFromWaveFormatEx(); + test_MFCreateMFVideoFormatFromMFMediaType(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 4da25341c6..e86fb526f1 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -509,6 +509,7 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HRESULT status, const PROPVARIANT *value, IMFMediaEvent **event); HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); +HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MFVIDEOFORMAT **video_format, UINT32 *size); HRESULT WINAPI MFCreateSample(IMFSample **sample); HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMediaType **media_type); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer);

1 0

Nikolay Sivov : mfplat: Add IMFVideoMediaType semi-stub.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: a7d18392e48ec3836af58927e733bb1901ab88cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7d18392e48ec3836af58927… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 22 17:20:35 2020 +0300 mfplat: Add IMFVideoMediaType semi-stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 487 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 480 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7d18392e48ec3836af5…

1 0

Nikolay Sivov : dxva2: Add IDirectXVideoProcessorService stub.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 3b4738bb20db7bd0da178d6d28c8661db611af2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b4738bb20db7bd0da178d6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 22 13:45:31 2020 +0300 dxva2: Add IDirectXVideoProcessorService stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/dxva2/tests/dxva2.c | 5 +- 2 files changed, 140 insertions(+), 6 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 7e983a43dd..7ba8d9806b 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -47,6 +47,7 @@ struct device_handle struct device_manager { IDirect3DDeviceManager9 IDirect3DDeviceManager9_iface; + IDirectXVideoProcessorService IDirectXVideoProcessorService_iface; LONG refcount; IDirect3DDevice9 *device; @@ -91,6 +92,115 @@ static struct device_manager *impl_from_IDirect3DDeviceManager9(IDirect3DDeviceM return CONTAINING_RECORD(iface, struct device_manager, IDirect3DDeviceManager9_iface); } +static struct device_manager *impl_from_IDirectXVideoProcessorService(IDirectXVideoProcessorService *iface) +{ + return CONTAINING_RECORD(iface, struct device_manager, IDirectXVideoProcessorService_iface); +} + +static HRESULT WINAPI device_manager_processor_service_QueryInterface(IDirectXVideoProcessorService *iface, + REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IDirectXVideoProcessorService) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IDirectXVideoProcessorService_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI device_manager_processor_service_AddRef(IDirectXVideoProcessorService *iface) +{ + struct device_manager *manager = impl_from_IDirectXVideoProcessorService(iface); + return IDirect3DDeviceManager9_AddRef(&manager->IDirect3DDeviceManager9_iface); +} + +static ULONG WINAPI device_manager_processor_service_Release(IDirectXVideoProcessorService *iface) +{ + struct device_manager *manager = impl_from_IDirectXVideoProcessorService(iface); + return IDirect3DDeviceManager9_Release(&manager->IDirect3DDeviceManager9_iface); +} + +static HRESULT WINAPI device_manager_processor_service_CreateSurface(IDirectXVideoProcessorService *iface, + UINT width, UINT height, UINT backbuffers, D3DFORMAT format, D3DPOOL pool, DWORD usage, DWORD dxvaType, + IDirect3DSurface9 **surface, HANDLE *shared_handle) +{ + FIXME("%p, %u, %u, %u, %u, %u, %u, %u, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage, dxvaType, + surface, shared_handle); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_processor_service_RegisterVideoProcessorSoftwareDevice( + IDirectXVideoProcessorService *iface, void *callbacks) +{ + FIXME("%p, %p.\n", iface, callbacks); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorDeviceGuids( + IDirectXVideoProcessorService *iface, const DXVA2_VideoDesc *video_desc, UINT *count, GUID **guids) +{ + FIXME("%p, %p, %p, %p.\n", iface, video_desc, count, guids); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorRenderTargets( + IDirectXVideoProcessorService *iface, REFGUID deviceguid, const DXVA2_VideoDesc *video_desc, UINT *count, + D3DFORMAT **formats) +{ + FIXME("%p, %s, %p, %p, %p.\n", iface, debugstr_guid(deviceguid), video_desc, count, formats); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorSubStreamFormats( + IDirectXVideoProcessorService *iface, REFGUID deviceguid, const DXVA2_VideoDesc *video_desc, + D3DFORMAT rt_format, UINT *count, D3DFORMAT **formats) +{ + FIXME("%p, %s, %p, %u, %p, %p.\n", iface, debugstr_guid(deviceguid), video_desc, rt_format, count, formats); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorCaps( + IDirectXVideoProcessorService *iface, REFGUID deviceguid, const DXVA2_VideoDesc *video_desc, + D3DFORMAT rt_format, DXVA2_VideoProcessorCaps *caps) +{ + FIXME("%p, %s, %p, %u, %p.\n", iface, debugstr_guid(deviceguid), video_desc, rt_format, caps); + + return E_NOTIMPL; +} + +static HRESULT WINAPI device_manager_processor_service_GetProcAmpRange( + IDirectXVideoProcessorService *iface, REFGUID deviceguid, const DXVA2_VideoDesc *video_desc, + D3DFORMAT rt_format, UINT ProcAmpCap, DXVA2_ValueRange *range) +{ + FIXME("%p, %s, %p, %u, %u, %p.\n", iface, debugstr_guid(deviceguid), video_desc, rt_format, ProcAmpCap, range); + + return E_NOTIMPL; +} + +static const IDirectXVideoProcessorServiceVtbl device_manager_processor_service_vtbl = +{ + device_manager_processor_service_QueryInterface, + device_manager_processor_service_AddRef, + device_manager_processor_service_Release, + device_manager_processor_service_CreateSurface, + device_manager_processor_service_RegisterVideoProcessorSoftwareDevice, + device_manager_processor_service_GetVideoProcessorDeviceGuids, + device_manager_processor_service_GetVideoProcessorRenderTargets, + device_manager_processor_service_GetVideoProcessorSubStreamFormats, + device_manager_processor_service_GetVideoProcessorCaps, + device_manager_processor_service_GetProcAmpRange, +}; + static HRESULT WINAPI device_manager_QueryInterface(IDirect3DDeviceManager9 *iface, REFIID riid, void **obj) { TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); @@ -276,9 +386,35 @@ static HRESULT WINAPI device_manager_UnlockDevice(IDirect3DDeviceManager9 *iface static HRESULT WINAPI device_manager_GetVideoService(IDirect3DDeviceManager9 *iface, HANDLE hdevice, REFIID riid, void **obj) { - FIXME("%p, %p, %s, %p.\n", iface, hdevice, debugstr_guid(riid), obj); + struct device_manager *manager = impl_from_IDirect3DDeviceManager9(iface); + HRESULT hr; + size_t idx; - return E_NOTIMPL; + TRACE("%p, %p, %s, %p.\n", iface, hdevice, debugstr_guid(riid), obj); + + EnterCriticalSection(&manager->cs); + if (SUCCEEDED(hr = device_manager_get_handle_index(manager, hdevice, &idx))) + { + unsigned int flags = manager->handles[idx].flags; + + if (flags & HANDLE_FLAG_INVALID) + 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; + } + } + LeaveCriticalSection(&manager->cs); + + return hr; } static const IDirect3DDeviceManager9Vtbl device_manager_vtbl = @@ -315,6 +451,7 @@ HRESULT WINAPI DXVA2CreateDirect3DDeviceManager9(UINT *token, IDirect3DDeviceMan return E_OUTOFMEMORY; object->IDirect3DDeviceManager9_iface.lpVtbl = &device_manager_vtbl; + object->IDirectXVideoProcessorService_iface.lpVtbl = &device_manager_processor_service_vtbl; object->refcount = 1; object->token = GetTickCount(); InitializeCriticalSection(&object->cs); diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 605a69dd5a..65771fb587 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -134,10 +134,8 @@ static void test_device_manager(void) hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, (void **)&processor_service); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IDirectXVideoProcessorService_Release(processor_service); + IDirectXVideoProcessorService_Release(processor_service); device2 = create_device(d3d, window); hr = IDirect3DDeviceManager9_ResetDevice(manager, device2, token); @@ -145,7 +143,6 @@ todo_wine hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, (void **)&processor_service); -todo_wine ok(hr == DXVA2_E_NEW_VIDEO_DEVICE, "Unexpected hr %#x.\n", hr); hr = IDirect3DDeviceManager9_TestDevice(manager, handle);

1 0

Nikolay Sivov : dxva2: Implement handle management for device manager.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 24aaf0d535b6c5c0d56b1e50deb2e47d3cce9ab8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24aaf0d535b6c5c0d56b1e50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 22 13:45:30 2020 +0300 dxva2: Implement handle management for device manager. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 158 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/dxva2/tests/dxva2.c | 16 +---- 2 files changed, 151 insertions(+), 23 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index e1eb212843..7e983a43dd 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -33,14 +33,59 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxva2); +enum device_handle_flags +{ + HANDLE_FLAG_OPEN = 0x1, + HANDLE_FLAG_INVALID = 0x2, +}; + +struct device_handle +{ + unsigned int flags; +}; + struct device_manager { IDirect3DDeviceManager9 IDirect3DDeviceManager9_iface; LONG refcount; + IDirect3DDevice9 *device; UINT token; + + struct device_handle *handles; + size_t count; + size_t capacity; + + CRITICAL_SECTION cs; }; +static BOOL dxva_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + + return TRUE; +} + static struct device_manager *impl_from_IDirect3DDeviceManager9(IDirect3DDeviceManager9 *iface) { return CONTAINING_RECORD(iface, struct device_manager, IDirect3DDeviceManager9_iface); @@ -82,6 +127,10 @@ static ULONG WINAPI device_manager_Release(IDirect3DDeviceManager9 *iface) if (!refcount) { + if (manager->device) + IDirect3DDevice9_Release(manager->device); + DeleteCriticalSection(&manager->cs); + heap_free(manager->handles); heap_free(manager); } @@ -91,30 +140,122 @@ static ULONG WINAPI device_manager_Release(IDirect3DDeviceManager9 *iface) static HRESULT WINAPI device_manager_ResetDevice(IDirect3DDeviceManager9 *iface, IDirect3DDevice9 *device, UINT token) { - FIXME("%p, %p, %#x.\n", iface, device, token); + struct device_manager *manager = impl_from_IDirect3DDeviceManager9(iface); + size_t i; - return E_NOTIMPL; + TRACE("%p, %p, %#x.\n", iface, device, token); + + if (token != manager->token) + return E_INVALIDARG; + + EnterCriticalSection(&manager->cs); + if (manager->device) + { + for (i = 0; i < manager->count; ++i) + manager->handles[i].flags |= HANDLE_FLAG_INVALID; + IDirect3DDevice9_Release(manager->device); + } + manager->device = device; + IDirect3DDevice9_AddRef(manager->device); + LeaveCriticalSection(&manager->cs); + + return S_OK; } static HRESULT WINAPI device_manager_OpenDeviceHandle(IDirect3DDeviceManager9 *iface, HANDLE *hdevice) { - FIXME("%p, %p.\n", iface, hdevice); + struct device_manager *manager = impl_from_IDirect3DDeviceManager9(iface); + HRESULT hr = S_OK; + size_t i; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, hdevice); + + *hdevice = NULL; + + EnterCriticalSection(&manager->cs); + if (!manager->device) + hr = DXVA2_E_NOT_INITIALIZED; + else + { + for (i = 0; i < manager->count; ++i) + { + if (!(manager->handles[i].flags & HANDLE_FLAG_OPEN)) + { + manager->handles[i].flags |= HANDLE_FLAG_OPEN; + *hdevice = ULongToHandle(i + 1); + break; + } + } + + if (dxva_array_reserve((void **)&manager->handles, &manager->capacity, manager->count + 1, + sizeof(*manager->handles))) + { + *hdevice = ULongToHandle(manager->count + 1); + manager->handles[manager->count].flags |= HANDLE_FLAG_OPEN; + manager->count++; + } + else + hr = E_OUTOFMEMORY; + } + LeaveCriticalSection(&manager->cs); + + return hr; +} + +static HRESULT device_manager_get_handle_index(struct device_manager *manager, HANDLE hdevice, size_t *idx) +{ + if (hdevice > ULongToHandle(manager->count)) + return E_HANDLE; + *idx = (ULONG_PTR)hdevice - 1; + return S_OK; } static HRESULT WINAPI device_manager_CloseDeviceHandle(IDirect3DDeviceManager9 *iface, HANDLE hdevice) { - FIXME("%p, %p.\n", iface, hdevice); + struct device_manager *manager = impl_from_IDirect3DDeviceManager9(iface); + HRESULT hr; + size_t idx; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, hdevice); + + EnterCriticalSection(&manager->cs); + if (SUCCEEDED(hr = device_manager_get_handle_index(manager, hdevice, &idx))) + { + if (manager->handles[idx].flags & HANDLE_FLAG_OPEN) + { + manager->handles[idx].flags = 0; + if (idx == manager->count - 1) + manager->count--; + } + else + hr = E_HANDLE; + } + LeaveCriticalSection(&manager->cs); + + return hr; } static HRESULT WINAPI device_manager_TestDevice(IDirect3DDeviceManager9 *iface, HANDLE hdevice) { - FIXME("%p, %p.\n", iface, hdevice); + struct device_manager *manager = impl_from_IDirect3DDeviceManager9(iface); + HRESULT hr; + size_t idx; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, hdevice); + + EnterCriticalSection(&manager->cs); + if (SUCCEEDED(hr = device_manager_get_handle_index(manager, hdevice, &idx))) + { + unsigned int flags = manager->handles[idx].flags; + + if (flags & HANDLE_FLAG_INVALID) + hr = DXVA2_E_NEW_VIDEO_DEVICE; + else if (!(flags & HANDLE_FLAG_OPEN)) + hr = E_HANDLE; + } + LeaveCriticalSection(&manager->cs); + + return hr; } static HRESULT WINAPI device_manager_LockDevice(IDirect3DDeviceManager9 *iface, HANDLE hdevice, @@ -176,6 +317,7 @@ HRESULT WINAPI DXVA2CreateDirect3DDeviceManager9(UINT *token, IDirect3DDeviceMan object->IDirect3DDeviceManager9_iface.lpVtbl = &device_manager_vtbl; object->refcount = 1; object->token = GetTickCount(); + InitializeCriticalSection(&object->cs); *token = object->token; *manager = &object->IDirect3DDeviceManager9_iface; diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index cbcad40ca5..605a69dd5a 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -84,23 +84,19 @@ static void test_device_manager(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); -todo_wine ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); /* Invalid token. */ hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token + 1); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); refcount = get_refcount((IUnknown *)device); handle1 = NULL; hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); refcount2 = get_refcount((IUnknown *)device); @@ -108,40 +104,32 @@ todo_wine handle = NULL; hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(handle != handle1, "Unexpected handle.\n"); -} + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); /* Already closed. */ hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); -todo_wine ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); handle = NULL; hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IDirect3DDeviceManager9_TestDevice(manager, handle1); -todo_wine ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); handle = NULL; hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); handle1 = NULL; hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, @@ -153,7 +141,6 @@ todo_wine device2 = create_device(d3d, window); hr = IDirect3DDeviceManager9_ResetDevice(manager, device2, token); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, @@ -162,7 +149,6 @@ todo_wine ok(hr == DXVA2_E_NEW_VIDEO_DEVICE, "Unexpected hr %#x.\n", hr); hr = IDirect3DDeviceManager9_TestDevice(manager, handle); -todo_wine ok(hr == DXVA2_E_NEW_VIDEO_DEVICE, "Unexpected hr %#x.\n", hr); IDirect3DDevice9_Release(device);

1 0

Nikolay Sivov : dxva2: Add device manager stub.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: fd72999bd68065a890a496b076a421841f92f778 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd72999bd68065a890a496b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 22 13:45:29 2020 +0300 dxva2: Add device manager stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/dxva2/Makefile.in | 4 +- dlls/dxva2/main.c | 147 ++++++++++++++++++++++++++++++++++- dlls/dxva2/tests/Makefile.in | 5 ++ dlls/dxva2/tests/dxva2.c | 181 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 334 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fd72999bd68065a890a4…

1 0

Alistair Leslie-Hughes : directmanipulation: Implement IDirectManipulationCompositor::SetUpdateManager.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: c84e0f5778dca4bbd1c176568ca62703af4993cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c84e0f5778dca4bbd1c17656… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 24 09:15:18 2019 +1000 directmanipulation: Implement IDirectManipulationCompositor::SetUpdateManager. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/directmanipulation.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index 480b746f1d..a3fac41480 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -341,6 +341,7 @@ struct directcompositor { IDirectManipulationCompositor IDirectManipulationCompositor_iface; IDirectManipulationFrameInfoProvider IDirectManipulationFrameInfoProvider_iface; + IDirectManipulationUpdateManager *manager; LONG ref; }; @@ -395,6 +396,8 @@ static ULONG WINAPI compositor_Release(IDirectManipulationCompositor *iface) if (!ref) { + if(This->manager) + IDirectManipulationUpdateManager_Release(This->manager); heap_free(This); } return ref; @@ -418,8 +421,14 @@ static HRESULT WINAPI compositor_RemoveContent(IDirectManipulationCompositor *if static HRESULT WINAPI compositor_SetUpdateManager(IDirectManipulationCompositor *iface, IDirectManipulationUpdateManager *manager) { struct directcompositor *This = impl_from_IDirectManipulationCompositor(iface); - FIXME("%p, %p\n", This, manager); - return E_NOTIMPL; + TRACE("%p, %p\n", This, manager); + + if(!manager) + return E_INVALIDARG; + + This->manager = manager; + IDirectManipulationUpdateManager_AddRef(This->manager); + return S_OK; } static HRESULT WINAPI compositor_Flush(IDirectManipulationCompositor *iface)

1 0

Alistair Leslie-Hughes : directmanipulation: Implement IDirectManipulationFrameInfoProvider stub interface.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 7cb3e3be29e7f81023e4a6160b6d1fe938a92c1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cb3e3be29e7f81023e4a616… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 23 08:37:12 2019 +1000 directmanipulation: Implement IDirectManipulationFrameInfoProvider stub interface. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/directmanipulation.c | 49 ++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index 9ccbabe985..480b746f1d 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -340,6 +340,7 @@ static HRESULT WINAPI DirectManipulation_CreateInstance(IClassFactory *iface, IU struct directcompositor { IDirectManipulationCompositor IDirectManipulationCompositor_iface; + IDirectManipulationFrameInfoProvider IDirectManipulationFrameInfoProvider_iface; LONG ref; }; @@ -348,8 +349,15 @@ static inline struct directcompositor *impl_from_IDirectManipulationCompositor(I return CONTAINING_RECORD(iface, struct directcompositor, IDirectManipulationCompositor_iface); } +static inline struct directcompositor *impl_from_IDirectManipulationFrameInfoProvider(IDirectManipulationFrameInfoProvider *iface) +{ + return CONTAINING_RECORD(iface, struct directcompositor, IDirectManipulationFrameInfoProvider_iface); +} + static HRESULT WINAPI compositor_QueryInterface(IDirectManipulationCompositor *iface, REFIID riid, void **ppv) { + struct directcompositor *This = impl_from_IDirectManipulationCompositor(iface); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectManipulationCompositor)) { @@ -357,6 +365,12 @@ static HRESULT WINAPI compositor_QueryInterface(IDirectManipulationCompositor *i *ppv = iface; return S_OK; } + else if(IsEqualGUID(riid, &IID_IDirectManipulationFrameInfoProvider)) + { + IUnknown_AddRef(iface); + *ppv = &This->IDirectManipulationFrameInfoProvider_iface; + return S_OK; + } FIXME("(%p)->(%s,%p),not found\n", iface, debugstr_guid(riid), ppv); return E_NOINTERFACE; @@ -426,6 +440,40 @@ static const struct IDirectManipulationCompositorVtbl compositorVtbl = compositor_Flush }; +static HRESULT WINAPI provider_QueryInterface(IDirectManipulationFrameInfoProvider *iface, REFIID riid, void **ppv) +{ + struct directcompositor *This = impl_from_IDirectManipulationFrameInfoProvider(iface); + return IDirectManipulationCompositor_QueryInterface(&This->IDirectManipulationCompositor_iface, riid, ppv); +} + +static ULONG WINAPI provider_AddRef(IDirectManipulationFrameInfoProvider *iface) +{ + struct directcompositor *This = impl_from_IDirectManipulationFrameInfoProvider(iface); + return IDirectManipulationCompositor_AddRef(&This->IDirectManipulationCompositor_iface); +} + +static ULONG WINAPI provider_Release(IDirectManipulationFrameInfoProvider *iface) +{ + struct directcompositor *This = impl_from_IDirectManipulationFrameInfoProvider(iface); + return IDirectManipulationCompositor_Release(&This->IDirectManipulationCompositor_iface); +} + +static HRESULT WINAPI provider_GetNextFrameInfo(IDirectManipulationFrameInfoProvider *iface, ULONGLONG *time, + ULONGLONG *process, ULONGLONG *composition) +{ + struct directcompositor *This = impl_from_IDirectManipulationFrameInfoProvider(iface); + FIXME("%p, %p, %p, %p\n", This, time, process, composition); + return E_NOTIMPL; +} + +static const struct IDirectManipulationFrameInfoProviderVtbl providerVtbl = +{ + provider_QueryInterface, + provider_AddRef, + provider_Release, + provider_GetNextFrameInfo +}; + static HRESULT WINAPI DirectCompositor_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { struct directcompositor *object; @@ -440,6 +488,7 @@ static HRESULT WINAPI DirectCompositor_CreateInstance(IClassFactory *iface, IUnk return E_OUTOFMEMORY; object->IDirectManipulationCompositor_iface.lpVtbl = &compositorVtbl; + object->IDirectManipulationFrameInfoProvider_iface.lpVtbl = &providerVtbl; object->ref = 1; ret = compositor_QueryInterface(&object->IDirectManipulationCompositor_iface, riid, ppv);

1 0

Alistair Leslie-Hughes : directmanipulation: Implement IDirectManipulationCompositor stub interface.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 1366793000a9bd3ff417b879d3442e2ead244e48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1366793000a9bd3ff417b879… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 19 08:49:51 2019 +1000 directmanipulation: Implement IDirectManipulationCompositor stub interface. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/directmanip.idl | 10 +++ dlls/directmanipulation/directmanipulation.c | 124 +++++++++++++++++++++++++++ 2 files changed, 134 insertions(+) diff --git a/dlls/directmanipulation/directmanip.idl b/dlls/directmanipulation/directmanip.idl index ff00668ba5..9e1efa48ed 100644 --- a/dlls/directmanipulation/directmanip.idl +++ b/dlls/directmanipulation/directmanip.idl @@ -36,3 +36,13 @@ coclass DirectManipulationSharedManager interface IDirectManipulationManager2; [default] interface IDirectManipulationManager; } + +[ + uuid(79dea627-a08a-43ac-8ef5-6900b9299126), + threading(both) +] +coclass DCompManipulationCompositor +{ + [default] interface IDirectManipulationCompositor; + interface IDirectManipulationFrameInfoProvider; +} diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index 9389302008..9ccbabe985 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -337,6 +337,117 @@ static HRESULT WINAPI DirectManipulation_CreateInstance(IClassFactory *iface, IU return ret; } +struct directcompositor +{ + IDirectManipulationCompositor IDirectManipulationCompositor_iface; + LONG ref; +}; + +static inline struct directcompositor *impl_from_IDirectManipulationCompositor(IDirectManipulationCompositor *iface) +{ + return CONTAINING_RECORD(iface, struct directcompositor, IDirectManipulationCompositor_iface); +} + +static HRESULT WINAPI compositor_QueryInterface(IDirectManipulationCompositor *iface, REFIID riid, void **ppv) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDirectManipulationCompositor)) + { + IUnknown_AddRef(iface); + *ppv = iface; + return S_OK; + } + + FIXME("(%p)->(%s,%p),not found\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI compositor_AddRef(IDirectManipulationCompositor *iface) +{ + struct directcompositor *This = impl_from_IDirectManipulationCompositor(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI compositor_Release(IDirectManipulationCompositor *iface) +{ + struct directcompositor *This = impl_from_IDirectManipulationCompositor(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI compositor_AddContent(IDirectManipulationCompositor *iface, IDirectManipulationContent *content, + IUnknown *device, IUnknown *parent, IUnknown *child) +{ + struct directcompositor *This = impl_from_IDirectManipulationCompositor(iface); + FIXME("%p, %p, %p, %p, %p\n", This, content, device, parent, child); + return E_NOTIMPL; +} + +static HRESULT WINAPI compositor_RemoveContent(IDirectManipulationCompositor *iface, IDirectManipulationContent *content) +{ + struct directcompositor *This = impl_from_IDirectManipulationCompositor(iface); + FIXME("%p, %p\n", This, content); + return E_NOTIMPL; +} + +static HRESULT WINAPI compositor_SetUpdateManager(IDirectManipulationCompositor *iface, IDirectManipulationUpdateManager *manager) +{ + struct directcompositor *This = impl_from_IDirectManipulationCompositor(iface); + FIXME("%p, %p\n", This, manager); + return E_NOTIMPL; +} + +static HRESULT WINAPI compositor_Flush(IDirectManipulationCompositor *iface) +{ + struct directcompositor *This = impl_from_IDirectManipulationCompositor(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static const struct IDirectManipulationCompositorVtbl compositorVtbl = +{ + compositor_QueryInterface, + compositor_AddRef, + compositor_Release, + compositor_AddContent, + compositor_RemoveContent, + compositor_SetUpdateManager, + compositor_Flush +}; + +static HRESULT WINAPI DirectCompositor_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + struct directcompositor *object; + HRESULT ret; + + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(riid), ppv); + + *ppv = NULL; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IDirectManipulationCompositor_iface.lpVtbl = &compositorVtbl; + object->ref = 1; + + ret = compositor_QueryInterface(&object->IDirectManipulationCompositor_iface, riid, ppv); + compositor_Release(&object->IDirectManipulationCompositor_iface); + + return ret; +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -380,7 +491,16 @@ static const IClassFactoryVtbl DirectFactoryVtbl = { ClassFactory_LockServer }; +static const IClassFactoryVtbl DirectCompositorVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + DirectCompositor_CreateInstance, + ClassFactory_LockServer +}; + static IClassFactory direct_factory = { &DirectFactoryVtbl }; +static IClassFactory compositor_factory = { &DirectCompositorVtbl }; HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { @@ -389,6 +509,10 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) TRACE("(CLSID_DirectManipulationManager %s %p)\n", debugstr_guid(riid), ppv); return IClassFactory_QueryInterface(&direct_factory, riid, ppv); } + else if(IsEqualGUID(&CLSID_DCompManipulationCompositor, rclsid)) { + TRACE("(CLSID_DCompManipulationCompositor %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&compositor_factory, riid, ppv); + } FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE;

1 0

Shawn M. Chapla : gdiplus: Preserve temp DC state for bitmap backed graphics objects.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 34aa117278a01bddb53ee4e3cc9f003a1859a3a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34aa117278a01bddb53ee4e3… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Fri Jun 19 13:21:17 2020 -0400 gdiplus: Preserve temp DC state for bitmap backed graphics objects. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 18 +++++++++++++++--- dlls/gdiplus/tests/graphics.c | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4b141e19b6..3c5e25ec41 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2536,6 +2536,12 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) return stat; } + if (graphics->temp_hdc) + { + DeleteDC(graphics->temp_hdc); + graphics->temp_hdc = NULL; + } + if(graphics->owndc) ReleaseDC(graphics->hwnd, graphics->hdc); @@ -6662,7 +6668,15 @@ GpStatus WINGDIPAPI GdipGetDC(GpGraphics *graphics, HDC *hdc) if (!hbitmap) return GenericError; - temp_hdc = CreateCompatibleDC(0); + if (!graphics->temp_hdc) + { + temp_hdc = CreateCompatibleDC(0); + } + else + { + temp_hdc = graphics->temp_hdc; + } + if (!temp_hdc) { DeleteObject(hbitmap); @@ -6723,9 +6737,7 @@ GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics *graphics, HDC hdc) graphics->temp_hbitmap_width * 4, PixelFormat32bppARGB); /* Clean up. */ - DeleteDC(graphics->temp_hdc); DeleteObject(graphics->temp_hbitmap); - graphics->temp_hdc = NULL; graphics->temp_hbitmap = NULL; } else if (hdc != graphics->hdc) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 7040327e67..da15392732 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -6870,7 +6870,7 @@ static void test_gdi_interop(void) stat = GdipBitmapGetPixel(bitmap, 26, 26, &color); expect(Ok, stat); - todo_wine expect(0xff0000ff, color); + expect(0xff0000ff, color); stat = GdipBitmapGetPixel(bitmap, 86, 86, &color); expect(Ok, stat);

1 0

Shawn M. Chapla : gdiplus/tests: Add GDI/GDI+ graphics interop test.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 739d0a1dfa92d65c7f9839b2e682933b67ee3fee URL: https://source.winehq.org/git/wine.git/?a=commit;h=739d0a1dfa92d65c7f9839b2… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Fri Jun 19 13:21:16 2020 -0400 gdiplus/tests: Add GDI/GDI+ graphics interop test. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index f2ff589ab5..7040327e67 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -6792,6 +6792,97 @@ static void test_hdc_caching(void) DeleteObject(hbm); } +static void test_gdi_interop(void) +{ + GpBitmap *bitmap; + GpGraphics *graphics; + GpMatrix *transform; + GpBrush *brush; + GpStatus stat; + HDC hdc; + HBRUSH hbrush, holdbrush; + ARGB color; + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + stat = GdipCreateMatrix(&transform); + expect(Ok, stat); + + stat = GdipSetMatrixElements(transform, 1.0, 0.0, 0.0, 1.0, 50.0, 50.0); + expect(Ok, stat); + + /* GDI+: Set world transform. Should not matter to GDI. */ + stat = GdipSetWorldTransform(graphics, transform); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &hdc); + expect(Ok, stat); + + hbrush = CreateSolidBrush(0xff0000); + + holdbrush = SelectObject(hdc, hbrush); + + /* GDI: Draw a rectangle at physical coords (5, 5) to (12, 10). */ + Rectangle(hdc, 5, 5, 12, 10); + + holdbrush = SelectObject(hdc, holdbrush); + + /* GDI: Set view port origin. Should not matter to GDI+. */ + SetViewportOrgEx(hdc, 20, 20, NULL); + + GdipReleaseDC(graphics, hdc); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + /* GDI+: Draw a rectangle at physical coords (85, 85) to (88, 95). */ + stat = GdipFillRectangleI(graphics, brush, 35, 35, 3, 10); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &hdc); + expect(Ok, stat); + + holdbrush = SelectObject(hdc, hbrush); + + /* GDI: Draw a rectangle at physical coords (25, 25) to (30, 34). + Updated view port origin should still be in effect. */ + Rectangle(hdc, 5, 5, 10, 14); + + SelectObject(hdc, holdbrush); + + DeleteObject(hbrush); + stat = GdipReleaseDC(graphics, hdc); + expect(Ok, stat); + + stat = GdipDeleteMatrix(transform); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap, 6, 6, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 26, 26, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 86, 86, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -6885,6 +6976,7 @@ START_TEST(graphics) test_GdipGraphicsSetAbort(); test_cliphrgn_transform(); test_hdc_caching(); + test_gdi_interop(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2020