February 2019 - Wine-commits

Andrey Gusev : ext-ms-win-gdi-font-l1-1-1: Add dll.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: a21448a663dea82a6200587d8e5983d941d9f974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a21448a663dea82a6200587d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Feb 19 14:29:53 2019 +0200 ext-ms-win-gdi-font-l1-1-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-gdi-font-l1-1-1/Makefile.in | 1 + .../ext-ms-win-gdi-font-l1-1-1.spec | 30 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 35 insertions(+) diff --git a/configure b/configure index 9f9f438..2dded71 100755 --- a/configure +++ b/configure @@ -1269,6 +1269,7 @@ enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_ext_ms_win_gdi_draw_l1_1_0 enable_ext_ms_win_gdi_draw_l1_1_1 enable_ext_ms_win_gdi_font_l1_1_0 +enable_ext_ms_win_gdi_font_l1_1_1 enable_ext_ms_win_gdi_render_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_kernel32_package_l1_1_1 @@ -19575,6 +19576,7 @@ wine_fn_config_makefile dlls/ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi wine_fn_config_makefile dlls/ext-ms-win-gdi-draw-l1-1-0 enable_ext_ms_win_gdi_draw_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-draw-l1-1-1 enable_ext_ms_win_gdi_draw_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-gdi-font-l1-1-0 enable_ext_ms_win_gdi_font_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-gdi-font-l1-1-1 enable_ext_ms_win_gdi_font_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-gdi-render-l1-1-0 enable_ext_ms_win_gdi_render_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-l1-1-1 enable_ext_ms_win_kernel32_package_l1_1_1 diff --git a/configure.ac b/configure.ac index f8cce37..29be1d0 100644 --- a/configure.ac +++ b/configure.ac @@ -3307,6 +3307,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-draw-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-font-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-font-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-render-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-l1-1-1) diff --git a/dlls/ext-ms-win-gdi-font-l1-1-1/Makefile.in b/dlls/ext-ms-win-gdi-font-l1-1-1/Makefile.in new file mode 100644 index 0000000..eb60e7a --- /dev/null +++ b/dlls/ext-ms-win-gdi-font-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-font-l1-1-1.dll diff --git a/dlls/ext-ms-win-gdi-font-l1-1-1/ext-ms-win-gdi-font-l1-1-1.spec b/dlls/ext-ms-win-gdi-font-l1-1-1/ext-ms-win-gdi-font-l1-1-1.spec new file mode 100644 index 0000000..c1b0679 --- /dev/null +++ b/dlls/ext-ms-win-gdi-font-l1-1-1/ext-ms-win-gdi-font-l1-1-1.spec @@ -0,0 +1,30 @@ +@ stdcall CreateFontIndirectA(ptr) gdi32.CreateFontIndirectA +@ stdcall CreateFontIndirectW(ptr) gdi32.CreateFontIndirectW +@ stdcall EnumFontFamiliesA(long str ptr long) gdi32.EnumFontFamiliesA +@ stdcall EnumFontFamiliesExA(long ptr ptr long long) gdi32.EnumFontFamiliesExA +@ stdcall EnumFontFamiliesExW(long ptr ptr long long) gdi32.EnumFontFamiliesExW +@ stdcall ExtTextOutA(long long long long ptr str long ptr) gdi32.ExtTextOutA +@ stdcall ExtTextOutW(long long long long ptr wstr long ptr) gdi32.ExtTextOutW +@ stdcall GetCharABCWidthsW(long long long ptr) gdi32.GetCharABCWidthsW +@ stdcall GetCharWidth32A(long long long long) gdi32.GetCharWidth32A +@ stdcall GetCharWidthA(long long long long) gdi32.GetCharWidthA +@ stdcall GetCharWidthW(long long long long) gdi32.GetCharWidthW +@ stdcall GetFontData(long long long ptr long) gdi32.GetFontData +@ stdcall GetFontFileData(long long int64 ptr long) gdi32.GetFontFileData +@ stdcall GetFontFileInfo(long long ptr long ptr) gdi32.GetFontFileInfo +@ stdcall GetFontRealizationInfo(long ptr) gdi32.GetFontRealizationInfo +@ stdcall GetGlyphIndicesW(long ptr long ptr long) gdi32.GetGlyphIndicesW +@ stdcall GetGlyphOutlineW(long long long ptr long ptr ptr) gdi32.GetGlyphOutlineW +@ stdcall GetKerningPairsA(long long ptr) gdi32.GetKerningPairsA +@ stdcall GetKerningPairsW(long long ptr) gdi32.GetKerningPairsW +@ stdcall GetOutlineTextMetricsA(long long ptr) gdi32.GetOutlineTextMetricsA +@ stdcall GetOutlineTextMetricsW(long long ptr) gdi32.GetOutlineTextMetricsW +@ stdcall GetTextCharsetInfo(long ptr long) gdi32.GetTextCharsetInfo +@ stdcall GetTextExtentExPointW(long wstr long long ptr ptr ptr) gdi32.GetTextExtentExPointW +@ stdcall GetTextFaceA(long long ptr) gdi32.GetTextFaceA +@ stdcall GetTextFaceW(long long ptr) gdi32.GetTextFaceW +@ stdcall GetTextMetricsW(long ptr) gdi32.GetTextMetricsW +@ stdcall SetTextAlign(long long) gdi32.SetTextAlign +@ stdcall SetTextColor(long long) gdi32.SetTextColor +@ stdcall TextOutW(long long long wstr long) gdi32.TextOutW +@ stdcall TranslateCharsetInfo(ptr ptr long) gdi32.TranslateCharsetInfo diff --git a/tools/make_specfiles b/tools/make_specfiles index 9201be4..8933ae4 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -439,6 +439,7 @@ my @dll_groups = "ext-ms-win-gdi-draw-l1-1-0", "ext-ms-win-gdi-draw-l1-1-1", "ext-ms-win-gdi-font-l1-1-0", + "ext-ms-win-gdi-font-l1-1-1", "ext-ms-win-gdi-render-l1-1-0", "ext-ms-win-rtcore-gdi-devcaps-l1-1-0", "ext-ms-win-rtcore-gdi-object-l1-1-0",

