February 2021 - Wine-commits

Rémi Bernon : include: Rename class parameters to mmcss_class.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 3f2e572da8dc9d301d62f2b617e483e1a75557cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f2e572da8dc9d301d62f2b6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 17:00:54 2021 +0100 include: Rename class parameters to mmcss_class. In MFGetWorkQueueMMCSSClass and Rtwq MMCSS functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfapi.h | 2 +- include/rtworkq.idl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/mfapi.h b/include/mfapi.h index 7bac3e21fa9..25602a7cd94 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -538,7 +538,7 @@ HRESULT WINAPI MFGetAttributesAsBlobSize(IMFAttributes *attributes, UINT32 *size HRESULT WINAPI MFGetStrideForBitmapInfoHeader(DWORD format, DWORD width, LONG *stride); HRESULT WINAPI MFGetPlaneSize(DWORD format, DWORD width, DWORD height, DWORD *size); HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); -HRESULT WINAPI MFGetWorkQueueMMCSSClass(DWORD queue, WCHAR *class, DWORD *length); +HRESULT WINAPI MFGetWorkQueueMMCSSClass(DWORD queue, WCHAR *mmcss_class, DWORD *length); HRESULT WINAPI MFGetWorkQueueMMCSSPriority(DWORD queue, LONG *priority); HRESULT WINAPI MFGetWorkQueueMMCSSTaskId(DWORD queue, DWORD *taskid); HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, diff --git a/include/rtworkq.idl b/include/rtworkq.idl index e7ff768074c..32132961bd8 100644 --- a/include/rtworkq.idl +++ b/include/rtworkq.idl @@ -92,13 +92,13 @@ cpp_quote("typedef void (WINAPI *RTWQPERIODICCALLBACK)(IUnknown *context);") cpp_quote("HRESULT WINAPI RtwqAddPeriodicCallback(RTWQPERIODICCALLBACK callback, IUnknown *context, DWORD *key);") cpp_quote("HRESULT WINAPI RtwqAllocateSerialWorkQueue(DWORD target_queue, DWORD *queue);") cpp_quote("HRESULT WINAPI RtwqAllocateWorkQueue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queue);") -cpp_quote("HRESULT WINAPI RtwqBeginRegisterWorkQueueWithMMCSS(DWORD queue, const WCHAR *class, DWORD taskid, LONG priority, IRtwqAsyncCallback *callback, IUnknown *state);") +cpp_quote("HRESULT WINAPI RtwqBeginRegisterWorkQueueWithMMCSS(DWORD queue, const WCHAR *mmcss_class, DWORD taskid, LONG priority, IRtwqAsyncCallback *callback, IUnknown *state);") cpp_quote("HRESULT WINAPI RtwqBeginUnregisterWorkQueueWithMMCSS(DWORD queue, IRtwqAsyncCallback *callback, IUnknown *state);") cpp_quote("HRESULT WINAPI RtwqCancelDeadline(HANDLE request);") cpp_quote("HRESULT WINAPI RtwqCancelWorkItem(RTWQWORKITEM_KEY key);") cpp_quote("HRESULT WINAPI RtwqCreateAsyncResult(IUnknown *object, IRtwqAsyncCallback *callback, IUnknown *state, IRtwqAsyncResult **result);") cpp_quote("HRESULT WINAPI RtwqEndRegisterWorkQueueWithMMCSS(IRtwqAsyncResult *result, DWORD *taskid);") -cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSClass(DWORD queue, WCHAR *class, DWORD *length);") +cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSClass(DWORD queue, WCHAR *mmcss_class, DWORD *length);") cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSPriority(DWORD queue, LONG *priority);") cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSTaskId(DWORD queue, DWORD *taskid);") cpp_quote("HRESULT WINAPI RtwqInvokeCallback(IRtwqAsyncResult *result);") @@ -109,7 +109,7 @@ cpp_quote("HRESULT WINAPI RtwqLockWorkQueue(DWORD queue);") cpp_quote("HRESULT WINAPI RtwqPutWaitingWorkItem(HANDLE event, LONG priority, IRtwqAsyncResult *result, RTWQWORKITEM_KEY *key);") cpp_quote("HRESULT WINAPI RtwqPutWorkItem(DWORD queue, LONG priority, IRtwqAsyncResult *result);") cpp_quote("HRESULT WINAPI RtwqRegisterPlatformEvents(IRtwqPlatformEvents *events);") -cpp_quote("HRESULT WINAPI RtwqRegisterPlatformWithMMCSS(const WCHAR *class, DWORD *taskid, LONG priority);") +cpp_quote("HRESULT WINAPI RtwqRegisterPlatformWithMMCSS(const WCHAR *mmcss_class, DWORD *taskid, LONG priority);") cpp_quote("HRESULT WINAPI RtwqRemovePeriodicCallback(DWORD key);") cpp_quote("HRESULT WINAPI RtwqScheduleWorkItem(IRtwqAsyncResult *result, INT64 timeout, RTWQWORKITEM_KEY *key);") cpp_quote("HRESULT WINAPI RtwqSetDeadline(DWORD queue_id, LONGLONG deadline, HANDLE *request);")

