wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Nikolay Sivov : mfplat/tests: Add some tests for sample allocator using D3D9 device.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 467a96e9e5b5a2b8974181ce6ce87c91798cb0ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=467a96e9e5b5a2b8974181ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 3 14:28:00 2021 +0300 mfplat/tests: Add some tests for sample allocator using D3D9 device. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 81 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index 4e9413e8da0..ae9cc378933 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat user32 d3d9 mfuuid propsys uuid strmiids +IMPORTS = ole32 mfplat user32 d3d9 dxva2 mfuuid propsys uuid strmiids C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 2e2610a3827..3d6e553ce35 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -46,6 +46,7 @@ #include "d3d9types.h" #include "ks.h" #include "ksmedia.h" +#include "dxva2api.h" DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); @@ -6290,15 +6291,20 @@ static void test_sample_allocator(void) IMFDXGIDeviceManager *manager; IMFSample *sample, *sample2; IMFDXGIBuffer *dxgi_buffer; + IMFAttributes *attributes; D3D11_TEXTURE2D_DESC desc; + unsigned int buffer_count, token; ID3D11Texture2D *texture; IMFMediaBuffer *buffer; ID3D11Device *device; LONG refcount, count; - unsigned int token; IUnknown *unk; HRESULT hr; BYTE *data; + IDirect3D9 *d3d9; + HWND window; + IDirect3DDeviceManager9 *d3d9_manager; + IDirect3DDevice9 *d3d9_device; if (!pMFCreateVideoSampleAllocatorEx) { @@ -6407,12 +6413,20 @@ todo_wine check_interface(buffer, &IID_IMFDXGIBuffer, FALSE); IMFMediaBuffer_Release(buffer); + + hr = IMFSample_GetBufferCount(sample, &buffer_count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(buffer_count == 1, "Unexpected buffer count %u.\n", buffer_count); + IMFSample_Release(sample); IMFVideoSampleAllocatorCallback_Release(allocator_cb); IMFVideoSampleAllocator_Release(allocator); /* IMFVideoSampleAllocatorEx */ + hr = MFCreateAttributes(&attributes, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocatorEx, (void **)&allocatorex); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -6422,9 +6436,15 @@ todo_wine hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 1, 0, NULL, video_type); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, NULL, video_type); + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_BUFFERS_PER_SAMPLE, 2); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(attributes, 1); + hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, attributes, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + EXPECT_REF(attributes, 2); + count = 0; hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -6433,6 +6453,11 @@ todo_wine hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFSample_GetBufferCount(sample, &buffer_count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(buffer_count == 2, "Unexpected buffer count %u.\n", buffer_count); + hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample2); ok(hr == MF_E_SAMPLEALLOCATOR_EMPTY, "Unexpected hr %#x.\n", hr); @@ -6440,6 +6465,7 @@ todo_wine IMFVideoSampleAllocatorCallback_Release(allocator_cb); IMFVideoSampleAllocatorEx_Release(allocatorex); + IMFAttributes_Release(attributes); /* Using device manager */ if (!(device = create_d3d11_device())) @@ -6511,10 +6537,57 @@ todo_wine IMFSample_Release(sample); IMFVideoSampleAllocator_Release(allocator); - - IMFMediaType_Release(media_type); IMFDXGIDeviceManager_Release(manager); ID3D11Device_Release(device); + + /* Use D3D9 device manager. */ + window = create_window(); + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D9 object.\n"); + if (!(d3d9_device = create_device(d3d9, window))) + { + skip("Failed to create a D3D9 device, skipping tests.\n"); + goto done; + } + + hr = DXVA2CreateDirect3DDeviceManager9(&token, &d3d9_manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_ResetDevice(d3d9_manager, d3d9_device, token); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocator, (void **)&allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_SetDirectXManager(allocator, (IUnknown *)d3d9_manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 1, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + check_interface(sample, &IID_IMFTrackedSample, TRUE); + check_interface(sample, &IID_IMFDesiredSample, FALSE); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + check_interface(buffer, &IID_IMF2DBuffer, TRUE); + check_interface(buffer, &IID_IMF2DBuffer2, TRUE); + check_interface(buffer, &IID_IMFGetService, TRUE); + check_interface(buffer, &IID_IMFDXGIBuffer, FALSE); + + IMFSample_Release(sample); + IMFMediaBuffer_Release(buffer); + + IMFVideoSampleAllocator_Release(allocator); + IMFMediaType_Release(media_type); + +done: + IDirect3D9_Release(d3d9); + DestroyWindow(window); } START_TEST(mfplat)