1 0

Nikolay Sivov : mfplat/tests: Remove initialization from tests that don' t need it.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: e87faa1ad2d11dd1db8c2194bf6d350ca9840bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e87faa1ad2d11dd1db8c2194… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 19 16:20:03 2019 +0300 mfplat/tests: Remove initialization from tests that don't need it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 395fde4..7d202bc 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -319,12 +319,6 @@ static void test_MFCreateMediaType(void) HRESULT hr; IMFMediaType *mediatype; - hr = MFStartup(MAKELONG( MF_API_VERSION, 0xdead ), MFSTARTUP_FULL); - ok(hr == MF_E_BAD_STARTUP_VERSION, "got 0x%08x\n", hr); - - hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - if(0) { /* Crash on Windows Vista/7 */ @@ -339,8 +333,6 @@ if(0) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); IMFMediaType_Release(mediatype); - - MFShutdown(); } static void test_MFCreateMediaEvent(void) @@ -832,12 +824,27 @@ static void test_MFCreateAsyncResult(void) ok(!refcount, "Unexpected refcount %u\n.", refcount); } +static void test_startup(void) +{ + HRESULT hr; + + hr = MFStartup(MAKELONG(MF_API_VERSION, 0xdead), MFSTARTUP_FULL); + ok(hr == MF_E_BAD_STARTUP_VERSION, "Unexpected hr %#x.\n", hr); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); init_functions(); + test_startup(); test_register(); test_MFCreateMediaType(); test_MFCreateMediaEvent();

1 0