1 0

Dmitry Timoshkov : shell32: IPersistFile::Save(NULL) should use previously stored file name.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: dbb1ed4895079f67ae385afe878e924d3249037b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbb1ed4895079f67ae385afe… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 3 12:40:43 2021 +0000 shell32: IPersistFile::Save(NULL) should use previously stored file name. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelllink.c | 16 ++++++++++++---- dlls/shell32/tests/shelllink.c | 25 ++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 46d9bc994ff..69d610f2503 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -367,7 +367,12 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile TRACE("(%p)->(%s)\n",This,debugstr_w(pszFileName)); if (!pszFileName) - return E_FAIL; + { + if (!This->filepath) return S_OK; + + pszFileName = This->filepath; + fRemember = FALSE; + } r = SHCreateStreamOnFileW( pszFileName, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, &stm ); if( SUCCEEDED( r ) ) @@ -379,9 +384,12 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile { StartLinkProcessor( pszFileName ); - /* update file path */ - heap_free(This->filepath); - This->filepath = strdupW(pszFileName); + if (fRemember) + { + /* update file path */ + heap_free(This->filepath); + This->filepath = strdupW(pszFileName); + } This->bDirty = FALSE; } diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 20c48814f1d..edd536c3a01 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -388,7 +388,7 @@ static void test_get_set(void) void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) { - HRESULT r; + HRESULT r, init_dirty; IShellLinkA *sl; IPersistFile *pf; @@ -451,6 +451,17 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) IPersistFile_GetCurFile(pf, NULL); } + init_dirty = IPersistFile_IsDirty(pf); /* empty links start off as clean */ + r = IPersistFile_Save(pf, NULL, FALSE); + lok(r == S_OK || r == E_INVALIDARG /* before Windows 7 */, "save failed (0x%08x)\n", r); + r = IPersistFile_IsDirty(pf); + lok(r == init_dirty, "dirty (0x%08x)\n", r); + + r = IPersistFile_Save(pf, NULL, TRUE); + lok(r == S_OK || r == E_INVALIDARG /* before Windows 7 */, "save failed (0x%08x)\n", r); + r = IPersistFile_IsDirty(pf); + lok(r == init_dirty, "dirty (0x%08x)\n", r); + /* test GetCurFile before ::Save */ str = (LPWSTR)0xdeadbeef; r = IPersistFile_GetCurFile(pf, &str); @@ -459,6 +470,18 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) r = IPersistFile_Save(pf, path, TRUE); lok(r == S_OK, "save failed (0x%08x)\n", r); + r = IPersistFile_IsDirty(pf); + lok(r == S_FALSE, "dirty (0x%08x)\n", r); + + /* test GetCurFile after ::Save */ + r = IPersistFile_GetCurFile(pf, &str); + lok(r == S_OK, "got 0x%08x\n", r); + lok(str != NULL, "Didn't expect NULL\n"); + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); + CoTaskMemFree(str); + + r = IPersistFile_Save(pf, NULL, TRUE); + lok(r == S_OK, "save failed (0x%08x)\n", r); /* test GetCurFile after ::Save */ r = IPersistFile_GetCurFile(pf, &str);

1 0