1 0

Nikolay Sivov : mfplat/allocator: Add initial implementation of sample allocator.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 0e7836c0ac8dca20864de33e86766cffdc4f2b5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e7836c0ac8dca20864de33e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 3 14:27:59 2021 +0300 mfplat/allocator: Add initial implementation of sample allocator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 2 +- dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/sample.c | 671 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 5 +- 4 files changed, 677 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0e7836c0ac8dca20864d…

1 0

Nikolay Sivov : mfplat: Add a stub implementation of DXGI surface buffer.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 3bf4896669bc87b9c06ab47e6d373b617c19f217 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bf4896669bc87b9c06ab47e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 3 14:27:58 2021 +0300 mfplat: Add a stub implementation of DXGI surface buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 279 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/main.c | 2 +- dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 8 +- 4 files changed, 288 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3bf4896669bc87b9c06a…

1 0

Nikolay Sivov : mfplat/tests: Add a workaround for test failures on Windows 7 VMs.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: f920f633d7ef6061ebe85f25e23a8d5a145b33e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f920f633d7ef6061ebe85f25… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 3 14:27:57 2021 +0300 mfplat/tests: Add a workaround for test failures on Windows 7 VMs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 71294686ae0..a548e307783 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5083,15 +5083,19 @@ static void test_queue_com_state(const char *name) queue_type = name[1] - '0'; hr = pMFAllocateWorkQueueEx(queue_type, &queue); - ok(hr == S_OK, "Failed to allocate a queue, hr %#x.\n", hr); + ok(hr == S_OK || broken(queue_type == MF_MULTITHREADED_WORKQUEUE && hr == E_INVALIDARG) /* Win7 */, + "Failed to allocate a queue of type %u, hr %#x.\n", queue_type, hr); - callback.param = queue; - hr = MFPutWorkItem(queue, &callback.IMFAsyncCallback_iface, NULL); - ok(SUCCEEDED(hr), "Failed to queue work item, hr %#x.\n", hr); - WaitForSingleObject(callback.event, INFINITE); + if (SUCCEEDED(hr)) + { + callback.param = queue; + hr = MFPutWorkItem(queue, &callback.IMFAsyncCallback_iface, NULL); + ok(SUCCEEDED(hr), "Failed to queue work item, hr %#x.\n", hr); + WaitForSingleObject(callback.event, INFINITE); - hr = MFUnlockWorkQueue(queue); - ok(hr == S_OK, "Failed to unlock the queue, hr %#x.\n", hr); + hr = MFUnlockWorkQueue(queue); + ok(hr == S_OK, "Failed to unlock the queue, hr %#x.\n", hr); + } } CloseHandle(callback.event);

1 0

Nikolay Sivov : mfplat/tests: Switch to a different texture format to enable more tests on older versions.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: b9dd3272ff7e10cdcafa54d34ce8868ee49b1753 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9dd3272ff7e10cdcafa54d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 3 14:27:56 2021 +0300 mfplat/tests: Switch to a different texture format to enable more tests on older versions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 949e8e5feed..71294686ae0 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6212,7 +6212,7 @@ static void test_dxgi_surface_buffer(void) desc.Width = 64; desc.Height = 64; desc.ArraySize = 1; - desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; desc.SampleDesc.Count = 1; desc.SampleDesc.Quality = 0; @@ -6220,14 +6220,7 @@ static void test_dxgi_surface_buffer(void) ok(hr == S_OK, "Failed to create a texture, hr %#x.\n", hr); hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D11Texture2D, (IUnknown *)texture, 0, FALSE, &buffer); - ok(hr == S_OK || broken(hr == MF_E_INVALIDMEDIATYPE) /* Win8 */, "Failed to create a buffer, hr %#x.\n", hr); - - if (FAILED(hr)) - { - ID3D11Texture2D_Release(texture); - ID3D11Device_Release(device); - return; - } + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); check_interface(buffer, &IID_IMF2DBuffer, TRUE); check_interface(buffer, &IID_IMF2DBuffer2, TRUE);