Nikolay Sivov : mfplat: Hold platform lock for async results lifetime.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 3d463b8ff581aa6348b84471fa32448127b7bb5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d463b8ff581aa6348b84471… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 19 16:20:04 2019 +0300 mfplat: Hold platform lock for async results lifetime. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 23 +++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 4 ++-- dlls/mfplat/queue.c | 4 ++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7e1736c..94d5ab0 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -38,6 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static LONG platform_lock; + static const WCHAR transform_keyW[] = {'M','e','d','i','a','F','o','u','n','d','a','t','i','o','n','\\', 'T','r','a','n','s','f','o','r','m','s',0}; static const WCHAR categories_keyW[] = {'M','e','d','i','a','F','o','u','n','d','a','t','i','o','n','\\', @@ -450,6 +452,27 @@ HRESULT WINAPI MFStartup(ULONG version, DWORD flags) HRESULT WINAPI MFShutdown(void) { FIXME("(): stub\n"); + + return S_OK; +} + +/*********************************************************************** + * MFLockPlatform (mfplat.@) + */ +HRESULT WINAPI MFLockPlatform(void) +{ + InterlockedIncrement(&platform_lock); + + return S_OK; +} + +/*********************************************************************** + * MFUnlockPlatform (mfplat.@) + */ +HRESULT WINAPI MFUnlockPlatform(void) +{ + InterlockedDecrement(&platform_lock); + return S_OK; } diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index b4e6c77..9813789 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -118,7 +118,7 @@ @ stub MFInitVideoFormat_RGB @ stub MFInvokeCallback @ stub MFJoinIoPort -@ stub MFLockPlatform +@ stdcall MFLockPlatform() @ stub MFLockWorkQueue @ stub MFPutWorkItem @ stub MFPutWorkItemEx @@ -146,7 +146,7 @@ @ stub MFTraceError @ stub MFTraceFuncEnter @ stub MFUnblockThread -@ stub MFUnlockPlatform +@ stdcall MFUnlockPlatform() @ stub MFUnlockWorkQueue @ stub MFUnwrapMediaType @ stub MFValidateMediaTypeSize diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 762af24..32c7a6c 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -83,6 +83,8 @@ static ULONG WINAPI async_result_Release(IMFAsyncResult *iface) if (result->state) IUnknown_Release(result->state); heap_free(result); + + MFUnlockPlatform(); } return refcount; @@ -172,6 +174,8 @@ HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, if (!result) return E_OUTOFMEMORY; + MFLockPlatform(); + result->result.AsyncResult.lpVtbl = &async_result_vtbl; result->refcount = 1; result->object = object;

1 0