Jan Sikorski : wined3d: Store stencil reference value in wined3d_state.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: f3aceef72559d9655e58779f1131b643e994e493 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3aceef72559d9655e58779f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Feb 3 14:12:47 2021 +0100 wined3d: Store stencil reference value in wined3d_state. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 2 -- dlls/d3d11/device.c | 15 +++------------ dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/context_vk.c | 4 ++-- dlls/wined3d/cs.c | 16 ++++++++++++---- dlls/wined3d/device.c | 25 +++++++++++++++++-------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/state.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 8 ++++++-- include/wine/wined3d.h | 4 ++-- 10 files changed, 48 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f3aceef72559d9655e58…

1 0

Jan Sikorski : wined3d: Check for stencil reference change in vulkan backend.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 433aaccc1fd424108f19075f4b464c05b1a8cbc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=433aaccc1fd424108f19075f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Feb 3 14:12:48 2021 +0100 wined3d: Check for stencil reference change in vulkan backend. Make stencil reference value dynamic, so it can be updated separately. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50380 Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 55127e44a00..f24f6bec6df 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1493,6 +1493,7 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context context_invalidate_state(&context_vk->c, STATE_STREAMSRC); context_invalidate_state(&context_vk->c, STATE_INDEXBUFFER); context_invalidate_state(&context_vk->c, STATE_BLEND_FACTOR); + context_invalidate_state(&context_vk->c, STATE_STENCIL_REF); VK_CALL(vkEndCommandBuffer(buffer->vk_command_buffer)); @@ -1701,6 +1702,7 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context static const VkDynamicState dynamic_states[] = { VK_DYNAMIC_STATE_BLEND_CONSTANTS, + VK_DYNAMIC_STATE_STENCIL_REFERENCE, }; key = &context_vk->graphics.pipeline_key_vk; @@ -2076,8 +2078,6 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->ds_desc.front.compareOp = vk_compare_op_from_wined3d(d->desc.front.func); key->ds_desc.front.compareMask = d->desc.stencil_read_mask; key->ds_desc.front.writeMask = d->desc.stencil_write_mask; - key->ds_desc.front.reference = state->stencil_ref - & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); key->ds_desc.back.failOp = vk_stencil_op_from_wined3d(d->desc.back.fail_op); key->ds_desc.back.passOp = vk_stencil_op_from_wined3d(d->desc.back.pass_op); @@ -2085,8 +2085,6 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->ds_desc.back.compareOp = vk_compare_op_from_wined3d(d->desc.back.func); key->ds_desc.back.compareMask = d->desc.stencil_read_mask; key->ds_desc.back.writeMask = d->desc.stencil_write_mask; - key->ds_desc.back.reference = state->stencil_ref - & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); } else { @@ -3033,6 +3031,12 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c VK_PIPELINE_BIND_POINT_GRAPHICS, context_vk->graphics.vk_pipeline)); } + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_STENCIL_REF) && dsv) + { + VK_CALL(vkCmdSetStencilReference(vk_command_buffer, VK_STENCIL_FACE_FRONT_AND_BACK, + state->stencil_ref & ((1 << dsv->format->stencil_size) - 1))); + } + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_STREAMSRC)) wined3d_context_vk_bind_vertex_buffers(context_vk, vk_command_buffer, state, vk_info);

1 0

Jan Sikorski : wined3d: Added missing states to debug_d3dstate().
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 3655e7d9450692fac0d9a2d71c8c110024e5fd67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3655e7d9450692fac0d9a2d7… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Feb 3 14:12:49 2021 +0100 wined3d: Added missing states to debug_d3dstate(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e7e04e81557..daf079f50dc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5197,6 +5197,12 @@ const char *debug_d3dstate(DWORD state) return "STATE_BLEND"; if (STATE_IS_BLEND_FACTOR(state)) return "STATE_BLEND_FACTOR"; + if (STATE_IS_SAMPLE_MASK(state)) + return "STATE_SAMPLE_MASK"; + if (STATE_IS_DEPTH_STENCIL(state)) + return "STATE_DEPTH_STENCIL"; + if (STATE_IS_STENCIL_REF(state)) + return "STATE_STENCIL_REF"; return wine_dbg_sprintf("UNKNOWN_STATE(%#x)", state); }

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

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

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

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 : 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