1 0

Nikolay Sivov : mfplat: Added MFMapDX9FormatToDXGIFormat().
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 5668c1ce5f4ec704271429e622ece08d5be3a947 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5668c1ce5f4ec704271429e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 3 14:27:55 2021 +0300 mfplat: Added MFMapDX9FormatToDXGIFormat(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 68 +++++++++++++++++++++++++++++++++++ include/mfapi.h | 1 + 4 files changed, 158 insertions(+) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 2bf9b674ea7..7c252147679 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3316,3 +3316,91 @@ DWORD WINAPI MFMapDXGIFormatToDX9Format(DXGI_FORMAT dxgi_format) return 0; } } + +/*********************************************************************** + * MFMapDX9FormatToDXGIFormat (mfplat.@) + */ +DXGI_FORMAT WINAPI MFMapDX9FormatToDXGIFormat(DWORD format) +{ + switch (format) + { + case D3DFMT_A32B32G32R32F: + return DXGI_FORMAT_R32G32B32A32_FLOAT; + case D3DFMT_A16B16G16R16F: + return DXGI_FORMAT_R16G16B16A16_FLOAT; + case D3DFMT_A16B16G16R16: + return DXGI_FORMAT_R16G16B16A16_UNORM; + case D3DFMT_Q16W16V16U16: + return DXGI_FORMAT_R16G16B16A16_SNORM; + case D3DFMT_G32R32F: + return DXGI_FORMAT_R32G32_FLOAT; + case D3DFMT_A2B10G10R10: + return DXGI_FORMAT_R10G10B10A2_UNORM; + case D3DFMT_Q8W8V8U8: + return DXGI_FORMAT_R8G8B8A8_SNORM; + case D3DFMT_G16R16F: + return DXGI_FORMAT_R16G16_FLOAT; + case D3DFMT_G16R16: + return DXGI_FORMAT_R16G16_UNORM; + case D3DFMT_V16U16: + return DXGI_FORMAT_R16G16_SNORM; + case D3DFMT_D32F_LOCKABLE: + return DXGI_FORMAT_D32_FLOAT; + case D3DFMT_R32F: + return DXGI_FORMAT_R32_FLOAT; + case D3DFMT_D24S8: + return DXGI_FORMAT_D24_UNORM_S8_UINT; + case D3DFMT_V8U8: + return DXGI_FORMAT_R8G8_SNORM; + case D3DFMT_R16F: + return DXGI_FORMAT_R16_FLOAT; + case D3DFMT_L16: + return DXGI_FORMAT_R16_UNORM; + case D3DFMT_L8: + return DXGI_FORMAT_R8_UNORM; + case D3DFMT_A8: + return DXGI_FORMAT_A8_UNORM; + case D3DFMT_DXT1: + return DXGI_FORMAT_BC1_UNORM; + case D3DFMT_DXT2: + return DXGI_FORMAT_BC2_UNORM; + case D3DFMT_DXT4: + return DXGI_FORMAT_BC3_UNORM; + case D3DFMT_A8R8G8B8: + return DXGI_FORMAT_B8G8R8A8_UNORM; + case D3DFMT_X8R8G8B8: + return DXGI_FORMAT_B8G8R8X8_UNORM; + case MAKEFOURCC('A','Y','U','V'): + return DXGI_FORMAT_AYUV; + case MAKEFOURCC('Y','4','1','0'): + return DXGI_FORMAT_Y410; + case MAKEFOURCC('Y','4','1','6'): + return DXGI_FORMAT_Y416; + case MAKEFOURCC('N','V','1','2'): + return DXGI_FORMAT_NV12; + case MAKEFOURCC('P','0','1','0'): + return DXGI_FORMAT_P010; + case MAKEFOURCC('P','0','1','6'): + return DXGI_FORMAT_P016; + case MAKEFOURCC('4','2','0','O'): + return DXGI_FORMAT_420_OPAQUE; + case D3DFMT_YUY2: + return DXGI_FORMAT_YUY2; + case MAKEFOURCC('Y','2','1','0'): + return DXGI_FORMAT_Y210; + case MAKEFOURCC('Y','2','1','6'): + return DXGI_FORMAT_Y216; + case MAKEFOURCC('N','V','1','1'): + return DXGI_FORMAT_NV11; + case MAKEFOURCC('A','I','4','4'): + return DXGI_FORMAT_AI44; + case MAKEFOURCC('I','A','4','4'): + return DXGI_FORMAT_IA44; + case D3DFMT_P8: + return DXGI_FORMAT_P8; + case D3DFMT_A8P8: + return DXGI_FORMAT_A8P8; + default: + return DXGI_FORMAT_UNKNOWN; + } +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 8ef40dd20c8..809903c4b22 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -131,6 +131,7 @@ @ stdcall MFJoinWorkQueue(long long ptr) rtworkq.RtwqJoinWorkQueue @ stdcall MFLockPlatform() rtworkq.RtwqLockPlatform @ stdcall MFLockWorkQueue(long) rtworkq.RtwqLockWorkQueue +@ stdcall MFMapDX9FormatToDXGIFormat(long) @ stdcall MFMapDXGIFormatToDX9Format(long) @ stdcall MFPutWaitingWorkItem(long long ptr ptr) rtworkq.RtwqPutWaitingWorkItem @ stdcall MFPutWorkItem(long ptr ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3f4dd48b2a8..949e8e5feed 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -131,6 +131,7 @@ static HRESULT (WINAPI *pMFCreateMediaBufferFromMediaType)(IMFMediaType *media_t static HRESULT (WINAPI *pMFCreateDXSurfaceBuffer)(REFIID riid, IUnknown *surface, BOOL bottom_up, IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateTrackedSample)(IMFTrackedSample **sample); static DWORD (WINAPI *pMFMapDXGIFormatToDX9Format)(DXGI_FORMAT dxgi_format); +static DXGI_FORMAT (WINAPI *pMFMapDX9FormatToDXGIFormat)(DWORD format); static HRESULT (WINAPI *pMFCreateVideoSampleAllocatorEx)(REFIID riid, void **allocator); static HRESULT (WINAPI *pMFCreateDXGISurfaceBuffer)(REFIID riid, IUnknown *surface, UINT subresource, BOOL bottomup, IMFMediaBuffer **buffer); @@ -800,6 +801,7 @@ static void init_functions(void) X(MFCreateVideoSampleAllocatorEx); X(MFGetPlaneSize); X(MFGetStrideForBitmapInfoHeader); + X(MFMapDX9FormatToDXGIFormat); X(MFMapDXGIFormatToDX9Format); X(MFPutWaitingWorkItem); X(MFRegisterLocalByteStreamHandler); @@ -6038,6 +6040,71 @@ static void test_MFMapDXGIFormatToDX9Format(void) } } +static void test_MFMapDX9FormatToDXGIFormat(void) +{ + static const struct format_pair + { + DXGI_FORMAT dxgi_format; + DWORD d3d9_format; + } + formats_map[] = + { + { DXGI_FORMAT_R32G32B32A32_FLOAT, D3DFMT_A32B32G32R32F }, + { DXGI_FORMAT_R16G16B16A16_FLOAT, D3DFMT_A16B16G16R16F }, + { DXGI_FORMAT_R16G16B16A16_UNORM, D3DFMT_A16B16G16R16 }, + { DXGI_FORMAT_R16G16B16A16_SNORM, D3DFMT_Q16W16V16U16 }, + { DXGI_FORMAT_R32G32_FLOAT, D3DFMT_G32R32F }, + { DXGI_FORMAT_R10G10B10A2_UNORM, D3DFMT_A2B10G10R10 }, + { DXGI_FORMAT_R8G8B8A8_SNORM, D3DFMT_Q8W8V8U8 }, + { DXGI_FORMAT_R16G16_FLOAT, D3DFMT_G16R16F }, + { DXGI_FORMAT_R16G16_UNORM, D3DFMT_G16R16 }, + { DXGI_FORMAT_R16G16_SNORM, D3DFMT_V16U16 }, + { DXGI_FORMAT_D32_FLOAT, D3DFMT_D32F_LOCKABLE }, + { DXGI_FORMAT_R32_FLOAT, D3DFMT_R32F }, + { DXGI_FORMAT_D24_UNORM_S8_UINT, D3DFMT_D24S8 }, + { DXGI_FORMAT_R8G8_SNORM, D3DFMT_V8U8 }, + { DXGI_FORMAT_R16_FLOAT, D3DFMT_R16F }, + { DXGI_FORMAT_R16_UNORM, D3DFMT_L16 }, + { DXGI_FORMAT_R8_UNORM, D3DFMT_L8 }, + { DXGI_FORMAT_A8_UNORM, D3DFMT_A8 }, + { DXGI_FORMAT_BC1_UNORM, D3DFMT_DXT1 }, + { DXGI_FORMAT_BC2_UNORM, D3DFMT_DXT2 }, + { DXGI_FORMAT_BC3_UNORM, D3DFMT_DXT4 }, + { DXGI_FORMAT_B8G8R8A8_UNORM, D3DFMT_A8R8G8B8 }, + { DXGI_FORMAT_B8G8R8X8_UNORM, D3DFMT_X8R8G8B8 }, + { DXGI_FORMAT_AYUV, MAKEFOURCC('A','Y','U','V') }, + { DXGI_FORMAT_Y410, MAKEFOURCC('Y','4','1','0') }, + { DXGI_FORMAT_Y416, MAKEFOURCC('Y','4','1','6') }, + { DXGI_FORMAT_NV12, MAKEFOURCC('N','V','1','2') }, + { DXGI_FORMAT_P010, MAKEFOURCC('P','0','1','0') }, + { DXGI_FORMAT_P016, MAKEFOURCC('P','0','1','6') }, + { DXGI_FORMAT_420_OPAQUE, MAKEFOURCC('4','2','0','O') }, + { DXGI_FORMAT_YUY2, D3DFMT_YUY2 }, + { DXGI_FORMAT_Y210, MAKEFOURCC('Y','2','1','0') }, + { DXGI_FORMAT_Y216, MAKEFOURCC('Y','2','1','6') }, + { DXGI_FORMAT_NV11, MAKEFOURCC('N','V','1','1') }, + { DXGI_FORMAT_AI44, MAKEFOURCC('A','I','4','4') }, + { DXGI_FORMAT_IA44, MAKEFOURCC('I','A','4','4') }, + { DXGI_FORMAT_P8, D3DFMT_P8 }, + { DXGI_FORMAT_A8P8, D3DFMT_A8P8 }, + }; + DXGI_FORMAT format; + unsigned int i; + + if (!pMFMapDX9FormatToDXGIFormat) + { + win_skip("MFMapDX9FormatToDXGIFormat() is not available.\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(formats_map); ++i) + { + format = pMFMapDX9FormatToDXGIFormat(formats_map[i].d3d9_format); + ok(format == formats_map[i].dxgi_format, "Unexpected DXGI format %#x, d3d9 format %#x.\n", + format, formats_map[i].d3d9_format); + } +} + static HRESULT WINAPI test_notify_callback_QueryInterface(IMFVideoSampleAllocatorNotify *iface, REFIID riid, void **obj) { @@ -6506,6 +6573,7 @@ START_TEST(mfplat) test_MFMapDXGIFormatToDX9Format(); test_dxgi_surface_buffer(); test_sample_allocator(); + test_MFMapDX9FormatToDXGIFormat(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 25602a7cd94..d6969984da7 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -553,6 +553,7 @@ HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *attributes, const UINT8 * HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WAVEFORMATEX *format, UINT32 size); HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); HRESULT WINAPI MFLockPlatform(void); +DXGI_FORMAT WINAPI MFMapDX9FormatToDXGIFormat(DWORD format); DWORD WINAPI MFMapDXGIFormatToDX9Format(DXGI_FORMAT dxgi_format); HRESULT WINAPI MFPutWaitingWorkItem(HANDLE event, LONG priority, IMFAsyncResult *result, MFWORKITEM_KEY *key); HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *state);

1 0

Nikolay Sivov : mfplat: Move sample implementation to a separate file.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 50c66e0aecb74b0d6c22c3694c077b6d95074799 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50c66e0aecb74b0d6c22c369… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 3 14:27:54 2021 +0300 mfplat: Move sample implementation to a separate file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/Makefile.in | 3 +- dlls/mfplat/buffer.c | 982 --------------------------------------------- dlls/mfplat/sample.c | 1007 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1009 insertions(+), 983 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=50c66e0aecb74b0d6c22…

1 0

Nikolay Sivov : evr/allocator: Fix sample entry leak.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: c37fe322cab631466a9f054ff370491be37ee49b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c37fe322cab631466a9f054f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 3 16:05:43 2021 +0300 evr/allocator: Fix sample entry leak. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 44b09d6d474..9c76011f153 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -585,7 +585,7 @@ static HRESULT sample_allocator_create_samples(struct sample_allocator *allocato for (i = 0; i < sample_count; ++i) { - struct queued_sample *queued_sample = heap_alloc(sizeof(*queued_sample)); + struct queued_sample *queued_sample; IMFMediaBuffer *buffer; if (SUCCEEDED(hr = MFCreateVideoSampleFromSurface(NULL, &sample)))

1 0

Jacek Caban : kernelbase: Support FileEndOfFileInfo in SetFileInformationByHandle.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 1d36532d2277046872fa39ff3a81d9dc84e27d5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d36532d2277046872fa39ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 3 19:53:47 2021 +0100 kernelbase: Support FileEndOfFileInfo in SetFileInformationByHandle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 7b122e263b0..abfdade04ed 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3528,7 +3528,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFileInformationByHandle( HANDLE file, FILE_INFO case FileNameInfo: case FileRenameInfo: case FileAllocationInfo: - case FileEndOfFileInfo: case FileStreamInfo: case FileIdBothDirectoryInfo: case FileIdBothDirectoryRestartInfo: @@ -3543,6 +3542,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFileInformationByHandle( HANDLE file, FILE_INFO SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; + case FileEndOfFileInfo: + status = NtSetInformationFile( file, &io, info, size, FileEndOfFileInformation ); + break; case FileBasicInfo: status = NtSetInformationFile( file, &io, info, size, FileBasicInformation ); break;

1 0

Gabriel Ivăncescu : gdi32: ExtTextOut should fail if count is larger than INT_MAX.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 14a9551a94bef6aed0298d0e707385c97385150c URL: https://source.winehq.org/git/wine.git/?a=commit;h=14a9551a94bef6aed0298d0e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 3 13:36:09 2021 +0000 gdi32: ExtTextOut should fail if count is larger than INT_MAX. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 3 +++ dlls/gdi32/tests/dib.c | 15 ++++++++++++++- dlls/gdi32/tests/metafile.c | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 74ca4825de4..de50bf0de42 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5823,6 +5823,8 @@ BOOL WINAPI ExtTextOutA( HDC hdc, INT x, INT y, UINT flags, BOOL ret; LPINT lpDxW = NULL; + if (count > INT_MAX) return FALSE; + if (flags & ETO_GLYPH_INDEX) return ExtTextOutW( hdc, x, y, flags, lprect, (LPCWSTR)str, count, lpDx ); @@ -5932,6 +5934,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, static int quietfixme = 0; if (!dc) return FALSE; + if (count > INT_MAX) return FALSE; align = dc->textAlign; breakRem = dc->breakRem; diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index d16cb0df5c0..bdc3d9ed55b 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -3020,8 +3020,9 @@ static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) static const char str[] = "Hello Wine"; POINT origin, g_org; static const BYTE vals[4] = { 0x00, 0x00, 0x00, 0x00 }; + COLORREF bk_color, text_color; TEXTMETRICA tm; - COLORREF text_color; + RECT rect; for(i = 0; i < dib_size; i++) bits[i] = vals[i % 4]; @@ -3116,6 +3117,18 @@ static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) diy_hash = hash_dib( hdc, bmi, bits ); ok( !strcmp( eto_hash, diy_hash ), "hash mismatch - aa %d\n", aa ); + bk_color = GetBkColor( hdc ); + SetBkColor( hdc, RGB(128,64,32) ); + + SetRect( &rect, 0, 0, bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight ); + ret = ExtTextOutA( hdc, 10, 100, ETO_OPAQUE, &rect, str, -1, NULL ); + ok( !ret, "ExtTextOutA succeeded\n" ); + + diy_hash = hash_dib( hdc, bmi, bits ); + ok( !strcmp( eto_hash, diy_hash ), "hash mismatch - aa %d\n", aa ); + + SetBkColor( hdc, bk_color ); + HeapFree( GetProcessHeap(), 0, diy_hash ); HeapFree( GetProcessHeap(), 0, eto_hash ); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 8dae908126d..e81cff1ae57 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2394,6 +2394,26 @@ static void test_mf_ExtTextOut_on_path(void) ok(ret, "DeleteMetaFile(%p) error %d\n", hMetafile, GetLastError()); } +static const unsigned char EMF_EMPTY_BITS[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xdd, 0xff, 0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x90, 0x06, 0x00, 0x00, 0xba, 0x03, 0x00, 0x00, + 0x4e, 0x02, 0x00, 0x00, 0x4a, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xb0, 0x00, 0x09, 0x00, + 0x10, 0x09, 0x05, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 +}; + static void test_emf_ExtTextOut_on_path(void) { HWND hwnd; @@ -2403,6 +2423,7 @@ static void test_emf_ExtTextOut_on_path(void) LOGFONTA lf; HFONT hFont; static const INT dx[4] = { 3, 5, 8, 12 }; + RECT rect = { 10, 20, 30, 40 }; /* Win9x doesn't play EMFs on invisible windows */ hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP | WS_VISIBLE, @@ -2515,6 +2536,26 @@ static void test_emf_ExtTextOut_on_path(void) ret = DeleteEnhMetaFile(hMetafile); ok(ret, "DeleteEnhMetaFile error %d\n", GetLastError()); + /* test ExtTextOut with count == -1 doesn't get written */ + hdcMetafile = CreateEnhMetaFileA(hdcDisplay, NULL, NULL, NULL); + ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); + + ret = ExtTextOutA(hdcMetafile, 11, 22, ETO_OPAQUE, &rect, "Test", -1, dx); + ok(!ret, "ExtTextOut error %d\n", GetLastError()); + + hMetafile = CloseEnhMetaFile(hdcMetafile); + ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + + if (compare_emf_bits(hMetafile, EMF_EMPTY_BITS, sizeof(EMF_EMPTY_BITS), + "emf_TextOut_negative_count", FALSE) != 0) + { + dump_emf_bits(hMetafile, "emf_TextOut_negative_count"); + dump_emf_records(hMetafile, "emf_TextOut_negative_count"); + } + + ret = DeleteEnhMetaFile(hMetafile); + ok(ret, "DeleteEnhMetaFile error %d\n", GetLastError()); + ret = ReleaseDC(hwnd, hdcDisplay); ok(ret, "ReleaseDC error %d\n", GetLastError()); DestroyWindow(hwnd);

1 0

← Newer
1
...
76
77
78
79
80
81
82
...
92
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 February 2021