Nikolay Sivov : mfplat: Add basic support for user queue object lifetime management.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 1fb58ab2fb08498b68d753de5456d2a1a0d6cb59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fb58ab2fb08498b68d753de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 19 16:20:05 2019 +0300 mfplat: Add basic support for user queue object lifetime management. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 6 +- dlls/mfplat/queue.c | 139 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 40 +++++++++++++ include/mfapi.h | 3 + include/mferror.h | 2 + 5 files changed, 187 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 9813789..8f5ee77 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -16,7 +16,7 @@ @ stub GetD3DFormatFromMFSubtype @ stub LFGetGlobalPool @ stub MFAddPeriodicCallback -@ stub MFAllocateWorkQueue +@ stdcall MFAllocateWorkQueue(ptr) @ stub MFAllocateWorkQueueEx @ stub MFAppendCollection @ stub MFAverageTimePerFrameToFrameRate @@ -119,7 +119,7 @@ @ stub MFInvokeCallback @ stub MFJoinIoPort @ stdcall MFLockPlatform() -@ stub MFLockWorkQueue +@ stdcall MFLockWorkQueue(long) @ stub MFPutWorkItem @ stub MFPutWorkItemEx @ stub MFRecordError @@ -147,7 +147,7 @@ @ stub MFTraceFuncEnter @ stub MFUnblockThread @ stdcall MFUnlockPlatform() -@ stub MFUnlockWorkQueue +@ stdcall MFUnlockWorkQueue(long) @ stub MFUnwrapMediaType @ stub MFValidateMediaTypeSize @ stub MFWrapMediaType diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 32c7a6c..65f111b 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -21,12 +21,121 @@ #define COBJMACROS #include "mfapi.h" +#include "mferror.h" #include "wine/debug.h" #include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +#define FIRST_USER_QUEUE_HANDLE 5 +#define MAX_USER_QUEUE_HANDLES 124 + +struct queue +{ + void *obj; + LONG refcount; + WORD generation; +}; + +static struct queue user_queues[MAX_USER_QUEUE_HANDLES]; +static struct queue *next_free_user_queue; +static struct queue *next_unused_user_queue = user_queues; +static WORD queue_generation; + +static CRITICAL_SECTION user_queues_section; +static CRITICAL_SECTION_DEBUG user_queues_critsect_debug = +{ + 0, 0, &user_queues_section, + { &user_queues_critsect_debug.ProcessLocksList, &user_queues_critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": user_queues_section") } +}; +static CRITICAL_SECTION user_queues_section = { &user_queues_critsect_debug, -1, 0, 0, 0, 0 }; + +static struct queue *get_queue_obj(DWORD handle) +{ + unsigned int idx = HIWORD(handle) - FIRST_USER_QUEUE_HANDLE; + + if (idx < MAX_USER_QUEUE_HANDLES && user_queues[idx].refcount) + { + if (LOWORD(handle) == user_queues[idx].generation) + return &user_queues[idx]; + } + + return NULL; +} + +static HRESULT alloc_user_queue(DWORD *queue) +{ + struct queue *entry; + unsigned int idx; + + EnterCriticalSection(&user_queues_section); + + entry = next_free_user_queue; + if (entry) + next_free_user_queue = entry->obj; + else if (next_unused_user_queue < user_queues + MAX_USER_QUEUE_HANDLES) + entry = next_unused_user_queue++; + else + { + LeaveCriticalSection(&user_queues_section); + return E_OUTOFMEMORY; + } + + entry->refcount = 1; + entry->obj = NULL; + if (++queue_generation == 0xffff) queue_generation = 1; + entry->generation = queue_generation; + idx = entry - user_queues + FIRST_USER_QUEUE_HANDLE; + *queue = (idx << 16) | entry->generation; + LeaveCriticalSection(&user_queues_section); + + return S_OK; +} + +static HRESULT lock_user_queue(DWORD queue) +{ + HRESULT hr = MF_E_INVALID_WORKQUEUE; + struct queue *entry; + + if (!(queue & MFASYNC_CALLBACK_QUEUE_PRIVATE_MASK)) + return S_OK; + + EnterCriticalSection(&user_queues_section); + entry = get_queue_obj(queue); + if (entry && entry->refcount) + { + entry->refcount++; + hr = S_OK; + } + LeaveCriticalSection(&user_queues_section); + return hr; +} + +static HRESULT unlock_user_queue(DWORD queue) +{ + HRESULT hr = MF_E_INVALID_WORKQUEUE; + struct queue *entry; + + if (!(queue & MFASYNC_CALLBACK_QUEUE_PRIVATE_MASK)) + return S_OK; + + EnterCriticalSection(&user_queues_section); + entry = get_queue_obj(queue); + if (entry && entry->refcount) + { + if (--entry->refcount == 0) + { + entry->obj = next_free_user_queue; + next_free_user_queue = entry; + } + hr = S_OK; + } + LeaveCriticalSection(&user_queues_section); + return hr; +} + struct async_result { MFASYNCRESULT result; @@ -192,3 +301,33 @@ HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, return S_OK; } + +/*********************************************************************** + * MFAllocateWorkQueue (mfplat.@) + */ +HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue) +{ + TRACE("%p.\n", queue); + + return alloc_user_queue(queue); +} + +/*********************************************************************** + * MFLockWorkQueue (mfplat.@) + */ +HRESULT WINAPI MFLockWorkQueue(DWORD queue) +{ + TRACE("%#x.\n", queue); + + return lock_user_queue(queue); +} + +/*********************************************************************** + * MFUnlockWorkQueue (mfplat.@) + */ +HRESULT WINAPI MFUnlockWorkQueue(DWORD queue) +{ + TRACE("%#x.\n", queue); + + return unlock_user_queue(queue); +} diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7d202bc..8b06e23 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -838,6 +838,45 @@ static void test_startup(void) ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); } +static void test_allocate_queue(void) +{ + DWORD queue, queue2; + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = MFAllocateWorkQueue(&queue); + ok(hr == S_OK, "Failed to allocate a queue, hr %#x.\n", hr); + ok(queue & MFASYNC_CALLBACK_QUEUE_PRIVATE_MASK, "Unexpected queue id.\n"); + + hr = MFUnlockWorkQueue(queue); + ok(hr == S_OK, "Failed to unlock the queue, hr %#x.\n", hr); + + hr = MFUnlockWorkQueue(queue); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + hr = MFAllocateWorkQueue(&queue2); + ok(hr == S_OK, "Failed to allocate a queue, hr %#x.\n", hr); + ok(queue2 & MFASYNC_CALLBACK_QUEUE_PRIVATE_MASK, "Unexpected queue id.\n"); + + hr = MFUnlockWorkQueue(queue2); + ok(hr == S_OK, "Failed to unlock the queue, hr %#x.\n", hr); + + /* Unlock in system queue range. */ + hr = MFUnlockWorkQueue(MFASYNC_CALLBACK_QUEUE_STANDARD); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFUnlockWorkQueue(MFASYNC_CALLBACK_QUEUE_UNDEFINED); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFUnlockWorkQueue(0x20); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -855,6 +894,7 @@ START_TEST(mfplat) test_MFCreateMemoryBuffer(); test_source_resolver(); test_MFCreateAsyncResult(); + test_allocate_queue(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 1575cc3..d70a300 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -80,6 +80,7 @@ DEFINE_GUID(MFMediaType_Video, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0 typedef unsigned __int64 MFWORKITEM_KEY; +HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines); HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); @@ -99,6 +100,7 @@ HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *inpu HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *pcount); +HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, @@ -109,6 +111,7 @@ HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWST HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void); +HRESULT WINAPI MFUnlockWorkQueue(DWORD queue); HRESULT WINAPI MFTUnregister(CLSID clsid); HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory); HRESULT WINAPI MFGetPluginControl(IMFPluginControl**); diff --git a/include/mferror.h b/include/mferror.h index 1f5ae98..53024ca 100644 --- a/include/mferror.h +++ b/include/mferror.h @@ -65,6 +65,8 @@ #define MF_E_INVALID_POSITION _HRESULT_TYPEDEF_(0xc00d36e5) #define MF_E_ATTRIBUTENOTFOUND _HRESULT_TYPEDEF_(0xc00d36e6) #define MF_E_PROPERTY_TYPE_NOT_ALLOWED _HRESULT_TYPEDEF_(0xc00d36e7) +#define MF_E_INVALID_WORKQUEUE _HRESULT_TYPEDEF_(0xc00d36ff) +#define MF_E_SHUTDOWN _HRESULT_TYPEDEF_(0xc00d3e85) #define MF_E_TOPO_INVALID_OPTIONAL_NODE _HRESULT_TYPEDEF_(0xc00d520e) #define MF_E_TOPO_CANNOT_FIND_DECRYPTOR _HRESULT_TYPEDEF_(0xc00d5211)

1 0

Nikolay Sivov : mfplat: Add trivial implementation of MFCopyImage().
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 9fdb1fd96e6165f806f2a400cf1586387c0ff614 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fdb1fd96e6165f806f2a400… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 19 16:20:06 2019 +0300 mfplat: Add trivial implementation of MFCopyImage(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 15 +++++++++++++-- dlls/mfplat/tests/mfplat.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 94d5ab0..21240df 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -476,10 +476,21 @@ HRESULT WINAPI MFUnlockPlatform(void) return S_OK; } +/*********************************************************************** + * MFCopyImage (mfplat.@) + */ HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines) { - FIXME("(%p, %d, %p, %d, %d, %d) stub\n", dest, deststride, src, srcstride, width, lines); - return E_NOTIMPL; + TRACE("(%p, %d, %p, %d, %u, %u)\n", dest, deststride, src, srcstride, width, lines); + + while (lines--) + { + memcpy(dest, src, width); + dest += deststride; + src += srcstride; + } + + return S_OK; } typedef struct _mfattributes diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 8b06e23..a7b5620 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -36,6 +36,8 @@ #include "wine/test.h" +static HRESULT (WINAPI *pMFCopyImage)(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, + DWORD width, DWORD lines); static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); static HRESULT (WINAPI *pMFCreateMemoryBuffer)(DWORD max_length, IMFMediaBuffer **buffer); @@ -308,6 +310,7 @@ static void init_functions(void) HMODULE mod = GetModuleHandleA("mfplat.dll"); #define X(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return; + X(MFCopyImage); X(MFCreateSourceResolver); X(MFCreateMFByteStreamOnStream); X(MFCreateMemoryBuffer); @@ -877,6 +880,39 @@ static void test_allocate_queue(void) ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); } +static void test_MFCopyImage(void) +{ + BYTE dest[16], src[16]; + HRESULT hr; + + if (!pMFCopyImage) + { + win_skip("MFCopyImage() is not available.\n"); + return; + } + + memset(dest, 0xaa, sizeof(dest)); + memset(src, 0x11, sizeof(src)); + + hr = pMFCopyImage(dest, 8, src, 8, 4, 1); + ok(hr == S_OK, "Failed to copy image %#x.\n", hr); + ok(!memcmp(dest, src, 4) && dest[4] == 0xaa, "Unexpected buffer contents.\n"); + + memset(dest, 0xaa, sizeof(dest)); + memset(src, 0x11, sizeof(src)); + + hr = pMFCopyImage(dest, 8, src, 8, 16, 1); + ok(hr == S_OK, "Failed to copy image %#x.\n", hr); + ok(!memcmp(dest, src, 16), "Unexpected buffer contents.\n"); + + memset(dest, 0xaa, sizeof(dest)); + memset(src, 0x11, sizeof(src)); + + hr = pMFCopyImage(dest, 8, src, 8, 8, 2); + ok(hr == S_OK, "Failed to copy image %#x.\n", hr); + ok(!memcmp(dest, src, 16), "Unexpected buffer contents.\n"); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -895,6 +931,7 @@ START_TEST(mfplat) test_source_resolver(); test_MFCreateAsyncResult(); test_allocate_queue(); + test_MFCopyImage(); CoUninitialize(); }

1 0

Zebediah Figura : user32: SetWindowPos() shouldn' t change the client rect of a minimized window.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 119e215e3ea7ff4396245f70a9fa3322625a3c99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=119e215e3ea7ff4396245f70… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 19 12:17:36 2019 -0600 user32: SetWindowPos() shouldn't change the client rect of a minimized window. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 12 ++++++++++++ dlls/user32/winpos.c | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 50dbf49..ceb4b82 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6550,6 +6550,18 @@ static void test_ShowWindow(void) todo_wine ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); + /* SetWindowPos shouldn't affect the client rect */ + ret = SetWindowPos(hwnd, 0, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + ok(ret, "not expected ret: %lu\n", ret); + GetWindowRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); + GetClientRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 4b39d0a..38444b2 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1699,7 +1699,7 @@ static BOOL SWP_DoWinPosChanging( WINDOWPOS *pWinpos, RECT *old_window_rect, REC WIN_GetRectangles( pWinpos->hwnd, COORDS_PARENT, old_window_rect, old_client_rect ); *new_window_rect = *old_window_rect; - *new_client_rect = (wndPtr->dwStyle & WS_MINIMIZE) ? *old_window_rect : *old_client_rect; + *new_client_rect = *old_client_rect; if (!(pWinpos->flags & SWP_NOSIZE)) {

1 0

Alexandre Julliard : winebuild: Align resource data to dword boundaries even on 64-bit.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 39698f5468bd2b9e9e9fe3d10e587991238002ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=39698f5468bd2b9e9e9fe3d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 22:55:34 2019 +0100 winebuild: Align resource data to dword boundaries even on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/res32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 1686f56..d237782 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -492,7 +492,7 @@ void output_resources( DLLSPEC *spec ) for (i = 0, res = spec->resources; i < spec->nb_resources; i++, res++) { - output( "\n\t.align %d\n", get_alignment(get_ptr_size()) ); + output( "\n\t.align %d\n", get_alignment(4) ); output( ".L__wine_spec_res_%d:\n", i ); dump_res_data( res ); }

1 0

Michael Stefaniuc : hnetcfg: Remove redundant "not NULL" check ( coccinellery).
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: c6ecb1b6a477e1b7367cb01bafb20837c68252bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6ecb1b6a477e1b7367cb01b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 19 00:06:21 2019 +0100 hnetcfg: Remove redundant "not NULL" check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/policy.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/hnetcfg/policy.c b/dlls/hnetcfg/policy.c index c2f3252..53f39ae 100644 --- a/dlls/hnetcfg/policy.c +++ b/dlls/hnetcfg/policy.c @@ -641,11 +641,8 @@ static HRESULT WINAPI fwpolicy2_get_Rules(INetFwPolicy2 *iface, INetFwRules **ru if(!rules) return E_POINTER; - if(rules) - { - *rules = This->fw_policy2_rules; - INetFwRules_AddRef(This->fw_policy2_rules); - } + *rules = This->fw_policy2_rules; + INetFwRules_AddRef(This->fw_policy2_rules); return S_OK; }

1 0

Jacek Caban : include: Add atlthunk.h.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 5f296d971f23a2c86d659c242af6e6d992ed89c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f296d971f23a2c86d659c24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 22:05:50 2019 +0100 include: Add atlthunk.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/atlthunk.h | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index eaf3114..c9f5be9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -22,6 +22,7 @@ SOURCES = \ atlbase.h \ atlcom.h \ atliface.idl \ + atlthunk.h \ atlwin.h \ audevcod.h \ audioclient.idl \ diff --git a/include/atlthunk.h b/include/atlthunk.h new file mode 100644 index 0000000..c7f2d27 --- /dev/null +++ b/include/atlthunk.h @@ -0,0 +1,37 @@ +/* + * Copyright 2019 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __ATLTHUNK_H__ +#define __ATLTHUNK_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct AtlThunkData_t AtlThunkData_t; + +AtlThunkData_t* WINAPI AtlThunk_AllocateData(void); +WNDPROC WINAPI AtlThunk_DataToCode(AtlThunkData_t*); +void WINAPI AtlThunk_FreeData(AtlThunkData_t*); +void WINAPI AtlThunk_InitData(AtlThunkData_t*,void*,SIZE_T); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* __ATLTHUNK_H__ */

1 0

Jacek Caban : atlthunk: Add stub DLL.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 3fe02210a9764120facba7f3be1146233359f803 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fe02210a9764120facba7f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 22:06:04 2019 +0100 atlthunk: Add stub DLL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/atlthunk/Makefile.in | 5 +++++ dlls/atlthunk/atlthunk.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/atlthunk/atlthunk.spec | 4 ++++ 5 files changed, 57 insertions(+) diff --git a/configure b/configure index ac22582..b86e260 100755 --- a/configure +++ b/configure @@ -1119,6 +1119,7 @@ enable_atl100 enable_atl110 enable_atl80 enable_atl90 +enable_atlthunk enable_atmlib enable_authz enable_avicap32 @@ -19357,6 +19358,7 @@ wine_fn_config_makefile dlls/atl110 enable_atl110 wine_fn_config_makefile dlls/atl80 enable_atl80 wine_fn_config_makefile dlls/atl80/tests enable_tests wine_fn_config_makefile dlls/atl90 enable_atl90 +wine_fn_config_makefile dlls/atlthunk enable_atlthunk wine_fn_config_makefile dlls/atmlib enable_atmlib wine_fn_config_makefile dlls/authz enable_authz wine_fn_config_makefile dlls/avicap32 enable_avicap32 diff --git a/configure.ac b/configure.ac index e468966..da14848 100644 --- a/configure.ac +++ b/configure.ac @@ -3093,6 +3093,7 @@ WINE_CONFIG_MAKEFILE(dlls/atl110) WINE_CONFIG_MAKEFILE(dlls/atl80) WINE_CONFIG_MAKEFILE(dlls/atl80/tests) WINE_CONFIG_MAKEFILE(dlls/atl90) +WINE_CONFIG_MAKEFILE(dlls/atlthunk) WINE_CONFIG_MAKEFILE(dlls/atmlib) WINE_CONFIG_MAKEFILE(dlls/authz) WINE_CONFIG_MAKEFILE(dlls/avicap32) diff --git a/dlls/atlthunk/Makefile.in b/dlls/atlthunk/Makefile.in new file mode 100644 index 0000000..1adeedf --- /dev/null +++ b/dlls/atlthunk/Makefile.in @@ -0,0 +1,5 @@ +MODULE = atlthunk.dll +IMPORTLIB = atlthunk + +C_SRCS = \ + atlthunk.c diff --git a/dlls/atlthunk/atlthunk.c b/dlls/atlthunk/atlthunk.c new file mode 100644 index 0000000..79d0432 --- /dev/null +++ b/dlls/atlthunk/atlthunk.c @@ -0,0 +1,45 @@ +/* + * Copyright 2019 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windows.h" +#include "atlthunk.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(atlthunk); + +AtlThunkData_t* WINAPI AtlThunk_AllocateData(void) +{ + FIXME("\n"); + return NULL; +} + +WNDPROC WINAPI AtlThunk_DataToCode(AtlThunkData_t *thunk) +{ + FIXME("(%p)\n", thunk); + return NULL; +} + +void WINAPI AtlThunk_FreeData(AtlThunkData_t *thunk) +{ + FIXME("(%p)\n", thunk); +} + +void WINAPI AtlThunk_InitData(AtlThunkData_t *thunk, void *proc, SIZE_T arg) +{ + FIXME("(%p %p %lx)\n", thunk, proc, arg); +} diff --git a/dlls/atlthunk/atlthunk.spec b/dlls/atlthunk/atlthunk.spec new file mode 100644 index 0000000..25516a8 --- /dev/null +++ b/dlls/atlthunk/atlthunk.spec @@ -0,0 +1,4 @@ +@ stdcall AtlThunk_AllocateData() +@ stdcall AtlThunk_DataToCode(ptr) +@ stdcall AtlThunk_FreeData(ptr) +@ stdcall AtlThunk_InitData(ptr ptr long)

1 0