May 2020 - wine-commits

Jacek Caban : ieframe: Return S_FALSE in IWebBrowser2::get_Document when returning NULL.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: bf83d755d987fec552cd1dce30638c31c49ab760 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf83d755d987fec552cd1dce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 29 20:37:03 2020 +0200 ieframe: Return S_FALSE in IWebBrowser2::get_Document when returning NULL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 6 ++++++ dlls/ieframe/webbrowser.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 426fe18da0..898d0e6805 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -4056,6 +4056,7 @@ static void test_SetAdvise(void) IViewObject2 *view; IAdviseSink *sink; IOleObject *oleobj; + IDispatch *doc; DWORD aspects, flags; if (!(browser = create_webbrowser())) return; @@ -4115,6 +4116,11 @@ static void test_SetAdvise(void) hr = IViewObject2_SetAdvise(view, 0, 0, NULL); ok(hr == S_OK, "got %08x\n", hr); + doc = (void*)0xdeadbeef; + hr = IWebBrowser2_get_Document(browser, &doc); + ok(hr == S_FALSE, "get_Document failed: %08x\n", hr); + ok(!doc, "doc = %p\n", doc); + IOleObject_Release(oleobj); IViewObject2_Release(view); IWebBrowser2_Release(browser); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 1e50512e42..356b0a2833 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -404,7 +404,7 @@ static HRESULT WINAPI WebBrowser_get_Document(IWebBrowser2 *iface, IDispatch **p } *ppDisp = disp; - return S_OK; + return disp ? S_OK : S_FALSE; } static HRESULT WINAPI WebBrowser_get_TopLevelContainer(IWebBrowser2 *iface, VARIANT_BOOL *pBool)

1 0

Nikolay Sivov : mfmediaengine: Send "pause" event on Pause().
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 58f468038013db22ba1905d57df0eb58caad5dbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=58f468038013db22ba1905d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 21:28:40 2020 +0300 mfmediaengine: Send "pause" event on Pause(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 21 +++++++++++++++++++-- dlls/mfmediaengine/tests/mfmediaengine.c | 17 +++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 13cbeb4b8d..fcef1be048 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -476,9 +476,26 @@ static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + + if (!(engine->flags & FLAGS_ENGINE_PAUSED)) + { + engine->flags &= ~FLAGS_ENGINE_WAITING; + engine->flags |= FLAGS_ENGINE_PAUSED; + + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PAUSE, 0, 0); + } + + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); + + LeaveCriticalSection(&engine->cs); + + return S_OK; } static BOOL WINAPI media_engine_GetMuted(IMFMediaEngine *iface) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index e7cb6432b9..a3db611e9f 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -421,6 +421,23 @@ static void test_Play(void) ok(!ret, "Unexpected state %d.\n", ret); IMFMediaEngine_Release(media_engine); + + /* Play -> Pause */ + media_engine = create_media_engine(callback); + + hr = IMFMediaEngine_Play(media_engine); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ret = IMFMediaEngine_IsPaused(media_engine); + ok(!ret, "Unexpected state %d.\n", ret); + + hr = IMFMediaEngine_Pause(media_engine); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ret = IMFMediaEngine_IsPaused(media_engine); + ok(!!ret, "Unexpected state %d.\n", ret); + + IMFMediaEngine_Release(media_engine); } START_TEST(mfmediaengine)

1 0

Nikolay Sivov : mfmediaengine: Send "play" event on Play().
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 41af1d1e710b0895f5aee04b178cdb59a283a40d URL: https://source.winehq.org/git/wine.git/?a=commit;h=41af1d1e710b0895f5aee04b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 21:28:39 2020 +0300 mfmediaengine: Send "play" event on Play(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 41 ++++++++++++++++++++++++++++---- dlls/mfmediaengine/tests/mfmediaengine.c | 33 ++++++++++++++++++++++++- 2 files changed, 68 insertions(+), 6 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 77466e9993..13cbeb4b8d 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -61,6 +61,8 @@ enum media_engine_flags FLAGS_ENGINE_SHUT_DOWN = 0x20, FLAGS_ENGINE_AUTO_PLAY = 0x40, FLAGS_ENGINE_LOOP = 0x80, + FLAGS_ENGINE_PAUSED = 0x100, + FLAGS_ENGINE_WAITING = 0x200, }; struct media_engine @@ -328,9 +330,16 @@ static double WINAPI media_engine_GetDuration(IMFMediaEngine *iface) static BOOL WINAPI media_engine_IsPaused(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + BOOL value; - return FALSE; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + value = !!(engine->flags & FLAGS_ENGINE_PAUSED); + LeaveCriticalSection(&engine->cs); + + return value; } static double WINAPI media_engine_GetDefaultPlaybackRate(IMFMediaEngine *iface) @@ -438,9 +447,31 @@ static HRESULT WINAPI media_engine_SetLoop(IMFMediaEngine *iface, BOOL loop) static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + PROPVARIANT var; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); + + if (!(engine->flags & FLAGS_ENGINE_WAITING)) + { + engine->flags &= ~FLAGS_ENGINE_PAUSED; + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAY, 0, 0); + + var.vt = VT_EMPTY; + IMFMediaSession_Start(engine->session, &GUID_NULL, &var); + + engine->flags |= FLAGS_ENGINE_WAITING; + } + + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_WAITING, 0, 0); + + LeaveCriticalSection(&engine->cs); + + return S_OK; } static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface) @@ -623,7 +654,7 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct engine->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; engine->session_events.lpVtbl = &media_engine_session_events_vtbl; engine->refcount = 1; - engine->flags = flags & MF_MEDIA_ENGINE_CREATEFLAGS_MASK; + engine->flags = (flags & MF_MEDIA_ENGINE_CREATEFLAGS_MASK) | FLAGS_ENGINE_PAUSED; InitializeCriticalSection(&engine->cs); hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 504464b527..e7cb6432b9 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -307,7 +307,6 @@ todo_wine ok(val == 0.0, "Unexpected time %f.\n", val); state = IMFMediaEngine_IsPaused(media_engine); -todo_wine ok(!!state, "Unexpected state %d.\n", state); val = IMFMediaEngine_GetDefaultPlaybackRate(media_engine); @@ -393,6 +392,37 @@ todo_wine IMFMediaEngine_Release(media_engine); } +static void test_Play(void) +{ + struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; + IMFMediaEngineNotify *callback = &notify_impl.IMFMediaEngineNotify_iface; + IMFMediaEngine *media_engine; + HRESULT hr; + BOOL ret; + + media_engine = create_media_engine(callback); + + ret = IMFMediaEngine_IsPaused(media_engine); + ok(ret, "Unexpected state %d.\n", ret); + + hr = IMFMediaEngine_Play(media_engine); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ret = IMFMediaEngine_IsPaused(media_engine); + ok(!ret, "Unexpected state %d.\n", ret); + + hr = IMFMediaEngine_Play(media_engine); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaEngine_Shutdown(media_engine); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ret = IMFMediaEngine_IsPaused(media_engine); + ok(!ret, "Unexpected state %d.\n", ret); + + IMFMediaEngine_Release(media_engine); +} + START_TEST(mfmediaengine) { HRESULT hr; @@ -416,6 +446,7 @@ START_TEST(mfmediaengine) test_factory(); test_CreateInstance(); test_Shutdown(); + test_Play(); IMFMediaEngineClassFactory_Release(factory);

1 0

Nikolay Sivov : mfmediaengine: Create media session instance.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: f465187f411b2d0b83fee25051d6b4d2c17e4ff8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f465187f411b2d0b83fee250… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 21:28:38 2020 +0300 mfmediaengine: Create media session instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/Makefile.in | 2 +- dlls/mfmediaengine/main.c | 78 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/Makefile.in b/dlls/mfmediaengine/Makefile.in index 292baa8001..2278e87a64 100644 --- a/dlls/mfmediaengine/Makefile.in +++ b/dlls/mfmediaengine/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfmediaengine.dll IMPORTLIB = mfmediaengine -IMPORTS = mfuuid uuid +IMPORTS = mf mfuuid uuid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index eef485e315..77466e9993 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -66,6 +66,7 @@ enum media_engine_flags struct media_engine { IMFMediaEngine IMFMediaEngine_iface; + IMFAsyncCallback session_events; LONG refcount; IMFMediaEngineNotify *callback; UINT64 playback_hwnd; @@ -73,6 +74,7 @@ struct media_engine IMFDXGIDeviceManager *dxgi_manager; enum media_engine_mode mode; unsigned int flags; + IMFMediaSession *session; CRITICAL_SECTION cs; }; @@ -89,6 +91,70 @@ static inline struct media_engine *impl_from_IMFMediaEngine(IMFMediaEngine *ifac return CONTAINING_RECORD(iface, struct media_engine, IMFMediaEngine_iface); } +static struct media_engine *impl_from_session_events_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct media_engine, session_events); +} + +static HRESULT WINAPI media_engine_session_events_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFAsyncCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI media_engine_session_events_AddRef(IMFAsyncCallback *iface) +{ + struct media_engine *engine = impl_from_session_events_IMFAsyncCallback(iface); + return IMFMediaEngine_AddRef(&engine->IMFMediaEngine_iface); +} + +static ULONG WINAPI media_engine_session_events_Release(IMFAsyncCallback *iface) +{ + struct media_engine *engine = impl_from_session_events_IMFAsyncCallback(iface); + return IMFMediaEngine_Release(&engine->IMFMediaEngine_iface); +} + +static HRESULT WINAPI media_engine_session_events_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct media_engine *engine = impl_from_session_events_IMFAsyncCallback(iface); + IMFMediaEvent *event = NULL; + HRESULT hr; + + if (FAILED(hr = IMFMediaSession_EndGetEvent(engine->session, result, &event))) + WARN("Failed to get session event, hr %#x.\n", hr); + + if (event) + IMFMediaEvent_Release(event); + + if (FAILED(hr = IMFMediaSession_BeginGetEvent(engine->session, iface, NULL))) + WARN("Failed to subscribe to session events, hr %#x.\n", hr); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl media_engine_session_events_vtbl = +{ + media_engine_session_events_QueryInterface, + media_engine_session_events_AddRef, + media_engine_session_events_Release, + media_engine_session_events_GetParameters, + media_engine_session_events_Invoke, +}; + static HRESULT WINAPI media_engine_QueryInterface(IMFMediaEngine *iface, REFIID riid, void **obj) { TRACE("(%p, %s, %p).\n", iface, debugstr_guid(riid), obj); @@ -122,6 +188,8 @@ static void free_media_engine(struct media_engine *engine) IMFMediaEngineNotify_Release(engine->callback); if (engine->dxgi_manager) IMFDXGIDeviceManager_Release(engine->dxgi_manager); + if (engine->session) + IMFMediaSession_Release(engine->session); DeleteCriticalSection(&engine->cs); heap_free(engine); } @@ -449,7 +517,10 @@ static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngine *iface) if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) hr = MF_E_SHUTDOWN; else + { engine->flags |= FLAGS_ENGINE_SHUT_DOWN; + IMFMediaSession_Shutdown(engine->session); + } LeaveCriticalSection(&engine->cs); return hr; @@ -550,6 +621,7 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct HRESULT hr; engine->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; + engine->session_events.lpVtbl = &media_engine_session_events_vtbl; engine->refcount = 1; engine->flags = flags & MF_MEDIA_ENGINE_CREATEFLAGS_MASK; InitializeCriticalSection(&engine->cs); @@ -559,6 +631,12 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct if (FAILED(hr)) return MF_E_ATTRIBUTENOTFOUND; + if (FAILED(hr = MFCreateMediaSession(NULL, &engine->session))) + return hr; + + if (FAILED(hr = IMFMediaSession_BeginGetEvent(engine->session, &engine->session_events, NULL))) + return hr; + IMFAttributes_GetUINT64(attributes, &MF_MEDIA_ENGINE_PLAYBACK_HWND, &engine->playback_hwnd); IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_DXGI_MANAGER, &IID_IMFDXGIDeviceManager, (void **)&engine->dxgi_manager);

1 0

Henri Verbeet : wined3d: Implement swapchains for the Vulkan adapter.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 9aeef376e5a2f4f0d178a1bd21901b9da50043f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aeef376e5a2f4f0d178a1bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 29 20:51:35 2020 +0430 wined3d: Implement swapchains for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 13 +- dlls/wined3d/swapchain.c | 613 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 24 +- dlls/wined3d/wined3d_vk.h | 18 +- 4 files changed, 658 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9aeef376e5a2f4f0d178…

1 0

Henri Verbeet : wined3d: Move swapchain buffer discarding to wined3d_cs_exec_present().
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: a8141ef0802ab8ec577bf975f130c9f3e64d7e99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8141ef0802ab8ec577bf975… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 29 20:51:34 2020 +0430 wined3d: Move swapchain buffer discarding to wined3d_cs_exec_present(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 20 ++++++++++++++++++-- dlls/wined3d/swapchain.c | 22 ---------------------- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ffd00c9b95..b87003c53b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -522,11 +522,14 @@ static void wined3d_cs_exec_nop(struct wined3d_cs *cs, const void *data) static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { struct wined3d_texture *logo_texture, *cursor_texture, *back_buffer; + struct wined3d_rendertarget_view *dsv = cs->state.fb.depth_stencil; const struct wined3d_cs_present *op = data; + const struct wined3d_swapchain_desc *desc; struct wined3d_swapchain *swapchain; unsigned int i; swapchain = op->swapchain; + desc = &swapchain->state.desc; back_buffer = swapchain->back_buffers[0]; wined3d_swapchain_set_window(swapchain, op->dst_window_override); @@ -557,7 +560,7 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) TRACE("Rendering the software cursor.\n"); - if (swapchain->state.desc.windowed) + if (desc->windowed) MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&dst_rect, 2); if (wined3d_clip_blit(&clip_rect, &dst_rect, &src_rect)) wined3d_texture_blt(back_buffer, 0, &dst_rect, cursor_texture, 0, @@ -566,6 +569,19 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->swap_interval, op->flags); + /* Discard buffers if the swap effect allows it. */ + back_buffer = swapchain->back_buffers[desc->backbuffer_count - 1]; + if (desc->swap_effect == WINED3D_SWAP_EFFECT_DISCARD || desc->swap_effect == WINED3D_SWAP_EFFECT_FLIP_DISCARD) + wined3d_texture_validate_location(back_buffer, 0, WINED3D_LOCATION_DISCARDED); + + if (dsv && dsv->resource->type != WINED3D_RTYPE_BUFFER) + { + struct wined3d_texture *ds = texture_from_resource(dsv->resource); + + if ((desc->flags & WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL || ds->flags & WINED3D_TEXTURE_DISCARD)) + wined3d_rendertarget_view_validate_location(dsv, WINED3D_LOCATION_DISCARDED); + } + if (TRACE_ON(fps)) { DWORD time = GetTickCount(); @@ -582,7 +598,7 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) } wined3d_resource_release(&swapchain->front_buffer->resource); - for (i = 0; i < swapchain->state.desc.backbuffer_count; ++i) + for (i = 0; i < desc->backbuffer_count; ++i) { wined3d_resource_release(&swapchain->back_buffers[i]->resource); } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 289013f4e9..465ab08eb8 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -467,8 +467,6 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, struct wined3d_swapchain_gl *swapchain_gl = wined3d_swapchain_gl(swapchain); const struct wined3d_swapchain_desc *desc = &swapchain->state.desc; struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; - const struct wined3d_fb_state *fb = &swapchain->device->cs->state.fb; - struct wined3d_rendertarget_view *dsv = fb->depth_stencil; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; struct wined3d_context *context; @@ -532,26 +530,6 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, wined3d_texture_validate_location(swapchain->front_buffer, 0, WINED3D_LOCATION_DRAWABLE); wined3d_texture_invalidate_location(swapchain->front_buffer, 0, ~WINED3D_LOCATION_DRAWABLE); - /* If the swapeffect is DISCARD, the back buffer is undefined. That means the SYSMEM - * and INTEXTURE copies can keep their old content if they have any defined content. - * If the swapeffect is COPY, the content remains the same. - * - * The FLIP swap effect is not implemented yet. We could mark WINED3D_LOCATION_DRAWABLE - * up to date and hope WGL flipped front and back buffers and read this data into - * the FBO. Don't bother about this for now. */ - if (desc->swap_effect == WINED3D_SWAP_EFFECT_DISCARD - || desc->swap_effect == WINED3D_SWAP_EFFECT_FLIP_DISCARD) - wined3d_texture_validate_location(swapchain->back_buffers[desc->backbuffer_count - 1], - 0, WINED3D_LOCATION_DISCARDED); - - if (dsv && dsv->resource->type != WINED3D_RTYPE_BUFFER) - { - struct wined3d_texture *ds = texture_from_resource(dsv->resource); - - if ((desc->flags & WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL - || ds->flags & WINED3D_TEXTURE_DISCARD)) - wined3d_texture_validate_location(ds, dsv->sub_resource_idx, WINED3D_LOCATION_DISCARDED); - } context_release(context); }

1 0

Henri Verbeet : wined3d: Map Vulkan adapter bo's persistently on 64-bit architectures.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 859514a684a1ae3bef57d4adc913d49d7a4b438b URL: https://source.winehq.org/git/wine.git/?a=commit;h=859514a684a1ae3bef57d4ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 29 20:51:33 2020 +0430 wined3d: Map Vulkan adapter bo's persistently on 64-bit architectures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 9 +++++++++ dlls/wined3d/context_vk.c | 5 +++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 15 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 0cd77c4e6b..cbde5d3683 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -844,6 +844,9 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ void *map_ptr; VkResult vr; + if (bo->map_ptr) + return bo->map_ptr; + vk_info = context_vk->vk_info; device_vk = wined3d_device_vk(context_vk->c.device); @@ -872,6 +875,9 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ return NULL; } + if (sizeof(map_ptr) >= sizeof(uint64_t)) + bo->map_ptr = map_ptr; + return map_ptr; } @@ -881,6 +887,9 @@ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context struct wined3d_device_vk *device_vk; struct wined3d_bo_slab_vk *slab; + if (bo->map_ptr) + return; + if ((slab = bo->slab)) { if (--slab->map_count) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 45924eb16b..a7c77dd5a6 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -483,6 +483,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic return FALSE; } + bo->map_ptr = NULL; bo->buffer_offset = 0; bo->size = size; bo->usage = usage; @@ -791,6 +792,8 @@ void wined3d_context_vk_destroy_sampler(struct wined3d_context_vk *context_vk, void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) { + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; size_t object_size, idx; TRACE("context_vk %p, bo %p.\n", context_vk, bo); @@ -810,6 +813,8 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const return; } + if (bo->map_ptr) + VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); wined3d_context_vk_destroy_memory(context_vk, bo->vk_memory, bo->command_buffer_id); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 49379b3ca5..8eee18ad17 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1554,6 +1554,7 @@ struct wined3d_bo_vk struct wined3d_bo_slab_vk *slab; VkDeviceMemory vk_memory; + void *map_ptr; VkDeviceSize buffer_offset; VkDeviceSize memory_offset;

1 0

Nikolay Sivov : dwrite: Implement chaining contextual substitution of format 1.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 7e798dae375f8b93f9cbb999c30c0cae8aa1e5bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e798dae375f8b93f9cbb999… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 19:01:08 2020 +0300 dwrite: Implement chaining contextual substitution of format 1. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 198da43f2c..5114e900df 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -618,6 +618,12 @@ struct ot_gsub_chaincontext_subst_format1 UINT16 rulesets[1]; }; +struct ot_gsub_ruleset +{ + UINT16 count; + UINT16 offsets[1]; +}; + struct ot_feature { WORD feature_params; @@ -3525,6 +3531,11 @@ struct ot_gdef_mark_glyph_sets DWORD offsets[1]; }; +static BOOL opentype_match_glyph_func(UINT16 glyph, UINT16 glyph_data, const struct match_data *data) +{ + return glyph == glyph_data; +} + static BOOL opentype_match_coverage_func(UINT16 glyph, UINT16 glyph_data, const struct match_data *data) { const struct match_context *mc = data->mc; @@ -5139,7 +5150,9 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts { struct match_context mc = { .context = context, .mask = lookup->mask }; const struct dwrite_fonttable *table = &context->table->table; - unsigned int coverage_index = GLYPH_NOT_COVERED; + unsigned int i, coverage_index = GLYPH_NOT_COVERED, count, offset; + unsigned int backtrack_count, input_count, lookahead_count, lookup_count; + const UINT16 *backtrack, *lookahead, *input, *lookup_records; UINT16 glyph, format, coverage; BOOL ret = FALSE; @@ -5149,6 +5162,8 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts if (format == 1) { + const struct ot_gsub_ruleset *ruleset; + coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_chaincontext_subst_format1, coverage)); @@ -5156,7 +5171,49 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - WARN("Chaining contextual substitution (1) is not supported.\n"); + count = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_chaincontext_subst_format1, + ruleset_count)); + if (coverage_index >= count) + return FALSE; + + offset = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_chaincontext_subst_format1, + rulesets[coverage_index])); + offset += subtable_offset; + + count = table_read_be_word(table, offset); + ruleset = table_read_ensure(table, offset, count * sizeof(ruleset->offsets)); + + mc.match_func = opentype_match_glyph_func; + for (i = 0; i < count; ++i) + { + unsigned int rule_offset = offset + GET_BE_WORD(ruleset->offsets[i]); + + backtrack_count = table_read_be_word(table, rule_offset); + rule_offset += 2; + backtrack = table_read_ensure(table, rule_offset, backtrack_count * sizeof(*backtrack)); + rule_offset += backtrack_count * sizeof(*backtrack); + + input_count = table_read_be_word(table, rule_offset); + rule_offset += 2; + input = table_read_ensure(table, rule_offset, input_count * sizeof(*input)); + rule_offset += input_count * sizeof(*input); + + lookahead_count = table_read_be_word(table, rule_offset); + rule_offset += 2; + lookahead = table_read_ensure(table, rule_offset, lookahead_count * sizeof(*lookahead)); + rule_offset += lookahead_count * sizeof(*lookahead); + + lookup_count = table_read_be_word(table, rule_offset); + rule_offset += 2; + lookup_records = table_read_ensure(table, rule_offset, lookup_count * 2 * sizeof(*lookup_records)); + + /* First applicable rule is used. */ + if (opentype_layout_apply_gsub_chain_context_lookup(backtrack_count, backtrack, input_count, input, lookahead_count, + lookahead, lookup_count, lookup_records, &mc)) + { + return TRUE; + } + } } else if (format == 2) { @@ -5174,7 +5231,7 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts unsigned int backtrack_count, input_count, lookahead_count, lookup_count; const UINT16 *backtrack, *lookahead, *input, *lookup_records; - unsigned int offset = subtable_offset + 2 /* format */; + offset = subtable_offset + 2 /* format */; backtrack_count = table_read_be_word(table, offset); offset += 2;

1 0

Henri Verbeet : wined3d: Initialise more caps and limits in wined3d_adapter_vk_init_d3d_info().
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: d777b9492ddd9c26c9e6ee9504c9065654d49c14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d777b9492ddd9c26c9e6ee95… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 29 20:51:32 2020 +0430 wined3d: Initialise more caps and limits in wined3d_adapter_vk_init_d3d_info(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 71 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index f8929ddf1f..0cd77c4e6b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2068,13 +2068,76 @@ static void adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, wined3d_driver_info_init(&adapter_vk->a.driver_info, gpu_description, vram_bytes, sysmem_bytes); } -static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter *adapter, uint32_t wined3d_creation_flags) +static enum wined3d_feature_level feature_level_from_caps(const struct shader_caps *shader_caps) { - struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; + unsigned int shader_model; + + shader_model = min(shader_caps->vs_version, shader_caps->ps_version); + shader_model = min(shader_model, max(shader_caps->gs_version, 3)); + shader_model = min(shader_model, max(shader_caps->hs_version, 4)); + shader_model = min(shader_model, max(shader_caps->ds_version, 4)); + + if (shader_model >= 5) + return WINED3D_FEATURE_LEVEL_11_1; + + if (shader_model >= 4) + return WINED3D_FEATURE_LEVEL_10_1; + + return WINED3D_FEATURE_LEVEL_NONE; +} + +static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_vk, uint32_t wined3d_creation_flags) +{ + struct wined3d_d3d_info *d3d_info = &adapter_vk->a.d3d_info; + struct wined3d_vertex_caps vertex_caps; + struct fragment_caps fragment_caps; + struct shader_caps shader_caps; + + adapter_vk->a.shader_backend->shader_get_caps(&adapter_vk->a, &shader_caps); + adapter_vk->a.vertex_pipe->vp_get_caps(&adapter_vk->a, &vertex_caps); + adapter_vk->a.fragment_pipe->get_caps(&adapter_vk->a, &fragment_caps); + + d3d_info->limits.vs_version = shader_caps.vs_version; + d3d_info->limits.hs_version = shader_caps.hs_version; + d3d_info->limits.ds_version = shader_caps.ds_version; + d3d_info->limits.gs_version = shader_caps.gs_version; + d3d_info->limits.ps_version = shader_caps.ps_version; + d3d_info->limits.cs_version = shader_caps.cs_version; + d3d_info->limits.vs_uniform_count = shader_caps.vs_uniform_count; + d3d_info->limits.ps_uniform_count = shader_caps.ps_uniform_count; + d3d_info->limits.varying_count = shader_caps.varying_count; + d3d_info->limits.ffp_textures = fragment_caps.MaxSimultaneousTextures; + d3d_info->limits.ffp_blend_stages = fragment_caps.MaxTextureBlendStages; + d3d_info->limits.ffp_vertex_blend_matrices = vertex_caps.max_vertex_blend_matrices; + d3d_info->limits.active_light_count = vertex_caps.max_active_lights; + + d3d_info->limits.max_rt_count = WINED3D_MAX_RENDER_TARGETS; + d3d_info->limits.max_clip_distances = WINED3D_MAX_CLIP_DISTANCES; + d3d_info->limits.texture_size = adapter_vk->device_limits.maxImageDimension2D; + d3d_info->limits.pointsize_max = adapter_vk->device_limits.pointSizeRange[1]; d3d_info->wined3d_creation_flags = wined3d_creation_flags; - d3d_info->texture_swizzle = TRUE; + d3d_info->xyzrhw = vertex_caps.xyzrhw; + d3d_info->emulated_flatshading = vertex_caps.emulated_flatshading; + d3d_info->ffp_generic_attributes = vertex_caps.ffp_generic_attributes; + d3d_info->ffp_alpha_test = false; + d3d_info->vs_clipping = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING); + d3d_info->shader_color_key = !!(fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_COLOR_KEY); + d3d_info->shader_double_precision = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION); + d3d_info->shader_output_interpolation = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION); + d3d_info->viewport_array_index_any_shader = false; /* VK_EXT_shader_viewport_index_layer */ + d3d_info->texture_npot = true; + d3d_info->texture_npot_conditional = true; + d3d_info->draw_base_vertex_offset = true; + d3d_info->vertex_bgra = true; + d3d_info->texture_swizzle = true; + d3d_info->srgb_read_control = false; + d3d_info->srgb_write_control = false; + d3d_info->clip_control = true; + d3d_info->full_ffp_varyings = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_FULL_FFP_VARYINGS); + d3d_info->scaled_resolve = false; + d3d_info->feature_level = feature_level_from_caps(&shader_caps); d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; } @@ -2130,7 +2193,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, adapter->misc_state_template = misc_state_template_vk; adapter->shader_backend = wined3d_spirv_shader_backend_init_vk(); - wined3d_adapter_vk_init_d3d_info(adapter, wined3d_creation_flags); + wined3d_adapter_vk_init_d3d_info(adapter_vk, wined3d_creation_flags); return TRUE;

1 0

Henri Verbeet : wined3d: Use wined3d_buffer_vk_get_buffer_info() when binding Vulkan vertex buffers.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: a2e39d837e64ea7f2095246cb7181b99559fb754 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2e39d837e64ea7f2095246c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 29 20:51:31 2020 +0430 wined3d: Use wined3d_buffer_vk_get_buffer_info() when binding Vulkan vertex buffers. 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, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 5cb04310d6..45924eb16b 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2194,9 +2194,10 @@ static void wined3d_context_vk_bind_vertex_buffers(struct wined3d_context_vk *co VkDeviceSize offsets[ARRAY_SIZE(state->streams)] = {0}; VkBuffer buffers[ARRAY_SIZE(state->streams)]; const struct wined3d_stream_state *stream; + const VkDescriptorBufferInfo *buffer_info; + struct wined3d_buffer_vk *buffer_vk; struct wined3d_buffer *buffer; unsigned int i, first, count; - struct wined3d_bo_vk *bo; first = 0; count = 0; @@ -2206,10 +2207,11 @@ static void wined3d_context_vk_bind_vertex_buffers(struct wined3d_context_vk *co if ((buffer = stream->buffer)) { - bo = &wined3d_buffer_vk(buffer)->bo; - wined3d_context_vk_reference_bo(context_vk, bo); - buffers[count] = bo->vk_buffer; - offsets[count] = bo->buffer_offset + stream->offset; + buffer_vk = wined3d_buffer_vk(buffer); + buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); + wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); + buffers[count] = buffer_info->buffer; + offsets[count] = buffer_info->offset + stream->offset; ++count; continue; }

1 0

Martin Storsjo : wine/asm.h: Don't define __ASM_CFI when using clang as cross compiler.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 264bd4fc84020f217807f1e59d3bfa9302e5110c URL: https://source.winehq.org/git/wine.git/?a=commit;h=264bd4fc84020f217807f1e5… Author: Martin Storsjo <martin(a)martin.st> Date: Fri May 29 13:51:04 2020 +0300 wine/asm.h: Don't define __ASM_CFI when using clang as cross compiler. Consolidate the existing checks for __APPLE__ and __clang__ into one, but only use it as long as __GNUC__ is defined (clang operating in gcc compatible mode, as opposed to MSVC compatible mode) and as long as __SEH__ isn't defined (which it is while cross compiling targeting windows, when SEH is used as unwind format). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index 7650d84a79..592f638306 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -33,7 +33,7 @@ # define __ASM_STDCALL(name,args) __ASM_NAME(name) #endif -#if defined(__GCC_HAVE_DWARF2_CFI_ASM) || defined(__APPLE__) || defined(__clang__) +#if defined(__GCC_HAVE_DWARF2_CFI_ASM) || (defined(__clang__) && defined(__GNUC__) && !defined(__SEH__)) # define __ASM_CFI(str) str #else # define __ASM_CFI(str)

1 0

Hans Leidekker : msado15: Fix NULL pointer dereference in close_recordset.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: fb1d46fc0a50f0b74c0f7476d224b56a239003fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb1d46fc0a50f0b74c0f7476… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 29 11:30:02 2020 +0200 msado15: Fix NULL pointer dereference in close_recordset. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49281 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 1f16add4c3..ffb3788531 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -748,7 +748,10 @@ static ULONG WINAPI recordset_AddRef( _Recordset *iface ) static void close_recordset( struct recordset *recordset ) { - ULONG row, col, col_count = get_column_count( recordset ); + ULONG row, col, col_count; + + if (!recordset->fields) return; + col_count = get_column_count( recordset ); recordset->fields->recordset = NULL; Fields_Release( &recordset->fields->Fields_iface );

1 0

Hans Leidekker : bcrypt: Add support for BCRYPT_DSA_ALGORITHM.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: c2a4a4ec3c1f6723a07eb9e8e49e0bf78a6f4cac URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2a4a4ec3c1f6723a07eb9e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 29 11:29:06 2020 +0200 bcrypt: Add support for BCRYPT_DSA_ALGORITHM. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/bcrypt_main.c | 46 ++++++++--- dlls/bcrypt/gnutls.c | 178 +++++++++++++++++++++++++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 96 +++++++++++++++++++++++ include/bcrypt.h | 69 ++++++++++++++-- 5 files changed, 369 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2a4a4ec3c1f6723a07e…

1 0

Nikolay Sivov : dwrite: Implement chaining contextual substitution of format 2.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: d1ae4a564771a97a685073e425f55c36094ee341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1ae4a564771a97a685073e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 19:01:09 2020 +0300 dwrite: Implement chaining contextual substitution of format 2. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 128 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 87 insertions(+), 41 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 5114e900df..f4e9d3305a 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3536,6 +3536,13 @@ static BOOL opentype_match_glyph_func(UINT16 glyph, UINT16 glyph_data, const str return glyph == glyph_data; } +static BOOL opentype_match_class_func(UINT16 glyph, UINT16 glyph_data, const struct match_data *data) +{ + const struct match_context *mc = data->mc; + UINT16 glyph_class = opentype_layout_get_glyph_class(&mc->context->table->table, data->subtable_offset, glyph); + return glyph_class == glyph_data; +} + static BOOL opentype_match_coverage_func(UINT16 glyph, UINT16 glyph_data, const struct match_data *data) { const struct match_context *mc = data->mc; @@ -5145,14 +5152,57 @@ static BOOL opentype_layout_apply_gsub_chain_context_lookup(unsigned int backtra opentype_layout_context_gsub_apply_lookup(mc->context, input_count, match_positions, lookup_count, lookup_records, match_length); } +static BOOL opentype_layout_apply_chain_rule_set(const struct match_context *mc, unsigned int offset) +{ + unsigned int backtrack_count, input_count, lookahead_count, lookup_count; + const struct dwrite_fonttable *table = &mc->context->table->table; + const UINT16 *backtrack, *lookahead, *input, *lookup_records; + const struct ot_gsub_ruleset *ruleset; + unsigned int i, count; + + count = table_read_be_word(table, offset); + ruleset = table_read_ensure(table, offset, count * sizeof(ruleset->offsets)); + + for (i = 0; i < count; ++i) + { + unsigned int rule_offset = offset + GET_BE_WORD(ruleset->offsets[i]); + + backtrack_count = table_read_be_word(table, rule_offset); + rule_offset += 2; + backtrack = table_read_ensure(table, rule_offset, backtrack_count * sizeof(*backtrack)); + rule_offset += backtrack_count * sizeof(*backtrack); + + input_count = table_read_be_word(table, rule_offset); + rule_offset += 2; + input = table_read_ensure(table, rule_offset, input_count * sizeof(*input)); + rule_offset += input_count * sizeof(*input); + + lookahead_count = table_read_be_word(table, rule_offset); + rule_offset += 2; + lookahead = table_read_ensure(table, rule_offset, lookahead_count * sizeof(*lookahead)); + rule_offset += lookahead_count * sizeof(*lookahead); + + lookup_count = table_read_be_word(table, rule_offset); + rule_offset += 2; + lookup_records = table_read_ensure(table, rule_offset, lookup_count * 2 * sizeof(*lookup_records)); + + /* First applicable rule is used. */ + if (opentype_layout_apply_gsub_chain_context_lookup(backtrack_count, backtrack, input_count, input, lookahead_count, + lookahead, lookup_count, lookup_records, mc)) + { + return TRUE; + } + } + + return FALSE; +} + static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { struct match_context mc = { .context = context, .mask = lookup->mask }; const struct dwrite_fonttable *table = &context->table->table; - unsigned int i, coverage_index = GLYPH_NOT_COVERED, count, offset; - unsigned int backtrack_count, input_count, lookahead_count, lookup_count; - const UINT16 *backtrack, *lookahead, *input, *lookup_records; + unsigned int coverage_index = GLYPH_NOT_COVERED, count, offset; UINT16 glyph, format, coverage; BOOL ret = FALSE; @@ -5162,8 +5212,6 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts if (format == 1) { - const struct ot_gsub_ruleset *ruleset; - coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_chaincontext_subst_format1, coverage)); @@ -5180,51 +5228,48 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts rulesets[coverage_index])); offset += subtable_offset; - count = table_read_be_word(table, offset); - ruleset = table_read_ensure(table, offset, count * sizeof(ruleset->offsets)); - mc.match_func = opentype_match_glyph_func; - for (i = 0; i < count; ++i) - { - unsigned int rule_offset = offset + GET_BE_WORD(ruleset->offsets[i]); - - backtrack_count = table_read_be_word(table, rule_offset); - rule_offset += 2; - backtrack = table_read_ensure(table, rule_offset, backtrack_count * sizeof(*backtrack)); - rule_offset += backtrack_count * sizeof(*backtrack); - - input_count = table_read_be_word(table, rule_offset); - rule_offset += 2; - input = table_read_ensure(table, rule_offset, input_count * sizeof(*input)); - rule_offset += input_count * sizeof(*input); - - lookahead_count = table_read_be_word(table, rule_offset); - rule_offset += 2; - lookahead = table_read_ensure(table, rule_offset, lookahead_count * sizeof(*lookahead)); - rule_offset += lookahead_count * sizeof(*lookahead); - - lookup_count = table_read_be_word(table, rule_offset); - rule_offset += 2; - lookup_records = table_read_ensure(table, rule_offset, lookup_count * 2 * sizeof(*lookup_records)); - - /* First applicable rule is used. */ - if (opentype_layout_apply_gsub_chain_context_lookup(backtrack_count, backtrack, input_count, input, lookahead_count, - lookahead, lookup_count, lookup_records, &mc)) - { - return TRUE; - } - } + + ret = opentype_layout_apply_chain_rule_set(&mc, offset); } else if (format == 2) { - coverage = table_read_be_word(table, subtable_offset + - FIELD_OFFSET(struct ot_gsub_chaincontext_subst_format1, coverage)); + unsigned int backtrack_classdef, input_classdef, lookahead_classdef, rule_set_idx; + + offset = subtable_offset + 2 /* format */; + + coverage = table_read_be_word(table, offset); + offset += 2; coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - WARN("Chaining contextual substitution (2) is not supported.\n"); + backtrack_classdef = table_read_be_word(table, offset) + subtable_offset; + offset += 2; + + input_classdef = table_read_be_word(table, offset) + subtable_offset; + offset += 2; + + lookahead_classdef = table_read_be_word(table, offset) + subtable_offset; + offset += 2; + + count = table_read_be_word(table, offset); + offset+= 2; + + rule_set_idx = opentype_layout_get_glyph_class(table, input_classdef, glyph); + if (rule_set_idx >= count) + return FALSE; + + offset = table_read_be_word(table, offset + rule_set_idx * 2); + offset += subtable_offset; + + mc.backtrack_offset = backtrack_classdef; + mc.input_offset = input_classdef; + mc.lookahead_offset = lookahead_classdef; + mc.match_func = opentype_match_class_func; + + ret = opentype_layout_apply_chain_rule_set(&mc, offset); } else if (format == 3) { @@ -5262,6 +5307,7 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts mc.input_offset = subtable_offset; mc.lookahead_offset = subtable_offset; mc.match_func = opentype_match_coverage_func; + ret = opentype_layout_apply_gsub_chain_context_lookup(backtrack_count, backtrack, input_count, input + 1, lookahead_count, lookahead, lookup_count, lookup_records, &mc); }

1 0

Nikolay Sivov : dwrite: Use iterator matching for chain substitution.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: a1d1647131b4038485ed20e484df6c8aba1b200a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1d1647131b4038485ed20e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 19:01:07 2020 +0300 dwrite: Use iterator matching for chain substitution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 105 +++++++++++++++++++++++++++++++------------------ 1 file changed, 67 insertions(+), 38 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 468368bcc0..198da43f2c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3474,7 +3474,24 @@ enum iterator_match ITER_MAYBE, }; -typedef BOOL (*p_match_func)(UINT16 glyph, UINT16 glyph_data, const void *match_data); +struct match_context; +struct match_data +{ + const struct match_context *mc; + unsigned int subtable_offset; +}; + +typedef BOOL (*p_match_func)(UINT16 glyph, UINT16 glyph_data, const struct match_data *match_data); + +struct match_context +{ + struct scriptshaping_context *context; + unsigned int backtrack_offset; + unsigned int input_offset; + unsigned int lookahead_offset; + p_match_func match_func; + unsigned int mask; +}; struct glyph_iterator { @@ -3485,7 +3502,7 @@ struct glyph_iterator unsigned int mask; p_match_func match_func; const UINT16 *glyph_data; - const void *match_data; + const struct match_data *match_data; }; static void glyph_iterator_init(struct scriptshaping_context *context, unsigned int flags, unsigned int pos, @@ -3495,7 +3512,7 @@ static void glyph_iterator_init(struct scriptshaping_context *context, unsigned iter->flags = flags; iter->pos = pos; iter->len = len; - iter->mask = ~0u; /* TODO: input sequences should be using actual mask */ + iter->mask = ~0u; iter->match_func = NULL; iter->match_data = NULL; iter->glyph_data = NULL; @@ -3508,6 +3525,13 @@ struct ot_gdef_mark_glyph_sets DWORD offsets[1]; }; +static BOOL opentype_match_coverage_func(UINT16 glyph, UINT16 glyph_data, const struct match_data *data) +{ + const struct match_context *mc = data->mc; + return opentype_layout_is_glyph_covered(&mc->context->table->table, data->subtable_offset + GET_BE_WORD(glyph_data), glyph) + != GLYPH_NOT_COVERED; +} + static BOOL opentype_layout_mark_set_covers(const struct scriptshaping_cache *cache, unsigned int set_index, UINT16 glyph) { @@ -4947,32 +4971,32 @@ static BOOL opentype_layout_apply_gsub_lig_substitution(struct scriptshaping_con return FALSE; } -#define CHAIN_CONTEXT_MAX_LENGTH 64 +#define GLYPH_CONTEXT_MAX_LENGTH 64 -static BOOL opentype_layout_context_match_input(struct scriptshaping_context *context, unsigned int subtable_offset, - unsigned int count, const UINT16 *input, unsigned int *end_offset, unsigned int *match_positions) +static BOOL opentype_layout_context_match_input(const struct match_context *mc, unsigned int count, const UINT16 *input, + unsigned int *end_offset, unsigned int *match_positions) { + struct match_data match_data = { .mc = mc, .subtable_offset = mc->input_offset }; + struct scriptshaping_context *context = mc->context; struct glyph_iterator iter; unsigned int i; - UINT16 glyph; - if (count > CHAIN_CONTEXT_MAX_LENGTH) + if (count > GLYPH_CONTEXT_MAX_LENGTH) return FALSE; match_positions[0] = context->cur; glyph_iterator_init(context, 0, context->cur, count - 1, &iter); + iter.mask = mc->mask; + iter.match_func = mc->match_func; + iter.match_data = &match_data; + iter.glyph_data = input; for (i = 1; i < count; ++i) { if (!glyph_iterator_next(&iter)) return FALSE; - /* TODO: this only covers Format3 substitution */ - glyph = context->u.subst.glyphs[iter.pos]; - if (opentype_layout_is_glyph_covered(&context->table->table, subtable_offset + GET_BE_WORD(input[i]), glyph) == GLYPH_NOT_COVERED) - return FALSE; - match_positions[i] = iter.pos; } @@ -4981,23 +5005,23 @@ static BOOL opentype_layout_context_match_input(struct scriptshaping_context *co return TRUE; } -static BOOL opentype_layout_context_match_backtrack(struct scriptshaping_context *context, unsigned int subtable_offset, - unsigned int count, const UINT16 *backtrack, unsigned int *match_start) +static BOOL opentype_layout_context_match_backtrack(const struct match_context *mc, unsigned int count, + const UINT16 *backtrack, unsigned int *match_start) { + struct match_data match_data = { .mc = mc, .subtable_offset = mc->backtrack_offset }; + struct scriptshaping_context *context = mc->context; struct glyph_iterator iter; unsigned int i; - UINT16 glyph; glyph_iterator_init(context, 0, context->cur, count, &iter); + iter.match_func = mc->match_func; + iter.match_data = &match_data; + iter.glyph_data = backtrack; for (i = 0; i < count; ++i) { if (!glyph_iterator_prev(&iter)) return FALSE; - - glyph = context->u.subst.glyphs[iter.pos]; - if (opentype_layout_is_glyph_covered(&context->table->table, subtable_offset + GET_BE_WORD(backtrack[i]), glyph) == GLYPH_NOT_COVERED) - return FALSE; } *match_start = iter.pos; @@ -5005,23 +5029,23 @@ static BOOL opentype_layout_context_match_backtrack(struct scriptshaping_context return TRUE; } -static BOOL opentype_layout_context_match_lookahead(struct scriptshaping_context *context, unsigned int subtable_offset, - unsigned int count, const UINT16 *lookahead, unsigned int offset, unsigned int *end_index) +static BOOL opentype_layout_context_match_lookahead(const struct match_context *mc, unsigned int count, + const UINT16 *lookahead, unsigned int offset, unsigned int *end_index) { + struct match_data match_data = { .mc = mc, .subtable_offset = mc->lookahead_offset }; + struct scriptshaping_context *context = mc->context; struct glyph_iterator iter; unsigned int i; - UINT16 glyph; glyph_iterator_init(context, 0, context->cur + offset - 1, count, &iter); + iter.match_func = mc->match_func; + iter.match_data = &match_data; + iter.glyph_data = lookahead; for (i = 0; i < count; ++i) { if (!glyph_iterator_next(&iter)) return FALSE; - - glyph = context->u.subst.glyphs[iter.pos]; - if (opentype_layout_is_glyph_covered(&context->table->table, subtable_offset + GET_BE_WORD(lookahead[i]), glyph) == GLYPH_NOT_COVERED) - return FALSE; } *end_index = iter.pos; @@ -5071,7 +5095,7 @@ static BOOL opentype_layout_context_gsub_apply_lookup(struct scriptshaping_conte if (delta > 0) { - if (delta + count > CHAIN_CONTEXT_MAX_LENGTH) + if (delta + count > GLYPH_CONTEXT_MAX_LENGTH) break; } else @@ -5097,22 +5121,23 @@ static BOOL opentype_layout_context_gsub_apply_lookup(struct scriptshaping_conte return TRUE; } -static BOOL opentype_layout_apply_gsub_chain_context_lookup(struct scriptshaping_context *context, unsigned int subtable_offset, - unsigned int backtrack_count, const UINT16 *backtrack, unsigned int input_count, const UINT16 *input, - unsigned int lookahead_count, const UINT16 *lookahead, unsigned int lookup_count, const UINT16 *lookup_records) +static BOOL opentype_layout_apply_gsub_chain_context_lookup(unsigned int backtrack_count, const UINT16 *backtrack, + unsigned int input_count, const UINT16 *input, unsigned int lookahead_count, const UINT16 *lookahead, + unsigned int lookup_count, const UINT16 *lookup_records, const struct match_context *mc) { unsigned int start_index = 0, match_length = 0, end_index = 0; - unsigned int match_positions[CHAIN_CONTEXT_MAX_LENGTH]; + unsigned int match_positions[GLYPH_CONTEXT_MAX_LENGTH]; - return opentype_layout_context_match_input(context, subtable_offset, input_count, input, &match_length, match_positions) && - opentype_layout_context_match_backtrack(context, subtable_offset, backtrack_count, backtrack, &start_index) && - opentype_layout_context_match_lookahead(context, subtable_offset, lookahead_count, lookahead, input_count, &end_index) && - opentype_layout_context_gsub_apply_lookup(context, input_count, match_positions, lookup_count, lookup_records, match_length); + return opentype_layout_context_match_input(mc, input_count, input, &match_length, match_positions) && + opentype_layout_context_match_backtrack(mc, backtrack_count, backtrack, &start_index) && + opentype_layout_context_match_lookahead(mc, lookahead_count, lookahead, input_count, &end_index) && + opentype_layout_context_gsub_apply_lookup(mc->context, input_count, match_positions, lookup_count, lookup_records, match_length); } static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { + struct match_context mc = { .context = context, .mask = lookup->mask }; const struct dwrite_fonttable *table = &context->table->table; unsigned int coverage_index = GLYPH_NOT_COVERED; UINT16 glyph, format, coverage; @@ -5176,8 +5201,12 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - ret = opentype_layout_apply_gsub_chain_context_lookup(context, subtable_offset, backtrack_count, backtrack, - input_count, input + 1, lookahead_count, lookahead, lookup_count, lookup_records); + mc.backtrack_offset = subtable_offset; + mc.input_offset = subtable_offset; + mc.lookahead_offset = subtable_offset; + mc.match_func = opentype_match_coverage_func; + ret = opentype_layout_apply_gsub_chain_context_lookup(backtrack_count, backtrack, input_count, input + 1, + lookahead_count, lookahead, lookup_count, lookup_records, &mc); } else WARN("Unknown chaining contextual substitution format %u.\n", format);

1 0

Nikolay Sivov : dwrite: Add matching callback support for iterators.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 4d233368824910f6096ab282bacea6c8f220d763 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d233368824910f6096ab282… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 19:01:06 2020 +0300 dwrite: Add matching callback support for iterators. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 67 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 05fc38bad3..468368bcc0 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3466,12 +3466,26 @@ struct ot_lookup unsigned int flags; }; +enum iterator_match +{ + /* First two to fit matching callback result. */ + ITER_NO = 0, + ITER_YES = 1, + ITER_MAYBE, +}; + +typedef BOOL (*p_match_func)(UINT16 glyph, UINT16 glyph_data, const void *match_data); + struct glyph_iterator { struct scriptshaping_context *context; unsigned int flags; unsigned int pos; unsigned int len; + unsigned int mask; + p_match_func match_func; + const UINT16 *glyph_data; + const void *match_data; }; static void glyph_iterator_init(struct scriptshaping_context *context, unsigned int flags, unsigned int pos, @@ -3481,6 +3495,10 @@ static void glyph_iterator_init(struct scriptshaping_context *context, unsigned iter->flags = flags; iter->pos = pos; iter->len = len; + iter->mask = ~0u; /* TODO: input sequences should be using actual mask */ + iter->match_func = NULL; + iter->match_data = NULL; + iter->glyph_data = NULL; } struct ot_gdef_mark_glyph_sets @@ -3535,21 +3553,48 @@ static BOOL lookup_is_glyph_match(const struct scriptshaping_context *context, u return TRUE; } -static BOOL glyph_iterator_match(const struct glyph_iterator *iter) +static enum iterator_match glyph_iterator_may_skip(const struct glyph_iterator *iter) +{ + if (!lookup_is_glyph_match(iter->context, iter->pos, iter->flags)) + return ITER_YES; + + return ITER_NO; +} + +static enum iterator_match glyph_iterator_may_match(const struct glyph_iterator *iter) { - return lookup_is_glyph_match(iter->context, iter->pos, iter->flags); + if (!(iter->mask & iter->context->glyph_infos[iter->pos].mask)) + return ITER_NO; + + if (iter->match_func) + return !!iter->match_func(iter->context->u.buffer.glyphs[iter->pos], *iter->glyph_data, iter->match_data); + + return ITER_MAYBE; } static BOOL glyph_iterator_next(struct glyph_iterator *iter) { + enum iterator_match skip, match; + while (iter->pos + iter->len < iter->context->glyph_count) { ++iter->pos; - if (glyph_iterator_match(iter)) + + skip = glyph_iterator_may_skip(iter); + if (skip == ITER_YES) + continue; + + match = glyph_iterator_may_match(iter); + if (match == ITER_YES || (match == ITER_MAYBE && skip == ITER_NO)) { --iter->len; + if (iter->glyph_data) + ++iter->glyph_data; return TRUE; } + + if (skip == ITER_NO) + return FALSE; } return FALSE; @@ -3557,17 +3602,27 @@ static BOOL glyph_iterator_next(struct glyph_iterator *iter) static BOOL glyph_iterator_prev(struct glyph_iterator *iter) { - if (!iter->pos) - return FALSE; + enum iterator_match skip, match; while (iter->pos > iter->len - 1) { --iter->pos; - if (glyph_iterator_match(iter)) + + skip = glyph_iterator_may_skip(iter); + if (skip == ITER_YES) + continue; + + match = glyph_iterator_may_match(iter); + if (match == ITER_YES || (match == ITER_MAYBE && skip == ITER_NO)) { --iter->len; + if (iter->glyph_data) + ++iter->glyph_data; return TRUE; } + + if (skip == ITER_NO) + return FALSE; } return FALSE;

1 0

Nikolay Sivov : dwrite/tests: Enable glyph class tests on Wine.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: d7d276c34b160d927b4c87acc50c5982d34197ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7d276c34b160d927b4c87ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 19:01:05 2020 +0300 dwrite/tests: Enable glyph class tests on Wine. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 38d6a68ef8..c5cf0954fe 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1748,9 +1748,6 @@ if (0) { IDWriteFontFace_Release(fontface); /* Test setting glyph properties from GDEF. */ -if (strcmp(winetest_platform, "wine")) -{ - hr = IDWriteFactory_GetSystemFontCollection(factory, &syscoll, FALSE); ok(hr == S_OK, "Failed to get system collection, hr %#x.\n", hr); @@ -1794,7 +1791,6 @@ if (strcmp(winetest_platform, "wine")) } IDWriteFontCollection_Release(syscoll); -} IDWriteTextAnalyzer_Release(analyzer); }

1 0

Nikolay Sivov : dwrite: Implement mark glyph filtering.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 5c9129723cabef5fa268b7af2383b4486bd9d492 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c9129723cabef5fa268b7af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 19:01:04 2020 +0300 dwrite: Implement mark glyph filtering. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 + dlls/dwrite/opentype.c | 214 ++++++++++++++++++++++++++++--------------- 2 files changed, 140 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c9129723cabef5fa268…

1 0

Nikolay Sivov : dwrite: Simplify glyph properties helpers by using current glyph buffer.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 2e79405eec7f4e1a60e76e3ad49f401ae9e6e0a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e79405eec7f4e1a60e76e3a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 19:01:03 2020 +0300 dwrite: Simplify glyph properties helpers by using current glyph buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c6cfdb6133..8ed52d3be4 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3167,14 +3167,15 @@ static unsigned int opentype_layout_get_glyph_class(const struct dwrite_fonttabl return glyph_class; } -static unsigned int opentype_set_glyph_props(struct scriptshaping_context *context, unsigned int g, UINT16 glyph) +static unsigned int opentype_set_glyph_props(struct scriptshaping_context *context, unsigned int idx) { struct scriptshaping_cache *cache = context->cache; unsigned int glyph_class = 0, props; if (cache->gdef.classdef) { - glyph_class = opentype_layout_get_glyph_class(&cache->gdef.table, cache->gdef.classdef, glyph); + glyph_class = opentype_layout_get_glyph_class(&cache->gdef.table, cache->gdef.classdef, + context->u.buffer.glyphs[idx]); } switch (glyph_class) @@ -3192,16 +3193,16 @@ static unsigned int opentype_set_glyph_props(struct scriptshaping_context *conte props = 0; } - context->glyph_infos[g].props = props; + context->glyph_infos[idx].props = props; return props; } -static void opentype_set_subst_glyph_props(struct scriptshaping_context *context, unsigned int g, UINT16 glyph) +static void opentype_set_subst_glyph_props(struct scriptshaping_context *context, unsigned int idx) { - unsigned int glyph_props = opentype_set_glyph_props(context, g, glyph); - context->u.subst.glyph_props[g].isDiacritic = !!(glyph_props == GLYPH_PROP_MARK); - context->u.subst.glyph_props[g].isZeroWidthSpace = !!(glyph_props == GLYPH_PROP_MARK); + unsigned int glyph_props = opentype_set_glyph_props(context, idx); + context->u.subst.glyph_props[idx].isDiacritic = !!(glyph_props == GLYPH_PROP_MARK); + context->u.subst.glyph_props[idx].isZeroWidthSpace = !!(glyph_props == GLYPH_PROP_MARK); } struct coverage_compare_format1_context @@ -4459,7 +4460,7 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gpos, &lookups); for (i = 0; i < context->glyph_count; ++i) - opentype_set_glyph_props(context, i, context->u.pos.glyphs[i]); + opentype_set_glyph_props(context, i); opentype_layout_set_glyph_masks(context, features); for (i = 0; i < lookups.count; ++i) @@ -4491,7 +4492,7 @@ static void opentype_layout_replace_glyph(struct scriptshaping_context *context, if (glyph != orig_glyph) { context->u.subst.glyphs[context->cur] = glyph; - opentype_set_subst_glyph_props(context, context->cur, glyph); + opentype_set_subst_glyph_props(context, context->cur); } context->cur++; } @@ -4673,7 +4674,7 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co context->u.subst.glyph_props[idx + i].isClusterStart = 0; context->u.buffer.glyph_props[idx + i].components = 0; } - opentype_set_subst_glyph_props(context, idx + i, glyph); + opentype_set_subst_glyph_props(context, idx + i); /* Inherit feature mask from original matched glyph. */ context->glyph_infos[idx + i].mask = mask; } @@ -5181,10 +5182,10 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c if (*context->u.subst.digits && codepoint >= '0' && codepoint <= '9') codepoint = context->u.subst.digits[codepoint - '0']; - context->u.subst.glyphs[g] = font->get_glyph(context->cache->context, codepoint); + context->u.buffer.glyphs[g] = font->get_glyph(context->cache->context, codepoint); context->u.buffer.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER; context->u.buffer.glyph_props[g].isClusterStart = 1; - opentype_set_subst_glyph_props(context, g, context->u.subst.glyphs[g]); + opentype_set_subst_glyph_props(context, g); if (opentype_is_default_ignorable(codepoint)) context->u.buffer.glyph_props[g].isZeroWidthSpace = 1; context->u.buffer.glyph_props[g].components = 1;

1 0

Alexandre Julliard : ntdll: Move server call functions to the Unix library.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 01150d7f8d27ad5efdb824da938c4a9fa562a036 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01150d7f8d27ad5efdb824da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 15:53:42 2020 +0200 ntdll: Move server call functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/server.c | 102 +------------------------------------- dlls/ntdll/unix/loader.c | 2 + dlls/ntdll/unix/server.c | 109 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 4 +- dlls/ntdll/virtual.c | 2 +- 7 files changed, 118 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01150d7f8d27ad5efdb8…

1 0

Alexandre Julliard : ntdll: Move fd cache functions to the Unix library.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 1a743c9af39d0224b65ae504ae7e24d9fad56c2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a743c9af39d0224b65ae504… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 15:35:16 2020 +0200 ntdll: Move fd cache functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/cdrom.c | 2 +- dlls/ntdll/directory.c | 10 +- dlls/ntdll/file.c | 46 +++---- dlls/ntdll/loader.c | 2 +- dlls/ntdll/ntdll_misc.h | 3 - dlls/ntdll/om.c | 4 +- dlls/ntdll/serial.c | 4 +- dlls/ntdll/server.c | 226 +--------------------------------- dlls/ntdll/tape.c | 2 +- dlls/ntdll/thread.c | 2 +- dlls/ntdll/unix/loader.c | 6 +- dlls/ntdll/unix/server.c | 271 ++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unix/unix_private.h | 10 +- dlls/ntdll/unixlib.h | 11 +- dlls/ntdll/virtual.c | 6 +- 15 files changed, 335 insertions(+), 270 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a743c9af39d0224b65a…

1 0

Alexandre Julliard : ntdll: Move server initialization functions to the Unix library.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 8a63b688ac49f19c259066fd100407edf3747f95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a63b688ac49f19c259066fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 14:17:55 2020 +0200 ntdll: Move server initialization functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/loader.c | 3 +- dlls/ntdll/ntdll_misc.h | 2 - dlls/ntdll/server.c | 578 +------------------------------ dlls/ntdll/thread.c | 4 +- dlls/ntdll/unix/loader.c | 16 +- dlls/ntdll/unix/server.c | 748 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 14 + dlls/ntdll/unixlib.h | 13 +- 9 files changed, 792 insertions(+), 587 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a63b688ac49f19c2590…

1 0

Alexandre Julliard : ntdll: Don't include ntdll_misc.h from the Unix library.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: e6e2f2325a0a4eb14f10dd6df319b068761e9600 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6e2f2325a0a4eb14f10dd6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 15:48:44 2020 +0200 ntdll: Don't include ntdll_misc.h from the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/debug.c | 5 ++++- dlls/ntdll/unix/unix_private.h | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 7bc7787c9d..12e9cdd36d 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -33,8 +33,11 @@ # include <unistd.h> #endif +#include "windef.h" +#include "winnt.h" +#include "winternl.h" +#include "unix_private.h" #include "wine/debug.h" -#include "ntdll_misc.h" WINE_DECLARE_DEBUG_CHANNEL(pid); WINE_DECLARE_DEBUG_CHANNEL(timestamp); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 663036a699..749f9add57 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -23,6 +23,33 @@ #include "unixlib.h" +struct debug_info +{ + unsigned int str_pos; /* current position in strings buffer */ + unsigned int out_pos; /* current position in output buffer */ + char strings[1024]; /* buffer for temporary strings */ + char output[1024]; /* current output line */ +}; + +/* thread private data, stored in NtCurrentTeb()->GdiTebBatch */ +struct ntdll_thread_data +{ + struct debug_info *debug_info; /* info for debugstr functions */ + void *start_stack; /* stack for thread startup */ + int request_fd; /* fd for sending server requests */ + int reply_fd; /* fd for receiving server replies */ + int wait_fd[2]; /* fd for sleeping server requests */ + BOOL wow64_redir; /* Wow64 filesystem redirection flag */ + pthread_t pthread_id; /* pthread thread id */ +}; + +C_ASSERT( sizeof(struct ntdll_thread_data) <= sizeof(((TEB *)0)->GdiTebBatch) ); + +static inline struct ntdll_thread_data *ntdll_get_thread_data(void) +{ + return (struct ntdll_thread_data *)&NtCurrentTeb()->GdiTebBatch; +} + void CDECL mmap_add_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN; void CDECL mmap_remove_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN; int CDECL mmap_is_in_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Create user shared data section in the server, and initialize it in wineboot.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: e854ea34cc481658ec61f4603d0438e075608c98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e854ea34cc481658ec61f460… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 12:26:57 2020 +0200 ntdll: Create user shared data section in the server, and initialize it in wineboot. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 + dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/server.c | 3 -- dlls/ntdll/thread.c | 92 ++---------------------------------------- include/wine/server_protocol.h | 4 +- programs/wineboot/wineboot.c | 88 ++++++++++++++++++++++++++++++++++++++++ server/directory.c | 10 ++++- server/file.h | 6 +-- server/mapping.c | 39 +++++++++--------- server/process.c | 8 ---- server/protocol.def | 1 - server/request.h | 3 +- server/trace.c | 1 - 13 files changed, 128 insertions(+), 130 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e854ea34cc481658ec61…

1 0

Alexandre Julliard : ntdll: Don't call terminate_thread request if not necessary.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 42bd67b576027ea6e7c53bccbd9476a2a97472cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=42bd67b576027ea6e7c53bcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 12:25:16 2020 +0200 ntdll: Don't call terminate_thread request if not necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 18 ++++++++++-------- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 1 - server/request.h | 1 - server/thread.c | 8 +------- server/trace.c | 1 - 6 files changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 3d370f7a98..52f8b6ec61 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -738,17 +738,19 @@ NTSTATUS WINAPI NtAlertThread( HANDLE handle ) NTSTATUS WINAPI NtTerminateThread( HANDLE handle, LONG exit_code ) { NTSTATUS ret; - BOOL self; + BOOL self = (handle == GetCurrentThread()); - SERVER_START_REQ( terminate_thread ) + if (!self || exit_code) { - req->handle = wine_server_obj_handle( handle ); - req->exit_code = exit_code; - ret = wine_server_call( req ); - self = !ret && reply->self; + SERVER_START_REQ( terminate_thread ) + { + req->handle = wine_server_obj_handle( handle ); + req->exit_code = exit_code; + ret = wine_server_call( req ); + self = !ret && reply->self; + } + SERVER_END_REQ; } - SERVER_END_REQ; - if (self) abort_thread( exit_code ); return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 3e205d4165..1fb345bc5f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -938,7 +938,7 @@ struct terminate_thread_reply { struct reply_header __header; int self; - int last; + char __pad_12[4]; }; @@ -6685,7 +6685,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 604 +#define SERVER_PROTOCOL_VERSION 605 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 86efb01cc3..600113ff02 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -896,7 +896,6 @@ struct rawinput_device int exit_code; /* thread exit code */ @REPLY int self; /* suicide? */ - int last; /* last thread in this process? */ @END diff --git a/server/request.h b/server/request.h index 7a7feb3cf9..4a65296eb5 100644 --- a/server/request.h +++ b/server/request.h @@ -814,7 +814,6 @@ C_ASSERT( FIELD_OFFSET(struct terminate_thread_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct terminate_thread_request, exit_code) == 16 ); C_ASSERT( sizeof(struct terminate_thread_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct terminate_thread_reply, self) == 8 ); -C_ASSERT( FIELD_OFFSET(struct terminate_thread_reply, last) == 12 ); C_ASSERT( sizeof(struct terminate_thread_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_process_info_request) == 16 ); diff --git a/server/thread.c b/server/thread.c index ea545d5c30..e2bfa50c7b 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1489,17 +1489,11 @@ DECL_HANDLER(terminate_thread) { struct thread *thread; - reply->self = 0; - reply->last = 0; if ((thread = get_thread_from_handle( req->handle, THREAD_TERMINATE ))) { thread->exit_code = req->exit_code; if (thread != current) kill_thread( thread, 1 ); - else - { - reply->self = 1; - reply->last = (thread->process->running_threads == 1); - } + else reply->self = 1; release_object( thread ); } } diff --git a/server/trace.c b/server/trace.c index c5c006ce41..1f0e71f1b6 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1368,7 +1368,6 @@ static void dump_terminate_thread_request( const struct terminate_thread_request static void dump_terminate_thread_reply( const struct terminate_thread_reply *req ) { fprintf( stderr, " self=%d", req->self ); - fprintf( stderr, ", last=%d", req->last ); } static void dump_get_process_info_request( const struct get_process_info_request *req )

1 0

Gijs Vermeulen : wtsapi32: Improve WTSQuerySessionInformationW stub.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 116890da122da856c49dc66643bda5cd8360339b URL: https://source.winehq.org/git/wine.git/?a=commit;h=116890da122da856c49dc666… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu May 28 15:59:27 2020 +0200 wtsapi32: Improve WTSQuerySessionInformationW stub. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/tests/wtsapi.c | 19 +++++++++++++++++++ dlls/wtsapi32/wtsapi32.c | 11 +++++++++++ 2 files changed, 30 insertions(+) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index f45598f548..c9312cd97c 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -97,6 +97,25 @@ static void test_WTSQuerySessionInformation(void) char *buf2; DWORD count; + SetLastError(0xdeadbeef); + count = 0; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); + ok(!ret, "got %u\n", GetLastError()); + ok(count == 0, "got %u\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + count = 1; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); + ok(!ret, "got %u\n", GetLastError()); + ok(count == 1, "got %u\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf1, NULL); + ok(!ret, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + count = 0; buf1 = NULL; ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf1, &count); diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 0ba05abf2c..ef3e0d10a0 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -341,6 +341,12 @@ BOOL WINAPI WTSQuerySessionInformationW( FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, Buffer, BytesReturned); + if (!Buffer || !BytesReturned) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + if (WTSInfoClass == WTSUserName) { WCHAR *username; @@ -354,6 +360,11 @@ BOOL WINAPI WTSQuerySessionInformationW( *BytesReturned = count * sizeof(WCHAR); return TRUE; } + else + { + *Buffer = NULL; + *BytesReturned = 0; + } return FALSE; }

1 0

Gijs Vermeulen : wtsapi32: Implement WTSQuerySessionInformationA.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 1db2b563360c48d6697b4f538b2c843ad4762db5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1db2b563360c48d6697b4f53… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu May 28 15:59:26 2020 +0200 wtsapi32: Implement WTSQuerySessionInformationA. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49178 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/tests/wtsapi.c | 44 ++++++++++++++++++++++++++++++++++-------- dlls/wtsapi32/wtsapi32.c | 46 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 72 insertions(+), 18 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 67f56bbd7f..f45598f548 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -90,19 +90,47 @@ static void test_WTSEnumerateProcessesW(void) WTSFreeMemory(info); } -static void test_WTSQuerySessionInformationW(void) +static void test_WTSQuerySessionInformation(void) { BOOL ret; - WCHAR *buf; + WCHAR *buf1; + char *buf2; DWORD count; count = 0; - buf = NULL; - ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf, &count); + buf1 = NULL; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf1, &count); ok(ret, "got %u\n", GetLastError()); - ok(buf != NULL, "buf not set\n"); - ok(count == (lstrlenW(buf) + 1) * sizeof(WCHAR), "got %u\n", count); - WTSFreeMemory(buf); + ok(buf1 != NULL, "buf not set\n"); + ok(count == (lstrlenW(buf1) + 1) * sizeof(WCHAR), "expected %u, got %u\n", (lstrlenW(buf1) + 1) * sizeof(WCHAR), count); + WTSFreeMemory(buf1); + + SetLastError(0xdeadbeef); + count = 0; + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); + ok(!ret, "got %u\n", GetLastError()); + ok(count == 0, "got %u\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + count = 1; + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); + ok(!ret, "got %u\n", GetLastError()); + ok(count == 1, "got %u\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf2, NULL); + ok(!ret, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + count = 0; + buf2 = NULL; + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf2, &count); + ok(ret, "got %u\n", GetLastError()); + ok(buf2 != NULL, "buf not set\n"); + ok(count == lstrlenA(buf2) + 1, "expected %u, got %u\n", lstrlenA(buf2) + 1, count); + WTSFreeMemory(buf2); } static void test_WTSQueryUserToken(void) @@ -118,6 +146,6 @@ static void test_WTSQueryUserToken(void) START_TEST (wtsapi) { test_WTSEnumerateProcessesW(); - test_WTSQuerySessionInformationW(); + test_WTSQuerySessionInformation(); test_WTSQueryUserToken(); } diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 026e7f4369..0ba05abf2c 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -19,6 +19,7 @@ #include <stdlib.h> #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wtsapi32.h" #include "wine/debug.h" #include "wine/heap.h" @@ -287,18 +288,43 @@ HANDLE WINAPI WTSOpenServerW(LPWSTR pServerName) /************************************************************ * WTSQuerySessionInformationA (WTSAPI32.@) */ -BOOL WINAPI WTSQuerySessionInformationA( - HANDLE hServer, - DWORD SessionId, - WTS_INFO_CLASS WTSInfoClass, - LPSTR* Buffer, - DWORD* BytesReturned) +BOOL WINAPI WTSQuerySessionInformationA(HANDLE server, DWORD session_id, WTS_INFO_CLASS class, char **buffer, DWORD *count) { - /* FIXME: Forward request to winsta.dll::WinStationQueryInformationA */ - FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, - Buffer, BytesReturned); + WCHAR *bufferW = NULL; - return FALSE; + TRACE("%p 0x%08x %d %p %p\n", server, session_id, class, buffer, count); + + if (!buffer || !count) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (!WTSQuerySessionInformationW(server, session_id, class, &bufferW, count)) + return FALSE; + + *count = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL); + if (!*count) + { + WTSFreeMemory(bufferW); + return FALSE; + } + + if (!(*buffer = heap_alloc(*count))) + { + WTSFreeMemory(bufferW); + return FALSE; + } + + if (!(*count = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, *buffer, *count, NULL, NULL))) + { + WTSFreeMemory(bufferW); + heap_free(*buffer); + return FALSE; + } + + WTSFreeMemory(bufferW); + return TRUE; } /************************************************************

1 0

Paul Gofman : ntoskrnl.exe: Call load image notify routines for driver modules.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 5d92cf7dbf11038c08eb35a042958faab3ef5b83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d92cf7dbf11038c08eb35a0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:12 2020 +0300 ntoskrnl.exe: Call load image notify routines for driver modules. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 24 ++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.c | 60 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 94733ec60a..fbf6262b3e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3673,6 +3673,30 @@ static HMODULE load_driver( const WCHAR *driver_name, const UNICODE_STRING *keyn TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); module = load_driver_module( str ); + + if (module && load_image_notify_routine_count) + { + UNICODE_STRING module_name; + IMAGE_NT_HEADERS *nt; + IMAGE_INFO info; + unsigned int i; + + RtlInitUnicodeString(&module_name, str); + nt = RtlImageNtHeader(module); + memset(&info, 0, sizeof(info)); + info.u.s.ImageAddressingMode = IMAGE_ADDRESSING_MODE_32BIT; + info.u.s.SystemModeImage = TRUE; + info.ImageSize = nt->OptionalHeader.SizeOfImage; + info.ImageBase = module; + + for (i = 0; i < load_image_notify_routine_count; ++i) + { + TRACE("Calling image load notify %p.\n", load_image_notify_routines[i]); + load_image_notify_routines[i](&module_name, NULL, &info); + TRACE("Called image load notify %p.\n", load_image_notify_routines[i]); + } + } + HeapFree( GetProcessHeap(), 0, path ); return module; } diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index f6cc442bab..ba2b4d6ac8 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -308,21 +308,79 @@ static const WCHAR driver2_path[] = { '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r','2',0 }; +static IMAGE_INFO test_image_info; +static int test_load_image_notify_count; +static WCHAR test_load_image_name[MAX_PATH]; + +static void WINAPI test_load_image_notify_routine(UNICODE_STRING *image_name, HANDLE process_id, + IMAGE_INFO *image_info) +{ + if (test_load_image_notify_count == -1 + || (image_name->Buffer && wcsstr(image_name->Buffer, L".tmp"))) + { + ++test_load_image_notify_count; + test_image_info = *image_info; + wcscpy(test_load_image_name, image_name->Buffer); + } +} + static void test_load_driver(void) { - UNICODE_STRING name; + static WCHAR image_path_key_name[] = L"ImagePath"; + RTL_QUERY_REGISTRY_TABLE query_table[2]; + UNICODE_STRING name, image_path; NTSTATUS ret; + ret = PsSetLoadImageNotifyRoutine(test_load_image_notify_routine); + ok(ret == STATUS_SUCCESS, "Got unexpected status %#x.\n", ret); + + /* Routine gets registered twice on Windows. */ + ret = PsSetLoadImageNotifyRoutine(test_load_image_notify_routine); + ok(ret == STATUS_SUCCESS, "Got unexpected status %#x.\n", ret); + + RtlInitUnicodeString(&image_path, NULL); + memset(query_table, 0, sizeof(query_table)); + query_table[0].QueryRoutine = NULL; + query_table[0].Name = image_path_key_name; + query_table[0].EntryContext = &image_path; + query_table[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_TYPECHECK; + query_table[0].DefaultType = REG_EXPAND_SZ << RTL_QUERY_REGISTRY_TYPECHECK_SHIFT; + + ret = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, driver2_path, query_table, NULL, NULL); + ok(ret == STATUS_SUCCESS, "Got unexpected status %#x.\n", ret); + ok(!!image_path.Buffer, "image_path.Buffer is NULL.\n"); + RtlInitUnicodeString(&name, driver2_path); ret = ZwLoadDriver(&name); ok(!ret, "got %#x\n", ret); + ok(test_load_image_notify_count == 2, "Got unexpected test_load_image_notify_count %u.\n", + test_load_image_notify_count); + ok(test_image_info.ImageAddressingMode == IMAGE_ADDRESSING_MODE_32BIT, + "Got unexpected ImageAddressingMode %#x.\n", test_image_info.ImageAddressingMode); + ok(test_image_info.SystemModeImage, + "Got unexpected SystemModeImage %#x.\n", test_image_info.SystemModeImage); + ok(!wcscmp(test_load_image_name, image_path.Buffer), "Image path names do not match.\n"); + + test_load_image_notify_count = -1; + ret = ZwLoadDriver(&name); ok(ret == STATUS_IMAGE_ALREADY_LOADED, "got %#x\n", ret); ret = ZwUnloadDriver(&name); ok(!ret, "got %#x\n", ret); + + ret = PsRemoveLoadImageNotifyRoutine(test_load_image_notify_routine); + ok(ret == STATUS_SUCCESS, "Got unexpected status %#x.\n", ret); + ret = PsRemoveLoadImageNotifyRoutine(test_load_image_notify_routine); + ok(ret == STATUS_SUCCESS, "Got unexpected status %#x.\n", ret); + ret = PsRemoveLoadImageNotifyRoutine(test_load_image_notify_routine); + ok(ret == STATUS_PROCEDURE_NOT_FOUND, "Got unexpected status %#x.\n", ret); + + ok(test_load_image_notify_count == -1, "Got unexpected test_load_image_notify_count %u.\n", + test_load_image_notify_count); + RtlFreeUnicodeString(&image_path); } static NTSTATUS wait_single(void *obj, ULONGLONG timeout)

1 0

Paul Gofman : include: Add RTL_QUERY_REGISTRY_TYPECHECK defines.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 9e8b44ac5c8aefbd43f256fcfae367a8ab8977ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e8b44ac5c8aefbd43f256fc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:11 2020 +0300 include: Add RTL_QUERY_REGISTRY_TYPECHECK defines. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index b70460f314..f362790dbc 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1988,6 +1988,9 @@ typedef void (NTAPI *RTL_WAITORTIMERCALLBACKFUNC)(PVOID,BOOLEAN); /* FIXME: not #define RTL_QUERY_REGISTRY_NOEXPAND 0x00000010 #define RTL_QUERY_REGISTRY_DIRECT 0x00000020 #define RTL_QUERY_REGISTRY_DELETE 0x00000040 +#define RTL_QUERY_REGISTRY_TYPECHECK 0x00000100 + +#define RTL_QUERY_REGISTRY_TYPECHECK_SHIFT 24 typedef NTSTATUS (WINAPI *PRTL_QUERY_REGISTRY_ROUTINE)( PCWSTR ValueName, ULONG ValueType,

1 0

Paul Gofman : ntoskrnl.exe: Implement image load notify routines registration.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 26fbff05a1e39a3c910ff778e2229c674a0569c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26fbff05a1e39a3c910ff778… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:10 2020 +0300 ntoskrnl.exe: Implement image load notify routines registration. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 28 ++++++++++++++++++++++++---- include/ddk/ntddk.h | 1 + 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e9c35cf7e3..94733ec60a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -85,6 +85,9 @@ static DWORD client_tid; static HANDLE ntoskrnl_heap; +static PLOAD_IMAGE_NOTIFY_ROUTINE load_image_notify_routines[8]; +static unsigned int load_image_notify_routine_count; + struct wine_driver { DRIVER_OBJECT driver_obj; @@ -3001,10 +3004,21 @@ NTSTATUS WINAPI PsRemoveCreateThreadNotifyRoutine( PCREATE_THREAD_NOTIFY_ROUTINE /*********************************************************************** * PsRemoveLoadImageNotifyRoutine (NTOSKRNL.EXE.@) */ - NTSTATUS WINAPI PsRemoveLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine) +NTSTATUS WINAPI PsRemoveLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) { - FIXME( "stub: %p\n", NotifyRoutine ); - return STATUS_SUCCESS; + unsigned int i; + + TRACE("routine %p.\n", routine); + + for (i = 0; i < load_image_notify_routine_count; ++i) + if (load_image_notify_routines[i] == routine) + { + --load_image_notify_routine_count; + memmove(&load_image_notify_routines[i], &load_image_notify_routines[i + 1], + sizeof(*load_image_notify_routines) * (load_image_notify_routine_count - i)); + return STATUS_SUCCESS; + } + return STATUS_PROCEDURE_NOT_FOUND; } @@ -3160,7 +3174,13 @@ NTSTATUS WINAPI IoWMIOpenBlock(LPCGUID guid, ULONG desired_access, PVOID *data_b */ NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) { - FIXME("(%p) stub\n", routine); + FIXME("routine %p, semi-stub.\n", routine); + + if (load_image_notify_routine_count == ARRAY_SIZE(load_image_notify_routines)) + return STATUS_INSUFFICIENT_RESOURCES; + + load_image_notify_routines[load_image_notify_routine_count++] = routine; + return STATUS_SUCCESS; } diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index e3c9124023..2b05fda711 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -231,6 +231,7 @@ BOOLEAN WINAPI MmIsAddressValid(void *); HANDLE WINAPI PsGetProcessId(PEPROCESS); HANDLE WINAPI PsGetThreadId(PETHREAD); HANDLE WINAPI PsGetThreadProcessId(PETHREAD); +NTSTATUS WINAPI PsRemoveLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine(PCREATE_PROCESS_NOTIFY_ROUTINE,BOOLEAN); NTSTATUS WINAPI PsSetCreateProcessNotifyRoutineEx(PCREATE_PROCESS_NOTIFY_ROUTINE_EX,BOOLEAN); NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine(PCREATE_THREAD_NOTIFY_ROUTINE);

1 0

Paul Gofman : include/ddk: Update the IMAGE_INFO structure.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: a5b5be497913b0e9cb5c53ce37c6c81f1cc02093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5b5be497913b0e9cb5c53ce… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:09 2020 +0300 include/ddk: Update the IMAGE_INFO structure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/ntddk.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 36f69cdf9a..e3c9124023 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -107,6 +107,8 @@ typedef enum _CONFIGURATION_TYPE MaximumType } CONFIGURATION_TYPE, *PCONFIGURATION_TYPE; +#define IMAGE_ADDRESSING_MODE_32BIT 3 + typedef struct _IMAGE_INFO { union @@ -118,7 +120,11 @@ typedef struct _IMAGE_INFO ULONG SystemModeImage : 1; ULONG ImageMappedToAllPids : 1; ULONG ExtendedInfoPresent : 1; - ULONG Reserved : 21; + ULONG MachineTypeMismatch : 1; + ULONG ImageSignatureLevel : 4; + ULONG ImageSignatureType : 3; + ULONG ImagePartialMap : 1; + ULONG Reserved : 12; } DUMMYSTRUCTNAME; } DUMMYUNIONNAME; PVOID ImageBase;

1 0

Paul Gofman : ntoskrnl.exe: Implement IoReuseIrp() function.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: eb7f7847610f73d3ce76169c8b4603fe5a13addb URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb7f7847610f73d3ce76169c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:08 2020 +0300 ntoskrnl.exe: Implement IoReuseIrp() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 37 +++++++++++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3c8b207a4a..e9c35cf7e3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -975,6 +975,17 @@ void WINAPI IoInitializeIrp( IRP *irp, USHORT size, CCHAR stack_size ) (PIO_STACK_LOCATION)(irp + 1) + stack_size; } +void WINAPI IoReuseIrp(IRP *irp, NTSTATUS iostatus) +{ + UCHAR AllocationFlags; + + TRACE("irp %p, iostatus %#x.\n", irp, iostatus); + + AllocationFlags = irp->AllocationFlags; + IoInitializeIrp(irp, irp->Size, irp->StackCount); + irp->AllocationFlags = AllocationFlags; + irp->IoStatus.u.Status = iostatus; +} /*********************************************************************** * IoInitializeTimer (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c442656694..3b36a62269 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -462,7 +462,7 @@ @ stub IoReportTargetDeviceChange @ stub IoReportTargetDeviceChangeAsynchronous @ stub IoRequestDeviceEject -@ stub IoReuseIrp +@ stdcall IoReuseIrp(ptr long) @ stub IoSetCompletionRoutineEx @ stdcall IoSetDeviceInterfaceState(ptr long) @ stub IoSetDeviceToVerify diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index e762ad0ccd..f6cc442bab 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -211,9 +211,18 @@ static void *get_proc_address(const char *name) static FILE_OBJECT *last_created_file; static unsigned int create_count, close_count; +static NTSTATUS WINAPI test_irp_struct_completion_routine(DEVICE_OBJECT *reserved, IRP *irp, void *context) +{ + unsigned int *result = context; + + *result = 1; + return STATUS_MORE_PROCESSING_REQUIRED; +} + static void test_irp_struct(IRP *irp, DEVICE_OBJECT *device) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + unsigned int irp_completion_result; ok(device == upper_device, "Expected device %p, got %p.\n", upper_device, device); ok(last_created_file != NULL, "last_created_file = NULL\n"); @@ -225,6 +234,34 @@ static void test_irp_struct(IRP *irp, DEVICE_OBJECT *device) "IRP thread is not the current thread\n"); ok(IoGetRequestorProcess(irp) == IoGetCurrentProcess(), "processes didn't match\n"); + + irp = IoAllocateIrp(1, FALSE); + ok(irp->AllocationFlags == IRP_ALLOCATED_FIXED_SIZE, "Got unexpected irp->AllocationFlags %#x.\n", + irp->AllocationFlags); + ok(irp->CurrentLocation == 2, + "Got unexpected irp->CurrentLocation %u.\n", irp->CurrentLocation); + IoSetCompletionRoutine(irp, test_irp_struct_completion_routine, &irp_completion_result, + TRUE, TRUE, TRUE); + + irp_completion_result = 0; + + irp->IoStatus.Status = STATUS_SUCCESS; + --irp->CurrentLocation; + --irp->Tail.Overlay.CurrentStackLocation; + IoCompleteRequest(irp, IO_NO_INCREMENT); + ok(irp->CurrentLocation == 2, + "Got unexpected irp->CurrentLocation %u.\n", irp->CurrentLocation); + ok(irp_completion_result, "IRP completion was not called.\n"); + + --irp->CurrentLocation; + --irp->Tail.Overlay.CurrentStackLocation; + IoReuseIrp(irp, STATUS_UNSUCCESSFUL); + ok(irp->CurrentLocation == 2, + "Got unexpected irp->CurrentLocation %u.\n", irp->CurrentLocation); + ok(irp->AllocationFlags == IRP_ALLOCATED_FIXED_SIZE, "Got unexpected irp->AllocationFlags %#x.\n", + irp->AllocationFlags); + + IoFreeIrp(irp); } static void test_mdl_map(void) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 0d98680cfa..57e4cf4fe5 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1679,6 +1679,7 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_S void WINAPI IoReleaseCancelSpinLock(KIRQL); void WINAPI IoReleaseRemoveLockAndWaitEx(IO_REMOVE_LOCK*,void*,ULONG); void WINAPI IoReleaseRemoveLockEx(IO_REMOVE_LOCK*,void*,ULONG); +void WINAPI IoReuseIrp(IRP*,NTSTATUS); NTSTATUS WINAPI IoSetDeviceInterfaceState(UNICODE_STRING*,BOOLEAN); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG);

1 0

Paul Gofman : ntoskrnl.exe: Add stub for ExUnregisterCallback() function.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 9effc3f96333d809ffba43b975fa062cbf8912d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9effc3f96333d809ffba43b9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:07 2020 +0300 ntoskrnl.exe: Add stub for ExUnregisterCallback() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 +++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f0892141c2..3c8b207a4a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2071,6 +2071,11 @@ void * WINAPI ExRegisterCallback(PCALLBACK_OBJECT callback_object, return (void *)0xdeadbeef; } +void WINAPI ExUnregisterCallback(void *callback_registration) +{ + FIXME("callback_registration %p stub.\n", callback_registration); +} + /*********************************************************************** * ExFreePool (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index dcec2375df..c442656694 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -191,7 +191,7 @@ @ stdcall ExSetTimerResolution(long long) @ stub ExSystemExceptionFilter @ stdcall ExSystemTimeToLocalTime(ptr ptr) RtlSystemTimeToLocalTime -@ stub ExUnregisterCallback +@ stdcall ExUnregisterCallback(ptr) @ stdcall ExUuidCreate(ptr) @ stub ExVerifySuite @ stub ExWindowStationObjectType diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 282ea14b77..0d98680cfa 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1632,6 +1632,7 @@ void * WINAPI ExRegisterCallback(PCALLBACK_OBJECT,PCALLBACK_FUNCTION,void*); void FASTCALL ExReleaseFastMutexUnsafe(PFAST_MUTEX); void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN); +void WINAPI ExUnregisterCallback(void*); void WINAPI IoAcquireCancelSpinLock(KIRQL*); NTSTATUS WINAPI IoAcquireRemoveLockEx(IO_REMOVE_LOCK*,void*,const char*,ULONG, ULONG);

1 0

Paul Gofman : ntoskrnl.exe: Add stub for ExRegisterCallback() function.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 7bc99ae1254f467a23b46756dce40a15494f0758 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bc99ae1254f467a23b46756… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:06 2020 +0300 ntoskrnl.exe: Add stub for ExRegisterCallback() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 09d4796ad4..f0892141c2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2062,6 +2062,14 @@ NTSTATUS WINAPI ExCreateCallback(PCALLBACK_OBJECT *obj, POBJECT_ATTRIBUTES attr, return STATUS_SUCCESS; } +void * WINAPI ExRegisterCallback(PCALLBACK_OBJECT callback_object, + PCALLBACK_FUNCTION callback_function, void *callback_context) +{ + FIXME("callback_object %p, callback_function %p, callback_context %p stub.\n", + callback_object, callback_function, callback_context); + + return (void *)0xdeadbeef; +} /*********************************************************************** * ExFreePool (NTOSKRNL.EXE.@) @@ -3046,6 +3054,7 @@ PVOID WINAPI MmGetSystemRoutineAddress(PUNICODE_STRING SystemRoutineName) if (!pFunc) { hMod = GetModuleHandleW( halW ); + if (hMod) pFunc = GetProcAddress( hMod, routineNameA.Buffer ); } RtlFreeAnsiString( &routineNameA ); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index dd7ff73bee..dcec2375df 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -183,7 +183,7 @@ @ stub ExRaiseException @ stub ExRaiseHardError @ stub ExRaiseStatus -@ stub ExRegisterCallback +@ stdcall ExRegisterCallback(ptr ptr ptr) @ stub ExReinitializeResourceLite @ stdcall ExReleaseResourceForThreadLite(ptr long) @ extern ExSemaphoreObjectType diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a67377352d..282ea14b77 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1356,6 +1356,7 @@ typedef void * (NTAPI *PALLOCATE_FUNCTION)(POOL_TYPE, SIZE_T, ULONG); typedef void * (NTAPI *PALLOCATE_FUNCTION_EX)(POOL_TYPE, SIZE_T, ULONG, PLOOKASIDE_LIST_EX); typedef void (NTAPI *PFREE_FUNCTION)(void *); typedef void (NTAPI *PFREE_FUNCTION_EX)(void *, PLOOKASIDE_LIST_EX); +typedef void (NTAPI *PCALLBACK_FUNCTION)(void *, void *, void *); #ifdef _WIN64 #define LOOKASIDE_ALIGN DECLSPEC_CACHEALIGN @@ -1627,6 +1628,7 @@ PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPI LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*); BOOLEAN WINAPI ExIsResourceAcquiredExclusiveLite(ERESOURCE*); ULONG WINAPI ExIsResourceAcquiredSharedLite(ERESOURCE*); +void * WINAPI ExRegisterCallback(PCALLBACK_OBJECT,PCALLBACK_FUNCTION,void*); void FASTCALL ExReleaseFastMutexUnsafe(PFAST_MUTEX); void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN);

1 0

Paul Gofman : ntoskrnl.exe: Return STATUS_SUCCESS from ExCreateCallback() stub.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 1cad86fced2b8eb32dcc1e2d58858f45e8135ea3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cad86fced2b8eb32dcc1e2d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:05 2020 +0300 ntoskrnl.exe: Return STATUS_SUCCESS from ExCreateCallback() stub. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3cb5591920..09d4796ad4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2059,7 +2059,7 @@ NTSTATUS WINAPI ExCreateCallback(PCALLBACK_OBJECT *obj, POBJECT_ATTRIBUTES attr, { FIXME("(%p, %p, %u, %u): stub\n", obj, attr, create, allow_multiple); - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; }

1 0

Paul Gofman : ntoskrnl.exe: Fix ObRegisterCallbacks() function parameter definition.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 4ae92fdaf653c8746284ecc8840a24e8ee5cb8ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ae92fdaf653c8746284ecc8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:04 2020 +0300 ntoskrnl.exe: Fix ObRegisterCallbacks() function parameter definition. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- include/ddk/wdm.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d50eac6c82..3cb5591920 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2807,9 +2807,9 @@ void FASTCALL ObfDereferenceObject( void *obj ) /*********************************************************************** * ObRegisterCallbacks (NTOSKRNL.EXE.@) */ -NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION *callBack, void **handle) +NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION callback, void **handle) { - FIXME( "stub: %p %p\n", callBack, handle ); + FIXME( "callback %p, handle %p.\n", callback, handle ); if(handle) *handle = UlongToHandle(0xdeadbeaf); diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 38a3098994..a67377352d 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1749,7 +1749,7 @@ static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority) void FASTCALL ObfReferenceObject(void*); void WINAPI ObDereferenceObject(void*); USHORT WINAPI ObGetFilterVersion(void); -NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION*, void**); +NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION, void**); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**); NTSTATUS WINAPI ObReferenceObjectByPointer(void*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE);

1 0

Ziqing Hui : windowscodecs: Implement DdsDecoder_Dds_GetFrame().
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 870b08b7fd59bd37dc66f7322019618e0e494595 URL: https://source.winehq.org/git/wine.git/?a=commit;h=870b08b7fd59bd37dc66f732… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu May 28 13:08:55 2020 +0800 windowscodecs: Implement DdsDecoder_Dds_GetFrame(). DdsDecoder_GetFrame() is implemented on top of DdsDecoder_Dds_GetFrame(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 80 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 72 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 7341147245..333f015820 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -121,8 +121,12 @@ typedef struct DdsFrameDecode { IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; IWICDdsFrameDecode IWICDdsFrameDecode_iface; LONG ref; + UINT width; + UINT height; } DdsFrameDecode; +static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *, UINT, UINT, UINT, IWICBitmapFrameDecode **); + static inline BOOL has_extended_header(DDS_HEADER *header) { return (header->ddspf.flags & DDPF_FOURCC) && @@ -643,15 +647,35 @@ static HRESULT WINAPI DdsDecoder_GetFrameCount(IWICBitmapDecoder *iface, static HRESULT WINAPI DdsDecoder_GetFrame(IWICBitmapDecoder *iface, UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) { - HRESULT hr; - DdsFrameDecode *frame_decode; + DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); + UINT frame_per_texture, array_index, mip_level, slice_index, depth; - FIXME("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); + TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); - hr = DdsFrameDecode_CreateInstance(&frame_decode); - if (hr == S_OK) *ppIBitmapFrame = &frame_decode->IWICBitmapFrameDecode_iface; + if (!ppIBitmapFrame) return E_INVALIDARG; - return hr; + EnterCriticalSection(&This->lock); + + if (!This->initialized) { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + frame_per_texture = This->info.frame_count / This->info.array_size; + array_index = index / frame_per_texture; + slice_index = index % frame_per_texture; + depth = This->info.depth; + mip_level = 0; + while (slice_index >= depth) + { + slice_index -= depth; + mip_level++; + if (depth > 1) depth /= 2; + } + + LeaveCriticalSection(&This->lock); + + return DdsDecoder_Dds_GetFrame(&This->IWICDdsDecoder_iface, array_index, mip_level, slice_index, ppIBitmapFrame); } static const IWICBitmapDecoderVtbl DdsDecoder_Vtbl = { @@ -730,9 +754,49 @@ static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *iface, UINT arrayIndex, UINT mipLevel, UINT sliceIndex, IWICBitmapFrameDecode **bitmapFrame) { - TRACE("(%p,%u,%u,%u,%p): Stub.\n", iface, arrayIndex, mipLevel, sliceIndex, bitmapFrame); + DdsDecoder *This = impl_from_IWICDdsDecoder(iface); + HRESULT hr; + UINT width = 0, height = 0; + int j; + DdsFrameDecode *frame_decode; - return E_NOTIMPL; + TRACE("(%p,%u,%u,%u,%p)\n", iface, arrayIndex, mipLevel, sliceIndex, bitmapFrame); + + if (!bitmapFrame) return E_INVALIDARG; + + EnterCriticalSection(&This->lock); + + if (!This->initialized) { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + if (arrayIndex >= This->info.array_size || mipLevel >= This->info.mip_levels || sliceIndex >= This->info.depth) { + hr = E_INVALIDARG; + goto end; + } + + width = This->info.width; + height = This->info.height; + for (j = 0; j < mipLevel; j++) + { + if (width > 1) width /= 2; + if (height > 1) height /= 2; + } + + hr = DdsFrameDecode_CreateInstance(&frame_decode); + if (hr != S_OK) goto end; + + frame_decode->width = width; + frame_decode->height = height; + *bitmapFrame = &frame_decode->IWICBitmapFrameDecode_iface; + + hr = S_OK; + +end: + LeaveCriticalSection(&This->lock); + + return hr; } static const IWICDdsDecoderVtbl DdsDecoder_Dds_Vtbl = {

1 0

Ziqing Hui : windowscodecs: Implement DdsFrameDecode_GetSize().
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 9a6108cf438808e93b1e5a66a56a2c72444fa6c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a6108cf438808e93b1e5a66… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu May 28 13:09:09 2020 +0800 windowscodecs: Implement DdsFrameDecode_GetSize(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 9 +++++++-- dlls/windowscodecs/tests/ddsformat.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 333f015820..20017788a0 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -299,9 +299,14 @@ static ULONG WINAPI DdsFrameDecode_Release(IWICBitmapFrameDecode *iface) static HRESULT WINAPI DdsFrameDecode_GetSize(IWICBitmapFrameDecode *iface, UINT *puiWidth, UINT *puiHeight) { - FIXME("(%p,%p,%p): stub.\n", iface, puiWidth, puiHeight); + DdsFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); - return E_NOTIMPL; + *puiWidth = This->width; + *puiHeight = This->height; + + TRACE("(%p) -> (%d,%d)\n", iface, *puiWidth, *puiHeight); + + return S_OK; } static HRESULT WINAPI DdsFrameDecode_GetPixelFormat(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index e31ca576fc..c7f56307d7 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -383,7 +383,7 @@ static void test_dds_decoder_frame_size(IWICBitmapDecoder *decoder, IWICBitmapFr if (hr != S_OK) goto end; hr = IWICBitmapFrameDecode_GetSize(frame_decode, &width, &height); - todo_wine ok (hr == S_OK, "%d: GetSize failed for frame %d, hr=%x\n", i, frame_index, hr); + ok (hr == S_OK, "%d: GetSize failed for frame %d, hr=%x\n", i, frame_index, hr); if (hr != S_OK) goto end; depth = params.Depth;

1 0

Ziqing Hui : windowscodecs: Get DDS parameters when initialize.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: ab0d2b1434d8f81e1f291cc10115e5cef7f1d3b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab0d2b1434d8f81e1f291cc1… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu May 28 13:08:39 2020 +0800 windowscodecs: Get DDS parameters when initialize. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 100 ++++++++++++++++++++++++++--------------- 1 file changed, 64 insertions(+), 36 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index de4cd1ea01..7341147245 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -93,6 +93,18 @@ typedef struct { DWORD miscFlags2; } DDS_HEADER_DXT10; +typedef struct dds_info { + UINT width; + UINT height; + UINT depth; + UINT mip_levels; + UINT array_size; + UINT frame_count; + DXGI_FORMAT format; + WICDdsDimension dimension; + WICDdsAlphaMode alpha_mode; +} dds_info; + typedef struct DdsDecoder { IWICBitmapDecoder IWICBitmapDecoder_iface; IWICDdsDecoder IWICDdsDecoder_iface; @@ -102,6 +114,7 @@ typedef struct DdsDecoder { CRITICAL_SECTION lock; DDS_HEADER header; DDS_HEADER_DXT10 header_dxt10; + dds_info info; } DdsDecoder; typedef struct DdsFrameDecode { @@ -175,6 +188,45 @@ static WICDdsAlphaMode get_alpha_mode_from_fourcc(DWORD fourcc) } } +static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *header_dxt10) +{ + int i; + UINT depth; + + info->width = header->width; + info->height = header->height; + info->depth = 1; + info->mip_levels = 1; + info->array_size = 1; + if (header->depth) info->depth = header->depth; + if (header->mipMapCount) info->mip_levels = header->mipMapCount; + + if (has_extended_header(header)) { + if (header_dxt10->arraySize) info->array_size = header_dxt10->arraySize; + info->format = header_dxt10->dxgiFormat; + info->dimension = get_dimension(NULL, header_dxt10); + info->alpha_mode = header_dxt10->miscFlags2 & 0x00000008; + } else { + info->format = get_format_from_fourcc(header->ddspf.fourCC); + info->dimension = get_dimension(header, NULL); + info->alpha_mode = get_alpha_mode_from_fourcc(header->ddspf.fourCC); + } + + /* get frame count */ + if (info->depth == 1) { + info->frame_count = info->array_size * info->mip_levels; + } else { + info->frame_count = 0; + depth = info->depth; + for (i = 0; i < info->mip_levels; i++) + { + info->frame_count += depth; + if (depth > 1) depth /= 2; + } + info->frame_count *= info->array_size; + } +} + static inline DdsDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) { return CONTAINING_RECORD(iface, DdsDecoder, IWICBitmapDecoder_iface); @@ -497,6 +549,8 @@ static HRESULT WINAPI DdsDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p } } + get_dds_info(&This->info, &This->header, &This->header_dxt10); + This->initialized = TRUE; This->stream = pIStream; IStream_AddRef(pIStream); @@ -571,33 +625,17 @@ static HRESULT WINAPI DdsDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); - UINT arraySize = 1, mipMapCount = 1, depth = 1; - int i; if (!pCount) return E_INVALIDARG; if (!This->initialized) return WINCODEC_ERR_WRONGSTATE; EnterCriticalSection(&This->lock); - if (This->header.mipMapCount) mipMapCount = This->header.mipMapCount; - if (This->header.depth) depth = This->header.depth; - if (has_extended_header(&This->header) && This->header_dxt10.arraySize) arraySize = This->header_dxt10.arraySize; - - if (depth == 1) { - *pCount = arraySize * mipMapCount; - } else { - *pCount = 0; - for (i = 0; i < mipMapCount; i++) - { - *pCount += depth; - if (depth > 1) depth /= 2; - } - *pCount *= arraySize; - } + *pCount = This->info.frame_count; LeaveCriticalSection(&This->lock); - TRACE("(%p) <-- %d\n", iface, *pCount); + TRACE("(%p) -> %d\n", iface, *pCount); return S_OK; } @@ -667,24 +705,14 @@ static HRESULT WINAPI DdsDecoder_Dds_GetParameters(IWICDdsDecoder *iface, goto end; } - parameters->Width = This->header.width; - parameters->Height = This->header.height; - parameters->Depth = 1; - parameters->MipLevels = 1; - parameters->ArraySize = 1; - if (This->header.depth) parameters->Depth = This->header.depth; - if (This->header.mipMapCount) parameters->MipLevels = This->header.mipMapCount; - - if (has_extended_header(&This->header)) { - if (This->header_dxt10.arraySize) parameters->ArraySize = This->header_dxt10.arraySize; - parameters->DxgiFormat = This->header_dxt10.dxgiFormat; - parameters->Dimension = get_dimension(NULL, &This->header_dxt10); - parameters->AlphaMode = This->header_dxt10.miscFlags2 & 0x00000008; - } else { - parameters->DxgiFormat = get_format_from_fourcc(This->header.ddspf.fourCC); - parameters->Dimension = get_dimension(&This->header, NULL); - parameters->AlphaMode = get_alpha_mode_from_fourcc(This->header.ddspf.fourCC); - } + parameters->Width = This->info.width; + parameters->Height = This->info.height; + parameters->Depth = This->info.depth; + parameters->MipLevels = This->info.mip_levels; + parameters->ArraySize = This->info.array_size; + parameters->DxgiFormat = This->info.format; + parameters->Dimension = This->info.dimension; + parameters->AlphaMode = This->info.alpha_mode; TRACE("(%p) -> (%dx%d depth=%d mipLevels=%d arraySize=%d dxgiFormat=0x%x dimension=0x%x alphaMode=0x%x)\n", iface, parameters->Width, parameters->Height, parameters->Depth, parameters->MipLevels,

1 0

Serge Gautherie : mscoree: RegQueryValueExW() wants bytes, not chars.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: e4e5eda3d9afcb5360747ddd97e6bf4fdc0c1c0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e5eda3d9afcb5360747ddd… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Thu May 28 04:30:37 2020 +0200 mscoree: RegQueryValueExW() wants bytes, not chars. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 2 +- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 9a299662e3..7702994252 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -477,7 +477,7 @@ static BOOL get_install_root(LPWSTR install_dir) if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, dotnet_key, 0, KEY_READ, &key)) return FALSE; - len = MAX_PATH; + len = MAX_PATH * sizeof(WCHAR); if (RegQueryValueExW(key, install_root, 0, NULL, (LPBYTE)install_dir, &len)) { RegCloseKey(key); diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 81fe5610b7..4679d79e66 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -80,7 +80,7 @@ static BOOL get_install_root(LPWSTR install_dir) if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, dotnet_key, 0, KEY_READ, &key)) return FALSE; - len = MAX_PATH; + len = MAX_PATH * sizeof(WCHAR); if (RegQueryValueExW(key, install_root, 0, NULL, (LPBYTE)install_dir, &len)) { RegCloseKey(key);

1 0

Jacek Caban : gdiplus/tests: Introduce compare_uint helper.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 10257a9417323f87094eda18fb4122f02a36aad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10257a9417323f87094eda18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 23:55:22 2020 +0200 gdiplus/tests: Introduce compare_uint helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index de6fad093d..b17323cb75 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -39,15 +39,21 @@ static GpStatus (WINGDIPAPI *pGdipInitializePalette)(ColorPalette*,PaletteType,I #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (UINT)(expected), (UINT)(got)) #define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + return diff <= max_diff; +} + static BOOL color_match(ARGB c1, ARGB c2, BYTE max_diff) { - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (!compare_uint(c1 & 0xff, c2 & 0xff, max_diff)) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (!compare_uint(c1 & 0xff, c2 & 0xff, max_diff)) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (!compare_uint(c1 & 0xff, c2 & 0xff, max_diff)) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (!compare_uint(c1 & 0xff, c2 & 0xff, max_diff)) return FALSE; return TRUE; }

1 0

Jacek Caban : mshtml: Add IHTMLTableCell::width property implementation.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: f6595bbdffeaac5bafd415b5ed1c9b574c4633ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6595bbdffeaac5bafd415b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 28 23:06:54 2020 +0200 mshtml: Add IHTMLTableCell::width property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmltable.c | 25 +++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 23 +++++++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 1429631d44..43a4f6ba08 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -332,15 +332,32 @@ static HRESULT WINAPI HTMLTableCell_get_borderColorDark(IHTMLTableCell *iface, V static HRESULT WINAPI HTMLTableCell_put_width(IHTMLTableCell *iface, VARIANT v) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + hres = variant_to_nsstr(&v, FALSE, &nsstr); + if(FAILED(hres)) + return hres; + + nsres = nsIDOMHTMLTableCellElement_SetWidth(This->nscell, &nsstr); + nsAString_Finish(&nsstr); + return map_nsresult(nsres); } static HRESULT WINAPI HTMLTableCell_get_width(IHTMLTableCell *iface, VARIANT *p) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLTableCellElement_GetWidth(This->nscell, &nsstr); + return return_nsstr_variant(nsres, &nsstr, NSSTR_IMPLICIT_PX, p); } static HRESULT WINAPI HTMLTableCell_put_height(IHTMLTableCell *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 433e0d561a..25b8b3536c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7649,6 +7649,29 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div) ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"110"), "height = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); + V_VT(&v) = VT_I4; + V_I4(&v) = 200; + hres = IHTMLTableCell_put_width(cell, v); + ok(hres == S_OK, "put_width failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLTableCell_get_width(cell, &v); + ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"200"), "width = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(L"210px"); + hres = IHTMLTableCell_put_width(cell, v); + ok(hres == S_OK, "put_width failed: %08x\n", hres); + SysFreeString(V_BSTR(&v)); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLTableCell_get_width(cell, &v); + ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"210"), "width = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); + /* Restore Original */ hres = IHTMLTableCell_put_bgColor(cell, vDefaultbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Add IHTMLTableCell::height property implementation.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 0702f0617718ea457d5d6f7812f27ad4113feefa URL: https://source.winehq.org/git/wine.git/?a=commit;h=0702f0617718ea457d5d6f78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 28 23:06:47 2020 +0200 mshtml: Add IHTMLTableCell::height property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmltable.c | 25 +++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 25 ++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 2f40bb078d..1429631d44 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -346,15 +346,32 @@ static HRESULT WINAPI HTMLTableCell_get_width(IHTMLTableCell *iface, VARIANT *p) static HRESULT WINAPI HTMLTableCell_put_height(IHTMLTableCell *iface, VARIANT v) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + hres = variant_to_nsstr(&v, FALSE, &nsstr); + if(FAILED(hres)) + return hres; + + nsres = nsIDOMHTMLTableCellElement_SetHeight(This->nscell, &nsstr); + nsAString_Finish(&nsstr); + return map_nsresult(nsres); } static HRESULT WINAPI HTMLTableCell_get_height(IHTMLTableCell *iface, VARIANT *p) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLTableCellElement_GetHeight(This->nscell, &nsstr); + return return_nsstr_variant(nsres, &nsstr, NSSTR_IMPLICIT_PX, p); } static HRESULT WINAPI HTMLTableCell_get_cellIndex(IHTMLTableCell *iface, LONG *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cb8141da93..433e0d561a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7564,7 +7564,7 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div) HRESULT hres; LONG lval; BSTR str; - VARIANT vbg, vDefaultbg; + VARIANT vbg, vDefaultbg, v; test_elem_set_innerhtml((IUnknown*)div, L"<table id=\"tbl\"><tbody>" @@ -7626,6 +7626,29 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div) ok(!lstrcmpW(V_BSTR(&vbg), L"#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); + V_VT(&v) = VT_I4; + V_I4(&v) = 100; + hres = IHTMLTableCell_put_height(cell, v); + ok(hres == S_OK, "put_height failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLTableCell_get_height(cell, &v); + ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"100"), "height = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(L"110px"); + hres = IHTMLTableCell_put_height(cell, v); + ok(hres == S_OK, "put_height failed: %08x\n", hres); + SysFreeString(V_BSTR(&v)); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLTableCell_get_height(cell, &v); + ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"110"), "height = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); + /* Restore Original */ hres = IHTMLTableCell_put_bgColor(cell, vDefaultbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Use return_nsstr_variant in HTMLTable_get_width.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 0dfc101e1702b7415f7acffd11534f034854c973 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dfc101e1702b7415f7acffd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 28 23:06:38 2020 +0200 mshtml: Use return_nsstr_variant in HTMLTable_get_width. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 4 ++-- dlls/mshtml/htmltable.c | 38 +++----------------------------------- dlls/mshtml/mshtml_private.h | 4 +++- dlls/mshtml/nsembed.c | 22 +++++++++++++++++----- dlls/mshtml/tests/dom.c | 10 ++++++++++ 5 files changed, 35 insertions(+), 43 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index d80c615e72..b2d35f4660 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1234,7 +1234,7 @@ static HRESULT WINAPI HTMLDOMNode3_get_namespaceURI(IHTMLDOMNode3 *iface, VARIAN nsAString_InitDepend(&nsstr, NULL); nsres = nsIDOMNode_GetNamespaceURI(This->nsnode, &nsstr); - return return_nsstr_variant(nsres, &nsstr, p); + return return_nsstr_variant(nsres, &nsstr, 0, p); } static HRESULT WINAPI HTMLDOMNode3_put_textContent(IHTMLDOMNode3 *iface, VARIANT v) @@ -1266,7 +1266,7 @@ static HRESULT WINAPI HTMLDOMNode3_get_textContent(IHTMLDOMNode3 *iface, VARIANT nsAString_Init(&nsstr, NULL); nsres = nsIDOMNode_GetTextContent(This->nsnode, &nsstr); - return return_nsstr_variant(nsres, &nsstr, p); + return return_nsstr_variant(nsres, &nsstr, 0, p); } static HRESULT WINAPI HTMLDOMNode3_isEqualNode(IHTMLDOMNode3 *iface, IHTMLDOMNode3 *otherNode, VARIANT_BOOL *isEqual) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index a37ab35413..2f40bb078d 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -1014,26 +1014,6 @@ static HRESULT var2str(const VARIANT *p, nsAString *nsstr) return ret ? S_OK : E_OUTOFMEMORY; } -static HRESULT nsstr_to_truncated_bstr(const nsAString *nsstr, BSTR *ret_ptr) -{ - const PRUnichar *str, *ptr, *end = NULL; - BSTR ret; - - nsAString_GetData(nsstr, &str); - - for(ptr = str; is_digit(*ptr); ptr++); - if(*ptr == '.') { - for(end = ptr++; is_digit(*ptr); ptr++); - if(*ptr) - end = NULL; - } - - ret = end ? SysAllocStringLen(str, end-str) : SysAllocString(str); - - *ret_ptr = ret; - return ret ? S_OK : E_OUTOFMEMORY; -} - static HRESULT WINAPI HTMLTable_QueryInterface(IHTMLTable *iface, REFIID riid, void **ppv) { @@ -1244,7 +1224,7 @@ static HRESULT WINAPI HTMLTable_get_cellPadding(IHTMLTable *iface, VARIANT *p) nsAString_Init(&val, NULL); nsres = nsIDOMHTMLTableElement_GetCellPadding(This->nstable, &val); - return return_nsstr_variant(nsres, &val, p); + return return_nsstr_variant(nsres, &val, 0, p); } static HRESULT WINAPI HTMLTable_put_background(IHTMLTable *iface, BSTR v) @@ -1440,25 +1420,13 @@ static HRESULT WINAPI HTMLTable_get_width(IHTMLTable *iface, VARIANT *p) { HTMLTable *This = impl_from_IHTMLTable(iface); nsAString val; - BSTR bstr; nsresult nsres; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); + nsAString_Init(&val, NULL); nsres = nsIDOMHTMLTableElement_GetWidth(This->nstable, &val); - if (NS_FAILED(nsres)){ - ERR("Get Width failed!\n"); - nsAString_Finish(&val); - return E_FAIL; - } - - hres = nsstr_to_truncated_bstr(&val, &bstr); - nsAString_Finish(&val); - - V_VT(p) = VT_BSTR; - V_BSTR(p) = bstr; - return hres; + return return_nsstr_variant(nsres, &val, NSSTR_IMPLICIT_PX, p); } static HRESULT WINAPI HTMLTable_put_height(IHTMLTable *iface, VARIANT v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cc9eefc528..565a2428ba 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -981,9 +981,11 @@ void nsAString_SetData(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; UINT32 nsAString_GetData(const nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; void nsAString_Finish(nsAString*) DECLSPEC_HIDDEN; +#define NSSTR_IMPLICIT_PX 0x01 + HRESULT map_nsresult(nsresult) DECLSPEC_HIDDEN; HRESULT return_nsstr(nsresult,nsAString*,BSTR*) DECLSPEC_HIDDEN; -HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) DECLSPEC_HIDDEN; +HRESULT return_nsstr_variant(nsresult,nsAString*,unsigned,VARIANT*) DECLSPEC_HIDDEN; HRESULT variant_to_nsstr(VARIANT*,BOOL,nsAString*) DECLSPEC_HIDDEN; HRESULT return_nsform(nsresult,nsIDOMHTMLFormElement*,IHTMLFormElement**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 2122536fc5..2d1eb817dc 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -962,10 +962,8 @@ HRESULT return_nsstr(nsresult nsres, nsAString *nsstr, BSTR *p) return S_OK; } -HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) +HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, unsigned flags, VARIANT *p) { - const PRUnichar *str; - if(NS_FAILED(nsres)) { ERR("failed: %08x\n", nsres); nsAString_Finish(nsstr); @@ -976,10 +974,24 @@ HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) TRACE("ret null\n"); V_VT(p) = VT_NULL; }else { + const WCHAR *str; + size_t len; nsAString_GetData(nsstr, &str); - TRACE("ret %s\n", debugstr_w(str)); + len = wcslen(str); + if(flags & NSSTR_IMPLICIT_PX) { + const WCHAR *iter; + if(len > 2 && !wcscmp(str + len - 2, L"px")) + len -= 2; + for(iter = str; iter < str + len && is_digit(*iter); iter++); + if(*iter == '.') { + const WCHAR *dot = iter++; + while(iter < str + len && is_digit(*iter)) iter++; + if(iter == str + len && dot) len = dot - str; + } + } + TRACE("ret %s\n", debugstr_wn(str, len)); if(*str) { - V_BSTR(p) = SysAllocString(str); + V_BSTR(p) = SysAllocStringLen(str, len); if(!V_BSTR(p)) { nsAString_Finish(nsstr); return E_OUTOFMEMORY; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 024ea21324..cb8141da93 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7910,6 +7910,16 @@ static void test_table_elem(IHTMLElement *elem) ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vDefaultbg); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(L"12px"); + hres = IHTMLTable_put_width(table, v); + ok(hres == S_OK, "put_width = %08x\n", hres); + VariantClear(&v); + hres = IHTMLTable_get_width(table, &v); + ok(hres == S_OK, "get_width = %08x\n", hres); + ok(!lstrcmpW(V_BSTR(&v), L"12"), "Expected 12, got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"11"); hres = IHTMLTable_put_width(table, v);

1 0

Aaro Altonen : msado15: Add IConnectionPointContainer stub to _Connection.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 93dfc9b60e849a6512d2899f2300d86f4f4140c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93dfc9b60e849a6512d2899f… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Thu May 28 16:13:40 2020 +0300 msado15: Add IConnectionPointContainer stub to _Connection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49272 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 69 ++++++++++++++++++++++++++++++++++++++++---- dlls/msado15/main.c | 1 - dlls/msado15/tests/msado15.c | 5 ++++ 3 files changed, 68 insertions(+), 7 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 2f0aa0c8df..8ed39a3a51 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -20,6 +20,8 @@ #include "windef.h" #include "winbase.h" #define COBJMACROS +#include "initguid.h" +#include "ocidl.h" #include "objbase.h" #include "msado15_backcompat.h" @@ -32,12 +34,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct connection { - _Connection Connection_iface; - ISupportErrorInfo ISupportErrorInfo_iface; - LONG refs; - ObjectStateEnum state; - LONG timeout; - WCHAR *datasource; + _Connection Connection_iface; + ISupportErrorInfo ISupportErrorInfo_iface; + IConnectionPointContainer IConnectionPointContainer_iface; + LONG refs; + ObjectStateEnum state; + LONG timeout; + WCHAR *datasource; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -50,6 +53,11 @@ static inline struct connection *impl_from_ISupportErrorInfo( ISupportErrorInfo return CONTAINING_RECORD( iface, struct connection, ISupportErrorInfo_iface ); } +static inline struct connection *impl_from_IConnectionPointContainer( IConnectionPointContainer *iface ) +{ + return CONTAINING_RECORD( iface, struct connection, IConnectionPointContainer_iface ); +} + static ULONG WINAPI connection_AddRef( _Connection *iface ) { struct connection *connection = impl_from_Connection( iface ); @@ -83,6 +91,10 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid { *obj = &connection->ISupportErrorInfo_iface; } + else if (IsEqualGUID( riid, &IID_IConnectionPointContainer )) + { + *obj = &connection->IConnectionPointContainer_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -397,6 +409,50 @@ static const struct ISupportErrorInfoVtbl support_error_vtbl = supporterror_InterfaceSupportsErrorInfo }; +static HRESULT WINAPI connpointcontainer_QueryInterface( IConnectionPointContainer *iface, + REFIID riid, void **obj ) +{ + struct connection *connection = impl_from_IConnectionPointContainer( iface ); + return connection_QueryInterface( &connection->Connection_iface, riid, obj ); +} + +static ULONG WINAPI connpointcontainer_AddRef( IConnectionPointContainer *iface ) +{ + struct connection *connection = impl_from_IConnectionPointContainer( iface ); + return connection_AddRef( &connection->Connection_iface ); +} + +static ULONG WINAPI connpointcontainer_Release( IConnectionPointContainer *iface ) +{ + struct connection *connection = impl_from_IConnectionPointContainer( iface ); + return connection_Release( &connection->Connection_iface ); +} + +static HRESULT WINAPI connpointcontainer_EnumConnectionPoints( IConnectionPointContainer *iface, + IEnumConnectionPoints **points ) +{ + struct connection *connection = impl_from_IConnectionPointContainer( iface ); + FIXME( "%p, %p\n", connection, points ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpointcontainer_FindConnectionPoint( IConnectionPointContainer *iface, + REFIID riid, IConnectionPoint **point ) +{ + struct connection *connection = impl_from_IConnectionPointContainer( iface ); + FIXME( "%p, %s, %p\n", connection, debugstr_guid( riid ), point ); + return E_NOTIMPL; +} + +static const struct IConnectionPointContainerVtbl connpointcontainer_vtbl = +{ + connpointcontainer_QueryInterface, + connpointcontainer_AddRef, + connpointcontainer_Release, + connpointcontainer_EnumConnectionPoints, + connpointcontainer_FindConnectionPoint +}; + HRESULT Connection_create( void **obj ) { struct connection *connection; @@ -404,6 +460,7 @@ HRESULT Connection_create( void **obj ) if (!(connection = heap_alloc( sizeof(*connection) ))) return E_OUTOFMEMORY; connection->Connection_iface.lpVtbl = &connection_vtbl; connection->ISupportErrorInfo_iface.lpVtbl = &support_error_vtbl; + connection->IConnectionPointContainer_iface.lpVtbl = &connpointcontainer_vtbl; connection->refs = 1; connection->state = adStateClosed; connection->timeout = 30; diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 3115474b84..770a02fc59 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -19,7 +19,6 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" -#include "initguid.h" #define COBJMACROS #include "objbase.h" #include "rpcproxy.h" diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 9834f55863..349363b7c5 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -666,6 +666,7 @@ static void test_Connection(void) _Connection *connection; IRunnableObject *runtime; ISupportErrorInfo *errorinfo; + IConnectionPointContainer *pointcontainer; LONG state, timeout; BSTR str, str2; @@ -679,6 +680,10 @@ static void test_Connection(void) ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); ISupportErrorInfo_Release(errorinfo); + hr = _Connection_QueryInterface(connection, &IID_IConnectionPointContainer, (void**)&pointcontainer); + ok(hr == S_OK, "Failed to get IConnectionPointContainer interface %08x\n", hr); + IConnectionPointContainer_Release(pointcontainer); + if (0) /* Crashes on windows */ { hr = _Connection_get_State(connection, NULL);

1 0

Paul Gofman : ntoskrnl.exe/tests: Add more timer tests.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 6870f137042b8aac71a1500a6ce81ee8d82dcae0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6870f137042b8aac71a1500a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 12:15:20 2020 +0300 ntoskrnl.exe/tests: Add more timer tests. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 88 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index dc576bfb1b..e762ad0ccd 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -382,6 +382,14 @@ static void test_critical_region(BOOL is_dispatcher) "KeAreApcsDisabled returned %x\n", result); } +static void sleep_1ms(void) +{ + LARGE_INTEGER timeout; + + timeout.QuadPart = -1 * 10000; + KeDelayExecutionThread( KernelMode, FALSE, &timeout ); +} + static void sleep(void) { LARGE_INTEGER timeout; @@ -447,18 +455,32 @@ static void WINAPI remove_lock_thread(void *arg) PsTerminateSystemThread(STATUS_SUCCESS); } +struct test_sync_dpc_context +{ + BOOL called; +}; + +static void WINAPI test_sync_dpc(KDPC *dpc, void *context, void *system_argument1, void *system_argument2) +{ + struct test_sync_dpc_context *c = context; + + c->called = TRUE; +} + static void test_sync(void) { static const ULONG wine_tag = 0x454e4957; /* WINE */ - KSEMAPHORE semaphore, semaphore2; + struct test_sync_dpc_context dpc_context; KEVENT manual_event, auto_event, *event; - KTIMER timer; + KSEMAPHORE semaphore, semaphore2; IO_REMOVE_LOCK remove_lock; LARGE_INTEGER timeout; OBJECT_ATTRIBUTES attr; HANDLE handle, thread; void *objs[2]; + KTIMER timer; NTSTATUS ret; + KDPC dpc; int i; KeInitializeEvent(&manual_event, NotificationEvent, FALSE); @@ -711,13 +733,19 @@ static void test_sync(void) KeCancelTimer(&timer); KeInitializeTimerEx(&timer, SynchronizationTimer); - KeSetTimerEx(&timer, timeout, 0, NULL); + memset(&dpc_context, 0, sizeof(dpc_context)); + KeInitializeDpc(&dpc, test_sync_dpc, &dpc_context); + + KeSetTimerEx(&timer, timeout, 0, &dpc); ret = wait_single(&timer, 0); ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + ok(!dpc_context.called, "DPC was called unexpectedly.\n"); ret = wait_single(&timer, -40 * 10000); ok(ret == 0, "got %#x\n", ret); + sleep_1ms(); + ok(dpc_context.called, "DPC was not called.\n"); ret = wait_single(&timer, -40 * 10000); ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); @@ -742,6 +770,60 @@ static void test_sync(void) KeCancelTimer(&timer); + /* Test cancelling timer. */ + dpc_context.called = 0; + KeSetTimerEx(&timer, timeout, 0, &dpc); + + ret = wait_single(&timer, 0); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + ok(!dpc_context.called, "DPC was called.\n"); + + KeCancelTimer(&timer); + dpc_context.called = 0; + ret = wait_single(&timer, -40 * 10000); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + ok(!dpc_context.called, "DPC was called.\n"); + + KeSetTimerEx(&timer, timeout, 20, &dpc); + KeSetTimerEx(&timer, timeout, 0, &dpc); + ret = wait_single(&timer, 0); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + ret = wait_single(&timer, -40 * 10000); + ok(ret == 0, "got %#x\n", ret); + + ret = wait_single(&timer, 0); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + ret = wait_single(&timer, -40 * 10000); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + ret = wait_single(&timer, -40 * 10000); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + KeCancelTimer(&timer); + /* Test reinitializing timer. */ + KeSetTimerEx(&timer, timeout, 0, &dpc); + KeInitializeTimerEx(&timer, SynchronizationTimer); + dpc_context.called = 0; + ret = wait_single(&timer, -40 * 10000); + ok(ret == 0, "got %#x\n", ret); + sleep_1ms(); + todo_wine ok(dpc_context.called, "DPC was not called.\n"); + + ret = wait_single(&timer, 0); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + sleep_1ms(); + todo_wine ok(dpc_context.called, "DPC was not called.\n"); + + dpc_context.called = 0; + KeSetTimerEx(&timer, timeout, 0, &dpc); + ret = wait_single(&timer, -40 * 10000); + ok(ret == 0, "got %#x\n", ret); + sleep_1ms(); + ok(dpc_context.called, "DPC was not called.\n"); + + KeCancelTimer(&timer); /* remove locks */ IoInitializeRemoveLockEx(&remove_lock, wine_tag, 0, 0, sizeof(IO_REMOVE_LOCK_COMMON_BLOCK));

1 0

Paul Gofman : ntoskrnl.exe: Support DPCs with timers.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: a4a903f97a11625ea36a8eb0425f89be44d853c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4a903f97a11625ea36a8eb0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 12:15:19 2020 +0300 ntoskrnl.exe: Support DPCs with timers. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 36fa12fe00..5e06ab2f2b 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -392,9 +392,15 @@ LONG WINAPI KeReleaseMutex( PRKMUTEX mutex, BOOLEAN wait ) static void CALLBACK ke_timer_complete_proc(PTP_CALLBACK_INSTANCE instance, void *timer_, PTP_TIMER tp_timer) { KTIMER *timer = timer_; + KDPC *dpc = timer->Dpc; TRACE("instance %p, timer %p, tp_timer %p.\n", instance, timer, tp_timer); + if (dpc && dpc->DeferredRoutine) + { + TRACE("Calling dpc->DeferredRoutine %p, dpc->DeferredContext %p.\n", dpc->DeferredRoutine, dpc->DeferredContext); + dpc->DeferredRoutine(dpc, dpc->DeferredContext, dpc->SystemArgument1, dpc->SystemArgument2); + } EnterCriticalSection( &sync_cs ); timer->Header.SignalState = TRUE; if (timer->Header.WaitListHead.Blink) @@ -435,12 +441,6 @@ BOOLEAN WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, TRACE("timer %p, duetime %s, period %d, dpc %p.\n", timer, wine_dbgstr_longlong(duetime.QuadPart), period, dpc); - if (dpc) - { - FIXME("Unhandled DPC %p.\n", dpc); - return FALSE; - } - EnterCriticalSection( &sync_cs ); if ((ret = timer->Header.Inserted)) @@ -456,6 +456,7 @@ BOOLEAN WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, timer->DueTime.QuadPart = duetime.QuadPart; timer->Period = period; + timer->Dpc = dpc; SetThreadpoolTimer((TP_TIMER *)timer->TimerListEntry.Blink, (FILETIME *)&duetime, period, 0); LeaveCriticalSection( &sync_cs );

1 0

Paul Gofman : ntoskrnl.exe: Cancel active timer before setting it.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 6cb3588969a9cbad1232dfdb9c0811ffdc7ead2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cb3588969a9cbad1232dfdb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 12:15:18 2020 +0300 ntoskrnl.exe: Cancel active timer before setting it. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 912dc046ba..36fa12fe00 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -443,7 +443,9 @@ BOOLEAN WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, EnterCriticalSection( &sync_cs ); - ret = timer->Header.Inserted; + if ((ret = timer->Header.Inserted)) + KeCancelTimer(timer); + timer->Header.Inserted = TRUE; if (!timer->TimerListEntry.Blink)

1 0

Paul Gofman : ntoskrnl.exe: Avoid leaking events on multipe KeSetTimerEx() calls.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 4584ffaddae059ae2308d6f1f81fe143608763d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4584ffaddae059ae2308d6f1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 12:15:17 2020 +0300 ntoskrnl.exe: Avoid leaking events on multipe KeSetTimerEx() calls. As the consequent testing shows we can't just close the events on timer reset. That would result in wrong wait results for current waiters. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 1954b8befb..912dc046ba 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -83,9 +83,11 @@ NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG count, void *pobjs[], { switch (objs[i]->Type) { + case TYPE_MANUAL_TIMER: case TYPE_MANUAL_EVENT: objs[i]->WaitListHead.Blink = CreateEventW( NULL, TRUE, objs[i]->SignalState, NULL ); break; + case TYPE_AUTO_TIMER: case TYPE_AUTO_EVENT: objs[i]->WaitListHead.Blink = CreateEventW( NULL, FALSE, objs[i]->SignalState, NULL ); break; @@ -99,9 +101,6 @@ NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG count, void *pobjs[], semaphore->Header.SignalState, semaphore->Limit, NULL ); break; } - case TYPE_MANUAL_TIMER: - case TYPE_AUTO_TIMER: - break; } } @@ -137,6 +136,8 @@ NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG count, void *pobjs[], { switch (objs[i]->Type) { + case TYPE_AUTO_TIMER: + case TYPE_MANUAL_TIMER: case TYPE_MANUAL_EVENT: case TYPE_AUTO_EVENT: case TYPE_SEMAPHORE: @@ -394,7 +395,11 @@ static void CALLBACK ke_timer_complete_proc(PTP_CALLBACK_INSTANCE instance, void TRACE("instance %p, timer %p, tp_timer %p.\n", instance, timer, tp_timer); - SetEvent(timer->Header.WaitListHead.Blink); + EnterCriticalSection( &sync_cs ); + timer->Header.SignalState = TRUE; + if (timer->Header.WaitListHead.Blink) + SetEvent(timer->Header.WaitListHead.Blink); + LeaveCriticalSection( &sync_cs ); } /*********************************************************************** @@ -440,7 +445,6 @@ BOOLEAN WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, ret = timer->Header.Inserted; timer->Header.Inserted = TRUE; - timer->Header.WaitListHead.Blink = CreateEventW( NULL, timer->Header.Type == TYPE_MANUAL_TIMER, FALSE, NULL ); if (!timer->TimerListEntry.Blink) timer->TimerListEntry.Blink = (void *)CreateThreadpoolTimer(ke_timer_complete_proc, timer, NULL); @@ -478,11 +482,15 @@ BOOLEAN WINAPI KeCancelTimer( KTIMER *timer ) timer->TimerListEntry.Blink = NULL; } } + timer->Header.SignalState = FALSE; + if (timer->Header.WaitListHead.Blink && !*((ULONG_PTR *)&timer->Header.WaitListHead.Flink)) + { + CloseHandle(timer->Header.WaitListHead.Blink); + timer->Header.WaitListHead.Blink = NULL; + } ret = timer->Header.Inserted; timer->Header.Inserted = FALSE; - CloseHandle(timer->Header.WaitListHead.Blink); - timer->Header.WaitListHead.Blink = NULL; LeaveCriticalSection( &sync_cs ); return ret;

1 0

Paul Gofman : ntoskrnl.exe: Reimplement KeSetTimerEx() on top of thread pool.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 68a03b6393220a8f24f862da9db2369349042d50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68a03b6393220a8f24f862da… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 12:15:16 2020 +0300 ntoskrnl.exe: Reimplement KeSetTimerEx() on top of thread pool. This is needed to call the DPC callbacks later as SetWaitableTimer() will call the callback only when the thread is in alertable wait state. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index d5a635efad..1954b8befb 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -388,6 +388,15 @@ LONG WINAPI KeReleaseMutex( PRKMUTEX mutex, BOOLEAN wait ) return ret; } +static void CALLBACK ke_timer_complete_proc(PTP_CALLBACK_INSTANCE instance, void *timer_, PTP_TIMER tp_timer) +{ + KTIMER *timer = timer_; + + TRACE("instance %p, timer %p, tp_timer %p.\n", instance, timer, tp_timer); + + SetEvent(timer->Header.WaitListHead.Blink); +} + /*********************************************************************** * KeInitializeTimerEx (NTOSKRNL.EXE.@) */ @@ -431,9 +440,18 @@ BOOLEAN WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, ret = timer->Header.Inserted; timer->Header.Inserted = TRUE; - timer->Header.WaitListHead.Blink = CreateWaitableTimerW( NULL, timer->Header.Type == TYPE_MANUAL_TIMER, NULL ); - SetWaitableTimer( timer->Header.WaitListHead.Blink, &duetime, period, NULL, NULL, FALSE ); + timer->Header.WaitListHead.Blink = CreateEventW( NULL, timer->Header.Type == TYPE_MANUAL_TIMER, FALSE, NULL ); + if (!timer->TimerListEntry.Blink) + timer->TimerListEntry.Blink = (void *)CreateThreadpoolTimer(ke_timer_complete_proc, timer, NULL); + + if (!timer->TimerListEntry.Blink) + ERR("Could not create thread pool timer.\n"); + + timer->DueTime.QuadPart = duetime.QuadPart; + timer->Period = period; + + SetThreadpoolTimer((TP_TIMER *)timer->TimerListEntry.Blink, (FILETIME *)&duetime, period, 0); LeaveCriticalSection( &sync_cs ); return ret; @@ -446,6 +464,21 @@ BOOLEAN WINAPI KeCancelTimer( KTIMER *timer ) TRACE("timer %p.\n", timer); EnterCriticalSection( &sync_cs ); + if (timer->TimerListEntry.Blink) + { + SetThreadpoolTimer((TP_TIMER *)timer->TimerListEntry.Blink, NULL, 0, 0); + + LeaveCriticalSection( &sync_cs ); + WaitForThreadpoolTimerCallbacks((TP_TIMER *)timer->TimerListEntry.Blink, TRUE); + EnterCriticalSection( &sync_cs ); + + if (timer->TimerListEntry.Blink) + { + CloseThreadpoolTimer((TP_TIMER *)timer->TimerListEntry.Blink); + timer->TimerListEntry.Blink = NULL; + } + } + ret = timer->Header.Inserted; timer->Header.Inserted = FALSE; CloseHandle(timer->Header.WaitListHead.Blink);

1 0

Paul Gofman : ntoskrnl.exe: Add KeSetTimer() function.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: ba98574207b8f85839587a880b97eecbe34bdd3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba98574207b8f85839587a88… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 12:15:15 2020 +0300 ntoskrnl.exe: Add KeSetTimer() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 7 +++++++ include/ddk/wdm.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 331b03ba9f..dd7ff73bee 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -642,7 +642,7 @@ @ stdcall KeSetSystemAffinityThreadEx(long) @ stdcall KeSetTargetProcessorDpc(ptr long) @ stub KeSetTimeIncrement -@ stub KeSetTimer +@ stdcall KeSetTimer(ptr int64 ptr) @ stdcall KeSetTimerEx(ptr int64 long ptr) @ stub KeStackAttachProcess @ stub KeSynchronizeExecution diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 647d427ee5..d5a635efad 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1258,3 +1258,10 @@ void WINAPI IoReleaseRemoveLockAndWaitEx( IO_REMOVE_LOCK *lock, void *tag, ULONG else if (count > 0) KeWaitForSingleObject( &lock->Common.RemoveEvent, Executive, KernelMode, FALSE, NULL ); } + +BOOLEAN WINAPI KeSetTimer(KTIMER *timer, LARGE_INTEGER duetime, KDPC *dpc) +{ + TRACE("timer %p, duetime %I64x, dpc %p.\n", timer, duetime.QuadPart, dpc); + + return KeSetTimerEx(timer, duetime, 0, dpc); +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 9dce98516b..38a3098994 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1720,6 +1720,7 @@ LONG WINAPI KeSetEvent(PRKEVENT,KPRIORITY,BOOLEAN); KPRIORITY WINAPI KeSetPriorityThread(PKTHREAD,KPRIORITY); void WINAPI KeSetSystemAffinityThread(KAFFINITY); KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity); +BOOLEAN WINAPI KeSetTimer(KTIMER*,LARGE_INTEGER,KDPC*); BOOLEAN WINAPI KeSetTimerEx(KTIMER*,LARGE_INTEGER,LONG,KDPC*); void WINAPI KeSignalCallDpcDone(void*); BOOLEAN WINAPI KeSignalCallDpcSynchronize(void*);

1 0

Paul Gofman : ntoskrnl.exe: Partially implement KeInitializeDpc() function.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: e49be2db28bbcd7ac82326c9cceab221b8260787 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e49be2db28bbcd7ac82326c9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 12:15:14 2020 +0300 ntoskrnl.exe: Partially implement KeInitializeDpc() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++-- include/ddk/wdm.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index bfac397011..d50eac6c82 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3079,9 +3079,13 @@ MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void) /*********************************************************************** * KeInitializeDpc (NTOSKRNL.EXE.@) */ -VOID WINAPI KeInitializeDpc(PRKDPC Dpc, PKDEFERRED_ROUTINE DeferredRoutine, PVOID DeferredContext) +void WINAPI KeInitializeDpc(KDPC *dpc, PKDEFERRED_ROUTINE deferred_routine, void *deferred_context) { - FIXME("stub\n"); + FIXME("dpc %p, deferred_routine %p, deferred_context %p semi-stub.\n", + dpc, deferred_routine, deferred_context); + + dpc->DeferredRoutine = deferred_routine; + dpc->DeferredContext = deferred_context; } /*********************************************************************** diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 8368f8c6e9..9dce98516b 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1695,6 +1695,7 @@ void WINAPI KeEnterCriticalRegion(void); void WINAPI KeGenericCallDpc(PKDEFERRED_ROUTINE,PVOID); ULONG WINAPI KeGetCurrentProcessorNumber(void); PKTHREAD WINAPI KeGetCurrentThread(void); +void WINAPI KeInitializeDpc(KDPC*,PKDEFERRED_ROUTINE,void*); void WINAPI KeInitializeEvent(PRKEVENT,EVENT_TYPE,BOOLEAN); void WINAPI KeInitializeMutex(PRKMUTEX,ULONG); void WINAPI KeInitializeSemaphore(PRKSEMAPHORE,LONG,LONG);

1 0

Martin Storsjo : ntdll: Implement RtlRaiseException in assembly to fix continuing from exceptions.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: e0c8c4c3cd2fc5db5da7cd7b5889ac306db356c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0c8c4c3cd2fc5db5da7cd7b… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:47 2020 +0300 ntdll: Implement RtlRaiseException in assembly to fix continuing from exceptions. If the handlers returned ExceptionContinueExecution and we restore the stored context, make sure it's a context that ends up returning from the RtlRaiseException function. This matches how it's done on x86_64. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 8e7296d207..7488b90d63 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -2097,14 +2097,29 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL /*********************************************************************** * RtlRaiseException (NTDLL.@) */ -void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) -{ - CONTEXT context; - - RtlCaptureContext( &context ); - rec->ExceptionAddress = (LPVOID)context.Pc; - RtlRaiseStatus( NtRaiseException( rec, &context, TRUE )); -} +__ASM_STDCALL_FUNC( RtlRaiseException, 4, + "sub sp, sp, #0x3b0\n\t" /* 0x390 (context) + 0x20 */ + "stp x29, x30, [sp]\n\t" + __ASM_CFI(".cfi_def_cfa x29, 944\n\t") + __ASM_CFI(".cfi_offset x30, -936\n\t") + __ASM_CFI(".cfi_offset x29, -944\n\t") + "mov x29, sp\n\t" + "str x0, [sp, #0x10]\n\t" + "add x0, sp, #0x20\n\t" + "bl " __ASM_NAME("RtlCaptureContext") "\n\t" + "add x1, sp, #0x20\n\t" /* context pointer */ + "add x2, sp, #0x3b0\n\t" /* orig stack pointer */ + "str x2, [x1, #0x100]\n\t" /* context->Sp */ + "ldr x0, [sp, #0x10]\n\t" /* original first parameter */ + "str x0, [x1, #0x08]\n\t" /* context->X0 */ + "ldp x4, x5, [sp]\n\t" /* frame pointer, return address */ + "stp x4, x5, [x1, #0xf0]\n\t" /* context->Fp, Lr */ + "str x5, [x1, #0x108]\n\t" /* context->Pc */ + "str x5, [x1, #0x108]\n\t" /* context->Pc */ + "str x5, [x0, #0x10]\n\t" /* rec->ExceptionAddress */ + "mov x2, #1\n\t" + "bl " __ASM_NAME("NtRaiseException") "\n\t" + "bl " __ASM_NAME("RtlRaiseStatus") /* does not return */ ); /************************************************************************* * RtlCaptureStackBackTrace (NTDLL.@)

1 0

Martin Storsjo : ntdll: Fix unwinding through raise_generic_exception.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 763f15ccde354a80826db4dbd7a700740b353447 URL: https://source.winehq.org/git/wine.git/?a=commit;h=763f15ccde354a80826db4db… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:46 2020 +0300 ntdll: Fix unwinding through raise_generic_exception. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index e544a1c2a4..8e7296d207 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -135,6 +135,8 @@ static DWORD64 get_fault_esr( ucontext_t *sigcontext ) static const size_t teb_size = 0x2000; /* we reserve two pages for the TEB */ +typedef void (*raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); + /* stack layout when calling an exception raise function */ struct stack_layout { @@ -1046,6 +1048,24 @@ static void WINAPI raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *cont raise_status( status, rec ); } +extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, raise_func func, void *sp ); +__ASM_GLOBAL_FUNC( raise_func_trampoline, + __ASM_CFI(".cfi_signal_frame\n\t") + "stp x29, x30, [sp, #-0x20]!\n\t" + __ASM_CFI(".cfi_def_cfa_offset 32\n\t") + __ASM_CFI(".cfi_offset 29, -32\n\t") + __ASM_CFI(".cfi_offset 30, -24\n\t") + "mov x29, sp\n\t" + __ASM_CFI(".cfi_def_cfa_register 29\n\t") + "str x3, [sp, 0x10]\n\t" + __ASM_CFI(".cfi_remember_state\n\t") + __ASM_CFI(".cfi_escape 0x0f,0x03,0x8d,0x10,0x06\n\t") /* CFA */ + __ASM_CFI(".cfi_escape 0x10,0x1d,0x02,0x8d,0x00\n\t") /* x29 */ + __ASM_CFI(".cfi_escape 0x10,0x1e,0x02,0x8d,0x08\n\t") /* x30 */ + "blr x2\n\t" + __ASM_CFI(".cfi_restore_state\n\t") + "brk #1") + /*********************************************************************** * setup_raise_exception * @@ -1060,10 +1080,13 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * restore_context( &stack->context, sigcontext ); return; } + REGn_sig(3, sigcontext) = SP_sig(sigcontext); /* original stack pointer, fourth arg for raise_func_trampoline */ SP_sig(sigcontext) = (ULONG_PTR)stack; - PC_sig(sigcontext) = (ULONG_PTR)raise_generic_exception; + LR_sig(sigcontext) = PC_sig(sigcontext); + PC_sig(sigcontext) = (ULONG_PTR)raise_func_trampoline; /* raise_generic_exception; */ REGn_sig(0, sigcontext) = (ULONG_PTR)&stack->rec; /* first arg for raise_generic_exception */ REGn_sig(1, sigcontext) = (ULONG_PTR)&stack->context; /* second arg for raise_generic_exception */ + REGn_sig(2, sigcontext) = (ULONG_PTR)raise_generic_exception; /* third arg for raise_func_trampoline */ REGn_sig(18, sigcontext) = (ULONG_PTR)NtCurrentTeb(); }

1 0

Martin Storsjo : ntdll: Keep the previous iteration of NonVolatileRegisters in call_function_handlers.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: a8a944c22099194c6458698eadd58f343d69fd22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8a944c22099194c6458698e… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:45 2020 +0300 ntdll: Keep the previous iteration of NonVolatileRegisters in call_function_handlers. Some language specific handlers, called by call_handler, can use the NonVolatileRegisters to restore the context before running code, and that assumes that NonVolatileRegisters contains the frame pointer as it was within the function (before unwinding). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 2af1e238ce..e544a1c2a4 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -849,14 +849,16 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList; UNWIND_HISTORY_TABLE table; DISPATCHER_CONTEXT dispatch; - CONTEXT context; + CONTEXT context, prev_context; NTSTATUS status; context = *orig_context; dispatch.TargetPc = 0; dispatch.ContextRecord = &context; dispatch.HistoryTable = &table; - dispatch.NonVolatileRegisters = (BYTE *)&context.u.s.X19; + prev_context = context; + dispatch.NonVolatileRegisters = (BYTE *)&prev_context.u.s.X19; + for (;;) { status = virtual_unwind( UNW_FLAG_EHANDLER, &dispatch, &context ); @@ -933,6 +935,7 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con } if (context.Sp == (ULONG64)NtCurrentTeb()->Tib.StackBase) break; + prev_context = context; } return STATUS_UNHANDLED_EXCEPTION; }

1 0

Martin Storsjo : ntdll: Implement RtlRestoreContext.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 6c11d1d745af859cab682c3330bcf391f2521121 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c11d1d745af859cab682c33… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:44 2020 +0300 ntdll: Implement RtlRestoreContext. Call the consolidate frame callback before resuming. Before calling the callback, fill in ExceptionInformation[10] with the equivalent of dispatch.NonVolatileRegisters. This fixes unwinding of MSVC C++ exceptions in a lot of cases. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-rtlsupport-l1-1-0.spec | 2 +- .../api-ms-win-core-rtlsupport-l1-2-0.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm64.c | 134 ++++++++++++++++++++- 4 files changed, 136 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6c11d1d745af859cab68…

1 0

Martin Storsjo : wine/asm.h: Use __ASM_CFI on clang too, despite not defining __GCC_HAVE_DWARF2_CFI_ASM.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: c22e8645b08547eeff322b047492c2214ae248d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c22e8645b08547eeff322b04… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:43 2020 +0300 wine/asm.h: Use __ASM_CFI on clang too, despite not defining __GCC_HAVE_DWARF2_CFI_ASM. It has already been unconditionally enabled for macOS (which uses clang). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index 7165f47e96..7650d84a79 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -33,7 +33,7 @@ # define __ASM_STDCALL(name,args) __ASM_NAME(name) #endif -#if defined(__GCC_HAVE_DWARF2_CFI_ASM) || defined(__APPLE__) +#if defined(__GCC_HAVE_DWARF2_CFI_ASM) || defined(__APPLE__) || defined(__clang__) # define __ASM_CFI(str) str #else # define __ASM_CFI(str)

1 0

Martin Storsjo : ntdll: Fix unwinding functions that end with a branch instruction.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: babbf352b651dac6458335e71a980317b3b42386 URL: https://source.winehq.org/git/wine.git/?a=commit;h=babbf352b651dac6458335e7… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:42 2020 +0300 ntdll: Fix unwinding functions that end with a branch instruction. This happens with functions that aren't intended to return e.g. like _Unwind_Resume. In these cases, the return address is outside of the function (the first instruction in the next function). Set the flag CONTEXT_UNWOUND_TO_CALL after unwinding to a callsite, and if this flag is set, look up a RUNTIME_FUNCTION based on Control.Pc - 4. This isn't a complete (nor probably entirely correct) implementation of the flag CONTEXT_UNWOUND_TO_CALL, but it practically seems to work fine and fixes a large number of unwinding cases. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 13 ++++++++++++- include/winnt.h | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 4c9017b9e2..cdffda7a12 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -527,6 +527,7 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX *frame = context->Sp; context->Pc = context->u.s.Lr; context->Sp = context->Sp + sizeof(ULONG64); + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; return STATUS_SUCCESS; } @@ -577,6 +578,7 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX unw_get_reg( &cursor, UNW_AARCH64_X30, (unw_word_t *)&context->u.s.Lr ); unw_get_reg( &cursor, UNW_AARCH64_SP, (unw_word_t *)&context->Sp ); context->Pc = context->u.s.Lr; + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; TRACE( "next function pc=%016lx%s\n", context->Pc, rc ? "" : " (last frame)" ); TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", @@ -614,10 +616,17 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX dispatch->ScopeIndex = 0; dispatch->EstablisherFrame = 0; dispatch->ControlPc = context->Pc; + /* + * TODO: CONTEXT_UNWOUND_TO_CALL should be cleared if unwound past a + * signal frame. + */ + dispatch->ControlPcIsUnwound = (context->ContextFlags & CONTEXT_UNWOUND_TO_CALL) != 0; /* first look for PE exception information */ - if ((dispatch->FunctionEntry = lookup_function_info( context->Pc, &dispatch->ImageBase, &module ))) + if ((dispatch->FunctionEntry = lookup_function_info( + context->Pc - (dispatch->ControlPcIsUnwound ? 4 : 0), + &dispatch->ImageBase, &module ))) { dispatch->LanguageHandler = RtlVirtualUnwind( type, dispatch->ImageBase, context->Pc, dispatch->FunctionEntry, context, @@ -654,6 +663,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX dispatch->EstablisherFrame = context->u.s.Fp; dispatch->LanguageHandler = NULL; context->Pc = context->u.s.Lr; + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; return STATUS_SUCCESS; } @@ -1758,6 +1768,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG_PTR base, ULONG_PTR pc, TRACE( "ret: lr=%lx sp=%lx handler=%p\n", context->u.s.Lr, context->Sp, handler ); context->Pc = context->u.s.Lr; + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; *frame_ret = context->Sp; return handler; } diff --git a/include/winnt.h b/include/winnt.h index 34951766dd..aa4daaa55f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1863,6 +1863,8 @@ NTSYSAPI PVOID WINAPI RtlVirtualUnwind(DWORD,DWORD,DWORD,RUNTIME_FUNCTION*,CONTE #define CONTEXT_FLOATING_POINT (CONTEXT_ARM64 | 0x00000004) #define CONTEXT_DEBUG_REGISTERS (CONTEXT_ARM64 | 0x00000008) +#define CONTEXT_UNWOUND_TO_CALL 0x20000000 + #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER) #define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS)

1 0

Martin Storsjo : ntdll: Store the real stack pointer in RtlCaptureContext.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 42a5885669e35f13725ab8e36d3a95132bd49ffc URL: https://source.winehq.org/git/wine.git/?a=commit;h=42a5885669e35f13725ab8e3… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:41 2020 +0300 ntdll: Store the real stack pointer in RtlCaptureContext. In most cases, unwinding will use the frame pointer anyway, so it doesn't make much of a difference, but for cases where it won't, capture the actual stack pointer. (In most cases on arm64, calling the RtlCaptureContext won't cause anything extra to be pushed on the stack at that point anyway). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index b364f08e9a..4c9017b9e2 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -265,8 +265,8 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, "stp x23, x24, [x0, #0xc0]\n\t" /* context->X23,X24 */ "stp x25, x26, [x0, #0xd0]\n\t" /* context->X25,X26 */ "stp x27, x28, [x0, #0xe0]\n\t" /* context->X27,X28 */ - "stp x29, x30, [x0, #0xf0]\n\t" /* context->Fp,Lr */ - "add x1, x29, #0x10\n\t" + "stp x29, x30, [x0, #0xf0]\n\t" /* context->Fp,Lr */ + "mov x1, sp\n\t" "stp x1, x30, [x0, #0x100]\n\t" /* context->Sp,Pc */ "mov w1, #0x400000\n\t" /* CONTEXT_ARM64 */ "add w1, w1, #0x3\n\t" /* CONTEXT_FULL */

1 0

Martin Storsjo : ntdll: Pass a nonnull handler_data in when continuing after a collided unwind.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 8e4f0b2a15f5c452aec93bda5fd185f0b4438c67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e4f0b2a15f5c452aec93bda… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:40 2020 +0300 ntdll: Pass a nonnull handler_data in when continuing after a collided unwind. This matches what was done for RtlUnwindEx in 93ecc54ae560a3677dfa78ca0f5448d7aef0cbd9, applying the same change in call_function_handlers (when called from raise_exception). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 8ccf3da57e..b364f08e9a 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -859,7 +859,7 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con dispatch.ContextRecord = &context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, - &context, NULL, &frame, NULL ); + &context, &dispatch.HandlerData, &frame, NULL ); goto unwind_done; } default: @@ -889,7 +889,7 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con dispatch.ContextRecord = &context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, - &context, NULL, &frame, NULL ); + &context, &dispatch.HandlerData, &frame, NULL ); teb_frame = teb_frame->Prev; goto unwind_done; }

1 0

Martin Storsjo : ntdll: Fix byte vs register units in unwind_packed_data.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: d6e9795223f0c978132342d77b36f8284ab1aed3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6e9795223f0c978132342d7… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:39 2020 +0300 ntdll: Fix byte vs register units in unwind_packed_data. restore_regs and restore_fpregs take offsets in units of registers, not bytes. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 7a3625b706..8ccf3da57e 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1517,6 +1517,7 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION int i; unsigned int len, offset, skip = 0; unsigned int int_size = func->u.s.RegI * 8, fp_size = func->u.s.RegF * 8, regsave, local_size; + unsigned int int_regs, fp_regs, saved_regs, local_size_regs; TRACE( "function %lx-%lx: len=%#x flag=%x regF=%u regI=%u H=%u CR=%u frame=%x\n", base + func->BeginAddress, base + func->BeginAddress + func->u.s.FunctionLength * 4, @@ -1529,6 +1530,11 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION regsave = ((int_size + fp_size + 8 * 8 * func->u.s.H) + 0xf) & ~0xf; local_size = func->u.s.FrameSize * 16 - regsave; + int_regs = int_size / 8; + fp_regs = fp_size / 8; + saved_regs = regsave / 8; + local_size_regs = local_size / 8; + /* check for prolog/epilog */ if (func->u.s.Flag == 1) { @@ -1568,9 +1574,9 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION context->u.X[30] = fp[1]; } context->Sp += local_size; - if (fp_size) restore_fpregs( 8, fp_size / 8, int_size, context, ptrs ); - if (func->u.s.CR == 1) restore_regs( 30, 1, int_size - 8, context, ptrs ); - restore_regs( 19, func->u.s.RegI, -regsave, context, ptrs ); + if (fp_size) restore_fpregs( 8, fp_regs, int_regs, context, ptrs ); + if (func->u.s.CR == 1) restore_regs( 30, 1, int_regs - 1, context, ptrs ); + restore_regs( 19, func->u.s.RegI, -saved_regs, context, ptrs ); } else { @@ -1582,7 +1588,7 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION if (local_size <= 512) { /* stp x29,lr,[sp,-#local_size]! */ - if (pos++ > skip) restore_regs( 29, 2, -local_size, context, ptrs ); + if (pos++ > skip) restore_regs( 29, 2, -local_size_regs, context, ptrs ); break; } /* stp x29,lr,[sp,0] */ @@ -1603,16 +1609,16 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION { if (func->u.s.RegF % 2 == 0 && pos++ > skip) /* str d%u,[sp,#fp_size] */ - restore_fpregs( 8 + func->u.s.RegF, 1, int_size + fp_size - 8, context, ptrs ); + restore_fpregs( 8 + func->u.s.RegF, 1, int_regs + fp_regs - 1, context, ptrs ); for (i = func->u.s.RegF / 2 - 1; i >= 0; i--) { if (pos++ <= skip) continue; if (!i && !int_size) /* stp d8,d9,[sp,-#regsave]! */ - restore_fpregs( 8, 2, -regsave, context, ptrs ); + restore_fpregs( 8, 2, -saved_regs, context, ptrs ); else /* stp dn,dn+1,[sp,#offset] */ - restore_fpregs( 8 + 2 * i, 2, int_size + 16 * i, context, ptrs ); + restore_fpregs( 8 + 2 * i, 2, int_regs + 2 * i, context, ptrs ); } } @@ -1621,15 +1627,15 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION if (func->u.s.RegI % 2) { /* stp xn,lr,[sp,#offset] */ - if (func->u.s.CR == 1) restore_regs( 30, 1, int_size - 8, context, ptrs ); + if (func->u.s.CR == 1) restore_regs( 30, 1, int_regs - 1, context, ptrs ); /* str xn,[sp,#offset] */ restore_regs( 18 + func->u.s.RegI, 1, - (func->u.s.RegI > 1) ? 8 * func->u.s.RegI - 8 : -regsave, + (func->u.s.RegI > 1) ? func->u.s.RegI - 1 : -saved_regs, context, ptrs ); } else if (func->u.s.CR == 1) /* str lr,[sp,#offset] */ - restore_regs( 30, 1, func->u.s.RegI ? int_size - 8 : -regsave, context, ptrs ); + restore_regs( 30, 1, func->u.s.RegI ? int_regs - 1 : -saved_regs, context, ptrs ); } for (i = func->u.s.RegI / 2 - 1; i >= 0; i--) @@ -1637,10 +1643,10 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION if (pos++ <= skip) continue; if (i) /* stp xn,xn+1,[sp,#offset] */ - restore_regs( 19 + 2 * i, 2, 16 * i, context, ptrs ); + restore_regs( 19 + 2 * i, 2, 2 * i, context, ptrs ); else /* stp x19,x20,[sp,-#regsave]! */ - restore_regs( 19, 2, -regsave, context, ptrs ); + restore_regs( 19, 2, -saved_regs, context, ptrs ); } } return NULL;

1 0

Martin Storsjo : ntdll: Fix handling of the save_lrpair unwind opcode.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 8477f61b9fc25e99cdf942ba745d08efd41d6c22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8477f61b9fc25e99cdf942ba… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:38 2020 +0300 ntdll: Fix handling of the save_lrpair unwind opcode. The register offset should be multiplied by 2, and the second register is always Lr. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 4c5944759f..7a3625b706 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1467,7 +1467,10 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, CONTEXT *context, else if (*ptr < 0xd6) /* save_reg_x */ restore_regs( 19 + ((val >> 5) & 0xf), 1, -(val & 0x1f) - 1, context, ptrs ); else if (*ptr < 0xd8) /* save_lrpair */ - restore_regs( 19 + ((val >> 6) & 0x7), 2, val & 0x3f, context, ptrs ); + { + restore_regs( 19 + 2 * ((val >> 6) & 0x7), 1, val & 0x3f, context, ptrs ); + restore_regs( 30, 1, (val & 0x3f) + 1, context, ptrs ); + } else if (*ptr < 0xda) /* save_fregp */ restore_fpregs( 8 + ((val >> 6) & 0x7), save_next, val & 0x3f, context, ptrs ); else if (*ptr < 0xdc) /* save_fregp_x */

1 0

Martin Storsjo : configure: Pass -fasynchronous-unwind-tables to the compiler.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: ad7fcd2c40eadb79a10ef64d6a9440b8b53132e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad7fcd2c40eadb79a10ef64d… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:37 2020 +0300 configure: Pass -fasynchronous-unwind-tables to the compiler. On aarch64-linux-gnu, unwind tables aren't emitted by default (contrary to x86_64-linux-gnu), so we must pass the flag (or -funwind-tables) to the compiler to make it generate them. Previously wine just added the flag to the linker options. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure index b652ddbf79..f1292fa4ca 100755 --- a/configure +++ b/configure @@ -17909,6 +17909,7 @@ fi $as_echo "$ac_cv_c_cfi_support" >&6; } if test "$ac_cv_c_cfi_support" = "yes" then + DLLFLAGS="$DLLFLAGS -fasynchronous-unwind-tables" LDDLLFLAGS="$LDDLLFLAGS -fasynchronous-unwind-tables" else if test "x$enable_win64" = "xyes" diff --git a/configure.ac b/configure.ac index c0f60fe694..816e368451 100644 --- a/configure.ac +++ b/configure.ac @@ -2141,6 +2141,7 @@ AC_CACHE_CHECK([whether CFI directives are supported in assembly code], ac_cv_c_ ac_cv_c_cfi_support="yes",ac_cv_c_cfi_support="no")) if test "$ac_cv_c_cfi_support" = "yes" then + DLLFLAGS="$DLLFLAGS -fasynchronous-unwind-tables" LDDLLFLAGS="$LDDLLFLAGS -fasynchronous-unwind-tables" else if test "x$enable_win64" = "xyes"

1 0

Jacek Caban : d3d9/tests: Use int for indexes in generate_bumpmap_textures.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: f9e9ef36faca6e768d0b597f690b8122170d42ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9e9ef36faca6e768d0b597f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 23:55:08 2020 +0200 d3d9/tests: Use int for indexes in generate_bumpmap_textures. Fixes -Wabsolute-value warning. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f873f3ae9b..5b0955b4ea 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3160,7 +3160,7 @@ done: } static void generate_bumpmap_textures(IDirect3DDevice9 *device) { - unsigned int i, x, y; + int i, x, y; HRESULT hr; IDirect3DTexture9 *texture[2] = {NULL, NULL}; D3DLOCKED_RECT locked_rect;

1 0

Paul Gofman : wined3d: Allow multisample source locations for all colour blits.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 3aa53f328c5ed9225248dea6f8fe9ebf4273e2ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa53f328c5ed9225248dea6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 22:50:18 2020 +0430 wined3d: Allow multisample source locations for all colour blits. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 94743c45e3..503f9f45e1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1707,7 +1707,7 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ if (src_texture->resource.multisample_type != WINED3D_MULTISAMPLE_NONE && ((scale && !context->d3d_info->scaled_resolve) - || convert || blit_op != WINED3D_BLIT_OP_COLOR_BLIT)) + || convert || !wined3d_is_colour_blit(blit_op))) src_location = WINED3D_LOCATION_RB_RESOLVED; else src_location = src_texture->resource.draw_binding;

1 0

Paul Gofman : wined3d: Allow multisample destination locations for all colour blits.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 826cee41a7b0d4dcb0d35c1cb33c548ed18a3413 URL: https://source.winehq.org/git/wine.git/?a=commit;h=826cee41a7b0d4dcb0d35c1c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 22:50:17 2020 +0430 wined3d: Allow multisample destination locations for all colour blits. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bdcbdf5a2a..94743c45e3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1459,6 +1459,20 @@ struct wined3d_blitter *wined3d_cpu_blitter_create(void) return blitter; } +static bool wined3d_is_colour_blit(enum wined3d_blit_op blit_op) +{ + switch (blit_op) + { + case WINED3D_BLIT_OP_COLOR_BLIT: + case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST: + case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: + return true; + + default: + return false; + } +} + HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags, const struct wined3d_blt_fx *fx, @@ -1701,7 +1715,7 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ if (!(dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) dst_location = dst_texture->resource.map_binding; else if (dst_texture->resource.multisample_type != WINED3D_MULTISAMPLE_NONE - && (scale || convert || blit_op != WINED3D_BLIT_OP_COLOR_BLIT)) + && (scale || convert || !wined3d_is_colour_blit(blit_op))) dst_location = WINED3D_LOCATION_RB_RESOLVED; else dst_location = dst_texture->resource.draw_binding;

1 0

Paul Gofman : wined3d: Prepare/load the destination resource location in glsl_blitter_blit().
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: c0ab55700f681ace7ac13f9fdaa6075185fef35c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0ab55700f681ace7ac13f9f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 22:50:16 2020 +0430 wined3d: Prepare/load the destination resource location in glsl_blitter_blit(). Like the other blitters. When the GLSL blitter was introduced, the idea was that caller would be responsible for doing this, but we never ended up updating the other blitters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49251 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7d16f03a21..ddb76143b5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13135,6 +13135,11 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli wined3d_texture_load(src_texture, context, FALSE); } + if (wined3d_texture_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, dst_rect)) + wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); + else + wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); + wined3d_context_gl_apply_blit_state(context_gl, device); if (dst_location == WINED3D_LOCATION_DRAWABLE)

1 0

Paul Gofman : wined3d: Use a single wined3d_texture_is_full_rect() function.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: a389f32967d534eab573cf9b4ae5674bfd15cf87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a389f32967d534eab573cf9b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 22:50:15 2020 +0430 wined3d: Use a single wined3d_texture_is_full_rect() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 17 ++--------------- dlls/wined3d/texture.c | 21 ++++----------------- dlls/wined3d/wined3d_private.h | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d8bf9ce04e..bdcbdf5a2a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -44,19 +44,6 @@ static void get_color_masks(const struct wined3d_format *format, DWORD *masks) masks[2] = ((1u << format->blue_size) - 1) << format->blue_offset; } -static BOOL texture2d_is_full_rect(const struct wined3d_texture *texture, unsigned int level, const RECT *r) -{ - unsigned int t; - - t = wined3d_texture_get_level_width(texture, level); - if ((r->left && r->right) || abs(r->right - r->left) != t) - return FALSE; - t = wined3d_texture_get_level_height(texture, level); - if ((r->top && r->bottom) || abs(r->bottom - r->top) != t) - return FALSE; - return TRUE; -} - /* See also float_16_to_32() in wined3d_private.h */ static inline unsigned short float_32_to_16(const float *in) { @@ -1664,9 +1651,9 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ TRACE("Not doing download because the source format needs conversion.\n"); else if (!(src_texture->flags & WINED3D_TEXTURE_DOWNLOADABLE)) TRACE("Not doing download because texture is not downloadable.\n"); - else if (!texture2d_is_full_rect(src_texture, src_sub_resource_idx % src_texture->level_count, &src_rect)) + else if (!wined3d_texture_is_full_rect(src_texture, src_sub_resource_idx % src_texture->level_count, &src_rect)) TRACE("Not doing download because of partial download (src).\n"); - else if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_rect)) + else if (!wined3d_texture_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_rect)) TRACE("Not doing download because of partial download (dst).\n"); else { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e8a92acab9..bef2c4ec30 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -48,19 +48,6 @@ struct wined3d_rect_f float b; }; -static bool texture2d_is_full_rect(const struct wined3d_texture *texture, unsigned int level, const RECT *r) -{ - unsigned int t; - - t = wined3d_texture_get_level_width(texture, level); - if ((r->left && r->right) || abs(r->right - r->left) != t) - return false; - t = wined3d_texture_get_level_height(texture, level); - if ((r->top && r->bottom) || abs(r->bottom - r->top) != t) - return false; - return true; -} - static BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) { if (!gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] @@ -366,7 +353,7 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont * in fact harmful if we're being called by surface_load_location() with * the purpose of loading the destination surface.) */ wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, src_location); - if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, dst_rect)) + if (!wined3d_texture_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, dst_rect)) wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); @@ -498,7 +485,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. */ wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, src_location); - if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, dst_rect)) + if (!wined3d_texture_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, dst_rect)) wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); @@ -6019,7 +6006,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (!location) location = dst_texture->flags & WINED3D_TEXTURE_IS_SRGB ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - if (texture2d_is_full_rect(dst_texture, dst_level, dst_rect)) + if (wined3d_texture_is_full_rect(dst_texture, dst_level, dst_rect)) { if (!wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, location)) ERR("Failed to prepare the destination sub-resource into %s.\n", wined3d_debug_location(location)); @@ -6491,7 +6478,7 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB)) ERR("Failed to load the source sub-resource.\n"); - if (texture2d_is_full_rect(dst_texture, dst_level, dst_rect)) + if (wined3d_texture_is_full_rect(dst_texture, dst_level, dst_rect)) { if (!wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ae78a60f2a..49379b3ca5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4169,6 +4169,20 @@ static inline void wined3d_texture_get_level_box(const struct wined3d_texture *t 0, wined3d_texture_get_level_depth(texture, level)); } +static inline bool wined3d_texture_is_full_rect(const struct wined3d_texture *texture, + unsigned int level, const RECT *r) +{ + unsigned int t; + + t = wined3d_texture_get_level_width(texture, level); + if ((r->left && r->right) || abs(r->right - r->left) != t) + return false; + t = wined3d_texture_get_level_height(texture, level); + if ((r->top && r->bottom) || abs(r->bottom - r->top) != t) + return false; + return true; +} + HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags,

1 0

Zhiyi Zhang : ddraw: Get new window size from the primary output after display mode changes.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 079caeaa8d4421b6842399a7ac0f08c6ab6ea252 URL: https://source.winehq.org/git/wine.git/?a=commit;h=079caeaa8d4421b6842399a7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 29 00:11:35 2020 +0800 ddraw: Get new window size from the primary output after display mode changes. MonitorFromWindow() may return a different monitor if switching to a smaller display mode. Fix Railroad Tycoon II crashes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 6f640ef422..e92ac25c40 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4926,8 +4926,7 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); - MONITORINFO monitor_info; - HMONITOR monitor; + struct wined3d_output_desc output_desc; RECT *r; TRACE("device_parent %p.\n", device_parent); @@ -4938,15 +4937,13 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic return; } - monitor = MonitorFromWindow(ddraw->swapchain_window, MONITOR_DEFAULTTOPRIMARY); - monitor_info.cbSize = sizeof(monitor_info); - if (!GetMonitorInfoW(monitor, &monitor_info)) + if (FAILED(wined3d_output_get_desc(ddraw->wined3d_output, &output_desc))) { - ERR("Failed to get monitor info.\n"); + ERR("Failed to get output description.\n"); return; } - r = &monitor_info.rcMonitor; + r = &output_desc.desktop_rect; TRACE("Resizing window %p to %s.\n", ddraw->swapchain_window, wine_dbgstr_rect(r)); if (!SetWindowPos(ddraw->swapchain_window, HWND_TOP, r->left, r->top,

1 0

Nikolay Sivov : mfmediaengine: Keep loop flag.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 8805f0429e598e71c5a4b6519d11415282675ae8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8805f0429e598e71c5a4b651… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 18:54:21 2020 +0300 mfmediaengine: Keep loop flag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 20 +++++++++++++++++--- dlls/mfmediaengine/tests/mfmediaengine.c | 3 --- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 7053a3afea..eef485e315 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -60,6 +60,7 @@ enum media_engine_flags /* MF_MEDIA_ENGINE_CREATEFLAGS_MASK is 0x1f. */ FLAGS_ENGINE_SHUT_DOWN = 0x20, FLAGS_ENGINE_AUTO_PLAY = 0x40, + FLAGS_ENGINE_LOOP = 0x80, }; struct media_engine @@ -342,16 +343,29 @@ static HRESULT WINAPI media_engine_SetAutoPlay(IMFMediaEngine *iface, BOOL autop static BOOL WINAPI media_engine_GetLoop(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + BOOL value; - return FALSE; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + value = !!(engine->flags & FLAGS_ENGINE_LOOP); + LeaveCriticalSection(&engine->cs); + + return value; } static HRESULT WINAPI media_engine_SetLoop(IMFMediaEngine *iface, BOOL loop) { + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + FIXME("(%p, %d): stub.\n", iface, loop); - return E_NOTIMPL; + EnterCriticalSection(&engine->cs); + media_engine_set_flag(engine, FLAGS_ENGINE_LOOP, loop); + LeaveCriticalSection(&engine->cs); + + return S_OK; } static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 8f6c4ca75b..504464b527 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -341,7 +341,6 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); state = IMFMediaEngine_GetAutoPlay(media_engine); -todo_wine ok(!!state, "Unexpected state.\n"); /* Loop mode is still accessible. */ @@ -349,11 +348,9 @@ todo_wine ok(!state, "Unexpected state.\n"); hr = IMFMediaEngine_SetLoop(media_engine, TRUE); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); state = IMFMediaEngine_GetLoop(media_engine); -todo_wine ok(!!state, "Unexpected state.\n"); hr = IMFMediaEngine_Play(media_engine);

1 0

Nikolay Sivov : mfmediaengine: Keep auto-play flag.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: e5b25e874e0c572ed78f4ce423bd6d4d59f51a6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5b25e874e0c572ed78f4ce4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 18:54:20 2020 +0300 mfmediaengine: Keep auto-play flag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 28 +++++++++++++++++++++++++--- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 0c082a87f5..7053a3afea 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -59,6 +59,7 @@ enum media_engine_flags { /* MF_MEDIA_ENGINE_CREATEFLAGS_MASK is 0x1f. */ FLAGS_ENGINE_SHUT_DOWN = 0x20, + FLAGS_ENGINE_AUTO_PLAY = 0x40, }; struct media_engine @@ -74,6 +75,14 @@ struct media_engine CRITICAL_SECTION cs; }; +static void media_engine_set_flag(struct media_engine *engine, unsigned int mask, BOOL value) +{ + if (value) + engine->flags |= mask; + else + engine->flags &= ~mask; +} + static inline struct media_engine *impl_from_IMFMediaEngine(IMFMediaEngine *iface) { return CONTAINING_RECORD(iface, struct media_engine, IMFMediaEngine_iface); @@ -306,16 +315,29 @@ static BOOL WINAPI media_engine_IsEnded(IMFMediaEngine *iface) static BOOL WINAPI media_engine_GetAutoPlay(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + BOOL value; - return FALSE; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + value = !!(engine->flags & FLAGS_ENGINE_AUTO_PLAY); + LeaveCriticalSection(&engine->cs); + + return value; } static HRESULT WINAPI media_engine_SetAutoPlay(IMFMediaEngine *iface, BOOL autoplay) { + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + FIXME("(%p, %d): stub.\n", iface, autoplay); - return E_NOTIMPL; + EnterCriticalSection(&engine->cs); + media_engine_set_flag(engine, FLAGS_ENGINE_AUTO_PLAY, autoplay); + LeaveCriticalSection(&engine->cs); + + return S_OK; } static BOOL WINAPI media_engine_GetLoop(IMFMediaEngine *iface) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index d3c15566a4..8f6c4ca75b 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -338,7 +338,6 @@ todo_wine ok(!state, "Unexpected state.\n"); hr = IMFMediaEngine_SetAutoPlay(media_engine, TRUE); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); state = IMFMediaEngine_GetAutoPlay(media_engine);

1 0

Nikolay Sivov : mfmediaengine: Add shut down state.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 5007c2bd365a62db4d804738b214bffbd84fd5cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5007c2bd365a62db4d804738… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 18:54:19 2020 +0300 mfmediaengine: Add shut down state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 38 ++++++++++++++++++++++++-------- dlls/mfmediaengine/tests/mfmediaengine.c | 2 -- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 050743e7e3..0c082a87f5 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -54,16 +54,24 @@ enum media_engine_mode MEDIA_ENGINE_FRAME_SERVER_MODE, }; +/* Used with create flags. */ +enum media_engine_flags +{ + /* MF_MEDIA_ENGINE_CREATEFLAGS_MASK is 0x1f. */ + FLAGS_ENGINE_SHUT_DOWN = 0x20, +}; + struct media_engine { IMFMediaEngine IMFMediaEngine_iface; LONG refcount; - DWORD flags; IMFMediaEngineNotify *callback; UINT64 playback_hwnd; DXGI_FORMAT output_format; IMFDXGIDeviceManager *dxgi_manager; enum media_engine_mode mode; + unsigned int flags; + CRITICAL_SECTION cs; }; static inline struct media_engine *impl_from_IMFMediaEngine(IMFMediaEngine *iface) @@ -104,6 +112,7 @@ static void free_media_engine(struct media_engine *engine) IMFMediaEngineNotify_Release(engine->callback); if (engine->dxgi_manager) IMFDXGIDeviceManager_Release(engine->dxgi_manager); + DeleteCriticalSection(&engine->cs); heap_free(engine); } @@ -395,9 +404,19 @@ static HRESULT WINAPI media_engine_GetVideoAspectRatio(IMFMediaEngine *iface, DW static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngine *iface) { + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; + FIXME("(%p): stub.\n", iface); - return E_NOTIMPL; + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + engine->flags |= FLAGS_ENGINE_SHUT_DOWN; + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_TransferVideoFrame(IMFMediaEngine *iface, IUnknown *surface, @@ -490,10 +509,15 @@ static ULONG WINAPI media_engine_factory_Release(IMFMediaEngineClassFactory *ifa return 1; } -static HRESULT init_media_engine(IMFAttributes *attributes, struct media_engine *engine) +static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct media_engine *engine) { HRESULT hr; + engine->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; + engine->refcount = 1; + engine->flags = flags & MF_MEDIA_ENGINE_CREATEFLAGS_MASK; + InitializeCriticalSection(&engine->cs); + hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, (void **)&engine->callback); if (FAILED(hr)) @@ -522,7 +546,7 @@ static HRESULT WINAPI media_engine_factory_CreateInstance(IMFMediaEngineClassFac struct media_engine *object; HRESULT hr; - TRACE("(%p, %#x, %p, %p).\n", iface, flags, attributes, engine); + TRACE("%p, %#x, %p, %p.\n", iface, flags, attributes, engine); if (!attributes || !engine) return E_POINTER; @@ -531,17 +555,13 @@ static HRESULT WINAPI media_engine_factory_CreateInstance(IMFMediaEngineClassFac if (!object) return E_OUTOFMEMORY; - hr = init_media_engine(attributes, object); + hr = init_media_engine(flags, attributes, object); if (FAILED(hr)) { free_media_engine(object); return hr; } - object->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; - object->refcount = 1; - object->flags = flags; - *engine = &object->IMFMediaEngine_iface; return S_OK; diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 07bd8c81e6..d3c15566a4 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -247,11 +247,9 @@ static void test_Shutdown(void) media_engine = create_media_engine(callback); hr = IMFMediaEngine_Shutdown(media_engine); -todo_wine ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); hr = IMFMediaEngine_Shutdown(media_engine); -todo_wine ok(hr == MF_E_SHUTDOWN || broken(hr == S_OK) /* before win10 */, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_SetSource(media_engine, NULL);

1 0

Nikolay Sivov : mfmediaengine/tests: Add some tests for shutdown state.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: a8ee0575fdb38c8f5724a4a3448d331c61514acf URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8ee0575fdb38c8f5724a4a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 18:54:18 2020 +0300 mfmediaengine/tests: Add some tests for shutdown state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/tests/Makefile.in | 2 +- dlls/mfmediaengine/tests/mfmediaengine.c | 196 +++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/tests/Makefile.in b/dlls/mfmediaengine/tests/Makefile.in index d508db9f6f..88758f7a61 100644 --- a/dlls/mfmediaengine/tests/Makefile.in +++ b/dlls/mfmediaengine/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfmediaengine.dll -IMPORTS = ole32 mfplat mfmediaengine mfuuid uuid +IMPORTS = ole32 mfplat mfmediaengine oleaut32 mfuuid uuid C_SRCS = \ mfmediaengine.c diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 14d9eed453..07bd8c81e6 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -105,6 +105,34 @@ static IMFMediaEngineNotifyVtbl media_engine_notify_vtbl = media_engine_notify_EventNotify, }; +static IMFMediaEngine *create_media_engine(IMFMediaEngineNotify *callback) +{ + IMFDXGIDeviceManager *manager; + IMFMediaEngine *media_engine; + IMFAttributes *attributes; + UINT token; + HRESULT hr; + + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "Failed to create dxgi device manager, hr %#x.\n", hr); + + hr = MFCreateAttributes(&attributes, 3); + ok(hr == S_OK, "Failed to create attributes, hr %#x.\n", hr); + + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)callback); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, 0, attributes, &media_engine); + ok(hr == S_OK, "Failed to create media engine, hr %#x.\n", hr); + + IMFAttributes_Release(attributes); + IMFDXGIDeviceManager_Release(manager); + + return media_engine; +} + static void test_factory(void) { struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; @@ -204,6 +232,173 @@ static void test_CreateInstance(void) IMFDXGIDeviceManager_Release(manager); } +static void test_Shutdown(void) +{ + struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; + IMFMediaEngineNotify *callback = &notify_impl.IMFMediaEngineNotify_iface; + IMFMediaTimeRange *time_range; + IMFMediaEngine *media_engine; + unsigned int state; + DWORD cx, cy; + double val; + HRESULT hr; + BSTR str; + + media_engine = create_media_engine(callback); + + hr = IMFMediaEngine_Shutdown(media_engine); +todo_wine + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + hr = IMFMediaEngine_Shutdown(media_engine); +todo_wine + ok(hr == MF_E_SHUTDOWN || broken(hr == S_OK) /* before win10 */, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaEngine_SetSource(media_engine, NULL); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaEngine_GetCurrentSource(media_engine, &str); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + state = IMFMediaEngine_GetNetworkState(media_engine); + ok(!state, "Unexpected state %d.\n", state); + + /* Preload mode is still accessible. */ + state = IMFMediaEngine_GetPreload(media_engine); +todo_wine + ok(!state, "Unexpected state %d.\n", state); + + hr = IMFMediaEngine_SetPreload(media_engine, MF_MEDIA_ENGINE_PRELOAD_AUTOMATIC); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + state = IMFMediaEngine_GetPreload(media_engine); +todo_wine + ok(state == MF_MEDIA_ENGINE_PRELOAD_AUTOMATIC, "Unexpected state %d.\n", state); + + hr = IMFMediaEngine_GetBuffered(media_engine, &time_range); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaEngine_Load(media_engine); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + str = SysAllocString(L"video/mp4"); + hr = IMFMediaEngine_CanPlayType(media_engine, str, &state); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + SysFreeString(str); + + state = IMFMediaEngine_GetReadyState(media_engine); + ok(!state, "Unexpected state %d.\n", state); + + state = IMFMediaEngine_IsSeeking(media_engine); + ok(!state, "Unexpected state %d.\n", state); + + val = IMFMediaEngine_GetCurrentTime(media_engine); + ok(val == 0.0, "Unexpected time %f.\n", val); + + hr = IMFMediaEngine_SetCurrentTime(media_engine, 1.0); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + val = IMFMediaEngine_GetStartTime(media_engine); + ok(val == 0.0, "Unexpected time %f.\n", val); + + state = IMFMediaEngine_IsPaused(media_engine); +todo_wine + ok(!!state, "Unexpected state %d.\n", state); + + val = IMFMediaEngine_GetDefaultPlaybackRate(media_engine); +todo_wine + ok(val == 1.0, "Unexpected rate %f.\n", val); + + hr = IMFMediaEngine_SetDefaultPlaybackRate(media_engine, 2.0); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + val = IMFMediaEngine_GetPlaybackRate(media_engine); +todo_wine + ok(val == 1.0, "Unexpected rate %f.\n", val); + + hr = IMFMediaEngine_GetPlayed(media_engine, &time_range); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaEngine_GetSeekable(media_engine, &time_range); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + state = IMFMediaEngine_IsEnded(media_engine); + ok(!state, "Unexpected state %d.\n", state); + + /* Autoplay mode is still accessible. */ + state = IMFMediaEngine_GetAutoPlay(media_engine); + ok(!state, "Unexpected state.\n"); + + hr = IMFMediaEngine_SetAutoPlay(media_engine, TRUE); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + state = IMFMediaEngine_GetAutoPlay(media_engine); +todo_wine + ok(!!state, "Unexpected state.\n"); + + /* Loop mode is still accessible. */ + state = IMFMediaEngine_GetLoop(media_engine); + ok(!state, "Unexpected state.\n"); + + hr = IMFMediaEngine_SetLoop(media_engine, TRUE); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + state = IMFMediaEngine_GetLoop(media_engine); +todo_wine + ok(!!state, "Unexpected state.\n"); + + hr = IMFMediaEngine_Play(media_engine); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaEngine_Pause(media_engine); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + state = IMFMediaEngine_GetMuted(media_engine); + ok(!state, "Unexpected state.\n"); + + hr = IMFMediaEngine_SetMuted(media_engine, TRUE); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + val = IMFMediaEngine_GetVolume(media_engine); +todo_wine + ok(val == 1.0, "Unexpected value %f.\n", val); + + val = IMFMediaEngine_SetVolume(media_engine, 2.0); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + state = IMFMediaEngine_HasVideo(media_engine); + ok(!state, "Unexpected state.\n"); + + state = IMFMediaEngine_HasAudio(media_engine); + ok(!state, "Unexpected state.\n"); + + hr = IMFMediaEngine_GetNativeVideoSize(media_engine, &cx, &cy); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaEngine_GetVideoAspectRatio(media_engine, &cx, &cy); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + IMFMediaEngine_Release(media_engine); +} + START_TEST(mfmediaengine) { HRESULT hr; @@ -226,6 +421,7 @@ START_TEST(mfmediaengine) test_factory(); test_CreateInstance(); + test_Shutdown(); IMFMediaEngineClassFactory_Release(factory);

1 0

Nikolay Sivov : mfmediaengine/tests: Use global factory instance.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 9de7895e4e4707b2c8fb164887a40bfe915ed580 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9de7895e4e4707b2c8fb1648… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 18:54:17 2020 +0300 mfmediaengine/tests: Use global factory instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/tests/mfmediaengine.c | 85 ++++++++++++++++++++++++++------ 1 file changed, 69 insertions(+), 16 deletions(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 2bbc79fb6c..14d9eed453 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -35,6 +35,8 @@ static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); +static IMFMediaEngineClassFactory *factory; + #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown *obj, ULONG ref, int line) { @@ -114,25 +116,20 @@ static void test_factory(void) UINT token; HRESULT hr; - CoInitialize(NULL); - - hr = CoCreateInstance(&CLSID_MFMediaEngineClassFactory, NULL, CLSCTX_INPROC_SERVER, - &IID_IMFMediaEngineClassFactory, (void **)&factory); - ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /* pre-win8 */, - "Failed to create class factory, hr %#x.\n", hr); - - hr = CoCreateInstance(&CLSID_MFMediaEngineClassFactory, (IUnknown *)factory, CLSCTX_INPROC_SERVER, - &IID_IMFMediaEngineClassFactory, (void **)&factory2); - ok(hr == CLASS_E_NOAGGREGATION || broken(hr == REGDB_E_CLASSNOTREG) /* pre-win8 */, - "Unexpected hr %#x.\n", hr); - - if (!factory) + hr = CoCreateInstance(&CLSID_MFMediaEngineClassFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IMFMediaEngineClassFactory, + (void **)&factory); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /* pre-win8 */, "Failed to create class factory, hr %#x.\n", hr); + if (FAILED(hr)) { - win_skip("Not IMFMediaEngineClassFactory support.\n"); - CoUninitialize(); + win_skip("Media Engine is not supported.\n"); return; } + /* Aggregation is not supported. */ + hr = CoCreateInstance(&CLSID_MFMediaEngineClassFactory, (IUnknown *)factory, CLSCTX_INPROC_SERVER, + &IID_IMFMediaEngineClassFactory, (void **)&factory2); + ok(hr == CLASS_E_NOAGGREGATION, "Unexpected hr %#x.\n", hr); + hr = pMFCreateDXGIDeviceManager(&token, &manager); ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); hr = MFCreateAttributes(&attributes, 3); @@ -163,20 +160,76 @@ static void test_factory(void) IMFAttributes_Release(attributes); IMFDXGIDeviceManager_Release(manager); IMFMediaEngineClassFactory_Release(factory); +} - CoUninitialize(); +static void test_CreateInstance(void) +{ + struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; + IMFMediaEngineNotify *notify = &notify_impl.IMFMediaEngineNotify_iface; + IMFDXGIDeviceManager *manager; + IMFMediaEngine *media_engine; + IMFAttributes *attributes; + UINT token; + HRESULT hr; + + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "Failed to create dxgi device manager, hr %#x.\n", hr); + + hr = MFCreateAttributes(&attributes, 3); + ok(hr == S_OK, "Failed to create attributes, hr %#x.\n", hr); + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_OPM_HWND, NULL); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + IMFAttributes_DeleteAllItems(attributes); + + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)notify); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); + ok(hr == S_OK, "Failed to create media engine, hr %#x.\n", hr); + + IMFMediaEngine_Release(media_engine); + IMFAttributes_Release(attributes); + IMFDXGIDeviceManager_Release(manager); } START_TEST(mfmediaengine) { HRESULT hr; + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_MFMediaEngineClassFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IMFMediaEngineClassFactory, + (void **)&factory); + if (FAILED(hr)) + { + win_skip("Media Engine is not supported.\n"); + CoUninitialize(); + return; + } + init_functions(); hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "MFStartup failed: %#x.\n", hr); test_factory(); + test_CreateInstance(); + + IMFMediaEngineClassFactory_Release(factory); + + CoUninitialize(); MFShutdown(); }

1 0

Nikolay Sivov : include: Add Media Engine events constants.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: e2c681a8976bb31378fd946497da485e5ef73fad URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2c681a8976bb31378fd9464… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 18:54:16 2020 +0300 include: Add Media Engine events constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfmediaengine.idl | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index e5d91a5732..4ea3d834cf 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -94,6 +94,49 @@ typedef enum MF_MEDIA_ENGINE_CREATEFLAGS MF_MEDIA_ENGINE_CREATEFLAGS_MASK = 0x1f } MF_MEDIA_ENGINE_CREATEFLAGS; +typedef enum MF_MEDIA_ENGINE_EVENT +{ + MF_MEDIA_ENGINE_EVENT_LOADSTART = 1, + MF_MEDIA_ENGINE_EVENT_PROGRESS = 2, + MF_MEDIA_ENGINE_EVENT_SUSPEND = 3, + MF_MEDIA_ENGINE_EVENT_ABORT = 4, + MF_MEDIA_ENGINE_EVENT_ERROR = 5, + MF_MEDIA_ENGINE_EVENT_EMPTIED = 6, + MF_MEDIA_ENGINE_EVENT_STALLED = 7, + MF_MEDIA_ENGINE_EVENT_PLAY = 8, + MF_MEDIA_ENGINE_EVENT_PAUSE = 9, + MF_MEDIA_ENGINE_EVENT_LOADEDMETADATA = 10, + MF_MEDIA_ENGINE_EVENT_LOADEDDATA = 11, + MF_MEDIA_ENGINE_EVENT_WAITING = 12, + MF_MEDIA_ENGINE_EVENT_PLAYING = 13, + MF_MEDIA_ENGINE_EVENT_CANPLAY = 14, + MF_MEDIA_ENGINE_EVENT_CANPLAYTHROUGH = 15, + MF_MEDIA_ENGINE_EVENT_SEEKING = 16, + MF_MEDIA_ENGINE_EVENT_SEEKED = 17, + MF_MEDIA_ENGINE_EVENT_TIMEUPDATE = 18, + MF_MEDIA_ENGINE_EVENT_ENDED = 19, + MF_MEDIA_ENGINE_EVENT_RATECHANGE = 20, + MF_MEDIA_ENGINE_EVENT_DURATIONCHANGE = 21, + MF_MEDIA_ENGINE_EVENT_VOLUMECHANGE = 22, + MF_MEDIA_ENGINE_EVENT_FORMATCHANGE = 1000, + MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS = 1001, + MF_MEDIA_ENGINE_EVENT_TIMELINE_MARKER = 1002, + MF_MEDIA_ENGINE_EVENT_BALANCECHANGE = 1003, + MF_MEDIA_ENGINE_EVENT_DOWNLOADCOMPLETE = 1004, + MF_MEDIA_ENGINE_EVENT_BUFFERINGSTARTED = 1005, + MF_MEDIA_ENGINE_EVENT_BUFFERINGENDED = 1006, + MF_MEDIA_ENGINE_EVENT_FRAMESTEPCOMPLETED = 1007, + MF_MEDIA_ENGINE_EVENT_NOTIFYSTABLESTATE = 1008, + MF_MEDIA_ENGINE_EVENT_FIRSTFRAMEREADY = 1009, + MF_MEDIA_ENGINE_EVENT_TRACKSCHANGE = 1010, + MF_MEDIA_ENGINE_EVENT_OPMINFO = 1011, + MF_MEDIA_ENGINE_EVENT_RESOURCELOST = 1012, + MF_MEDIA_ENGINE_EVENT_DELAYLOADEVENT_CHANGED = 1013, + MF_MEDIA_ENGINE_EVENT_STREAMRENDERINGERROR = 1014, + MF_MEDIA_ENGINE_EVENT_SUPPORTEDRATES_CHANGED = 1015, + MF_MEDIA_ENGINE_EVENT_AUDIOENDPOINTCHANGE = 1016, +} MF_MEDIA_ENGINE_EVENT; + [ object, uuid(fc0e10d2-ab2a-4501-a951-06bb1075184c),

1 0

Nikolay Sivov : dwrite: Add stub handler for ligature substitution.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 9479f87b8a646b4c3324070c5a56b11bdf5a7bd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9479f87b8a646b4c3324070c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 14:54:29 2020 +0300 dwrite: Add stub handler for ligature substitution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 154 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 126 insertions(+), 28 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 92061cbf5c..c6cfdb6133 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -585,6 +585,27 @@ struct ot_gsub_altsubst_format1 UINT16 sets[1]; }; +struct ot_gsub_ligsubst_format1 +{ + UINT16 format; + UINT16 coverage; + UINT16 lig_set_count; + UINT16 lig_sets[1]; +}; + +struct ot_gsub_ligset +{ + UINT16 count; + UINT16 offsets[1]; +}; + +struct ot_gsub_lig +{ + UINT16 lig_glyph; + UINT16 comp_count; + UINT16 components[1]; +}; + struct ot_gsub_chaincontext_subst_format1 { UINT16 format; @@ -4464,13 +4485,23 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, heap_free(lookups.lookups); } +static void opentype_layout_replace_glyph(struct scriptshaping_context *context, UINT16 glyph) +{ + UINT16 orig_glyph = context->u.subst.glyphs[context->cur]; + if (glyph != orig_glyph) + { + context->u.subst.glyphs[context->cur] = glyph; + opentype_set_subst_glyph_props(context, context->cur, glyph); + } + context->cur++; +} + static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { const struct dwrite_fonttable *gsub = &context->table->table; UINT16 format, coverage, orig_glyph, glyph; unsigned int idx, coverage_index; - BOOL ret; idx = context->cur; orig_glyph = glyph = context->u.subst.glyphs[idx]; @@ -4502,16 +4533,14 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_ glyph = GET_BE_WORD(format2->substitutes[coverage_index]); } else - WARN("Unknown single substitution format %u.\n", format); - - if ((ret = (glyph != orig_glyph))) { - context->u.subst.glyphs[idx] = glyph; - opentype_set_subst_glyph_props(context, idx, glyph); - context->cur++; + WARN("Unknown single substitution format %u.\n", format); + return FALSE; } - return ret; + opentype_layout_replace_glyph(context, glyph); + + return TRUE; } static BOOL opentype_layout_gsub_ensure_buffer(struct scriptshaping_context *context, unsigned int count) @@ -4568,13 +4597,13 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co unsigned int subtable_offset) { const struct dwrite_fonttable *gsub = &context->table->table; - UINT16 format, coverage, orig_glyph, glyph, seq_count, glyph_count; + UINT16 format, coverage, glyph, seq_count, glyph_count; const struct ot_gsub_multsubst_format1 *format1; unsigned int i, idx, coverage_index; const UINT16 *glyphs; idx = context->cur; - orig_glyph = glyph = context->u.subst.glyphs[idx]; + glyph = context->u.subst.glyphs[idx]; format = table_read_be_word(gsub, subtable_offset); @@ -4603,15 +4632,7 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co if (glyph_count == 1) { /* Equivalent of single substitution. */ - glyph = GET_BE_WORD(glyphs[0]); - - if (glyph != orig_glyph) - { - context->u.subst.glyphs[idx] = glyph; - opentype_set_subst_glyph_props(context, idx, glyph); - } - - context->cur++; + opentype_layout_replace_glyph(context, GET_BE_WORD(glyphs[0])); } else if (glyph_count == 0) { @@ -4682,12 +4703,11 @@ static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_con unsigned int subtable_offset) { const struct dwrite_fonttable *gsub = &context->table->table; - UINT16 format, coverage, orig_glyph, glyph; unsigned int idx, coverage_index, offset; - BOOL ret; + UINT16 format, coverage, glyph; idx = context->cur; - orig_glyph = glyph = context->u.subst.glyphs[idx]; + glyph = context->u.subst.glyphs[idx]; format = table_read_be_word(gsub, subtable_offset); @@ -4721,16 +4741,92 @@ static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_con glyph = table_read_be_word(gsub, subtable_offset + offset + sizeof(count) + (alt_index - 1) * sizeof(glyph)); } else + { WARN("Unexpected alternate substitution format %d.\n", format); + return FALSE; + } + + opentype_layout_replace_glyph(context, glyph); + + return TRUE; +} + +static BOOL opentype_layout_apply_ligature(struct scriptshaping_context *context, unsigned int offset) +{ + const struct dwrite_fonttable *gsub = &context->table->table; + const struct ot_gsub_lig *lig; + unsigned int comp_count; + + comp_count = table_read_be_word(gsub, offset + FIELD_OFFSET(struct ot_gsub_lig, comp_count)); + + if (!comp_count) + return FALSE; + + lig = table_read_ensure(gsub, offset, FIELD_OFFSET(struct ot_gsub_lig, components[comp_count-1])); + if (!lig) + return FALSE; - if ((ret = (glyph != orig_glyph))) + if (comp_count == 1) { - context->u.subst.glyphs[idx] = glyph; - opentype_set_subst_glyph_props(context, idx, glyph); - context->cur++; + opentype_layout_replace_glyph(context, GET_BE_WORD(lig->lig_glyph)); + return TRUE; } - return ret; + /* TODO: actually apply ligature */ + + return FALSE; +} + +static BOOL opentype_layout_apply_gsub_lig_substitution(struct scriptshaping_context *context, const struct lookup *lookup, + unsigned int subtable_offset) +{ + const struct dwrite_fonttable *gsub = &context->table->table; + unsigned int coverage_index, offset, lig_set_offset, lig_set_count; + UINT16 format, coverage, glyph; + + glyph = context->u.subst.glyphs[context->cur]; + + format = table_read_be_word(gsub, subtable_offset); + + if (format == 1) + { + const struct ot_gsub_ligsubst_format1 *format1 = table_read_ensure(gsub, subtable_offset, sizeof(*format1)); + const struct ot_gsub_ligset *lig_set; + unsigned int i, lig_count; + + coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_ligsubst_format1, coverage)); + + coverage_index = opentype_layout_is_glyph_covered(context, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) + return FALSE; + + lig_set_count = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_ligsubst_format1, lig_set_count)); + if (coverage_index >= lig_set_count || !table_read_ensure(gsub, subtable_offset, + FIELD_OFFSET(struct ot_gsub_ligsubst_format1, lig_sets[lig_set_count]))) + { + return FALSE; + } + + lig_set_offset = table_read_be_word(gsub, subtable_offset + + FIELD_OFFSET(struct ot_gsub_ligsubst_format1, lig_sets[coverage_index])); + offset = subtable_offset + lig_set_offset; + + lig_count = table_read_be_word(gsub, offset); + lig_set = table_read_ensure(gsub, offset, FIELD_OFFSET(struct ot_gsub_ligset, offsets[lig_count])); + if (!lig_count || !lig_set) + return FALSE; + + /* First applicable ligature is used. */ + for (i = 0; i < lig_count; ++i) + { + if (opentype_layout_apply_ligature(context, offset + GET_BE_WORD(lig_set->offsets[i]))) + return TRUE; + } + } + else + WARN("Unexpected ligature substitution format %d.\n", format); + + return FALSE; } #define CHAIN_CONTEXT_MAX_LENGTH 64 @@ -5000,10 +5096,12 @@ static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont case GSUB_LOOKUP_ALTERNATE_SUBST: ret = opentype_layout_apply_gsub_alt_substitution(context, lookup, subtable_offset); break; + case GSUB_LOOKUP_LIGATURE_SUBST: + ret = opentype_layout_apply_gsub_lig_substitution(context, lookup, subtable_offset); + break; case GSUB_LOOKUP_CHAINING_CONTEXTUAL_SUBST: ret = opentype_layout_apply_gsub_chain_context_substitution(context, lookup, subtable_offset); break; - case GSUB_LOOKUP_LIGATURE_SUBST: case GSUB_LOOKUP_CONTEXTUAL_SUBST: case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST: WARN("Unimplemented lookup %d.\n", lookup->type);

1 0

Nikolay Sivov : dwrite: Update glyph component count on multiple substitution.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 2e4d71c7218d139476c5ef84129a54c9209cea8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e4d71c7218d139476c5ef84… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 14:54:28 2020 +0300 dwrite: Update glyph component count on multiple substitution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 13 ++++++++++++- dlls/dwrite/opentype.c | 10 +++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 2ed53658cd..94705b0d63 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -468,6 +468,17 @@ struct shaping_glyph_info unsigned int props; }; +struct shaping_glyph_properties +{ + UINT16 justification : 4; + UINT16 isClusterStart : 1; + UINT16 isDiacritic : 1; + UINT16 isZeroWidthSpace : 1; + UINT16 reserved : 1; + UINT16 components : 4; + UINT16 reserved2 : 4; +}; + struct scriptshaping_context { struct scriptshaping_cache *cache; @@ -498,7 +509,7 @@ struct scriptshaping_context struct { UINT16 *glyphs; - DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; + struct shaping_glyph_properties *glyph_props; UINT16 *clustermap; } buffer; } u; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index e31057710b..92061cbf5c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4648,7 +4648,10 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co glyph = GET_BE_WORD(glyphs[i]); context->u.subst.glyphs[idx + i] = glyph; if (i) + { context->u.subst.glyph_props[idx + i].isClusterStart = 0; + context->u.buffer.glyph_props[idx + i].components = 0; + } opentype_set_subst_glyph_props(context, idx + i, glyph); /* Inherit feature mask from original matched glyph. */ context->glyph_infos[idx + i].mask = mask; @@ -5081,11 +5084,12 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c codepoint = context->u.subst.digits[codepoint - '0']; context->u.subst.glyphs[g] = font->get_glyph(context->cache->context, codepoint); - context->u.subst.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER; - context->u.subst.glyph_props[g].isClusterStart = 1; + context->u.buffer.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER; + context->u.buffer.glyph_props[g].isClusterStart = 1; opentype_set_subst_glyph_props(context, g, context->u.subst.glyphs[g]); if (opentype_is_default_ignorable(codepoint)) - context->u.subst.glyph_props[g].isZeroWidthSpace = 1; + context->u.buffer.glyph_props[g].isZeroWidthSpace = 1; + context->u.buffer.glyph_props[g].components = 1; context->glyph_count++; clustermap[i] = i;

1 0

Nikolay Sivov : dwrite: Implement multiple substitution (GSUB lookup 2).
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 9f31bf0e1c444a3b96dfa478a3cfcf1bd45f470d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f31bf0e1c444a3b96dfa478… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 14:54:27 2020 +0300 dwrite: Implement multiple substitution (GSUB lookup 2). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 173 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 172 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 8886186303..e31057710b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -569,6 +569,14 @@ struct ot_gsub_singlesubst_format2 UINT16 substitutes[1]; }; +struct ot_gsub_multsubst_format1 +{ + UINT16 format; + UINT16 coverage; + UINT16 seq_count; + UINT16 seq[1]; +}; + struct ot_gsub_altsubst_format1 { UINT16 format; @@ -4506,6 +4514,167 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_ return ret; } +static BOOL opentype_layout_gsub_ensure_buffer(struct scriptshaping_context *context, unsigned int count) +{ + DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; + struct shaping_glyph_info *glyph_infos; + unsigned int new_capacity; + UINT16 *glyphs; + BOOL ret; + + if (context->u.subst.capacity >= count) + return TRUE; + + new_capacity = context->u.subst.capacity * 2; + + if ((glyphs = heap_realloc(context->u.subst.glyphs, new_capacity * sizeof(*glyphs)))) + context->u.subst.glyphs = glyphs; + if ((glyph_props = heap_realloc(context->u.subst.glyph_props, new_capacity * sizeof(*glyph_props)))) + context->u.subst.glyph_props = glyph_props; + if ((glyph_infos = heap_realloc(context->glyph_infos, new_capacity * sizeof(*glyph_infos)))) + context->glyph_infos = glyph_infos; + + if ((ret = (glyphs && glyph_props && glyph_infos))) + context->u.subst.capacity = new_capacity; + + return ret; +} + +static unsigned int opentype_layout_get_next_char_index(const struct scriptshaping_context *context, unsigned int idx) +{ + unsigned int start = 0, end = context->length - 1, mid, ret = ~0u; + + for (;;) + { + mid = (start + end) / 2; + + if (context->u.buffer.clustermap[mid] <= idx) + { + if (mid == end) break; + start = mid + 1; + } + else + { + ret = mid; + if (mid == start) break; + end = mid - 1; + } + } + + return ret; +} + +static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_context *context, const struct lookup *lookup, + unsigned int subtable_offset) +{ + const struct dwrite_fonttable *gsub = &context->table->table; + UINT16 format, coverage, orig_glyph, glyph, seq_count, glyph_count; + const struct ot_gsub_multsubst_format1 *format1; + unsigned int i, idx, coverage_index; + const UINT16 *glyphs; + + idx = context->cur; + orig_glyph = glyph = context->u.subst.glyphs[idx]; + + format = table_read_be_word(gsub, subtable_offset); + + coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, coverage)); + + if (format == 1) + { + coverage_index = opentype_layout_is_glyph_covered(context, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) + return FALSE; + + seq_count = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, seq_count)); + + format1 = table_read_ensure(gsub, subtable_offset, FIELD_OFFSET(struct ot_gsub_multsubst_format1, seq[seq_count])); + + if (!seq_count || seq_count <= coverage_index || !format1) + return FALSE; + + glyph_count = table_read_be_word(gsub, subtable_offset + GET_BE_WORD(format1->seq[coverage_index])); + + glyphs = table_read_ensure(gsub, subtable_offset + GET_BE_WORD(format1->seq[coverage_index]) + 2, + glyph_count * sizeof(*glyphs)); + if (!glyphs) + return FALSE; + + if (glyph_count == 1) + { + /* Equivalent of single substitution. */ + glyph = GET_BE_WORD(glyphs[0]); + + if (glyph != orig_glyph) + { + context->u.subst.glyphs[idx] = glyph; + opentype_set_subst_glyph_props(context, idx, glyph); + } + + context->cur++; + } + else if (glyph_count == 0) + { + context->cur++; + } + else + { + unsigned int shift_len, src_idx, dest_idx, mask; + + /* Current glyph is also replaced. */ + glyph_count--; + + if (!(opentype_layout_gsub_ensure_buffer(context, context->glyph_count + glyph_count))) + return FALSE; + + shift_len = context->cur + 1 < context->glyph_count ? context->glyph_count - context->cur - 1 : 0; + + if (shift_len) + { + src_idx = context->cur + 1; + dest_idx = src_idx + glyph_count; + + memmove(&context->u.subst.glyphs[dest_idx], &context->u.subst.glyphs[src_idx], + shift_len * sizeof(*context->u.subst.glyphs)); + memmove(&context->u.subst.glyph_props[dest_idx], &context->u.subst.glyph_props[src_idx], + shift_len * sizeof(*context->u.subst.glyph_props)); + memmove(&context->glyph_infos[dest_idx], &context->glyph_infos[src_idx], + shift_len * sizeof(*context->glyph_infos)); + } + + mask = context->glyph_infos[context->cur].mask; + for (i = 0, idx = context->cur; i <= glyph_count; ++i) + { + glyph = GET_BE_WORD(glyphs[i]); + context->u.subst.glyphs[idx + i] = glyph; + if (i) + context->u.subst.glyph_props[idx + i].isClusterStart = 0; + opentype_set_subst_glyph_props(context, idx + i, glyph); + /* Inherit feature mask from original matched glyph. */ + context->glyph_infos[idx + i].mask = mask; + } + + /* Update following clusters. */ + idx = opentype_layout_get_next_char_index(context, context->cur); + if (idx != ~0u) + { + for (i = idx; i < context->length; ++i) + context->u.subst.clustermap[i] += glyph_count; + } + + context->cur += glyph_count + 1; + context->glyph_count += glyph_count; + } + } + else + { + WARN("Unknown multiple substitution format %u.\n", format); + return FALSE; + } + + return TRUE; +} + static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { @@ -4822,13 +4991,15 @@ static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont case GSUB_LOOKUP_SINGLE_SUBST: ret = opentype_layout_apply_gsub_single_substitution(context, lookup, subtable_offset); break; + case GSUB_LOOKUP_MULTIPLE_SUBST: + ret = opentype_layout_apply_gsub_mult_substitution(context, lookup, subtable_offset); + break; case GSUB_LOOKUP_ALTERNATE_SUBST: ret = opentype_layout_apply_gsub_alt_substitution(context, lookup, subtable_offset); break; case GSUB_LOOKUP_CHAINING_CONTEXTUAL_SUBST: ret = opentype_layout_apply_gsub_chain_context_substitution(context, lookup, subtable_offset); break; - case GSUB_LOOKUP_MULTIPLE_SUBST: case GSUB_LOOKUP_LIGATURE_SUBST: case GSUB_LOOKUP_CONTEXTUAL_SUBST: case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST:

1 0

Nikolay Sivov : dwrite: Use GPOS handlers for subtables, not whole lookups.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 684dd31cc218d77e38289c87d7df15e065ff379c URL: https://source.winehq.org/git/wine.git/?a=commit;h=684dd31cc218d77e38289c87… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 14:54:26 2020 +0300 dwrite: Use GPOS handlers for subtables, not whole lookups. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 885 +++++++++++++++++++++++-------------------------- 1 file changed, 410 insertions(+), 475 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=684dd31cc218d77e3828…

1 0

Nikolay Sivov : dwrite: Keep text properties zero initialized.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: a66668c129aa44c7fc734ef585168326819f4836 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a66668c129aa44c7fc734ef5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 14:54:25 2020 +0300 dwrite: Keep text properties zero initialized. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 6 +-- dlls/dwrite/dwrite_private.h | 10 ----- dlls/dwrite/shape.c | 99 -------------------------------------------- 3 files changed, 2 insertions(+), 113 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 556191a13d..56950a5baa 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -34,11 +34,11 @@ extern const unsigned short wine_scripts_table[] DECLSPEC_HIDDEN; /* Number of characters needed for LOCALE_SNATIVEDIGITS */ #define NATIVE_DIGITS_LEN 11 -struct dwritescript_properties { +struct dwritescript_properties +{ DWRITE_SCRIPT_PROPERTIES props; UINT32 scripttags[3]; /* Maximum 2 script tags, 0-terminated. */ BOOL is_complex; - const struct scriptshaping_ops *ops; }; #define _OT(a,b,c,d) DWRITE_MAKE_OPENTYPE_TAG(a,b,c,d) @@ -1194,8 +1194,6 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, *actual_glyph_count = context.glyph_count; memcpy(glyphs, context.u.subst.glyphs, context.glyph_count * sizeof(*glyphs)); memcpy(glyph_props, context.u.subst.glyph_props, context.glyph_count * sizeof(*glyph_props)); - hr = default_shaping_ops.set_text_glyphs_props(&context, clustermap, glyphs, *actual_glyph_count, - text_props, glyph_props); } heap_free(context.u.subst.glyph_props); diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index cf3e0f7c12..2ed53658cd 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -571,15 +571,5 @@ extern void opentype_layout_apply_gsub_features(struct scriptshaping_context *co extern void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, const struct shaping_features *features) DECLSPEC_HIDDEN; -struct scriptshaping_ops -{ - HRESULT (*contextual_shaping)(struct scriptshaping_context *context, UINT16 *clustermap, UINT16 *glyph_indices, UINT32* actual_glyph_count); - HRESULT (*set_text_glyphs_props)(struct scriptshaping_context *context, UINT16 *clustermap, UINT16 *glyph_indices, - UINT32 glyphcount, DWRITE_SHAPING_TEXT_PROPERTIES *text_props, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props); - const struct shaping_features *gpos_features; -}; - -extern const struct scriptshaping_ops default_shaping_ops DECLSPEC_HIDDEN; - extern HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned int *scripts) DECLSPEC_HIDDEN; extern HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigned int *scripts) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index b7b40d1211..32aabac5f6 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -55,105 +55,6 @@ void release_scriptshaping_cache(struct scriptshaping_cache *cache) heap_free(cache); } -static void shape_update_clusters_from_glyphprop(UINT32 glyphcount, UINT32 text_len, UINT16 *clustermap, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props) -{ - UINT32 i; - - for (i = 0; i < glyphcount; i++) { - if (!glyph_props[i].isClusterStart) { - UINT32 j; - - for (j = 0; j < text_len; j++) { - if (clustermap[j] == i) { - int k = j; - while (k >= 0 && k < text_len && !glyph_props[clustermap[k]].isClusterStart) - k--; - - if (k >= 0 && k < text_len && glyph_props[clustermap[k]].isClusterStart) - clustermap[j] = clustermap[k]; - } - } - } - } -} - -static int compare_clustersearch(const void *a, const void* b) -{ - UINT16 target = *(UINT16*)a; - UINT16 index = *(UINT16*)b; - int ret = 0; - - if (target > index) - ret = 1; - else if (target < index) - ret = -1; - - return ret; -} - -/* Maps given glyph position in glyph indices array to text index this glyph represents. - Lowest possible index is returned. - - clustermap [I] Text index to index in glyph indices array map - len [I] Clustermap size - target [I] Index in glyph indices array to map - */ -static INT32 map_glyph_to_text_pos(const UINT16 *clustermap, UINT32 len, UINT16 target) -{ - UINT16 *ptr; - INT32 k; - - ptr = bsearch(&target, clustermap, len, sizeof(UINT16), compare_clustersearch); - if (!ptr) - return -1; - - /* get to the beginning */ - for (k = (ptr - clustermap) - 1; k >= 0 && clustermap[k] == target; k--) - ; - k++; - - return k; -} - -static HRESULT default_set_text_glyphs_props(struct scriptshaping_context *context, UINT16 *clustermap, UINT16 *glyph_indices, - UINT32 glyphcount, DWRITE_SHAPING_TEXT_PROPERTIES *text_props, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props) -{ - UINT32 i; - - for (i = 0; i < glyphcount; i++) { - UINT32 char_index[20]; - UINT32 char_count = 0; - INT32 k; - - k = map_glyph_to_text_pos(clustermap, context->length, i); - if (k >= 0) { - for (; k < context->length && clustermap[k] == i; k++) - char_index[char_count++] = k; - } - - if (char_count == 0) - continue; - - if (char_count == 1 && isspaceW(context->text[char_index[0]])) { - glyph_props[i].justification = SCRIPT_JUSTIFY_BLANK; - text_props[char_index[0]].isShapedAlone = context->text[char_index[0]] == ' '; - } - else - glyph_props[i].justification = SCRIPT_JUSTIFY_CHARACTER; - } - - /* FIXME: update properties using GDEF table */ - shape_update_clusters_from_glyphprop(glyphcount, context->length, clustermap, glyph_props); - - return S_OK; -} - -const struct scriptshaping_ops default_shaping_ops = -{ - NULL, - default_set_text_glyphs_props -}; - static unsigned int shape_select_script(const struct scriptshaping_cache *cache, DWORD kind, const DWORD *scripts, unsigned int *script_index) {

1 0

Brendan Shanks : winemac.drv: Set output id property for monitors.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: b582ab26f91b1b189409cf9d058ffd7c8827ccb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b582ab26f91b1b189409cf9d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu May 28 18:09:51 2020 +0800 winemac.drv: Set output id property for monitors. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 69b74e810e..5bbea22d3a 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -53,6 +53,7 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_GPU_LUID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 1); +DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 2); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); @@ -1570,6 +1571,11 @@ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *m DEVPROP_TYPE_INT64, (const BYTE *)gpu_luid, sizeof(*gpu_luid), 0)) goto done; + /* Write DEVPROPKEY_MONITOR_OUTPUT_ID */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_MONITOR_OUTPUT_ID, + DEVPROP_TYPE_UINT32, (const BYTE *)&video_index, sizeof(video_index), 0)) + goto done; + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey);

1 0

Brendan Shanks : winemac.drv: Set GPU LUID property for monitors.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: c36e26f41d1653d11ac47c7890497cc14ceb99ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=c36e26f41d1653d11ac47c78… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu May 28 18:09:40 2020 +0800 winemac.drv: Set GPU LUID property for monitors. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 7d9ff2d7c6..69b74e810e 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -52,6 +52,7 @@ struct display_mode_descriptor BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmode, DWORD flags); DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); +DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_GPU_LUID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 1); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); @@ -1361,12 +1362,13 @@ void macdrv_displays_changed(const macdrv_event *event) /*********************************************************************** * macdrv_init_gpu * - * Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter. + * Initialize a GPU instance. + * Return its GUID string in guid_string, driver value in driver parameter and LUID in gpu_luid. * * Return FALSE on failure and TRUE on success. */ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int gpu_index, WCHAR *guid_string, - WCHAR *driver) + WCHAR *driver, LUID *gpu_luid) { static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; @@ -1414,6 +1416,7 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int DEVPROP_TYPE_UINT64, (const BYTE *)&luid, sizeof(luid), 0)) goto done; } + *gpu_luid = luid; TRACE("GPU id:0x%s name:%s LUID:%08x:%08x.\n", wine_dbgstr_longlong(gpu->id), gpu->name, luid.HighPart, luid.LowPart); @@ -1541,7 +1544,7 @@ done: * Return FALSE on failure and TRUE on success. */ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *monitor, int monitor_index, - int video_index) + int video_index, const LUID *gpu_luid) { SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)}; WCHAR nameW[MAX_PATH]; @@ -1562,6 +1565,11 @@ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *m (const BYTE *)monitor_hardware_idW, sizeof(monitor_hardware_idW))) goto done; + /* Write DEVPROPKEY_MONITOR_GPU_LUID */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_MONITOR_GPU_LUID, + DEVPROP_TYPE_INT64, (const BYTE *)gpu_luid, sizeof(*gpu_luid), 0)) + goto done; + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey); @@ -1670,6 +1678,7 @@ void macdrv_init_display_devices(BOOL force) DWORD disposition = 0; WCHAR guidW[40]; WCHAR driverW[1024]; + LUID gpu_luid; mutex = CreateMutexW(NULL, FALSE, init_mutexW); WaitForSingleObject(mutex, INFINITE); @@ -1699,7 +1708,7 @@ void macdrv_init_display_devices(BOOL force) for (gpu = 0; gpu < gpu_count; gpu++) { - if (!macdrv_init_gpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW)) + if (!macdrv_init_gpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW, &gpu_luid)) goto done; /* Initialize adapters */ @@ -1721,7 +1730,7 @@ void macdrv_init_display_devices(BOOL force) for (monitor = 0; monitor < monitor_count; monitor++) { TRACE("monitor: %#x %s\n", monitor, monitors[monitor].name); - if (!macdrv_init_monitor(monitor_devinfo, &monitors[monitor], monitor, video_index)) + if (!macdrv_init_monitor(monitor_devinfo, &monitors[monitor], monitor, video_index, &gpu_luid)) goto done; }

1 0

Brendan Shanks : winex11.drv: Set output id property for monitors.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 707fcb99a60015fcbb20c83e9031bc5be7a58618 URL: https://source.winehq.org/git/wine.git/?a=commit;h=707fcb99a60015fcbb20c83e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu May 28 18:09:30 2020 +0800 winex11.drv: Set output id property for monitors. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 55533255f3..cf661f9f06 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_GPU_LUID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 1); +DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 2); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); @@ -506,6 +507,11 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo DEVPROP_TYPE_INT64, (const BYTE *)gpu_luid, sizeof(*gpu_luid), 0)) goto done; + /* Write DEVPROPKEY_MONITOR_OUTPUT_ID */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_MONITOR_OUTPUT_ID, + DEVPROP_TYPE_UINT32, (const BYTE *)&video_index, sizeof(video_index), 0)) + goto done; + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey);

1 0

Brendan Shanks : winex11.drv: Set GPU LUID property for monitors.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 8cd6245b7633abccd68f73928544ae4de6f76d52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cd6245b7633abccd68f7392… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu May 28 18:09:16 2020 +0800 winex11.drv: Set GPU LUID property for monitors. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index daea434dab..55533255f3 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -40,6 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); +DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_GPU_LUID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 1); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); @@ -317,9 +318,10 @@ void X11DRV_DisplayDevices_Update(BOOL send_display_change) EnumWindows(update_windows_on_display_change, (LPARAM)mask); } -/* Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter */ +/* Initialize a GPU instance. + * Return its GUID string in guid_string, driver value in driver parameter and LUID in gpu_luid */ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, - WCHAR *driver) + WCHAR *driver, LUID *gpu_luid) { static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; @@ -365,6 +367,7 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g DEVPROP_TYPE_UINT64, (const BYTE *)&luid, sizeof(luid), 0)) goto done; } + *gpu_luid = luid; TRACE("GPU id:0x%s name:%s LUID:%08x:%08x.\n", wine_dbgstr_longlong(gpu->id), wine_dbgstr_w(gpu->name), luid.HighPart, luid.LowPart); @@ -480,7 +483,7 @@ done: } static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *monitor, int monitor_index, - int video_index) + int video_index, const LUID *gpu_luid) { SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)}; WCHAR bufferW[MAX_PATH]; @@ -498,6 +501,11 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo (const BYTE *)monitor_hardware_idW, sizeof(monitor_hardware_idW))) goto done; + /* Write DEVPROPKEY_MONITOR_GPU_LUID */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_MONITOR_GPU_LUID, + DEVPROP_TYPE_INT64, (const BYTE *)gpu_luid, sizeof(*gpu_luid), 0)) + goto done; + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey); @@ -599,6 +607,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) DWORD disposition = 0; WCHAR guidW[40]; WCHAR driverW[1024]; + LUID gpu_luid; mutex = get_display_device_init_mutex(); @@ -627,7 +636,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) for (gpu = 0; gpu < gpu_count; gpu++) { - if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW)) + if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW, &gpu_luid)) goto done; /* Initialize adapters */ @@ -649,7 +658,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) for (monitor = 0; monitor < monitor_count; monitor++) { TRACE("monitor: %#x %s\n", monitor, wine_dbgstr_w(monitors[monitor].name)); - if (!X11DRV_InitMonitor(monitor_devinfo, &monitors[monitor], monitor, video_index)) + if (!X11DRV_InitMonitor(monitor_devinfo, &monitors[monitor], monitor, video_index, &gpu_luid)) goto done; }

1 0

Alex Henrie : ntdll/tests: Make RtlIpv6AddressToString test data static and constant.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: fef9849aae6521382d0414eca00034913db73faf URL: https://source.winehq.org/git/wine.git/?a=commit;h=fef9849aae6521382d0414ec… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 27 23:57:48 2020 -0600 ntdll/tests: Make RtlIpv6AddressToString test data static and constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 94c6b582f3..7a62670ea0 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1711,7 +1711,7 @@ static void test_RtlIpv6AddressToString(void) LPCSTR result; IN6_ADDR ip; DWORD_PTR len; - struct + static const struct { PCSTR address; int ip[8]; @@ -1835,7 +1835,7 @@ static void test_RtlIpv6AddressToStringEx(void) NTSTATUS res; IN6_ADDR ip; ULONG len; - struct + static const struct { PCSTR address; ULONG scopeid;

1 0

Gijs Vermeulen : wuapi: Fake success in IUpdateInstaller::get_IsBusy.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: b9acfa96a9a91cf942f65debfaebe3b5cfdeccab URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9acfa96a9a91cf942f65deb… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat May 23 16:41:32 2020 +0200 wuapi: Fake success in IUpdateInstaller::get_IsBusy. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wuapi/installer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wuapi/installer.c b/dlls/wuapi/installer.c index 376148244d..acfc101f8c 100644 --- a/dlls/wuapi/installer.c +++ b/dlls/wuapi/installer.c @@ -274,8 +274,9 @@ static HRESULT WINAPI update_installer_get_IsBusy( IUpdateInstaller *This, VARIANT_BOOL *retval ) { - FIXME("\n"); - return E_NOTIMPL; + FIXME("semi-stub, returning VARIANT_FALSE!\n"); + *retval = VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI update_installer_Uninstall(

1 0

Gijs Vermeulen : wuapi: Add UpdateInstaller coclass.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 45cb03f4878dc80df6624d246bfb1ad1f925af51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45cb03f4878dc80df6624d24… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat May 23 16:41:31 2020 +0200 wuapi: Add UpdateInstaller coclass. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wuapi/main.c | 5 +++++ include/wuapi.idl | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/wuapi/main.c b/dlls/wuapi/main.c index c2ed95ed42..63392b3660 100644 --- a/dlls/wuapi/main.c +++ b/dlls/wuapi/main.c @@ -111,6 +111,7 @@ static const struct IClassFactoryVtbl wucf_vtbl = static wucf sessioncf = { { &wucf_vtbl }, UpdateSession_create }; static wucf updatescf = { { &wucf_vtbl }, AutomaticUpdates_create }; static wucf sysinfocf = { { &wucf_vtbl }, SystemInformation_create }; +static wucf installercf = { { &wucf_vtbl }, UpdateInstaller_create }; static HINSTANCE instance; @@ -146,6 +147,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { cf = &sysinfocf.IClassFactory_iface; } + else if (IsEqualGUID( rclsid, &CLSID_UpdateInstaller )) + { + cf = &installercf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv ); } diff --git a/include/wuapi.idl b/include/wuapi.idl index d1a3593084..a0a8e4359a 100644 --- a/include/wuapi.idl +++ b/include/wuapi.idl @@ -1329,6 +1329,15 @@ interface ISystemInformation : IDispatch ] coclass AutomaticUpdates { interface IAutomaticUpdates; } +[ + helpstring("UpdateInstaller Class"), + threading(both), + progid("Microsoft.Update.Installer.1"), + vi_progid("Microsoft.Update.Installer"), + uuid(d2e0fe7f-d23e-48e1-93c0-6fa8cc346474) +] +coclass UpdateInstaller { interface IUpdateInstaller; } + [ helpstring("UpdateSession Class"), threading(both),

1 0

Serge Gautherie : shlwapi: RegQueryValueExW() wants bytes, not chars.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 0662da18b85634928905e72041961ffd3a6e8045 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0662da18b85634928905e720… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Thu May 28 04:30:53 2020 +0200 shlwapi: RegQueryValueExW() wants bytes, not chars. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 8c9e324ae0..e73ba6efa7 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3372,7 +3372,7 @@ HRESULT WINAPI CLSIDFromStringWrap(LPCWSTR idstr, CLSID *id) */ HRESULT WINAPI SHLoadRegUIStringW(HKEY hkey, LPCWSTR value, LPWSTR buf, DWORD size) { - DWORD type, sz = size; + DWORD type, sz = size * sizeof(WCHAR); if(RegQueryValueExW(hkey, value, NULL, &type, (LPBYTE)buf, &sz) != ERROR_SUCCESS) return E_FAIL;

1 0

Serge Gautherie : advpack: RegQueryValueExW() wants bytes, not chars.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: a359e026662251b7c3367fe2815dcb6cb371af50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a359e026662251b7c3367fe2… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Thu May 28 04:30:19 2020 +0200 advpack: RegQueryValueExW() wants bytes, not chars. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/advpack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index f2de8a6b25..e3d4d50837 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -907,7 +907,7 @@ HRESULT WINAPI UserInstStubWrapperW(HWND hWnd, HINSTANCE hInstance, { HKEY setup, guid; WCHAR stub[MAX_PATH]; - DWORD size = MAX_PATH; + DWORD size = sizeof(stub); HRESULT hr = S_OK; BOOL res;

1 0

Jacek Caban : taskmgr: Introduce size_diff helper.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 032190ac918009a43384d79e666b10725130185c URL: https://source.winehq.org/git/wine.git/?a=commit;h=032190ac918009a43384d79e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 23:56:02 2020 +0200 taskmgr: Introduce size_diff helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/perfdata.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index f86d52159f..3b5997d759 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -51,6 +51,11 @@ static SYSTEM_CACHE_INFORMATION SystemCacheInfo; static SYSTEM_HANDLE_INFORMATION SystemHandleInfo; static PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION SystemProcessorTimeInfo = NULL; +static size_t size_diff(size_t x, size_t y) +{ + return x > y ? x - y : y - x; +} + BOOL PerfDataInitialize(void) { LONG status; @@ -266,12 +271,12 @@ void PerfDataRefresh(void) pPerfData[Idx].vmCounters.WorkingSetSize = pSPI->vmCounters.WorkingSetSize; pPerfData[Idx].vmCounters.PeakWorkingSetSize = pSPI->vmCounters.PeakWorkingSetSize; if (pPDOld) - pPerfData[Idx].WorkingSetSizeDelta = labs(pSPI->vmCounters.WorkingSetSize - pPDOld->vmCounters.WorkingSetSize); + pPerfData[Idx].WorkingSetSizeDelta = size_diff(pSPI->vmCounters.WorkingSetSize, pPDOld->vmCounters.WorkingSetSize); else pPerfData[Idx].WorkingSetSizeDelta = 0; pPerfData[Idx].vmCounters.PageFaultCount = pSPI->vmCounters.PageFaultCount; if (pPDOld) - pPerfData[Idx].PageFaultCountDelta = labs(pSPI->vmCounters.PageFaultCount - pPDOld->vmCounters.PageFaultCount); + pPerfData[Idx].PageFaultCountDelta = size_diff(pSPI->vmCounters.PageFaultCount, pPDOld->vmCounters.PageFaultCount); else pPerfData[Idx].PageFaultCountDelta = 0; pPerfData[Idx].vmCounters.VirtualSize = pSPI->vmCounters.VirtualSize;

1 0

Jacek Caban : wintab32: Fix -Wabsolute-value warning.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: ca8de0e9f88b53858695179d2eb3b3917b097639 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca8de0e9f88b53858695179d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 23:55:58 2020 +0200 wintab32: Fix -Wabsolute-value warning. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/context.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index ff9a4ca677..2da0462193 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -223,7 +223,10 @@ LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) if (ptr->context.lcOutExtY > 0) packet->pkY = ptr->context.lcOutExtY - packet->pkY; else if (ptr->context.lcOutExtY < 0) - packet->pkY = abs(ptr->context.lcOutExtY + packet->pkY); + { + int y = ptr->context.lcOutExtY + packet->pkY; + packet->pkY = abs(y); + } DUMPPACKET(*packet);

1 0

Jacek Caban : kernel32/tests: Avoid using abs on ULONGLONG values.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 0a3a2556c19df9e85cd48c17ed6ea83c5dc79ebd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a3a2556c19df9e85cd48c17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 23:55:35 2020 +0200 kernel32/tests: Avoid using abs on ULONGLONG values. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 2e26e2ace8..7001baa173 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3546,7 +3546,7 @@ static BOOL check_file_time( const FILETIME *ft1, const FILETIME *ft2, UINT tole { ULONGLONG t1 = ((ULONGLONG)ft1->dwHighDateTime << 32) | ft1->dwLowDateTime; ULONGLONG t2 = ((ULONGLONG)ft2->dwHighDateTime << 32) | ft2->dwLowDateTime; - return abs(t1 - t2) <= tolerance; + return (t1 > t2 ? t1 - t2 : t2 - t1) <= tolerance; } static void test_ReplaceFileA(void)

1 0

Jacek Caban : kernel32/tests: Remove workaround for NT4.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 90f81e619800858d77a485d05a03da57edd12a46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90f81e619800858d77a485d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 23:55:30 2020 +0200 kernel32/tests: Remove workaround for NT4. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/resource.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index aef131d32e..cd3921426b 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -405,8 +405,7 @@ static void check_exe( const sec_verify *verify ) dir = (void*) ((BYTE*) dos + sec[verify->rsrc_section].VirtualAddress); ok( dir->Characteristics == 0, "Characteristics wrong\n"); - ok( dir->TimeDateStamp == 0 || abs( dir->TimeDateStamp - GetTickCount() ) < 1000 /* nt4 */, - "TimeDateStamp wrong %u\n", dir->TimeDateStamp); + ok( dir->TimeDateStamp == 0, "TimeDateStamp wrong %u\n", dir->TimeDateStamp); ok( dir->MajorVersion == 4, "MajorVersion wrong\n"); ok( dir->MinorVersion == 0, "MinorVersion wrong\n");

1 0

Jacek Caban : dmusic/tests: Introduce compare_time helper.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 5dd670c7c54d6c170088499021ce78a1694fdd9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dd670c7c54d6c1700884990… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 23:55:15 2020 +0200 dmusic/tests: Introduce compare_time helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/tests/dmusic.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 776f9d0ec9..c7de6c5326 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -30,6 +30,12 @@ #include "dmusicf.h" #include "dmksctrl.h" +static BOOL compare_time(REFERENCE_TIME x, REFERENCE_TIME y, unsigned int max_diff) +{ + REFERENCE_TIME diff = x > y ? x - y : y - x; + return diff <= max_diff; +} + static void test_dmusic(void) { IDirectMusic *dmusic = NULL; @@ -800,7 +806,7 @@ static void test_master_clock(void) hr = IReferenceClock_GetTime(clock, &time1); ok(hr == S_OK, "Got hr %#x.\n", hr); time2 = counter.QuadPart * 10000000.0 / freq.QuadPart; - ok(abs(time1 - time2) < 20 * 10000, "Expected about %s, got %s.\n", + ok(compare_time(time1, time2, 20 * 10000), "Expected about %s, got %s.\n", wine_dbgstr_longlong(time2), wine_dbgstr_longlong(time1)); hr = IReferenceClock_GetTime(clock, &time2);

1 0

Zebediah Figura : quartz/vmr9: Trace argument values instead of omitting them.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: e48fabff525061c8eea9558084a97308cebe6b7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e48fabff525061c8eea95580… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 27 11:47:38 2020 -0500 quartz/vmr9: Trace argument values instead of omitting them. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 8ba82e8259..4ea3b483a7 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2583,19 +2583,21 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) return refCount; } -static HRESULT WINAPI VMR9_ImagePresenter_StartPresenting(IVMRImagePresenter9 *iface, DWORD_PTR id) +static HRESULT WINAPI VMR9_ImagePresenter_StartPresenting(IVMRImagePresenter9 *iface, DWORD_PTR cookie) { - struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); + struct default_presenter *presenter = impl_from_IVMRImagePresenter9(iface); + + TRACE("presenter %p, cookie %#Ix.\n", presenter, cookie); - TRACE("(%p/%p/%p)->(...) stub\n", iface, This,This->pVMR9); return S_OK; } -static HRESULT WINAPI VMR9_ImagePresenter_StopPresenting(IVMRImagePresenter9 *iface, DWORD_PTR id) +static HRESULT WINAPI VMR9_ImagePresenter_StopPresenting(IVMRImagePresenter9 *iface, DWORD_PTR cookie) { - struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); + struct default_presenter *presenter = impl_from_IVMRImagePresenter9(iface); + + TRACE("presenter %p, cookie %#Ix.\n", presenter, cookie); - TRACE("(%p/%p/%p)->(...) stub\n", iface, This,This->pVMR9); return S_OK; } @@ -2619,13 +2621,14 @@ static HRESULT VMR9_ImagePresenter_PresentOffscreenSurface(struct default_presen return hr; } -static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *iface, DWORD_PTR id, VMR9PresentationInfo *info) +static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *iface, + DWORD_PTR cookie, VMR9PresentationInfo *info) { struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); HRESULT hr; BOOL render = FALSE; - TRACE("(%p/%p/%p)->(...) stub\n", iface, This, This->pVMR9); + TRACE("presenter %p, cookie %#Ix, info %p.\n", This, cookie, info); /* This might happen if we don't have active focus (eg on a different virtual desktop) */ if (!This->d3d9_dev) @@ -2857,14 +2860,14 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocator9 *if } static HRESULT WINAPI VMR9_SurfaceAllocator_AdviseNotify(IVMRSurfaceAllocator9 *iface, - IVMRSurfaceAllocatorNotify9 *allocnotify) + IVMRSurfaceAllocatorNotify9 *notify) { - struct default_presenter *This = impl_from_IVMRSurfaceAllocator9(iface); + struct default_presenter *presenter = impl_from_IVMRSurfaceAllocator9(iface); - TRACE("(%p/%p)->(...)\n", iface, This); + TRACE("presenter %p, notify %p.\n", presenter, notify); /* No AddRef taken here or the base VMR9 filter would never be destroyed */ - This->SurfaceAllocatorNotify = allocnotify; + presenter->SurfaceAllocatorNotify = notify; return S_OK; }

1 0

Zebediah Figura : quartz/vmr9: Get rid of CreateRenderingWindow().
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: c6abb3b241b67934b1bebebac70293ea3e0cdf3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6abb3b241b67934b1bebeba… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 27 11:47:37 2020 -0500 quartz/vmr9: Get rid of CreateRenderingWindow(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 6f699ce70f..8ba82e8259 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2751,8 +2751,10 @@ static UINT d3d9_adapter_from_hwnd(IDirect3D9 *d3d9, HWND hwnd, HMONITOR *mon_ou return d3d9_adapter; } -static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9AllocationInfo *info, DWORD *numbuffers) +static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocator9 *iface, + DWORD_PTR cookie, VMR9AllocationInfo *info, DWORD *numbuffers) { + struct default_presenter *This = impl_from_IVMRSurfaceAllocator9(iface); D3DPRESENT_PARAMETERS d3dpp; IDirect3DDevice9 *device; DWORD d3d9_adapter; @@ -2760,7 +2762,9 @@ static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9Allocation HWND window; HRESULT hr; - TRACE("(%p)->()\n", This); + TRACE("presenter %p, cookie %#Ix, info %p, numbuffers %p.\n", This, cookie, info, numbuffers); + + This->info = *info; if (This->pVMR9->mode == VMR9Mode_Windowed) window = This->pVMR9->window.hwnd; @@ -2783,7 +2787,7 @@ static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9Allocation if (FAILED(hr)) { ERR("Could not create device: %08x\n", hr); - return FALSE; + return hr; } IDirect3DDevice9_GetDeviceCaps(device, &caps); @@ -2791,14 +2795,14 @@ static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9Allocation { WARN("Device does not support blitting from textures.\n"); IDirect3DDevice9_Release(device); - return FALSE; + return VFW_E_DDRAW_CAPS_NOT_SUITABLE; } This->d3d9_dev = device; IVMRSurfaceAllocatorNotify9_SetD3DDevice(This->SurfaceAllocatorNotify, This->d3d9_dev, This->hMon); if (!(This->d3d9_surfaces = calloc(*numbuffers, sizeof(IDirect3DSurface9 *)))) - return FALSE; + return E_OUTOFMEMORY; hr = VMR9_SurfaceAllocator_SetAllocationSettings(This, info); if (FAILED(hr)) @@ -2814,27 +2818,11 @@ static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9Allocation if (FAILED(hr)) { IVMRSurfaceAllocator9_TerminateDevice(This->pVMR9->allocator, This->pVMR9->cookie); - return FALSE; + return hr; } This->num_surfaces = *numbuffers; - return TRUE; -} - -static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocator9 *iface, - DWORD_PTR cookie, VMR9AllocationInfo *allocinfo, DWORD *numbuffers) -{ - struct default_presenter *This = impl_from_IVMRSurfaceAllocator9(iface); - - This->info = *allocinfo; - - if (!CreateRenderingWindow(This, allocinfo, numbuffers)) - { - ERR("Failed to create rendering window, expect no output!\n"); - return VFW_E_WRONG_STATE; - } - return S_OK; }

1 0

Zebediah Figura : quartz/vmr9: Remove the unused "allocator_mon" field.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 6ccbc0579d7b3857687e2611ca586a4cbb9d99a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ccbc0579d7b3857687e2611… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 27 11:47:36 2020 -0500 quartz/vmr9: Remove the unused "allocator_mon" field. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index bc03326599..6f699ce70f 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -97,7 +97,6 @@ struct quartz_vmr /* Presentation related members */ IDirect3DDevice9 *allocator_d3d9_dev; - HMONITOR allocator_mon; IDirect3DSurface9 **surfaces; DWORD num_surfaces; DWORD cur_surface; @@ -1987,7 +1986,6 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_SetD3DDevice(IVMRSurfaceAllocat IDirect3DDevice9_Release(filter->allocator_d3d9_dev); filter->allocator_d3d9_dev = device; IDirect3DDevice9_AddRef(device); - filter->allocator_mon = monitor; return S_OK; } @@ -2001,7 +1999,6 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_ChangeD3DDevice(IVMRSurfaceAllo IDirect3DDevice9_Release(This->allocator_d3d9_dev); This->allocator_d3d9_dev = device; IDirect3DDevice9_AddRef(This->allocator_d3d9_dev); - This->allocator_mon = monitor; return S_OK; }

1 0

Zebediah Figura : quartz/vmr9: Don't expose IVMRSurfaceAllocatorEx9 from the default presenter.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: aa44879a09b29997e68f416c0c6e77d0a0ea82bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa44879a09b29997e68f416c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 27 11:47:35 2020 -0500 quartz/vmr9: Don't expose IVMRSurfaceAllocatorEx9 from the default presenter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 58 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index e02b642dbc..bc03326599 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -174,7 +174,7 @@ static inline struct quartz_vmr *impl_from_IVMRWindowlessControl9(IVMRWindowless struct default_presenter { IVMRImagePresenter9 IVMRImagePresenter9_iface; - IVMRSurfaceAllocatorEx9 IVMRSurfaceAllocatorEx9_iface; + IVMRSurfaceAllocator9 IVMRSurfaceAllocator9_iface; LONG refCount; @@ -195,9 +195,9 @@ static inline struct default_presenter *impl_from_IVMRImagePresenter9(IVMRImageP return CONTAINING_RECORD(iface, struct default_presenter, IVMRImagePresenter9_iface); } -static inline struct default_presenter *impl_from_IVMRSurfaceAllocatorEx9(IVMRSurfaceAllocatorEx9 *iface) +static inline struct default_presenter *impl_from_IVMRSurfaceAllocator9(IVMRSurfaceAllocator9 *iface) { - return CONTAINING_RECORD(iface, struct default_presenter, IVMRSurfaceAllocatorEx9_iface); + return CONTAINING_RECORD(iface, struct default_presenter, IVMRSurfaceAllocator9_iface); } static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *parent, LPVOID * ppv); @@ -1367,7 +1367,8 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface hr = VMR9DefaultAllocatorPresenterImpl_create(This, (LPVOID*)&This->presenter); if (SUCCEEDED(hr)) - hr = IVMRImagePresenter9_QueryInterface(This->presenter, &IID_IVMRSurfaceAllocatorEx9, (LPVOID*)&This->allocator); + hr = IVMRImagePresenter9_QueryInterface(This->presenter, + &IID_IVMRSurfaceAllocator9, (void **)&This->allocator); if (FAILED(hr)) { ERR("Unable to find Presenter interface\n"); @@ -2530,8 +2531,8 @@ static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *if if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IVMRImagePresenter9)) *ppv = &This->IVMRImagePresenter9_iface; - else if (IsEqualIID(riid, &IID_IVMRSurfaceAllocatorEx9)) - *ppv = &This->IVMRSurfaceAllocatorEx9_iface; + else if (IsEqualIID(riid, &IID_IVMRSurfaceAllocator9)) + *ppv = &This->IVMRSurfaceAllocator9_iface; if (*ppv) { @@ -2667,25 +2668,22 @@ static const IVMRImagePresenter9Vtbl VMR9_ImagePresenter = VMR9_ImagePresenter_PresentImage }; -static HRESULT WINAPI VMR9_SurfaceAllocator_QueryInterface(IVMRSurfaceAllocatorEx9 *iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI VMR9_SurfaceAllocator_QueryInterface(IVMRSurfaceAllocator9 *iface, REFIID iid, void **out) { - struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); - - return VMR9_ImagePresenter_QueryInterface(&This->IVMRImagePresenter9_iface, riid, ppv); + struct default_presenter *presenter = impl_from_IVMRSurfaceAllocator9(iface); + return IVMRImagePresenter9_QueryInterface(&presenter->IVMRImagePresenter9_iface, iid, out); } -static ULONG WINAPI VMR9_SurfaceAllocator_AddRef(IVMRSurfaceAllocatorEx9 *iface) +static ULONG WINAPI VMR9_SurfaceAllocator_AddRef(IVMRSurfaceAllocator9 *iface) { - struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); - - return VMR9_ImagePresenter_AddRef(&This->IVMRImagePresenter9_iface); + struct default_presenter *presenter = impl_from_IVMRSurfaceAllocator9(iface); + return IVMRImagePresenter9_AddRef(&presenter->IVMRImagePresenter9_iface); } -static ULONG WINAPI VMR9_SurfaceAllocator_Release(IVMRSurfaceAllocatorEx9 *iface) +static ULONG WINAPI VMR9_SurfaceAllocator_Release(IVMRSurfaceAllocator9 *iface) { - struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); - - return VMR9_ImagePresenter_Release(&This->IVMRImagePresenter9_iface); + struct default_presenter *presenter = impl_from_IVMRSurfaceAllocator9(iface); + return IVMRImagePresenter9_Release(&presenter->IVMRImagePresenter9_iface); } static HRESULT VMR9_SurfaceAllocator_SetAllocationSettings(struct default_presenter *This, VMR9AllocationInfo *allocinfo) @@ -2827,9 +2825,10 @@ static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9Allocation return TRUE; } -static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id, VMR9AllocationInfo *allocinfo, DWORD *numbuffers) +static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocator9 *iface, + DWORD_PTR cookie, VMR9AllocationInfo *allocinfo, DWORD *numbuffers) { - struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + struct default_presenter *This = impl_from_IVMRSurfaceAllocator9(iface); This->info = *allocinfo; @@ -2842,16 +2841,17 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocato return S_OK; } -static HRESULT WINAPI VMR9_SurfaceAllocator_TerminateDevice(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id) +static HRESULT WINAPI VMR9_SurfaceAllocator_TerminateDevice(IVMRSurfaceAllocator9 *iface, DWORD_PTR cookie) { - TRACE("iface %p, id %#lx.\n", iface, id); + TRACE("iface %p, cookie %#lx.\n", iface, cookie); return S_OK; } -static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id, DWORD surfaceindex, DWORD flags, IDirect3DSurface9 **surface) +static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocator9 *iface, + DWORD_PTR cookie, DWORD surfaceindex, DWORD flags, IDirect3DSurface9 **surface) { - struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + struct default_presenter *This = impl_from_IVMRSurfaceAllocator9(iface); /* Update everything first, this is needed because the surface might be destroyed in the reset */ if (!This->d3d9_dev) @@ -2871,9 +2871,10 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocatorEx9 * return S_OK; } -static HRESULT WINAPI VMR9_SurfaceAllocator_AdviseNotify(IVMRSurfaceAllocatorEx9 *iface, IVMRSurfaceAllocatorNotify9 *allocnotify) +static HRESULT WINAPI VMR9_SurfaceAllocator_AdviseNotify(IVMRSurfaceAllocator9 *iface, + IVMRSurfaceAllocatorNotify9 *allocnotify) { - struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + struct default_presenter *This = impl_from_IVMRSurfaceAllocator9(iface); TRACE("(%p/%p)->(...)\n", iface, This); @@ -2882,7 +2883,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_AdviseNotify(IVMRSurfaceAllocatorEx9 return S_OK; } -static const IVMRSurfaceAllocatorEx9Vtbl VMR9_SurfaceAllocator = +static const IVMRSurfaceAllocator9Vtbl VMR9_SurfaceAllocator = { VMR9_SurfaceAllocator_QueryInterface, VMR9_SurfaceAllocator_AddRef, @@ -2891,7 +2892,6 @@ static const IVMRSurfaceAllocatorEx9Vtbl VMR9_SurfaceAllocator = VMR9_SurfaceAllocator_TerminateDevice, VMR9_SurfaceAllocator_GetSurface, VMR9_SurfaceAllocator_AdviseNotify, - NULL /* This isn't the SurfaceAllocatorEx type yet, working on it */ }; static IDirect3D9 *init_d3d9(HMODULE d3d9_handle) @@ -2940,7 +2940,7 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *paren } object->IVMRImagePresenter9_iface.lpVtbl = &VMR9_ImagePresenter; - object->IVMRSurfaceAllocatorEx9_iface.lpVtbl = &VMR9_SurfaceAllocator; + object->IVMRSurfaceAllocator9_iface.lpVtbl = &VMR9_SurfaceAllocator; object->refCount = 1; object->pVMR9 = parent;

1 0

Zebediah Figura : quartz/vmr9: Don't query for IVMRSurfaceAllocatorEx9.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 39489e4d01ace78e90943c066e7e43105cf208a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39489e4d01ace78e90943c06… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 27 11:47:34 2020 -0500 quartz/vmr9: Don't query for IVMRSurfaceAllocatorEx9. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 1 + dlls/quartz/vmr9.c | 33 ++++++++++++--------------------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 0a8ae371a6..2921d1aed0 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2852,6 +2852,7 @@ static HRESULT WINAPI allocator_QueryInterface(IVMRSurfaceAllocator9 *iface, REF IVMRImagePresenter9_AddRef(&presenter_iface); return S_OK; } + ok(!IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorEx9), "Unexpected query for IVMRSurfaceAllocatorEx9.\n"); *out = NULL; return E_NOTIMPL; } diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 7fca3550d1..e02b642dbc 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -79,9 +79,8 @@ struct quartz_vmr IOverlay IOverlay_iface; - IVMRSurfaceAllocatorEx9 *allocator; + IVMRSurfaceAllocator9 *allocator; IVMRImagePresenter9 *presenter; - BOOL allocator_is_ex; DWORD stream_count; DWORD mixing_prefs; @@ -345,7 +344,7 @@ static HRESULT initialize_device(struct quartz_vmr *filter, VMR9AllocationInfo * HRESULT hr; DWORD i; - if (FAILED(hr = IVMRSurfaceAllocatorEx9_InitializeDevice(filter->allocator, + if (FAILED(hr = IVMRSurfaceAllocator9_InitializeDevice(filter->allocator, filter->cookie, info, &count))) { WARN("Failed to initialize device (flags %#x), hr %#x.\n", info->dwFlags, hr); @@ -354,13 +353,13 @@ static HRESULT initialize_device(struct quartz_vmr *filter, VMR9AllocationInfo * for (i = 0; i < count; ++i) { - if (FAILED(hr = IVMRSurfaceAllocatorEx9_GetSurface(filter->allocator, + if (FAILED(hr = IVMRSurfaceAllocator9_GetSurface(filter->allocator, filter->cookie, i, 0, &filter->surfaces[i]))) { ERR("Failed to get surface %u, hr %#x.\n", i, hr); while (i--) IDirect3DSurface9_Release(filter->surfaces[i]); - IVMRSurfaceAllocatorEx9_TerminateDevice(filter->allocator, filter->cookie); + IVMRSurfaceAllocator9_TerminateDevice(filter->allocator, filter->cookie); return hr; } } @@ -533,7 +532,7 @@ static HRESULT WINAPI VMR9_BreakConnect(struct strmbase_renderer *This) for (i = 0; i < pVMR9->num_surfaces; ++i) IDirect3DSurface9_Release(pVMR9->surfaces[i]); free(pVMR9->surfaces); - IVMRSurfaceAllocatorEx9_TerminateDevice(pVMR9->allocator, pVMR9->cookie); + IVMRSurfaceAllocator9_TerminateDevice(pVMR9->allocator, pVMR9->cookie); pVMR9->num_surfaces = 0; } return hr; @@ -558,8 +557,8 @@ static void vmr_destroy(struct strmbase_renderer *iface) if (filter->allocator) { - IVMRSurfaceAllocatorEx9_TerminateDevice(filter->allocator, filter->cookie); - IVMRSurfaceAllocatorEx9_Release(filter->allocator); + IVMRSurfaceAllocator9_TerminateDevice(filter->allocator, filter->cookie); + IVMRSurfaceAllocator9_Release(filter->allocator); } if (filter->presenter) IVMRImagePresenter9_Release(filter->presenter); @@ -1353,7 +1352,7 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface } if (This->allocator) - IVMRSurfaceAllocatorEx9_Release(This->allocator); + IVMRSurfaceAllocator9_Release(This->allocator); if (This->presenter) IVMRImagePresenter9_Release(This->presenter); @@ -1364,7 +1363,6 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface { case VMR9Mode_Windowed: case VMR9Mode_Windowless: - This->allocator_is_ex = 0; This->cookie = ~0; hr = VMR9DefaultAllocatorPresenterImpl_create(This, (LPVOID*)&This->presenter); @@ -1378,7 +1376,7 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface This->presenter = NULL; } else - hr = IVMRSurfaceAllocatorEx9_AdviseNotify(This->allocator, &This->IVMRSurfaceAllocatorNotify9_iface); + hr = IVMRSurfaceAllocator9_AdviseNotify(This->allocator, &This->IVMRSurfaceAllocatorNotify9_iface); break; case VMR9Mode_Renderless: break; @@ -1971,15 +1969,8 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator( if (FAILED(IVMRSurfaceAllocator9_QueryInterface(allocator, &IID_IVMRImagePresenter9, (void **)&filter->presenter))) return E_NOINTERFACE; - if (SUCCEEDED(IVMRSurfaceAllocator9_QueryInterface(allocator, - &IID_IVMRSurfaceAllocatorEx9, (void **)&filter->allocator))) - filter->allocator_is_ex = 1; - else - { - filter->allocator = (IVMRSurfaceAllocatorEx9 *)allocator; - IVMRSurfaceAllocator9_AddRef(allocator); - filter->allocator_is_ex = 0; - } + filter->allocator = allocator; + IVMRSurfaceAllocator9_AddRef(allocator); return S_OK; } @@ -2827,7 +2818,7 @@ static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9Allocation if (FAILED(hr)) { - IVMRSurfaceAllocatorEx9_TerminateDevice(This->pVMR9->allocator, This->pVMR9->cookie); + IVMRSurfaceAllocator9_TerminateDevice(This->pVMR9->allocator, This->pVMR9->cookie); return FALSE; }

1 0

Zebediah Figura : quartz/vmr9: Use TRACE for some implemented methods.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: f020fe051b02d7bda90a1fdb028a60e2ab7400f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f020fe051b02d7bda90a1fdb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 27 11:47:33 2020 -0500 quartz/vmr9: Use TRACE for some implemented methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 59 +++++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index a716a6e712..7fca3550d1 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1699,17 +1699,18 @@ static HRESULT WINAPI VMR9WindowlessControl_SetVideoPosition(IVMRWindowlessContr return S_OK; } -static HRESULT WINAPI VMR9WindowlessControl_GetVideoPosition(IVMRWindowlessControl9 *iface, RECT *source, RECT *dest) +static HRESULT WINAPI VMR9WindowlessControl_GetVideoPosition(IVMRWindowlessControl9 *iface, RECT *src, RECT *dst) { - struct quartz_vmr *This = impl_from_IVMRWindowlessControl9(iface); + struct quartz_vmr *filter = impl_from_IVMRWindowlessControl9(iface); - if (source) - *source = This->window.src; + TRACE("filter %p, src %p, dst %p.\n", filter, src, dst); - if (dest) - *dest = This->window.dst; + if (src) + *src = filter->window.src; + + if (dst) + *dst = filter->window.dst; - FIXME("(%p/%p)->(%p/%p) stub\n", iface, This, source, dest); return S_OK; } @@ -1955,42 +1956,46 @@ static ULONG WINAPI VMR9SurfaceAllocatorNotify_Release(IVMRSurfaceAllocatorNotif return refcount; } -static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator(IVMRSurfaceAllocatorNotify9 *iface, DWORD_PTR id, IVMRSurfaceAllocator9 *alloc) +static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator( + IVMRSurfaceAllocatorNotify9 *iface, DWORD_PTR cookie, IVMRSurfaceAllocator9 *allocator) { - struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); + struct quartz_vmr *filter = impl_from_IVMRSurfaceAllocatorNotify9(iface); - /* FIXME: This code is not tested!!! */ - FIXME("(%p/%p)->(...) stub\n", iface, This); - This->cookie = id; + TRACE("filter %p, cookie %#Ix, allocator %p.\n", filter, cookie, allocator); - if (This->presenter) + filter->cookie = cookie; + + if (filter->presenter) return VFW_E_WRONG_STATE; - if (FAILED(IVMRSurfaceAllocator9_QueryInterface(alloc, &IID_IVMRImagePresenter9, (void **)&This->presenter))) + if (FAILED(IVMRSurfaceAllocator9_QueryInterface(allocator, &IID_IVMRImagePresenter9, (void **)&filter->presenter))) return E_NOINTERFACE; - if (SUCCEEDED(IVMRSurfaceAllocator9_QueryInterface(alloc, &IID_IVMRSurfaceAllocatorEx9, (void **)&This->allocator))) - This->allocator_is_ex = 1; + if (SUCCEEDED(IVMRSurfaceAllocator9_QueryInterface(allocator, + &IID_IVMRSurfaceAllocatorEx9, (void **)&filter->allocator))) + filter->allocator_is_ex = 1; else { - This->allocator = (IVMRSurfaceAllocatorEx9 *)alloc; - IVMRSurfaceAllocator9_AddRef(alloc); - This->allocator_is_ex = 0; + filter->allocator = (IVMRSurfaceAllocatorEx9 *)allocator; + IVMRSurfaceAllocator9_AddRef(allocator); + filter->allocator_is_ex = 0; } return S_OK; } -static HRESULT WINAPI VMR9SurfaceAllocatorNotify_SetD3DDevice(IVMRSurfaceAllocatorNotify9 *iface, IDirect3DDevice9 *device, HMONITOR monitor) +static HRESULT WINAPI VMR9SurfaceAllocatorNotify_SetD3DDevice(IVMRSurfaceAllocatorNotify9 *iface, + IDirect3DDevice9 *device, HMONITOR monitor) { - struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); + struct quartz_vmr *filter = impl_from_IVMRSurfaceAllocatorNotify9(iface); - FIXME("(%p/%p)->(...) semi-stub\n", iface, This); - if (This->allocator_d3d9_dev) - IDirect3DDevice9_Release(This->allocator_d3d9_dev); - This->allocator_d3d9_dev = device; - IDirect3DDevice9_AddRef(This->allocator_d3d9_dev); - This->allocator_mon = monitor; + TRACE("filter %p, device %p, monitor %p.\n", filter, device, monitor); + + if (filter->allocator_d3d9_dev) + IDirect3DDevice9_Release(filter->allocator_d3d9_dev); + filter->allocator_d3d9_dev = device; + IDirect3DDevice9_AddRef(device); + filter->allocator_mon = monitor; return S_OK; }

1 0

Zebediah Figura : quartz/vmr9: Fake success from IVMRMixerConrol9::SetMixingPrefs().
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: dc93d5f856cd14eddc2db688248a700c256d17ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc93d5f856cd14eddc2db688… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 27 14:26:22 2020 -0500 quartz/vmr9: Fake success from IVMRMixerConrol9::SetMixingPrefs(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 33 +++++++++++++++++++++++++++++++++ dlls/quartz/vmr9.c | 14 +++++++++++--- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index dfa9dae73e..0a8ae371a6 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3876,6 +3876,38 @@ out: DestroyWindow(window); } +static void test_mixing_prefs(void) +{ + IBaseFilter *filter = create_vmr9(VMR9Mode_Windowed); + IVMRMixerControl9 *mixer_control; + DWORD flags; + HRESULT hr; + ULONG ref; + + set_mixing_mode(filter, 1); + + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRMixerControl9, (void **)&mixer_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRMixerControl9_GetMixingPrefs(mixer_control, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(flags == (MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_BiLinearFiltering + | MixerPref9_RenderTargetRGB), "Got flags %#x.\n", flags); + + hr = IVMRMixerControl9_SetMixingPrefs(mixer_control, MixerPref9_NoDecimation + | MixerPref9_ARAdjustXorY | MixerPref9_PointFiltering | MixerPref9_RenderTargetRGB); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRMixerControl9_GetMixingPrefs(mixer_control, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(flags == (MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_PointFiltering + | MixerPref9_RenderTargetRGB), "Got flags %#x.\n", flags); + + IVMRMixerControl9_Release(mixer_control); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -3910,6 +3942,7 @@ START_TEST(vmr9) test_surface_allocator_notify_refcount(); test_basic_video(); test_windowless_size(); + test_mixing_prefs(); CoUninitialize(); } diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 81e265f104..a716a6e712 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -84,6 +84,7 @@ struct quartz_vmr BOOL allocator_is_ex; DWORD stream_count; + DWORD mixing_prefs; /* * The Video Mixing Renderer supports 3 modes, renderless, windowless and windowed @@ -2227,7 +2228,10 @@ static HRESULT WINAPI mixer_control9_SetMixingPrefs(IVMRMixerControl9 *iface, DW FIXME("filter %p, flags %#x, stub!\n", filter, flags); - return E_NOTIMPL; + EnterCriticalSection(&filter->renderer.filter.csFilter); + filter->mixing_prefs = flags; + LeaveCriticalSection(&filter->renderer.filter.csFilter); + return S_OK; } static HRESULT WINAPI mixer_control9_GetMixingPrefs(IVMRMixerControl9 *iface, DWORD *flags) @@ -2236,8 +2240,9 @@ static HRESULT WINAPI mixer_control9_GetMixingPrefs(IVMRMixerControl9 *iface, DW FIXME("filter %p, flags %p, stub!\n", filter, flags); - *flags = MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_BiLinearFiltering | MixerPref9_RenderTargetRGB; - + EnterCriticalSection(&filter->renderer.filter.csFilter); + *flags = filter->mixing_prefs; + LeaveCriticalSection(&filter->renderer.filter.csFilter); return S_OK; } @@ -2500,6 +2505,9 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); + object->mixing_prefs = MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY + | MixerPref9_BiLinearFiltering | MixerPref9_RenderTargetRGB; + TRACE("Created VMR %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; return S_OK;

1 0

Gijs Vermeulen : include: Add cfg.h.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 912d5437ea5728fad10c5f7e3c2285f6107ccf04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=912d5437ea5728fad10c5f7e… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon May 25 17:17:38 2020 +0200 include: Add cfg.h. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/cfg.h | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 198 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 2f2d94d574..9796dd8e5d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -55,6 +55,7 @@ SOURCES = \ bthsdpdef.h \ cderr.h \ cdosys.idl \ + cfg.h \ cfgmgr32.h \ cguid.h \ chprst.idl \ diff --git a/include/cfg.h b/include/cfg.h new file mode 100644 index 0000000000..30d30b4bee --- /dev/null +++ b/include/cfg.h @@ -0,0 +1,197 @@ +/* + * Copyright 2020 Gijs Vermeulen + * + * 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 _CFG_INCLUDED_ +#define _CFG_INCLUDED_ + +typedef enum _PNP_VETO_TYPE { + PNP_VetoTypeUnknown, + PNP_VetoLegacyDevice, + PNP_VetoPendingClose, + PNP_VetoWindowsApp, + PNP_VetoWindowsService, + PNP_VetoOutstandingOpen, + PNP_VetoDevice, + PNP_VetoDriver, + PNP_VetoIllegalDeviceRequest, + PNP_VetoInsufficientPower, + PNP_VetoNonDisableable, + PNP_VetoLegacyDriver, + PNP_VetoInsufficientRights, + PNP_VetoAlreadyRemoved +} PNP_VETO_TYPE, *PPNP_VETO_TYPE; + +#define CM_PROB_NOT_CONFIGURED (0x00000001) +#define CM_PROB_DEVLOADER_FAILED (0x00000002) +#define CM_PROB_OUT_OF_MEMORY (0x00000003) +#define CM_PROB_ENTRY_IS_WRONG_TYPE (0x00000004) +#define CM_PROB_LACKED_ARBITRATOR (0x00000005) +#define CM_PROB_BOOT_CONFIG_CONFLICT (0x00000006) +#define CM_PROB_FAILED_FILTER (0x00000007) +#define CM_PROB_DEVLOADER_NOT_FOUND (0x00000008) +#define CM_PROB_INVALID_DATA (0x00000009) +#define CM_PROB_FAILED_START (0x0000000A) +#define CM_PROB_LIAR (0x0000000B) +#define CM_PROB_NORMAL_CONFLICT (0x0000000C) +#define CM_PROB_NOT_VERIFIED (0x0000000D) +#define CM_PROB_NEED_RESTART (0x0000000E) +#define CM_PROB_REENUMERATION (0x0000000F) +#define CM_PROB_PARTIAL_LOG_CONF (0x00000010) +#define CM_PROB_UNKNOWN_RESOURCE (0x00000011) +#define CM_PROB_REINSTALL (0x00000012) +#define CM_PROB_REGISTRY (0x00000013) +#define CM_PROB_VXDLDR (0x00000014) +#define CM_PROB_WILL_BE_REMOVED (0x00000015) +#define CM_PROB_DISABLED (0x00000016) +#define CM_PROB_DEVLOADER_NOT_READY (0x00000017) +#define CM_PROB_DEVICE_NOT_THERE (0x00000018) +#define CM_PROB_MOVED (0x00000019) +#define CM_PROB_TOO_EARLY (0x0000001A) +#define CM_PROB_NO_VALID_LOG_CONF (0x0000001B) +#define CM_PROB_FAILED_INSTALL (0x0000001C) +#define CM_PROB_HARDWARE_DISABLED (0x0000001D) +#define CM_PROB_CANT_SHARE_IRQ (0x0000001E) +#define CM_PROB_FAILED_ADD (0x0000001F) +#define CM_PROB_DISABLED_SERVICE (0x00000020) +#define CM_PROB_TRANSLATION_FAILED (0x00000021) +#define CM_PROB_NO_SOFTCONFIG (0x00000022) +#define CM_PROB_BIOS_TABLE (0x00000023) +#define CM_PROB_IRQ_TRANSLATION_FAILED (0x00000024) +#define CM_PROB_FAILED_DRIVER_ENTRY (0x00000025) +#define CM_PROB_DRIVER_FAILED_PRIOR_UNLOAD (0x00000026) +#define CM_PROB_DRIVER_FAILED_LOAD (0x00000027) +#define CM_PROB_DRIVER_SERVICE_KEY_INVALID (0x00000028) +#define CM_PROB_LEGACY_SERVICE_NO_DEVICES (0x00000029) +#define CM_PROB_DUPLICATE_DEVICE (0x0000002A) +#define CM_PROB_FAILED_POST_START (0x0000002B) +#define CM_PROB_HALTED (0x0000002C) +#define CM_PROB_PHANTOM (0x0000002D) +#define CM_PROB_SYSTEM_SHUTDOWN (0x0000002E) +#define CM_PROB_HELD_FOR_EJECT (0x0000002F) +#define CM_PROB_DRIVER_BLOCKED (0x00000030) +#define CM_PROB_REGISTRY_TOO_LARGE (0x00000031) +#define CM_PROB_SETPROPERTIES_FAILED (0x00000032) +#define CM_PROB_WAITING_ON_DEPENDENCY (0x00000033) +#define CM_PROB_UNSIGNED_DRIVER (0x00000034) +#define CM_PROB_USED_BY_DEBUGGER (0x00000035) +#define CM_PROB_DEVICE_RESET (0x00000036) +#define CM_PROB_CONSOLE_LOCKED (0x00000037) +#define CM_PROB_NEED_CLASS_CONFIG (0x00000038) +#define CM_PROB_GUEST_ASSIGNMENT_FAILED (0x00000039) + +#define NUM_CM_PROB_V1 (0x00000025) +#define NUM_CM_PROB_V2 (0x00000032) +#define NUM_CM_PROB_V3 (0x00000033) +#define NUM_CM_PROB_V4 (0x00000034) +#define NUM_CM_PROB_V5 (0x00000035) +#define NUM_CM_PROB_V6 (0x00000036) +#define NUM_CM_PROB_V7 (0x00000037) +#define NUM_CM_PROB_V8 (0x00000039) +#define NUM_CM_PROB_V9 (0x0000003A) + +#define NUM_CM_PROB NUM_CM_PROB_V9 + +#define DN_ROOT_ENUMERATED (0x00000001) +#define DN_DRIVER_LOADED (0x00000002) +#define DN_ENUM_LOADED (0x00000004) +#define DN_STARTED (0x00000008) +#define DN_MANUAL (0x00000010) +#define DN_NEED_TO_ENUM (0x00000020) +#define DN_NOT_FIRST_TIME (0x00000040) +#define DN_HARDWARE_ENUM (0x00000080) +#define DN_LIAR (0x00000100) +#define DN_HAS_MARK (0x00000200) +#define DN_HAS_PROBLEM (0x00000400) +#define DN_FILTERED (0x00000800) +#define DN_MOVED (0x00001000) +#define DN_DISABLEABLE (0x00002000) +#define DN_REMOVABLE (0x00004000) +#define DN_PRIVATE_PROBLEM (0x00008000) +#define DN_MF_PARENT (0x00010000) +#define DN_MF_CHILD (0x00020000) +#define DN_WILL_BE_REMOVED (0x00040000) + +#define DN_NOT_FIRST_TIMEE 0x00080000 +#define DN_STOP_FREE_RES 0x00100000 +#define DN_REBAL_CANDIDATE 0x00200000 +#define DN_BAD_PARTIAL 0x00400000 +#define DN_NT_ENUMERATOR 0x00800000 +#define DN_NT_DRIVER 0x01000000 + +#define DN_NEEDS_LOCKING 0x02000000 +#define DN_ARM_WAKEUP 0x04000000 +#define DN_APM_ENUMERATOR 0x08000000 +#define DN_APM_DRIVER 0x10000000 +#define DN_SILENT_INSTALL 0x20000000 +#define DN_NO_SHOW_IN_DM 0x40000000 +#define DN_BOOT_LOG_PROB 0x80000000 + +#define DN_NEED_RESTART DN_LIAR +#define DN_DRIVER_BLOCKED DN_NOT_FIRST_TIME +#define DN_LEGACY_DRIVER DN_MOVED +#define DN_CHILD_WITH_INVALID_ID DN_HAS_MARK +#define DN_DEVICE_DISCONNECTED DN_NEEDS_LOCKING +#define DN_QUERY_REMOVE_PENDING DN_MF_PARENT +#define DN_QUERY_REMOVE_ACTIVE DN_MF_CHILD + +#define DN_CHANGEABLE_FLAGS (DN_NOT_FIRST_TIME+DN_HARDWARE_ENUM+DN_HAS_MARK+DN_DISABLEABLE+DN_REMOVABLE+DN_MF_CHILD+DN_MF_PARENT+DN_NOT_FIRST_TIMEE+DN_STOP_FREE_RES+DN_REBAL_CANDIDATE+DN_NT_ENUMERATOR+DN_NT_DRIVER+DN_SILENT_INSTALL+DN_NO_SHOW_IN_DM) + +#define LCPRI_FORCECONFIG (0x00000000) +#define LCPRI_BOOTCONFIG (0x00000001) +#define LCPRI_DESIRED (0x00002000) +#define LCPRI_NORMAL (0x00003000) +#define LCPRI_LASTBESTCONFIG (0x00003FFF) +#define LCPRI_SUBOPTIMAL (0x00005000) +#define LCPRI_LASTSOFTCONFIG (0x00007FFF) +#define LCPRI_RESTART (0x00008000) +#define LCPRI_REBOOT (0x00009000) +#define LCPRI_POWEROFF (0x0000A000) +#define LCPRI_HARDRECONFIG (0x0000C000) +#define LCPRI_HARDWIRED (0x0000E000) +#define LCPRI_IMPOSSIBLE (0x0000F000) +#define LCPRI_DISABLED (0x0000FFFF) +#define MAX_LCPRI (0x0000FFFF) + +#define CM_DEVICE_PANEL_SIDE_UNKNOWN (0x00000000) +#define CM_DEVICE_PANEL_SIDE_TOP (0x00000001) +#define CM_DEVICE_PANEL_SIDE_BOTTOM (0x00000002) +#define CM_DEVICE_PANEL_SIDE_LEFT (0x00000003) +#define CM_DEVICE_PANEL_SIDE_RIGHT (0x00000004) +#define CM_DEVICE_PANEL_SIDE_FRONT (0x00000005) +#define CM_DEVICE_PANEL_SIDE_BACK (0x00000006) + +#define CM_DEVICE_PANEL_EDGE_UNKNOWN (0x00000000) +#define CM_DEVICE_PANEL_EDGE_TOP (0x00000001) +#define CM_DEVICE_PANEL_EDGE_BOTTOM (0x00000002) +#define CM_DEVICE_PANEL_EDGE_LEFT (0x00000003) +#define CM_DEVICE_PANEL_EDGE_RIGHT (0x00000004) + +#define CM_DEVICE_PANEL_SHAPE_UNKNOWN (0x00000000) +#define CM_DEVICE_PANEL_SHAPE_RECTANGLE (0x00000001) +#define CM_DEVICE_PANEL_SHAPE_OVAL (0x00000002) + +#define CM_DEVICE_PANEL_ORIENTATION_HORIZONTAL (0x00000000) +#define CM_DEVICE_PANEL_ORIENTATION_VERTICAL (0x00000001) + +#define CM_DEVICE_PANEL_JOINT_TYPE_UNKNOWN (0x00000000) +#define CM_DEVICE_PANEL_JOINT_TYPE_PLANAR (0x00000001) +#define CM_DEVICE_PANEL_JOINT_TYPE_HINGE (0x00000002) +#define CM_DEVICE_PANEL_JOINT_TYPE_PIVOT (0x00000003) +#define CM_DEVICE_PANEL_JOINT_TYPE_SWIVEL (0x00000004) + +#endif /* _CFG_INCLUDED_ */

1 0

Arkadiusz Hiler : user32: Fix NULL dereference in UnregisterDeviceNotification.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 65e550d265c481ff80d796622258c7177b36d745 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65e550d265c481ff80d79662… Author: Arkadiusz Hiler <arek(a)hiler.eu> Date: Tue May 26 23:01:36 2020 +0300 user32: Fix NULL dereference in UnregisterDeviceNotification. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49211 Signed-off-by: Arkadiusz Hiler <arek(a)hiler.eu> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sechost/service.c | 3 +++ dlls/user32/tests/input.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 924a6c9264..68d2b9e78e 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -2109,6 +2109,9 @@ BOOL WINAPI I_ScUnregisterDeviceNotification( HDEVNOTIFY handle ) TRACE("%p\n", handle); + if (!handle) + return FALSE; + EnterCriticalSection( &service_cs ); list_remove( &registration->entry ); LeaveCriticalSection(&service_cs); diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 92b18becd2..913fabfbd8 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3004,6 +3004,12 @@ static void test_GetPointerType(void) ok(type == PT_MOUSE, " type %d\n", type ); } +static void test_UnregisterDeviceNotification(void) +{ + BOOL ret = UnregisterDeviceNotification(NULL); + ok(ret == FALSE, "Unregistering NULL Device Notification returned: %d\n", ret); +} + START_TEST(input) { POINT pos; @@ -3050,4 +3056,6 @@ START_TEST(input) test_GetPointerType(); else win_skip("GetPointerType is not available\n"); + + test_UnregisterDeviceNotification(); }

1 0

Arkadiusz Hiler : user32: Move *RegisterDeviceNotification*() to input.c.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 8091922d9af2ae82bea37c7dbc26776c1407252a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8091922d9af2ae82bea37c7d… Author: Arkadiusz Hiler <arek(a)hiler.eu> Date: Tue May 26 23:01:35 2020 +0300 user32: Move *RegisterDeviceNotification*() to input.c. Signed-off-by: Arkadiusz Hiler <arek(a)hiler.eu> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/misc.c | 69 ----------------------------------------------------- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 2f8648f177..1dd43a36a1 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -45,6 +45,7 @@ #include "winerror.h" #include "win.h" #include "user_private.h" +#include "dbt.h" #include "wine/server.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -1298,3 +1299,71 @@ BOOL WINAPI EnableMouseInPointer(BOOL enable) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +static DWORD CALLBACK devnotify_window_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) +{ + SendMessageTimeoutW(handle, WM_DEVICECHANGE, flags, (LPARAM)header, SMTO_ABORTIFHUNG, 2000, NULL); + return 0; +} + +static DWORD CALLBACK devnotify_service_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) +{ + FIXME("Support for service handles is not yet implemented!\n"); + return 0; +} + +struct device_notification_details +{ + DWORD (CALLBACK *cb)(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header); + HANDLE handle; +}; + +extern HDEVNOTIFY WINAPI I_ScRegisterDeviceNotification( struct device_notification_details *details, + void *filter, DWORD flags ); +extern BOOL WINAPI I_ScUnregisterDeviceNotification( HDEVNOTIFY handle ); + +/*********************************************************************** + * RegisterDeviceNotificationA (USER32.@) + * + * See RegisterDeviceNotificationW. + */ +HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hRecipient, LPVOID pNotificationFilter, DWORD dwFlags) +{ + TRACE("(hwnd=%p, filter=%p,flags=0x%08x)\n", + hRecipient,pNotificationFilter,dwFlags); + if (pNotificationFilter) + FIXME("The notification filter will requires an A->W when filter support is implemented\n"); + return RegisterDeviceNotificationW(hRecipient, pNotificationFilter, dwFlags); +} + +/*********************************************************************** + * RegisterDeviceNotificationW (USER32.@) + */ +HDEVNOTIFY WINAPI RegisterDeviceNotificationW( HANDLE handle, void *filter, DWORD flags ) +{ + struct device_notification_details details; + + TRACE("handle %p, filter %p, flags %#x\n", handle, filter, flags); + + if (flags & ~(DEVICE_NOTIFY_SERVICE_HANDLE | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES)) + FIXME("unhandled flags %#x\n", flags); + + details.handle = handle; + + if (flags & DEVICE_NOTIFY_SERVICE_HANDLE) + details.cb = devnotify_service_callback; + else + details.cb = devnotify_window_callback; + + return I_ScRegisterDeviceNotification( &details, filter, 0 ); +} + +/*********************************************************************** + * UnregisterDeviceNotification (USER32.@) + */ +BOOL WINAPI UnregisterDeviceNotification( HDEVNOTIFY handle ) +{ + TRACE("%p\n", handle); + + return I_ScUnregisterDeviceNotification( handle ); +} diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 41909f9071..59b85baa58 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -31,7 +31,6 @@ #include "wingdi.h" #include "controls.h" #include "user_private.h" -#include "dbt.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -279,74 +278,6 @@ DWORD WINAPI RegisterTasklist (DWORD x) return TRUE; } -static DWORD CALLBACK devnotify_window_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) -{ - SendMessageTimeoutW(handle, WM_DEVICECHANGE, flags, (LPARAM)header, SMTO_ABORTIFHUNG, 2000, NULL); - return 0; -} - -static DWORD CALLBACK devnotify_service_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) -{ - FIXME("Support for service handles is not yet implemented!\n"); - return 0; -} - -struct device_notification_details -{ - DWORD (CALLBACK *cb)(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header); - HANDLE handle; -}; - -extern HDEVNOTIFY WINAPI I_ScRegisterDeviceNotification( struct device_notification_details *details, - void *filter, DWORD flags ); -extern BOOL WINAPI I_ScUnregisterDeviceNotification( HDEVNOTIFY handle ); - -/*********************************************************************** - * RegisterDeviceNotificationA (USER32.@) - * - * See RegisterDeviceNotificationW. - */ -HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hRecipient, LPVOID pNotificationFilter, DWORD dwFlags) -{ - TRACE("(hwnd=%p, filter=%p,flags=0x%08x)\n", - hRecipient,pNotificationFilter,dwFlags); - if (pNotificationFilter) - FIXME("The notification filter will requires an A->W when filter support is implemented\n"); - return RegisterDeviceNotificationW(hRecipient, pNotificationFilter, dwFlags); -} - -/*********************************************************************** - * RegisterDeviceNotificationW (USER32.@) - */ -HDEVNOTIFY WINAPI RegisterDeviceNotificationW( HANDLE handle, void *filter, DWORD flags ) -{ - struct device_notification_details details; - - TRACE("handle %p, filter %p, flags %#x\n", handle, filter, flags); - - if (flags & ~(DEVICE_NOTIFY_SERVICE_HANDLE | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES)) - FIXME("unhandled flags %#x\n", flags); - - details.handle = handle; - - if (flags & DEVICE_NOTIFY_SERVICE_HANDLE) - details.cb = devnotify_service_callback; - else - details.cb = devnotify_window_callback; - - return I_ScRegisterDeviceNotification( &details, filter, 0 ); -} - -/*********************************************************************** - * UnregisterDeviceNotification (USER32.@) - */ -BOOL WINAPI UnregisterDeviceNotification( HDEVNOTIFY handle ) -{ - TRACE("%p\n", handle); - - return I_ScUnregisterDeviceNotification( handle ); -} - /*********************************************************************** * GetAppCompatFlags (USER32.@) */

1 0

Jacek Caban : winnt.h: Provide inline NtCurrentTeb implementation for mingw arm builds.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 6a05b84ecaf6fa1f3343011351f9bdd2e4e5eaf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a05b84ecaf6fa1f33430113… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 20:19:04 2020 +0200 winnt.h: Provide inline NtCurrentTeb implementation for mingw arm builds. Based on mingw-w64. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index ae9177842b..34951766dd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2675,6 +2675,13 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB, Self)); } +#elif defined(__arm__) && defined(__MINGW32__) +static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) +{ + struct _TEB *teb; + __asm__("mrc p15, 0, %0, c13, c0, 2" : "=r" (teb)); + return teb; +} #else extern struct _TEB * WINAPI NtCurrentTeb(void); #endif

1 0

Jacek Caban : setjmp.h: Use __intrinsic_setjmpex when using ucrt.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 0413e2a523e96b70ea4e8ba598b61460b1500d75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0413e2a523e96b70ea4e8ba5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 19:13:09 2020 +0200 setjmp.h: Use __intrinsic_setjmpex when using ucrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/setjmp.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h index 837a876820..4b73703629 100644 --- a/include/msvcrt/setjmp.h +++ b/include/msvcrt/setjmp.h @@ -147,6 +147,9 @@ int __cdecl _setjmp(jmp_buf); void __cdecl longjmp(jmp_buf,int); #if defined(_WIN64) && defined(__GNUC__) +# ifdef _UCRT +# define _setjmpex __intrinsic_setjmpex +# endif int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,void*); # define setjmp(buf) _setjmpex(buf,__builtin_frame_address(0)) # define setjmpex(buf) _setjmpex(buf,__builtin_frame_address(0))

1 0

Henri Verbeet : wined3d: Use wined3d_buffer_vk_get_buffer_info() when binding the Vulkan index buffer.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 5d1fc2580819a3855248fbce94b46ff4b65f1e8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d1fc2580819a3855248fbce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 27 20:43:37 2020 +0430 wined3d: Use wined3d_buffer_vk_get_buffer_info() when binding the Vulkan index buffer. Since it updates "bo_user.valid". Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 5ca22bd113..5cb04310d6 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2920,16 +2920,18 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_INDEXBUFFER) && state->index_buffer) { - struct wined3d_bo_vk *bo = &wined3d_buffer_vk(state->index_buffer)->bo; + struct wined3d_buffer_vk *buffer_vk = wined3d_buffer_vk(state->index_buffer); + const VkDescriptorBufferInfo *buffer_info; VkIndexType idx_type; if (state->index_format == WINED3DFMT_R16_UINT) idx_type = VK_INDEX_TYPE_UINT16; else idx_type = VK_INDEX_TYPE_UINT32; - wined3d_context_vk_reference_bo(context_vk, bo); - VK_CALL(vkCmdBindIndexBuffer(vk_command_buffer, bo->vk_buffer, - bo->buffer_offset + state->index_offset, idx_type)); + buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); + wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); + VK_CALL(vkCmdBindIndexBuffer(vk_command_buffer, buffer_info->buffer, + buffer_info->offset + state->index_offset, idx_type)); } if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL))

1 0

Henri Verbeet : wined3d: Also load the index buffer in wined3d_context_vk_apply_draw_state() if STATE_INDEXBUFFER was invalidated.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 2d22715561c1d4cb472a8aa0fc47eb4e203d90d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d22715561c1d4cb472a8aa0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 27 20:43:36 2020 +0430 wined3d: Also load the index buffer in wined3d_context_vk_apply_draw_state() if STATE_INDEXBUFFER was invalidated. Otherwise we might try to bind a NULL buffer if the index buffer was not previously loaded. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index c5f2789f7f..5ca22bd113 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2878,7 +2878,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c context_invalidate_state(&context_vk->c, STATE_STREAMSRC); } - if (indexed) + if (indexed || (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_INDEXBUFFER) && state->index_buffer)) { wined3d_buffer_load(state->index_buffer, &context_vk->c, state); if (!wined3d_buffer_vk(state->index_buffer)->bo_user.valid)

1 0

Henri Verbeet : wined3d: Map vkGetPhysicalDeviceFeatures2() to vkGetPhysicalDeviceFeatures2KHR().
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 3da7d9d6bcebd6e07a9e2515766d2a4fa21f3122 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3da7d9d6bcebd6e07a9e2515… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 27 20:43:35 2020 +0430 wined3d: Map vkGetPhysicalDeviceFeatures2() to vkGetPhysicalDeviceFeatures2KHR(). Instead of to vkGetPhysicalDeviceFeaturess2KHR(), which doesn't typically exist. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3cccda3b2c..f8929ddf1f 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1963,7 +1963,7 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) if (!vk_ops->core_pfn) \ vk_ops->core_pfn = (void *)VK_CALL(vkGetInstanceProcAddr(instance, #ext_pfn)); MAP_INSTANCE_FUNCTION(vkGetPhysicalDeviceProperties2, vkGetPhysicalDeviceProperties2KHR) - MAP_INSTANCE_FUNCTION(vkGetPhysicalDeviceFeatures2, vkGetPhysicalDeviceFeaturess2KHR) + MAP_INSTANCE_FUNCTION(vkGetPhysicalDeviceFeatures2, vkGetPhysicalDeviceFeatures2KHR) #undef MAP_INSTANCE_FUNCTION vk_info->instance = instance;

1 0

Henri Verbeet : wined3d: Implement pipeline statistics queries for the Vulkan adapter.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 7a03ccfbe9313eb7ccb0b050dddf570a1e5f2ca5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a03ccfbe9313eb7ccb0b050… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 27 20:43:34 2020 +0430 wined3d: Implement pipeline statistics queries for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 6 ++++++ dlls/wined3d/query.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 45 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index af29ef7e7a..c5f2789f7f 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1231,6 +1231,10 @@ bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, free_pools = &context_vk->free_timestamp_query_pools; break; + case WINED3D_QUERY_TYPE_PIPELINE_STATISTICS: + free_pools = &context_vk->free_pipeline_statistics_query_pools; + break; + default: FIXME("Unhandled query type %#x.\n", type); return false; @@ -1291,6 +1295,7 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) wined3d_context_vk_cleanup_resources(context_vk); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_occlusion_query_pools); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_timestamp_query_pools); + wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_pipeline_statistics_query_pools); wine_rb_destroy(&context_vk->bo_slab_available, wined3d_context_vk_destroy_bo_slab, context_vk); heap_free(context_vk->pending_queries.queries); heap_free(context_vk->submitted.buffers); @@ -3063,6 +3068,7 @@ HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wi list_init(&context_vk->active_queries); list_init(&context_vk->free_occlusion_query_pools); list_init(&context_vk->free_timestamp_query_pools); + list_init(&context_vk->free_pipeline_statistics_query_pools); wine_rb_init(&context_vk->render_passes, wined3d_render_pass_vk_compare); wine_rb_init(&context_vk->pipeline_layouts, wined3d_pipeline_layout_vk_compare); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 9179350147..3af5649990 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1408,6 +1408,21 @@ bool wined3d_query_pool_vk_init(struct wined3d_query_pool_vk *pool_vk, pool_info.pipelineStatistics = 0; break; + case WINED3D_QUERY_TYPE_PIPELINE_STATISTICS: + pool_info.queryType = VK_QUERY_TYPE_PIPELINE_STATISTICS; + pool_info.pipelineStatistics = VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_VERTICES_BIT + | VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_PRIMITIVES_BIT + | VK_QUERY_PIPELINE_STATISTIC_VERTEX_SHADER_INVOCATIONS_BIT + | VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_INVOCATIONS_BIT + | VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_PRIMITIVES_BIT + | VK_QUERY_PIPELINE_STATISTIC_CLIPPING_INVOCATIONS_BIT + | VK_QUERY_PIPELINE_STATISTIC_CLIPPING_PRIMITIVES_BIT + | VK_QUERY_PIPELINE_STATISTIC_FRAGMENT_SHADER_INVOCATIONS_BIT + | VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_CONTROL_SHADER_PATCHES_BIT + | VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_EVALUATION_SHADER_INVOCATIONS_BIT + | VK_QUERY_PIPELINE_STATISTIC_COMPUTE_SHADER_INVOCATIONS_BIT; + break; + default: FIXME("Unhandled query type %#x.\n", type); return false; @@ -1428,12 +1443,15 @@ bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, struct wined3d_context_vk *context_vk, const struct wined3d_query_pool_idx_vk *pool_idx) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_query_data_pipeline_statistics *ps_tmp; const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_query_data_pipeline_statistics *ps_result; VkResult vr; union { uint64_t occlusion; uint64_t timestamp; + struct wined3d_query_data_pipeline_statistics pipeline_statistics; } tmp, *result; if ((vr = VK_CALL(vkGetQueryPoolResults(device_vk->vk_device, pool_idx->pool_vk->vk_query_pool, @@ -1457,6 +1475,22 @@ bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, result->timestamp = tmp.timestamp; break; + case WINED3D_QUERY_TYPE_PIPELINE_STATISTICS: + ps_result = &result->pipeline_statistics; + ps_tmp = &tmp.pipeline_statistics; + ps_result->vertices_submitted += ps_tmp->vertices_submitted; + ps_result->primitives_submitted += ps_tmp->primitives_submitted; + ps_result->vs_invocations += ps_tmp->vs_invocations; + ps_result->gs_invocations += ps_tmp->gs_invocations; + ps_result->gs_primitives += ps_tmp->gs_primitives; + ps_result->clipping_input_primitives += ps_tmp->clipping_input_primitives; + ps_result->clipping_output_primitives += ps_tmp->clipping_output_primitives; + ps_result->ps_invocations += ps_tmp->ps_invocations; + ps_result->hs_invocations += ps_tmp->hs_invocations; + ps_result->ds_invocations += ps_tmp->ds_invocations; + ps_result->cs_invocations += ps_tmp->cs_invocations; + break; + default: FIXME("Unhandled query type %#x.\n", query_vk->q.type); return false; @@ -1763,6 +1797,10 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer data_size = sizeof(struct wined3d_query_data_timestamp_disjoint); break; + case WINED3D_QUERY_TYPE_PIPELINE_STATISTICS: + data_size = sizeof(struct wined3d_query_data_pipeline_statistics); + break; + default: FIXME("Unhandled query type %#x.\n", type); return WINED3DERR_NOTAVAILABLE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9f8c212fbf..ae78a60f2a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2496,6 +2496,7 @@ struct wined3d_context_vk struct wined3d_pending_queries_vk pending_queries; struct list free_occlusion_query_pools; struct list free_timestamp_query_pools; + struct list free_pipeline_statistics_query_pools; struct wined3d_retired_objects_vk retired; struct wine_rb_tree render_passes;

1 0

Henri Verbeet : wined3d: Implement event queries for the Vulkan adapter.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 8f70aad2d5fa335758f4274d844860c364e8513b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f70aad2d5fa335758f4274d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 27 20:43:33 2020 +0430 wined3d: Implement event queries for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 69fc5e7474..9179350147 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1617,6 +1617,59 @@ static const struct wined3d_query_ops wined3d_query_vk_ops = .query_destroy = wined3d_query_vk_destroy, }; +static BOOL wined3d_query_event_vk_poll(struct wined3d_query *query, uint32_t flags) +{ + struct wined3d_query_vk *query_vk = wined3d_query_vk(query); + struct wined3d_context_vk *context_vk; + BOOL *signalled; + + context_vk = wined3d_context_vk(context_acquire(query->device, NULL, 0)); + + signalled = (BOOL *)query->data; + if (flags & WINED3DGETDATA_FLUSH) + wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); + if (query_vk->command_buffer_id == context_vk->current_command_buffer.id) + { + context_release(&context_vk->c); + return *signalled = FALSE; + } + + if (query_vk->command_buffer_id > context_vk->completed_command_buffer_id) + wined3d_context_vk_poll_command_buffers(context_vk); + *signalled = context_vk->completed_command_buffer_id >= query_vk->command_buffer_id; + + context_release(&context_vk->c); + + return *signalled; +} + +static BOOL wined3d_query_event_vk_issue(struct wined3d_query *query, uint32_t flags) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(query->device); + struct wined3d_query_vk *query_vk = wined3d_query_vk(query); + struct wined3d_context_vk *context_vk; + + TRACE("query %p, flags %#x.\n", query, flags); + + if (flags & WINED3DISSUE_END) + { + context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); + wined3d_context_vk_reference_query(context_vk, query_vk); + context_release(&context_vk->c); + + return TRUE; + } + + return FALSE; +} + +static const struct wined3d_query_ops wined3d_query_event_vk_ops = +{ + .query_poll = wined3d_query_event_vk_poll, + .query_issue = wined3d_query_event_vk_issue, + .query_destroy = wined3d_query_vk_destroy, +}; + static BOOL wined3d_query_timestamp_vk_issue(struct wined3d_query *query, uint32_t flags) { struct wined3d_device_vk *device_vk = wined3d_device_vk(query->device); @@ -1681,6 +1734,11 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer switch (type) { + case WINED3D_QUERY_TYPE_EVENT: + ops = &wined3d_query_event_vk_ops; + data_size = sizeof(BOOL); + break; + case WINED3D_QUERY_TYPE_OCCLUSION: data_size = sizeof(uint64_t); break;

1 0

Aaro Altonen : msado15: Implement _Command get/put CommandText.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 4963da2538b4c578336497d4272fabd4acee30f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4963da2538b4c578336497d4… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Wed May 27 17:19:03 2020 +0300 msado15: Implement _Command get/put CommandText. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49264 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/command.c | 30 +++++++++++++++++++++++------- dlls/msado15/tests/msado15.c | 26 ++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index 9081f1554f..eb7b3a035e 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -31,9 +31,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct command { - _Command Command_iface; - LONG ref; - CommandTypeEnum type; + _Command Command_iface; + LONG ref; + CommandTypeEnum type; + BSTR text; }; static inline struct command *impl_from_Command( _Command *iface ) @@ -79,6 +80,7 @@ static ULONG WINAPI command_Release( _Command *iface ) if (!ref) { TRACE( "destroying %p\n", command ); + heap_free( command->text ); heap_free( command ); } return ref; @@ -137,14 +139,27 @@ static HRESULT WINAPI command_put_ActiveConnection( _Command *iface, VARIANT con static HRESULT WINAPI command_get_CommandText( _Command *iface, BSTR *text ) { - FIXME( "%p, %p\n", iface, text ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + BSTR cmd_text = NULL; + + TRACE( "%p, %p\n", command, text ); + + if (command->text && !(cmd_text = SysAllocString( command->text ))) return E_OUTOFMEMORY; + *text = cmd_text; + return S_OK; } static HRESULT WINAPI command_put_CommandText( _Command *iface, BSTR text ) { - FIXME( "%p, %s\n", iface, debugstr_w(text) ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + WCHAR *source = NULL; + + TRACE( "%p, %s\n", command, debugstr_w( text ) ); + + if (text && !(source = strdupW( text ))) return E_OUTOFMEMORY; + heap_free( command->text ); + command->text = source; + return S_OK; } static HRESULT WINAPI command_get_CommandTimeout( _Command *iface, LONG *timeout ) @@ -327,6 +342,7 @@ HRESULT Command_create( void **obj ) if (!(command = heap_alloc( sizeof(*command) ))) return E_OUTOFMEMORY; command->Command_iface.lpVtbl = &command_vtbl; command->type = adCmdUnknown; + command->text = NULL; command->ref = 1; *obj = &command->Command_iface; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index b17430a93d..9834f55863 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -743,6 +743,7 @@ static void test_Command(void) Command15 *command15; Command25 *command25; CommandTypeEnum cmd_type = adCmdUnspecified; + BSTR cmd_text = (BSTR)"test"; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); ok( hr == S_OK, "got %08x\n", hr ); @@ -771,6 +772,31 @@ static void test_Command(void) hr = _Command_put_CommandType( command, 0xdeadbeef ); ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); + hr = _Command_get_CommandText( command, &cmd_text ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !cmd_text, "got %s\n", wine_dbgstr_w( cmd_text )); + + hr = _Command_put_CommandText( command, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + cmd_text = SysAllocString( L"" ); + hr = _Command_put_CommandText( command, cmd_text ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( cmd_text ); + + hr = _Command_get_CommandText( command, &cmd_text ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cmd_text && !*cmd_text, "got %p\n", cmd_text ); + + cmd_text = SysAllocString( L"test" ); + hr = _Command_put_CommandText( command, cmd_text ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( cmd_text ); + + hr = _Command_get_CommandText( command, &cmd_text ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !wcscmp( L"test", cmd_text ), "got %p\n", wine_dbgstr_w( cmd_text ) ); + _Command_Release( command ); }

1 0

Zhiyi Zhang : user32: Fake success for detaching adapters.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: f1e7d5bbd6e8817f7266c7144b747115a52893da URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1e7d5bbd6e8817f7266c714… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 26 16:35:39 2020 +0800 user32: Fake success for detaching adapters. It is currently unsupported. This helps later patches so that settings handlers using a new interface can be introduced without detaching adapter support, making patches smaller. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 12 +++++++++++- dlls/winemac.drv/display.c | 15 +++++++++++++++ dlls/winex11.drv/settings.c | 15 +++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index e6f33006db..82ed851364 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3287,6 +3287,15 @@ static void trace_devmode(const DEVMODEW *devmode) TRACE("\n"); } +static BOOL is_detached_mode(const DEVMODEW *mode) +{ + return mode->dmFields & DM_POSITION && + mode->dmFields & DM_PELSWIDTH && + mode->dmFields & DM_PELSHEIGHT && + mode->dmPelsWidth == 0 && + mode->dmPelsHeight == 0; +} + /*********************************************************************** * ChangeDisplaySettingsExW (USER32.@) */ @@ -3318,7 +3327,8 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND if (devmode->dmSize < FIELD_OFFSET(DEVMODEW, dmICMMethod)) return DISP_CHANGE_BADMODE; - if (((devmode->dmFields & DM_BITSPERPEL) && devmode->dmBitsPerPel) || + if (is_detached_mode(devmode) || + ((devmode->dmFields & DM_BITSPERPEL) && devmode->dmBitsPerPel) || ((devmode->dmFields & DM_PELSWIDTH) && devmode->dmPelsWidth) || ((devmode->dmFields & DM_PELSHEIGHT) && devmode->dmPelsHeight) || ((devmode->dmFields & DM_DISPLAYFREQUENCY) && devmode->dmDisplayFrequency)) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 402f54982a..7d9ff2d7c6 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -765,6 +765,15 @@ static BOOL get_primary_adapter(WCHAR *name) return FALSE; } +static BOOL is_detached_mode(const DEVMODEW *mode) +{ + return mode->dmFields & DM_POSITION && + mode->dmFields & DM_PELSWIDTH && + mode->dmFields & DM_PELSHEIGHT && + mode->dmPelsWidth == 0 && + mode->dmPelsHeight == 0; +} + /*********************************************************************** * ChangeDisplaySettingsEx (MACDRV.@) * @@ -811,6 +820,12 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, return DISP_CHANGE_SUCCESSFUL; } + if (is_detached_mode(devmode)) + { + FIXME("Detaching adapters is currently unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; + } + if (macdrv_get_displays(&displays, &num_displays)) return DISP_CHANGE_FAILED; diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 5609e2b43f..70ce35361b 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -329,6 +329,15 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo return FALSE; } +BOOL is_detached_mode(const DEVMODEW *mode) +{ + return mode->dmFields & DM_POSITION && + mode->dmFields & DM_PELSWIDTH && + mode->dmFields & DM_PELSHEIGHT && + mode->dmPelsWidth == 0 && + mode->dmPelsHeight == 0; +} + /*********************************************************************** * ChangeDisplaySettingsEx (X11DRV.@) * @@ -364,6 +373,12 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, return DISP_CHANGE_SUCCESSFUL; } + if (is_detached_mode(devmode)) + { + FIXME("Detaching adapters is currently unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; + } + for (i = 0; i < dd_mode_count; i++) { if (devmode->dmFields & DM_BITSPERPEL) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 52057e875d..5021c71a41 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -660,6 +660,7 @@ extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int he extern void X11DRV_resize_desktop(BOOL) DECLSPEC_HIDDEN; extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; +extern BOOL is_detached_mode(const DEVMODEW *) DECLSPEC_HIDDEN; extern BOOL create_desktop_win_data( Window win ) DECLSPEC_HIDDEN; extern BOOL get_primary_adapter(WCHAR *) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN;

1 0

Zhiyi Zhang : winemac.drv: Fake success for changing non-primary adapter settings.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 411fe4f1c3fc45ec6bed0a1beaf61c67f6cf6294 URL: https://source.winehq.org/git/wine.git/?a=commit;h=411fe4f1c3fc45ec6bed0a1b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 26 16:35:29 2020 +0800 winemac.drv: Fake success for changing non-primary adapter settings. Changing non-primary adapter settings is currently unsupported. Return success for non-primary adapter settings changes so that the primary adapter settings don't get changed unintentionally. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 968b9277bb..402f54982a 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -805,6 +805,12 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, devmode = &default_mode; } + if (lstrcmpiW(primary_adapter, devname)) + { + FIXME("Changing non-primary adapter settings is currently unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; + } + if (macdrv_get_displays(&displays, &num_displays)) return DISP_CHANGE_FAILED;

1 0

Zhiyi Zhang : winex11.drv: Fake success for changing non-primary adapter settings.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: ae4804d502fecab835146043010f53377bf1b65a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae4804d502fecab835146043… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 26 16:35:17 2020 +0800 winex11.drv: Fake success for changing non-primary adapter settings. Changing non-primary adapter settings is currently unsupported. Return success for non-primary adapter settings changes so that the primary adapter settings don't get changed unintentionally. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 3e7a5960f0..5609e2b43f 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -357,6 +357,13 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, devmode = &default_mode; } + if (lstrcmpiW(primary_adapter, devname)) + { + FIXME("Changing non-primary adapter %s settings is currently unsupported.\n", + wine_dbgstr_w(devname)); + return DISP_CHANGE_SUCCESSFUL; + } + for (i = 0; i < dd_mode_count; i++) { if (devmode->dmFields & DM_BITSPERPEL)

1 0

Zhiyi Zhang : user32: Handle NULL device and mode parameters in ChangeDisplaySettingsExW().
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 8a4ec0addba76bf3b34a9782556364ab4161dc22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a4ec0addba76bf3b34a9782… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 26 16:35:09 2020 +0800 user32: Handle NULL device and mode parameters in ChangeDisplaySettingsExW(). NULL device and mode parameters mean to restore all adapters to their registry settings. Since all user graphics drivers only support a primary adapter now, it's okay to restore only the primary adapter. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 3 +++ dlls/winemac.drv/display.c | 35 +++++++++++++++++++++++++++++++++++ dlls/winex11.drv/settings.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 75 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 10f17bb4c3..e6f33006db 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3300,6 +3300,9 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND TRACE("%s %p %p %#x %p\n", debugstr_w(devname), devmode, hwnd, flags, lparam); TRACE("flags=%s\n", _CDS_flags(flags)); + if (!devname && !devmode) + return USER_Driver->pChangeDisplaySettingsEx(NULL, NULL, hwnd, flags, lparam); + if (!devname && devmode) { if (!get_primary_adapter(primary_adapter)) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 851d549d5f..968b9277bb 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -747,6 +747,23 @@ void check_retina_status(void) } } +static BOOL get_primary_adapter(WCHAR *name) +{ + DISPLAY_DEVICEW dd; + DWORD i; + + dd.cb = sizeof(dd); + for (i = 0; EnumDisplayDevicesW(NULL, i, &dd, 0); ++i) + { + if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + lstrcpyW(name, dd.DeviceName); + return TRUE; + } + } + + return FALSE; +} /*********************************************************************** * ChangeDisplaySettingsEx (MACDRV.@) @@ -755,7 +772,9 @@ void check_retina_status(void) LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid) { + WCHAR primary_adapter[CCHDEVICENAME]; LONG ret = DISP_CHANGE_BADMODE; + DEVMODEW default_mode; int bpp; struct macdrv_display *displays; int num_displays; @@ -770,6 +789,22 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, init_original_display_mode(); + if (!get_primary_adapter(primary_adapter)) + return DISP_CHANGE_FAILED; + + if (!devname && !devmode) + { + default_mode.dmSize = sizeof(default_mode); + if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) + { + ERR("Default mode not found for %s!\n", wine_dbgstr_w(primary_adapter)); + return DISP_CHANGE_BADMODE; + } + + devname = primary_adapter; + devmode = &default_mode; + } + if (macdrv_get_displays(&displays, &num_displays)) return DISP_CHANGE_FAILED; diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 24644db620..3e7a5960f0 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -252,6 +252,24 @@ static BOOL write_registry_settings(const DEVMODEW *dm) return ret; } +BOOL get_primary_adapter(WCHAR *name) +{ + DISPLAY_DEVICEW dd; + DWORD i; + + dd.cb = sizeof(dd); + for (i = 0; EnumDisplayDevicesW(NULL, i, &dd, 0); ++i) + { + if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + lstrcpyW(name, dd.DeviceName); + return TRUE; + } + } + + return FALSE; +} + /*********************************************************************** * EnumDisplaySettingsEx (X11DRV.@) * @@ -318,9 +336,27 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid ) { + WCHAR primary_adapter[CCHDEVICENAME]; char bpp_buffer[16], freq_buffer[18]; + DEVMODEW default_mode; DWORD i; + if (!get_primary_adapter(primary_adapter)) + return DISP_CHANGE_FAILED; + + if (!devname && !devmode) + { + default_mode.dmSize = sizeof(default_mode); + if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) + { + ERR("Default mode not found for %s!\n", wine_dbgstr_w(primary_adapter)); + return DISP_CHANGE_BADMODE; + } + + devname = primary_adapter; + devmode = &default_mode; + } + for (i = 0; i < dd_mode_count; i++) { if (devmode->dmFields & DM_BITSPERPEL) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ff0aeb7dab..52057e875d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -661,6 +661,7 @@ extern void X11DRV_resize_desktop(BOOL) DECLSPEC_HIDDEN; extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern BOOL create_desktop_win_data( Window win ) DECLSPEC_HIDDEN; +extern BOOL get_primary_adapter(WCHAR *) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq) DECLSPEC_HIDDEN; unsigned int X11DRV_Settings_GetModeCount(void) DECLSPEC_HIDDEN;

1 0

Alex Henrie : ws2_32/tests: Put WSAAddressToString tests in tables.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 73ef942c6537b9faaf6401387b91d408e972beb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73ef942c6537b9faaf640138… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue May 26 23:33:32 2020 -0600 ws2_32/tests: Put WSAAddressToString tests in tables. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 431 +++++++++++++---------------------------------- 1 file changed, 115 insertions(+), 316 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73ef942c6537b9faaf64…

1 0

Paul Gofman : ntoskrnl.exe/tests: Add basic test for DPC call.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 4c81f499a632726b111473730c413d3cce537938 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c81f499a632726b11147373… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed May 27 13:23:22 2020 +0300 ntoskrnl.exe/tests: Add basic test for DPC call. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 112 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 356c60a2e7..dc576bfb1b 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1779,6 +1779,117 @@ static void test_affinity(void) KeRevertToUserAffinityThread(); } +struct test_dpc_func_context +{ + volatile LONG call_count; + volatile LONG selected_count; + volatile DEFERRED_REVERSE_BARRIER sync_barrier_start_value, sync_barrier_mid_value, sync_barrier_end_value; + volatile LONG done_barrier_start_value; +}; + +static BOOLEAN (WINAPI *pKeSignalCallDpcSynchronize)(void *barrier); +static void (WINAPI *pKeSignalCallDpcDone)(void *barrier); + +static void WINAPI test_dpc_func(PKDPC Dpc, void *context, void *cpu_count, + void *reverse_barrier) +{ + DEFERRED_REVERSE_BARRIER *barrier = reverse_barrier; + struct test_dpc_func_context *data = context; + + InterlockedIncrement(&data->call_count); + + InterlockedCompareExchange((volatile LONG*)&data->sync_barrier_start_value.Barrier, + *(volatile LONG *)&barrier->Barrier, 0); + InterlockedCompareExchange((volatile LONG*)&data->sync_barrier_start_value.TotalProcessors, + *(volatile LONG *)&barrier->TotalProcessors, 0); + + if (pKeSignalCallDpcSynchronize(reverse_barrier)) + InterlockedIncrement(&data->selected_count); + + InterlockedCompareExchange((volatile LONG*)&data->sync_barrier_mid_value.Barrier, + *(volatile LONG *)&barrier->Barrier, 0); + InterlockedCompareExchange((volatile LONG*)&data->sync_barrier_mid_value.TotalProcessors, + *(volatile LONG *)&barrier->TotalProcessors, 0); + + data->done_barrier_start_value = *(volatile LONG *)cpu_count; + + if (pKeSignalCallDpcSynchronize(reverse_barrier)) + InterlockedIncrement(&data->selected_count); + + pKeSignalCallDpcSynchronize(reverse_barrier); + pKeSignalCallDpcSynchronize(reverse_barrier); + + InterlockedCompareExchange((volatile LONG*)&data->sync_barrier_end_value.Barrier, + *(volatile LONG *)&barrier->Barrier, 0); + InterlockedCompareExchange((volatile LONG*)&data->sync_barrier_end_value.TotalProcessors, + *(volatile LONG *)&barrier->TotalProcessors, 0); + + pKeSignalCallDpcDone(cpu_count); +} + +static void test_dpc(void) +{ + void (WINAPI *pKeGenericCallDpc)(PKDEFERRED_ROUTINE routine, void *context); + struct test_dpc_func_context data; + KAFFINITY cpu_mask; + ULONG cpu_count; + + pKeGenericCallDpc = get_proc_address("KeGenericCallDpc"); + if (!pKeGenericCallDpc) + { + win_skip("KeGenericCallDpc is not available.\n"); + return; + } + + pKeSignalCallDpcDone = get_proc_address("KeSignalCallDpcDone"); + ok(!!pKeSignalCallDpcDone, "KeSignalCallDpcDone is not available.\n"); + pKeSignalCallDpcSynchronize = get_proc_address("KeSignalCallDpcSynchronize"); + ok(!!pKeSignalCallDpcSynchronize, "KeSignalCallDpcSynchronize is not available.\n"); + + + cpu_mask = KeQueryActiveProcessors(); + cpu_count = 0; + while (cpu_mask) + { + if (cpu_mask & 1) + ++cpu_count; + + cpu_mask >>= 1; + } + + memset(&data, 0, sizeof(data)); + + KeSetSystemAffinityThread(0x1); + + pKeGenericCallDpc(test_dpc_func, &data); + ok(data.call_count == cpu_count, "Got unexpected call_count %u.\n", data.call_count); + ok(data.selected_count == 2, "Got unexpected selected_count %u.\n", data.selected_count); + ok(data.sync_barrier_start_value.Barrier == cpu_count, + "Got unexpected sync_barrier_start_value.Barrier %d.\n", + data.sync_barrier_start_value.Barrier); + ok(data.sync_barrier_start_value.TotalProcessors == cpu_count, + "Got unexpected sync_barrier_start_value.TotalProcessors %d.\n", + data.sync_barrier_start_value.TotalProcessors); + + ok(data.sync_barrier_mid_value.Barrier == (0x80000000 | cpu_count), + "Got unexpected sync_barrier_mid_value.Barrier %d.\n", + data.sync_barrier_mid_value.Barrier); + ok(data.sync_barrier_mid_value.TotalProcessors == cpu_count, + "Got unexpected sync_barrier_mid_value.TotalProcessors %d.\n", + data.sync_barrier_mid_value.TotalProcessors); + + ok(data.sync_barrier_end_value.Barrier == cpu_count, + "Got unexpected sync_barrier_end_value.Barrier %d.\n", + data.sync_barrier_end_value.Barrier); + ok(data.sync_barrier_end_value.TotalProcessors == cpu_count, + "Got unexpected sync_barrier_end_value.TotalProcessors %d.\n", + data.sync_barrier_end_value.TotalProcessors); + + ok(data.done_barrier_start_value == cpu_count, "Got unexpected done_barrier_start_value %d.\n", data.done_barrier_start_value); + + KeRevertToUserAffinityThread(); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -1833,6 +1944,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_executable_pool(); #endif test_affinity(); + test_dpc(); if (main_test_work_item) return STATUS_UNEXPECTED_IO_ERROR;

1 0

Paul Gofman : ntoskrnl.exe: Add KeSignalCallDpcSynchronize() function.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 4921d24627f5f004b94f1212187adeda3f09219a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4921d24627f5f004b94f1212… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed May 27 12:50:49 2020 +0300 ntoskrnl.exe: Add KeSignalCallDpcSynchronize() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 46 +++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + 3 files changed, 48 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1a0cf1c5c2..bfac397011 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -75,6 +75,7 @@ KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4] = { { 0 } }; static TP_POOL *dpc_call_tp; static TP_CALLBACK_ENVIRON dpc_call_tpe; DECLARE_CRITICAL_SECTION(dpc_call_cs); +static DWORD dpc_call_tls_index; /* tid of the thread running client request */ static DWORD request_thread; @@ -3161,6 +3162,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) KeQueryTickCount( &count ); /* initialize the global KeTickCount */ NtBuildNumber = NtCurrentTeb()->Peb->OSBuildNumber; ntoskrnl_heap = HeapCreate( HEAP_CREATE_ENABLE_EXECUTE, 0, 0 ); + dpc_call_tls_index = TlsAlloc(); break; case DLL_PROCESS_DETACH: if (reserved) break; @@ -4027,6 +4029,8 @@ struct generic_call_dpc_context ULONG *cpu_count_barrier; void *context; ULONG cpu_index; + ULONG current_barrier_flag; + LONG *barrier_passed_count; }; static void WINAPI generic_call_dpc_callback(TP_CALLBACK_INSTANCE *instance, void *context) @@ -4044,7 +4048,9 @@ static void WINAPI generic_call_dpc_callback(TP_CALLBACK_INSTANCE *instance, voi new.Mask = 1 << c->cpu_index; NtSetInformationThread(GetCurrentThread(), ThreadGroupInformation, &new, sizeof(new)); + TlsSetValue(dpc_call_tls_index, context); c->routine((PKDPC)0xdeadbeef, c->context, c->cpu_count_barrier, c->reverse_barrier); + TlsSetValue(dpc_call_tls_index, NULL); NtSetInformationThread(GetCurrentThread(), ThreadGroupInformation, &old, sizeof(old)); } @@ -4054,6 +4060,7 @@ void WINAPI KeGenericCallDpc(PKDEFERRED_ROUTINE routine, void *context) static struct generic_call_dpc_context *contexts; DEFERRED_REVERSE_BARRIER reverse_barrier; static ULONG last_cpu_count; + LONG barrier_passed_count; ULONG cpu_count_barrier; ULONG i; @@ -4107,6 +4114,7 @@ void WINAPI KeGenericCallDpc(PKDEFERRED_ROUTINE routine, void *context) memset(contexts, 0, sizeof(*contexts) * cpu_count); last_cpu_count = cpu_count; + barrier_passed_count = 0; for (i = 0; i < cpu_count; ++i) { @@ -4115,6 +4123,7 @@ void WINAPI KeGenericCallDpc(PKDEFERRED_ROUTINE routine, void *context) contexts[i].routine = routine; contexts[i].context = context; contexts[i].cpu_index = i; + contexts[i].barrier_passed_count = &barrier_passed_count; TrySubmitThreadpoolCallback(generic_call_dpc_callback, &contexts[i], &dpc_call_tpe); } @@ -4125,6 +4134,43 @@ void WINAPI KeGenericCallDpc(PKDEFERRED_ROUTINE routine, void *context) LeaveCriticalSection(&dpc_call_cs); } + +BOOLEAN WINAPI KeSignalCallDpcSynchronize(void *barrier) +{ + struct generic_call_dpc_context *context = TlsGetValue(dpc_call_tls_index); + DEFERRED_REVERSE_BARRIER *b = barrier; + LONG curr_flag, comp, done_value; + BOOL first; + + TRACE("barrier %p, context %p.\n", barrier, context); + + if (!context) + { + WARN("Called outside of DPC context.\n"); + return FALSE; + } + + context->current_barrier_flag ^= 0x80000000; + curr_flag = context->current_barrier_flag; + + first = !context->cpu_index; + comp = curr_flag + context->cpu_index; + done_value = curr_flag + b->TotalProcessors; + + if (first) + InterlockedExchange((LONG *)&b->Barrier, comp); + + while (InterlockedCompareExchange((LONG *)&b->Barrier, comp + 1, comp) != done_value) + ; + + InterlockedIncrement(context->barrier_passed_count); + + while (first && InterlockedCompareExchange(context->barrier_passed_count, 0, b->TotalProcessors)) + ; + + return first; +} + void WINAPI KeSignalCallDpcDone(void *barrier) { InterlockedDecrement((LONG *)barrier); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 923ba22529..331b03ba9f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -61,6 +61,7 @@ @ stub KefReleaseSpinLockFromDpcLevel @ stdcall KeGenericCallDpc(ptr ptr) @ stdcall KeSignalCallDpcDone(ptr) +@ stdcall KeSignalCallDpcSynchronize(ptr) @ stub KiAcquireSpinLock @ stub KiReleaseSpinLock @ stdcall -fastcall ObfDereferenceObject(ptr) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 1b001d7424..8368f8c6e9 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1721,6 +1721,7 @@ void WINAPI KeSetSystemAffinityThread(KAFFINITY); KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity); BOOLEAN WINAPI KeSetTimerEx(KTIMER*,LARGE_INTEGER,LONG,KDPC*); void WINAPI KeSignalCallDpcDone(void*); +BOOLEAN WINAPI KeSignalCallDpcSynchronize(void*); NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG,void*[],WAIT_TYPE,KWAIT_REASON,KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*,KWAIT_BLOCK*); NTSTATUS WINAPI KeWaitForSingleObject(void*,KWAIT_REASON,KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*);

1 0

Paul Gofman : ntoskrnl.exe: Add KeGenericCallDpc() function.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 1adc1b1ecf387bcefea9e4b2204b878f90add394 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1adc1b1ecf387bcefea9e4b2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed May 27 12:50:48 2020 +0300 ntoskrnl.exe: Add KeGenericCallDpc() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 113 ++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 7 +++ 3 files changed, 121 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2291842a67..1a0cf1c5c2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -72,6 +72,10 @@ KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4] = { { 0 } }; #define MAX_SERVICE_NAME 260 +static TP_POOL *dpc_call_tp; +static TP_CALLBACK_ENVIRON dpc_call_tpe; +DECLARE_CRITICAL_SECTION(dpc_call_cs); + /* tid of the thread running client request */ static DWORD request_thread; @@ -3160,6 +3164,10 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) break; case DLL_PROCESS_DETACH: if (reserved) break; + + if (dpc_call_tp) + CloseThreadpool(dpc_call_tp); + HeapDestroy( ntoskrnl_heap ); RtlRemoveVectoredExceptionHandler( handler ); break; @@ -4012,6 +4020,111 @@ BOOLEAN WINAPI KdRefreshDebuggerNotPresent(void) return !KdDebuggerEnabled; } +struct generic_call_dpc_context +{ + DEFERRED_REVERSE_BARRIER *reverse_barrier; + PKDEFERRED_ROUTINE routine; + ULONG *cpu_count_barrier; + void *context; + ULONG cpu_index; +}; + +static void WINAPI generic_call_dpc_callback(TP_CALLBACK_INSTANCE *instance, void *context) +{ + struct generic_call_dpc_context *c = context; + GROUP_AFFINITY old, new; + + TRACE("instance %p, context %p.\n", instance, context); + + NtQueryInformationThread(GetCurrentThread(), ThreadGroupInformation, + &old, sizeof(old), NULL); + + memset(&new, 0, sizeof(new)); + + new.Mask = 1 << c->cpu_index; + NtSetInformationThread(GetCurrentThread(), ThreadGroupInformation, &new, sizeof(new)); + + c->routine((PKDPC)0xdeadbeef, c->context, c->cpu_count_barrier, c->reverse_barrier); + NtSetInformationThread(GetCurrentThread(), ThreadGroupInformation, &old, sizeof(old)); +} + +void WINAPI KeGenericCallDpc(PKDEFERRED_ROUTINE routine, void *context) +{ + ULONG cpu_count = KeQueryActiveProcessorCountEx(ALL_PROCESSOR_GROUPS); + static struct generic_call_dpc_context *contexts; + DEFERRED_REVERSE_BARRIER reverse_barrier; + static ULONG last_cpu_count; + ULONG cpu_count_barrier; + ULONG i; + + TRACE("routine %p, context %p.\n", routine, context); + + EnterCriticalSection(&dpc_call_cs); + + if (!dpc_call_tp) + { + if (!(dpc_call_tp = CreateThreadpool(NULL))) + { + ERR("Could not create thread pool.\n"); + LeaveCriticalSection(&dpc_call_cs); + return; + } + + SetThreadpoolThreadMinimum(dpc_call_tp, cpu_count); + SetThreadpoolThreadMaximum(dpc_call_tp, cpu_count); + + memset(&dpc_call_tpe, 0, sizeof(dpc_call_tpe)); + dpc_call_tpe.Version = 1; + dpc_call_tpe.Pool = dpc_call_tp; + } + + reverse_barrier.Barrier = cpu_count; + reverse_barrier.TotalProcessors = cpu_count; + cpu_count_barrier = cpu_count; + + if (contexts) + { + if (last_cpu_count < cpu_count) + { + static struct generic_call_dpc_context *new_contexts; + if (!(new_contexts = heap_realloc(contexts, sizeof(*contexts) * cpu_count))) + { + ERR("No memory.\n"); + LeaveCriticalSection(&dpc_call_cs); + return; + } + contexts = new_contexts; + SetThreadpoolThreadMinimum(dpc_call_tp, cpu_count); + SetThreadpoolThreadMaximum(dpc_call_tp, cpu_count); + } + } + else if (!(contexts = heap_alloc(sizeof(*contexts) * cpu_count))) + { + ERR("No memory.\n"); + LeaveCriticalSection(&dpc_call_cs); + return; + } + + memset(contexts, 0, sizeof(*contexts) * cpu_count); + last_cpu_count = cpu_count; + + for (i = 0; i < cpu_count; ++i) + { + contexts[i].reverse_barrier = &reverse_barrier; + contexts[i].cpu_count_barrier = &cpu_count_barrier; + contexts[i].routine = routine; + contexts[i].context = context; + contexts[i].cpu_index = i; + + TrySubmitThreadpoolCallback(generic_call_dpc_callback, &contexts[i], &dpc_call_tpe); + } + + while (InterlockedCompareExchange((LONG *)&cpu_count_barrier, 0, 0)) + SwitchToThread(); + + LeaveCriticalSection(&dpc_call_cs); +} + void WINAPI KeSignalCallDpcDone(void *barrier) { InterlockedDecrement((LONG *)barrier); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 28f8d5e4cd..923ba22529 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -59,6 +59,7 @@ @ stub KeSetTimeUpdateNotifyRoutine @ stub KefAcquireSpinLockAtDpcLevel @ stub KefReleaseSpinLockFromDpcLevel +@ stdcall KeGenericCallDpc(ptr ptr) @ stdcall KeSignalCallDpcDone(ptr) @ stub KiAcquireSpinLock @ stub KiReleaseSpinLock diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index b11f4d239d..1b001d7424 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -122,6 +122,12 @@ typedef struct _KMUTANT { UCHAR ApcDisable; } KMUTANT, *PKMUTANT, *RESTRICTED_POINTER PRKMUTANT, KMUTEX, *PKMUTEX, *RESTRICTED_POINTER PRKMUTEX; +typedef struct _DEFERRED_REVERSE_BARRIER +{ + ULONG Barrier; + ULONG TotalProcessors; +} DEFERRED_REVERSE_BARRIER; + typedef enum _KWAIT_REASON { Executive, @@ -1686,6 +1692,7 @@ BOOLEAN WINAPI KeCancelTimer(KTIMER*); void WINAPI KeClearEvent(PRKEVENT); NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*); void WINAPI KeEnterCriticalRegion(void); +void WINAPI KeGenericCallDpc(PKDEFERRED_ROUTINE,PVOID); ULONG WINAPI KeGetCurrentProcessorNumber(void); PKTHREAD WINAPI KeGetCurrentThread(void); void WINAPI KeInitializeEvent(PRKEVENT,EVENT_TYPE,BOOLEAN);

1 0

Paul Gofman : ntoskrnl.exe: Add KeSignalCallDpcDone() function.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 73d915fd8e3c7389b114f5d8379d126047b906e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73d915fd8e3c7389b114f5d8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed May 27 12:50:47 2020 +0300 ntoskrnl.exe: Add KeSignalCallDpcDone() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 +++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c4f2180c4c..2291842a67 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4011,3 +4011,8 @@ BOOLEAN WINAPI KdRefreshDebuggerNotPresent(void) return !KdDebuggerEnabled; } + +void WINAPI KeSignalCallDpcDone(void *barrier) +{ + InterlockedDecrement((LONG *)barrier); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c4ddfb2830..28f8d5e4cd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -59,6 +59,7 @@ @ stub KeSetTimeUpdateNotifyRoutine @ stub KefAcquireSpinLockAtDpcLevel @ stub KefReleaseSpinLockFromDpcLevel +@ stdcall KeSignalCallDpcDone(ptr) @ stub KiAcquireSpinLock @ stub KiReleaseSpinLock @ stdcall -fastcall ObfDereferenceObject(ptr) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index c1d083ef01..b11f4d239d 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1713,6 +1713,7 @@ KPRIORITY WINAPI KeSetPriorityThread(PKTHREAD,KPRIORITY); void WINAPI KeSetSystemAffinityThread(KAFFINITY); KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity); BOOLEAN WINAPI KeSetTimerEx(KTIMER*,LARGE_INTEGER,LONG,KDPC*); +void WINAPI KeSignalCallDpcDone(void*); NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG,void*[],WAIT_TYPE,KWAIT_REASON,KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*,KWAIT_BLOCK*); NTSTATUS WINAPI KeWaitForSingleObject(void*,KWAIT_REASON,KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*);

1 0

Paul Gofman : ntoskrnl.exe: Import KeGetCurrentProcessorNumber() function.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 8daad8963ec35f0278b6be9968abcd834a559166 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8daad8963ec35f0278b6be99… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed May 27 12:50:46 2020 +0300 ntoskrnl.exe: Import KeGetCurrentProcessorNumber() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3c7a9d1950..c4ddfb2830 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -546,6 +546,7 @@ @ stub KeFindConfigurationNextEntry @ stub KeFlushEntireTb @ stdcall KeFlushQueuedDpcs() +@ stdcall KeGetCurrentProcessorNumber() NtGetCurrentProcessorNumber @ stdcall KeGetCurrentThread() @ stub KeGetPreviousMode @ stub KeGetRecommendedSharedDataAlignment diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index b0ad0e70d3..c1d083ef01 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1686,6 +1686,7 @@ BOOLEAN WINAPI KeCancelTimer(KTIMER*); void WINAPI KeClearEvent(PRKEVENT); NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*); void WINAPI KeEnterCriticalRegion(void); +ULONG WINAPI KeGetCurrentProcessorNumber(void); PKTHREAD WINAPI KeGetCurrentThread(void); void WINAPI KeInitializeEvent(PRKEVENT,EVENT_TYPE,BOOLEAN); void WINAPI KeInitializeMutex(PRKMUTEX,ULONG);

1 0

Alexandre Julliard : ntdll: Fix off-by-one buffer size error.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: f5e703042ac6b10e803e7b796ffddabfdd82438c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5e703042ac6b10e803e7b79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 27 16:08:12 2020 +0200 ntdll: Fix off-by-one buffer size error. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49262 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3c05c524af..fecb3673d4 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2582,7 +2582,7 @@ static NTSTATUS find_builtin_dll( const WCHAR *name, WINE_MODREF **pwm, len = wcslen( name ); if (build_dir) maxlen = strlen(build_dir) + sizeof("/programs/") + len; - maxlen = max( maxlen, dll_path_maxlen ) + len + sizeof(".so"); + maxlen = max( maxlen, dll_path_maxlen + 1 ) + len + sizeof(".so"); if (!(file = RtlAllocateHeap( GetProcessHeap(), 0, maxlen ))) return STATUS_NO_MEMORY;

1 0

Nikolay Sivov : dwrite: Mark some of default ignorables as ZWS.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: cd8cdc7893958f217ce9aa750cb8666f24247f43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd8cdc7893958f217ce9aa75… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 10:14:25 2020 +0300 dwrite: Mark some of default ignorables as ZWS. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index f687740fa4..18bffc3fa2 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4923,6 +4923,20 @@ static unsigned int unicode_get_mirrored_char(unsigned int codepoint) return mirror ? mirror : codepoint; } +/* + * 034F # Mn COMBINING GRAPHEME JOINER + * 061C # Cf ARABIC LETTER MARK + * 180B..180D # Mn [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE + * 180E # Cf MONGOLIAN VOWEL SEPARATOR + * 200B..200F # Cf [5] ZERO WIDTH SPACE..RIGHT-TO-LEFT MARK + * FEFF # Cf ZERO WIDTH NO-BREAK SPACE +*/ +static unsigned int opentype_is_default_ignorable(unsigned int codepoint) +{ + return codepoint == 0x34f || codepoint == 0x61c || codepoint == 0xfeff || + (codepoint >= 0x180b && codepoint <= 0x180e) || (codepoint >= 0x200b && codepoint <= 0x200f); +} + static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, const struct shaping_features *features) { unsigned int rtlm_mask = shaping_features_get_mask(features, DWRITE_MAKE_OPENTYPE_TAG('r','t','l','m'), NULL); @@ -4964,6 +4978,8 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c context->u.subst.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER; context->u.subst.glyph_props[g].isClusterStart = 1; opentype_set_subst_glyph_props(context, g, context->u.subst.glyphs[g]); + if (opentype_is_default_ignorable(codepoint)) + context->u.subst.glyph_props[g].isZeroWidthSpace = 1; context->glyph_count++; clustermap[i] = i;

1 0

Nikolay Sivov : dwrite: Use cluster map to apply use feature ranges.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 47272be6aada4b7e41908ab047ac064f3fae4950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47272be6aada4b7e41908ab0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 10:14:24 2020 +0300 dwrite: Use cluster map to apply use feature ranges. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 2 ++ dlls/dwrite/dwrite_private.h | 7 +++++++ dlls/dwrite/opentype.c | 32 +++++++++++++++++++++++++++----- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index a7186a6815..556191a13d 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1251,6 +1251,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 context.is_sideways = is_sideways; context.u.pos.glyphs = glyphs; context.u.pos.glyph_props = glyph_props; + context.u.pos.clustermap = clustermap; context.glyph_count = glyph_count; context.emsize = emSize; context.measuring_mode = DWRITE_MEASURING_MODE_NATURAL; @@ -1320,6 +1321,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite context.is_sideways = is_sideways; context.u.pos.glyphs = glyphs; context.u.pos.glyph_props = glyph_props; + context.u.pos.clustermap = clustermap; context.glyph_count = glyph_count; context.emsize = emSize * ppdip; context.measuring_mode = measuring_mode; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index ad86422d50..cf3e0f7c12 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -484,6 +484,7 @@ struct scriptshaping_context { const UINT16 *glyphs; const DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; + const UINT16 *clustermap; } pos; struct { @@ -494,6 +495,12 @@ struct scriptshaping_context unsigned int capacity; const WCHAR *digits; } subst; + struct + { + UINT16 *glyphs; + DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; + UINT16 *clustermap; + } buffer; } u; const struct ot_gsubgpos_table *table; /* Either GSUB or GPOS. */ diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c815165505..f687740fa4 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4436,18 +4436,40 @@ static unsigned int shaping_features_get_mask(const struct shaping_features *fea return feature->mask; } +static void opentype_layout_get_glyph_range_for_text(struct scriptshaping_context *context, unsigned int start_char, + unsigned int end_char, unsigned int *start_glyph, unsigned int *end_glyph) +{ + *start_glyph = context->u.buffer.clustermap[start_char]; + if (end_char >= context->length - 1) + *end_glyph = context->glyph_count - 1; + else + *end_glyph = context->u.buffer.clustermap[end_char + 1] - 1; +} + static void opentype_layout_set_glyph_masks(struct scriptshaping_context *context, const struct shaping_features *features) { const DWRITE_TYPOGRAPHIC_FEATURES **user_features = context->user_features.features; - unsigned int f, r, g, start_glyph = 0, mask, shift, value; + unsigned int f, r, g, start_char, mask, shift, value; for (g = 0; g < context->glyph_count; ++g) context->glyph_infos[g].mask = context->global_mask; /* FIXME: set shaper masks */ - for (r = 0; r < context->user_features.range_count; ++r) + for (r = 0, start_char = 0; r < context->user_features.range_count; ++r) { + unsigned int start_glyph, end_glyph; + + if (start_char >= context->length) + break; + + opentype_layout_get_glyph_range_for_text(context, start_char, start_char + context->user_features.range_lengths[r], + &start_glyph, &end_glyph); + start_char += context->user_features.range_lengths[r]; + + if (start_glyph > end_glyph || end_glyph >= context->glyph_count) + continue; + for (f = 0; f < user_features[r]->featureCount; ++f) { mask = shaping_features_get_mask(features, user_features[r]->features[f].nameTag, &shift); @@ -4455,9 +4477,9 @@ static void opentype_layout_set_glyph_masks(struct scriptshaping_context *contex continue; value = (user_features[r]->features[f].parameter << shift) & mask; - for (g = 0; g < context->user_features.range_lengths[r]; ++g) - context->glyph_infos[g + start_glyph].mask = (context->glyph_infos[g + start_glyph].mask & ~mask) | value; - start_glyph += context->user_features.range_lengths[r]; + + for (g = start_glyph; g <= end_glyph; ++g) + context->glyph_infos[g].mask = (context->glyph_infos[g].mask & ~mask) | value; } } }

1 0

Nikolay Sivov : dwrite: Implement alternate substitution (GSUB lookup 3).
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: d5058fb304b72d6a0a836780ad865c6100d1a4c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5058fb304b72d6a0a836780… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 10:14:23 2020 +0300 dwrite: Implement alternate substitution (GSUB lookup 3). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 81b6aaa229..c815165505 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -569,6 +569,14 @@ struct ot_gsub_singlesubst_format2 UINT16 substitutes[1]; }; +struct ot_gsub_altsubst_format1 +{ + UINT16 format; + UINT16 coverage; + UINT16 count; + UINT16 sets[1]; +}; + struct ot_gsub_chaincontext_subst_format1 { UINT16 format; @@ -3256,6 +3264,23 @@ static inline unsigned int dwrite_popcount(unsigned int x) #endif } +static inline unsigned int dwrite_ctz(unsigned int x) +{ +#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) + return __builtin_ctz(x); +#else + unsigned int c = 32; + x &= - (int) x; + if (x) c--; + if (x & 0x0000ffff) c -= 16; + if (x & 0x00ff00ff) c -= 8; + if (x & 0x0f0f0f0f) c -= 4; + if (x & 0x33333333) c -= 2; + if (x & 0x55555555) c -= 1; + return c; +#endif +} + static inline unsigned int dwrite_log2i(unsigned int x) { #if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) @@ -4505,6 +4530,61 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_ return ret; } +static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_context *context, const struct lookup *lookup, + unsigned int subtable_offset) +{ + const struct dwrite_fonttable *gsub = &context->table->table; + UINT16 format, coverage, orig_glyph, glyph; + unsigned int idx, coverage_index, offset; + BOOL ret; + + idx = context->cur; + orig_glyph = glyph = context->u.subst.glyphs[idx]; + + format = table_read_be_word(gsub, subtable_offset); + + if (format == 1) + { + const struct ot_gsub_altsubst_format1 *format1 = table_read_ensure(gsub, subtable_offset, sizeof(*format1)); + unsigned int count, shift, alt_index; + + coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_altsubst_format1, coverage)); + + coverage_index = opentype_layout_is_glyph_covered(context, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) + return FALSE; + + if (coverage_index >= GET_BE_WORD(format1->count)) + return FALSE; + + offset = table_read_be_word(gsub, subtable_offset + + FIELD_OFFSET(struct ot_gsub_altsubst_format1, sets[coverage_index])); + + count = table_read_be_word(gsub, subtable_offset + offset); + if (!count) + return FALSE; + + shift = dwrite_ctz(lookup->mask); + alt_index = (lookup->mask & context->glyph_infos[idx].mask) >> shift; + + if (alt_index > count || !alt_index) + return FALSE; + + glyph = table_read_be_word(gsub, subtable_offset + offset + sizeof(count) + (alt_index - 1) * sizeof(glyph)); + } + else + WARN("Unexpected alternate substitution format %d.\n", format); + + if ((ret = (glyph != orig_glyph))) + { + context->u.subst.glyphs[idx] = glyph; + opentype_set_subst_glyph_props(context, idx, glyph); + context->cur++; + } + + return ret; +} + #define CHAIN_CONTEXT_MAX_LENGTH 64 static BOOL opentype_layout_context_match_input(struct scriptshaping_context *context, unsigned int subtable_offset, @@ -4785,11 +4865,13 @@ static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont case GSUB_LOOKUP_SINGLE_SUBST: ret = opentype_layout_apply_gsub_single_substitution(context, lookup, subtable_offset); break; + case GSUB_LOOKUP_ALTERNATE_SUBST: + ret = opentype_layout_apply_gsub_alt_substitution(context, lookup, subtable_offset); + break; case GSUB_LOOKUP_CHAINING_CONTEXTUAL_SUBST: ret = opentype_layout_apply_gsub_chain_context_substitution(context, lookup, subtable_offset); break; case GSUB_LOOKUP_MULTIPLE_SUBST: - case GSUB_LOOKUP_ALTERNATE_SUBST: case GSUB_LOOKUP_LIGATURE_SUBST: case GSUB_LOOKUP_CONTEXTUAL_SUBST: case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST:

1 0

Nikolay Sivov : dwrite: Handle extension substitution (GSUB lookup 7).
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 3abcf68af994780050cbef5e3d2cdd30c1abc681 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3abcf68af994780050cbef5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 10:14:22 2020 +0300 dwrite: Handle extension substitution (GSUB lookup 7). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 255 ++++++++++++++++++++++++++----------------------- 1 file changed, 135 insertions(+), 120 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3abcf68af994780050cb…

1 0

Nikolay Sivov : dwrite: Reference currently used layout table in context.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 3cf308d1b8dd57d0569d796cdfc206eb08e944c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cf308d1b8dd57d0569d796c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 10:14:21 2020 +0300 dwrite: Reference currently used layout table in context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 3 ++ dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 114 +++++++++++++++++++------------------------ 3 files changed, 54 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3cf308d1b8dd57d0569d…

1 0

Zebediah Figura : tests: Test multiple register spaces with samplers.
by Alexandre Julliard 27 May '20

27 May '20

Module: vkd3d Branch: master Commit: 5d5a458247cbcc9b4b4a77bb8da4cda751bf52e6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5d5a458247cbcc9b4b4a77b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 26 15:16:48 2020 -0500 tests: Test multiple register spaces with samplers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index dcec8ed..c4ec41a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33022,6 +33022,131 @@ static void test_register_space(void) destroy_test_context(&context); } +static void test_sampler_register_space(void) +{ + static const struct test_context_desc desc = {.no_root_signature = true}; + ID3D12DescriptorHeap *heap, *sampler_heap, *heaps[2]; + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_SAMPLER_DESC sampler_desc; + D3D12_SUBRESOURCE_DATA data; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *texture; + ID3D12Device *device; + HRESULT hr; + + static const D3D12_DESCRIPTOR_RANGE descriptor_ranges[] = + { + {D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 0, 0, 0}, + }; + + static const D3D12_DESCRIPTOR_RANGE sampler_ranges[] = + { + {D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, 1, 1, 1, 0}, + {D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, 1, 1, 2, D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND}, + }; + + static const D3D12_ROOT_PARAMETER root_parameters[] = + { + {D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE, + .DescriptorTable = {ARRAY_SIZE(descriptor_ranges), descriptor_ranges}}, + {D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE, + .DescriptorTable = {ARRAY_SIZE(sampler_ranges), sampler_ranges}}, + }; + + static const DWORD ps_code[] = + { +#if 0 + Texture2D<float> t; + SamplerState s1 : register(s1, space1); + SamplerState s2 : register(s1, space2); + + float4 main() : SV_Target + { + float2 coords = float2(0.5, 0.5); + return float4(t.Sample(s1, coords), t.Sample(s2, coords), 0, 1); + } +#endif + 0x43425844, 0xa29c83c7, 0xd4c8eeff, 0x7b73ff7b, 0x6463d58c, 0x00000001, 0x0000018c, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000114, 0x00000051, 0x00000045, + 0x0100086a, 0x0600005a, 0x00306e46, 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x0600005a, + 0x00306e46, 0x00000001, 0x00000001, 0x00000001, 0x00000002, 0x07001858, 0x00307e46, 0x00000000, + 0x00000000, 0x00000000, 0x00005555, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0e000045, 0x00100012, 0x00000000, 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, + 0x00000000, 0x00207e46, 0x00000000, 0x00000000, 0x00206000, 0x00000000, 0x00000001, 0x0e000045, + 0x00100022, 0x00000000, 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, 0x00000000, 0x00207e16, + 0x00000000, 0x00000000, 0x00206000, 0x00000001, 0x00000001, 0x05000036, 0x00102032, 0x00000000, + 0x00100046, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const float texture_data[4] = {0.0, 1.0, 0.0, 1.0}; + static const float blue[] = {0.0f, 0.0f, 1.0f, 1.0f}; + + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + memset(&root_signature_desc, 0, sizeof(root_signature_desc)); + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, ARRAY_SIZE(descriptor_ranges)); + sampler_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, ARRAY_SIZE(sampler_ranges)); + + texture = create_default_texture(device, 2, 2, DXGI_FORMAT_R32_FLOAT, 0, D3D12_RESOURCE_STATE_COPY_DEST); + data.pData = texture_data; + data.SlicePitch = data.RowPitch = 2 * sizeof(*texture_data); + upload_texture_data(texture, &data, 1, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + ID3D12Device_CreateShaderResourceView(device, texture, NULL, get_cpu_descriptor_handle(&context, heap, 0)); + + memset(&sampler_desc, 0, sizeof(sampler_desc)); + sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_LINEAR; + sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + ID3D12Device_CreateSampler(device, &sampler_desc, get_cpu_sampler_handle(&context, sampler_heap, 0)); + sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT; + ID3D12Device_CreateSampler(device, &sampler_desc, get_cpu_sampler_handle(&context, sampler_heap, 1)); + + context.pipeline_state = create_pipeline_state(device, context.root_signature, + context.render_target_desc.Format, NULL, &ps, NULL); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, blue, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + heaps[0] = heap; heaps[1] = sampler_heap; + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, ARRAY_SIZE(heaps), heaps); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, + 0, get_gpu_descriptor_handle(&context, heap, 0)); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, + 1, get_gpu_sampler_handle(&context, sampler_heap, 0)); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x0000ff80, 1); + + ID3D12Resource_Release(texture); + ID3D12DescriptorHeap_Release(heap); + ID3D12DescriptorHeap_Release(sampler_heap); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -33187,4 +33312,5 @@ START_TEST(d3d12) run_test(test_bufinfo_instruction); run_test(test_write_buffer_immediate); run_test(test_register_space); + run_test(test_sampler_register_space); }

1 0

Zebediah Figura : tests: Test multiple register spaces.
by Alexandre Julliard 27 May '20

27 May '20

Module: vkd3d Branch: master Commit: 6ac880da107b5b83564cdb0ef3a078dede3dad91 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6ac880da107b5b83564cdb0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 26 15:16:47 2020 -0500 tests: Test multiple register spaces. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 212 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=6ac880da107b5b83564…

1 0

Zebediah Figura : vkd3d: Implement register spaces.
by Alexandre Julliard 27 May '20

27 May '20

Module: vkd3d Branch: master Commit: 4bf22c6c27331b9569013ca0874d56db256714f9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4bf22c6c27331b9569013ca… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 26 15:16:46 2020 -0500 vkd3d: Implement register spaces. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 40 +++++++++------------------------------- 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 3233654..a7b6251 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -308,13 +308,6 @@ static bool vk_binding_from_d3d12_descriptor_range(struct VkDescriptorSetLayoutB binding_desc->descriptorType = vk_descriptor_type_from_d3d12_range_type(descriptor_range->RangeType, is_buffer); binding_desc->descriptorCount = 1; - - if (descriptor_range->RegisterSpace) - { - FIXME("Unhandled register space %u.\n", descriptor_range->RegisterSpace); - return false; - } - binding_desc->stageFlags = stage_flags_from_visibility(shader_visibility); binding_desc->pImmutableSamplers = NULL; @@ -495,12 +488,6 @@ static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signat if (p->ParameterType != D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS) continue; - if (p->u.Constants.RegisterSpace) - { - FIXME("Unhandled register space %u for parameter %u.\n", p->u.Constants.RegisterSpace, i); - return E_NOTIMPL; - } - idx = push_constant_count == 1 ? 0 : p->ShaderVisibility; offset = push_constants_offset[idx]; push_constants_offset[idx] += p->u.Constants.Num32BitValues * sizeof(uint32_t); @@ -510,7 +497,7 @@ static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signat ? push_constants[0].stageFlags : stage_flags_from_visibility(p->ShaderVisibility); root_constant->offset = offset; - root_signature->root_constants[j].register_space = 0; + root_signature->root_constants[j].register_space = p->u.Constants.RegisterSpace; root_signature->root_constants[j].register_index = p->u.Constants.ShaderRegister; root_signature->root_constants[j].shader_visibility = vkd3d_shader_visibility_from_d3d12(p->ShaderVisibility); @@ -534,7 +521,7 @@ struct vkd3d_descriptor_set_context }; static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature *root_signature, - enum vkd3d_shader_descriptor_type descriptor_type, unsigned int register_idx, + enum vkd3d_shader_descriptor_type descriptor_type, unsigned int register_space, unsigned int register_idx, bool buffer_descriptor, enum vkd3d_shader_visibility shader_visibility, struct vkd3d_descriptor_set_context *context) { @@ -542,7 +529,7 @@ static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature * = &root_signature->descriptor_mapping[context->descriptor_index++]; mapping->type = descriptor_type; - mapping->register_space = 0; + mapping->register_space = register_space; mapping->register_index = register_idx; mapping->shader_visibility = shader_visibility; mapping->flags = buffer_descriptor ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE; @@ -551,7 +538,7 @@ static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature * } static uint32_t d3d12_root_signature_assign_vk_bindings(struct d3d12_root_signature *root_signature, - enum vkd3d_shader_descriptor_type descriptor_type, unsigned int base_register_idx, + enum vkd3d_shader_descriptor_type descriptor_type, unsigned int register_space, unsigned int base_register_idx, unsigned int binding_count, bool is_buffer_descriptor, bool duplicate_descriptors, enum vkd3d_shader_visibility shader_visibility, struct vkd3d_descriptor_set_context *context) { @@ -567,10 +554,10 @@ static uint32_t d3d12_root_signature_assign_vk_bindings(struct d3d12_root_signat for (i = 0; i < binding_count; ++i) { if (duplicate_descriptors) - d3d12_root_signature_append_vk_binding(root_signature, descriptor_type, + d3d12_root_signature_append_vk_binding(root_signature, descriptor_type, register_space, base_register_idx + i, true, shader_visibility, context); - d3d12_root_signature_append_vk_binding(root_signature, descriptor_type, + d3d12_root_signature_append_vk_binding(root_signature, descriptor_type, register_space, base_register_idx + i, is_buffer_descriptor, shader_visibility, context); } return first_binding; @@ -627,7 +614,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo vk_binding = d3d12_root_signature_assign_vk_bindings(root_signature, vkd3d_descriptor_type_from_d3d12_range_type(range->RangeType), - range->BaseShaderRegister, range->NumDescriptors, false, true, + range->RegisterSpace, range->BaseShaderRegister, range->NumDescriptors, false, true, vkd3d_shader_visibility_from_d3d12(p->ShaderVisibility), context); /* Unroll descriptor range. */ @@ -685,15 +672,9 @@ static HRESULT d3d12_root_signature_init_root_descriptors(struct d3d12_root_sign root_signature->push_descriptor_mask |= 1u << i; - if (p->u.Descriptor.RegisterSpace) - { - FIXME("Unhandled register space %u for parameter %u.\n", p->u.Descriptor.RegisterSpace, i); - return E_NOTIMPL; - } - cur_binding->binding = d3d12_root_signature_assign_vk_bindings(root_signature, vkd3d_descriptor_type_from_d3d12_root_parameter_type(p->ParameterType), - p->u.Descriptor.ShaderRegister, 1, true, false, + p->u.Descriptor.RegisterSpace, p->u.Descriptor.ShaderRegister, 1, true, false, vkd3d_shader_visibility_from_d3d12(p->ShaderVisibility), context); cur_binding->descriptorType = vk_descriptor_type_from_d3d12_root_parameter(p->ParameterType); cur_binding->descriptorCount = 1; @@ -723,14 +704,11 @@ static HRESULT d3d12_root_signature_init_static_samplers(struct d3d12_root_signa { const D3D12_STATIC_SAMPLER_DESC *s = &desc->pStaticSamplers[i]; - if (s->RegisterSpace) - FIXME("Unhandled register space %u for static sampler %u.\n", s->RegisterSpace, i); - if (FAILED(hr = vkd3d_create_static_sampler(device, s, &root_signature->static_samplers[i]))) return hr; cur_binding->binding = d3d12_root_signature_assign_vk_bindings(root_signature, - VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, s->ShaderRegister, 1, false, false, + VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, s->RegisterSpace, s->ShaderRegister, 1, false, false, vkd3d_shader_visibility_from_d3d12(s->ShaderVisibility), context); cur_binding->descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER; cur_binding->descriptorCount = 1;

1 0

Zebediah Figura : vkd3d-shader: Also match the register space when looking up bindings.
by Alexandre Julliard 27 May '20

27 May '20

Module: vkd3d Branch: master Commit: 87364057dac0bb29bb3ce12ec70e038d9c1d7de9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=87364057dac0bb29bb3ce12… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 26 15:16:45 2020 -0500 vkd3d-shader: Also match the register space when looking up bindings. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 3 +++ libs/vkd3d-shader/spirv.c | 52 ++++++++++++++++++++--------------------------- libs/vkd3d/state.c | 5 +++++ 3 files changed, 30 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=87364057dac0bb29bb3…

1 0

Zebediah Figura : vkd3d-shader: Do not treat descriptor registers as arrayed.
by Alexandre Julliard 27 May '20

27 May '20

Module: vkd3d Branch: master Commit: e53496f6fd7fe9b302ac459f300e35e1ce8935f6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e53496f6fd7fe9b302ac459… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 26 15:16:44 2020 -0500 vkd3d-shader: Do not treat descriptor registers as arrayed. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d09e0fd..1b2cf3d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2821,6 +2821,21 @@ static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compil return true; } +static bool register_is_descriptor(const struct vkd3d_shader_register *reg) +{ + switch (reg->type) + { + case VKD3DSPR_SAMPLER: + case VKD3DSPR_RESOURCE: + case VKD3DSPR_CONSTBUFFER: + case VKD3DSPR_UAV: + return true; + + default: + return false; + } +} + static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, struct vkd3d_shader_register_info *register_info) { @@ -2868,7 +2883,7 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp FIXME("Relative addressing not implemented.\n"); /* Handle arrayed registers, e.g. v[3][0]. */ - if (reg->idx[1].offset != ~0u) + if (reg->idx[1].offset != ~0u && !register_is_descriptor(reg)) indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[0]); }

1 0

Zebediah Figura : vkd3d-shader: Use the size from struct vkd3d_shader_constant_buffer when declaring push constant buffers.
by Alexandre Julliard 27 May '20

27 May '20

Module: vkd3d Branch: master Commit: d08107da90962b0def92c9f2d62fa1bf94e8dff6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d08107da90962b0def92c9f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 26 15:16:43 2020 -0500 vkd3d-shader: Use the size from struct vkd3d_shader_constant_buffer when declaring push constant buffers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a3cc5f9..d09e0fd 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2029,6 +2029,7 @@ struct vkd3d_push_constant_buffer_binding { struct vkd3d_shader_register reg; struct vkd3d_shader_push_constant_buffer pc; + unsigned int size; }; struct vkd3d_shader_phase @@ -4892,7 +4893,7 @@ static void vkd3d_dxbc_compiler_emit_push_constant_buffers(struct vkd3d_dxbc_com const SpvStorageClass storage_class = SpvStorageClassPushConstant; uint32_t vec4_id, length_id, struct_id, pointer_type_id, var_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - unsigned int i, j, count, reg_idx, cb_size; + unsigned int i, j, count, reg_idx; struct vkd3d_symbol reg_symbol; uint32_t *member_ids; @@ -4918,8 +4919,7 @@ static void vkd3d_dxbc_compiler_emit_push_constant_buffers(struct vkd3d_dxbc_com if (!cb->reg.type) continue; - cb_size = cb->reg.idx[1].offset; - length_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, cb_size); + length_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, cb->size); member_ids[j] = vkd3d_spirv_build_op_type_array(builder, vec4_id, length_id); vkd3d_spirv_build_op_decorate1(builder, member_ids[j], SpvDecorationArrayStride, 16); @@ -4979,6 +4979,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi */ unsigned int cb_size_in_bytes = cb->size * VKD3D_VEC4_SIZE * sizeof(uint32_t); push_cb->reg = *reg; + push_cb->size = cb->size; if (cb_size_in_bytes > push_cb->pc.size) { WARN("Constant buffer size %u exceeds push constant size %u.\n",

1 0

Zebediah Figura : vkd3d-shader: Read constant buffer offsets from the second index.
by Alexandre Julliard 27 May '20

27 May '20

Module: vkd3d Branch: master Commit: 4c993c672a1765d9d9bb353992a0e917689f9b56 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4c993c672a1765d9d9bb353… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 27 14:15:30 2020 -0500 vkd3d-shader: Read constant buffer offsets from the second index. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 10 +++++++++- libs/vkd3d-shader/spirv.c | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5156074..de6aea3 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -646,7 +646,7 @@ static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction if (opcode_token & VKD3D_SM4_INDEX_TYPE_MASK) ins->flags |= VKD3DSI_INDEXED_DYNAMIC; - ins->declaration.cb.size = ins->declaration.cb.src.reg.idx[1].offset; + ins->declaration.cb.size = ins->declaration.cb.src.reg.idx[2].offset; ins->declaration.cb.register_space = 0; if (shader_is_sm_5_1(priv)) @@ -1603,6 +1603,14 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr break; } } + else if (register_type == VKD3D_SM4_RT_CONSTBUFFER && order == 2) + { + /* SM5.1 places the buffer offset in idx[2]; earlier versions place it + * in idx[1]. Normalize to SM5.1. */ + param->idx[2] = param->idx[1]; + param->idx[1].rel_addr = NULL; + param->idx[1].offset = 0; + } map_register(priv, param); diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0d4812b..a3cc5f9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2832,7 +2832,7 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp { assert(!reg->idx[0].rel_addr); indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); - indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[1]); + indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[2]); } else if (reg->type == VKD3DSPR_IMMCONSTBUFFER) {

1 0

Zebediah Figura : vkd3d-shader: Read the resource index from idx[1] instead of idx[0] when looking up SM5.1 bindings.
by Alexandre Julliard 27 May '20

27 May '20

Module: vkd3d Branch: master Commit: 6dace4a8be7bba174be2dc1acbd495697f07f5af URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6dace4a8be7bba174be2dc1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 26 15:16:41 2020 -0500 vkd3d-shader: Read the resource index from idx[1] instead of idx[0] when looking up SM5.1 bindings. We still use the first index to uniquely identify the register in vkd3d_symbol, only changing which field is used to declare it. This patch does not handle descriptor arrays. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 18 ++++++++++++++++ libs/vkd3d-shader/spirv.c | 35 ++++++++++++++++---------------- libs/vkd3d-shader/vkd3d_shader_private.h | 10 ++++----- 3 files changed, 41 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=6dace4a8be7bba174be…

1 0

Zebediah Figura : vkd3d: Fix a spelling error in vkd3d_init_null_resources_data().
by Alexandre Julliard 27 May '20

27 May '20

Module: vkd3d Branch: master Commit: 2abc6154190d762182d34ff7cf0ffe07a90dd2b6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2abc6154190d762182d34ff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 26 15:00:17 2020 -0500 vkd3d: Fix a spelling error in vkd3d_init_null_resources_data(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f40d986..a9d4d46 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3947,7 +3947,7 @@ static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_ vr = VK_CALL(vkWaitForFences(device->vk_device, 1, &vk_fence, VK_FALSE, ~(uint64_t)0)); if (vr != VK_SUCCESS) - WARN("Failed to wait fo fence, vr %d.\n", vr); + WARN("Failed to wait for fence, vr %d.\n", vr); done: VK_CALL(vkDestroyCommandPool(vk_device, vk_command_pool, NULL));

1 0

Hans Leidekker : bcrypt: Implement BCryptDeriveKeyCapi.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 0e170452885e109c92e641bed6326ec2013112ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e170452885e109c92e641be… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 26 20:14:38 2020 +0200 bcrypt: Implement BCryptDeriveKeyCapi. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 1 + dlls/bcrypt/bcrypt_main.c | 47 ++++++++++++++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ncrypt/ncrypt.spec | 2 +- include/bcrypt.h | 1 + 5 files changed, 118 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 95bec876b9..90ab7b52fe 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -8,6 +8,7 @@ @ stdcall BCryptDecrypt(ptr ptr long ptr ptr long ptr long ptr long) @ stub BCryptDeleteContext @ stdcall BCryptDeriveKey(ptr wstr ptr ptr long ptr long) +@ stdcall BCryptDeriveKeyCapi(ptr ptr ptr long long) @ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long) @ stdcall BCryptDestroyHash(ptr) @ stdcall BCryptDestroyKey(ptr) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 5f0b9f1ca8..6311700880 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1609,6 +1609,53 @@ NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHA } } +#define HMAC_PAD_LEN 64 +NTSTATUS WINAPI BCryptDeriveKeyCapi( BCRYPT_HASH_HANDLE handle, BCRYPT_ALG_HANDLE halg, UCHAR *key, ULONG keylen, ULONG flags ) +{ + struct hash *hash = handle; + UCHAR buf[MAX_HASH_OUTPUT_BYTES * 2]; + NTSTATUS status; + ULONG len; + + TRACE( "%p, %p, %p, %u, %08x\n", handle, halg, key, keylen, flags ); + + if (!key || !keylen) return STATUS_INVALID_PARAMETER; + if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; + if (keylen > builtin_algorithms[hash->alg_id].hash_length * 2) return STATUS_INVALID_PARAMETER; + + if (halg) + { + FIXME( "algorithm handle not supported\n" ); + return STATUS_NOT_IMPLEMENTED; + } + + len = builtin_algorithms[hash->alg_id].hash_length; + if ((status = BCryptFinishHash( handle, buf, len, 0 ))) return status; + + if (len < keylen) + { + UCHAR pad1[HMAC_PAD_LEN], pad2[HMAC_PAD_LEN]; + ULONG i; + + for (i = 0; i < sizeof(pad1); i++) + { + pad1[i] = 0x36 ^ (i < len ? buf[i] : 0); + pad2[i] = 0x5c ^ (i < len ? buf[i] : 0); + } + + if ((status = prepare_hash( hash )) || + (status = BCryptHashData( handle, pad1, sizeof(pad1), 0 )) || + (status = BCryptFinishHash( handle, buf, len, 0 ))) return status; + + if ((status = prepare_hash( hash )) || + (status = BCryptHashData( handle, pad2, sizeof(pad2), 0 )) || + (status = BCryptFinishHash( handle, buf + len, len, 0 ))) return status; + } + + memcpy( key, buf, keylen ); + return STATUS_SUCCESS; +} + static NTSTATUS pbkdf2( BCRYPT_HASH_HANDLE handle, UCHAR *pwd, ULONG pwd_len, UCHAR *salt, ULONG salt_len, ULONGLONG iterations, ULONG i, UCHAR *dst, ULONG hash_len ) { diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index f7404057fa..e64e78546d 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -32,6 +32,7 @@ static NTSTATUS (WINAPI *pBCryptCreateHash)(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDL ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptDecrypt)(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); +static NTSTATUS (WINAPI *pBCryptDeriveKeyCapi)(BCRYPT_HASH_HANDLE, BCRYPT_ALG_HANDLE, UCHAR *, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptDeriveKeyPBKDF2)(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, ULONGLONG, PUCHAR, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptDestroyHash)(BCRYPT_HASH_HANDLE); @@ -2356,6 +2357,71 @@ static void test_aes_vector(void) ok(!ret, "got %08x\n", ret); } +static void test_BcryptDeriveKeyCapi(void) +{ + static const UCHAR expect[] = + {0xda,0x39,0xa3,0xee,0x5e,0x6b,0x4b,0x0d,0x32,0x55,0xbf,0xef,0x95,0x60,0x18,0x90,0xaf,0xd8,0x07,0x09}; + static const UCHAR expect2[] = + {0x9b,0x03,0x17,0x41,0xf4,0x75,0x11,0xac,0xff,0x22,0xee,0x40,0xbb,0xe8,0xf9,0x74,0x17,0x26,0xb6,0xf2, + 0xf8,0xc7,0x88,0x02,0x9a,0xdc,0x0d,0xd7,0x83,0x58,0xea,0x65,0x2e,0x8b,0x85,0xc6,0xdb,0xb7,0xed,0x1c}; + BCRYPT_ALG_HANDLE alg; + BCRYPT_HASH_HANDLE hash; + UCHAR key[40]; + NTSTATUS ret; + + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA1_ALGORITHM, NULL, 0); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); + ok(!ret || broken(ret == STATUS_INVALID_PARAMETER) /* win2k8 */, "got %08x\n", ret); + if (ret == STATUS_INVALID_PARAMETER) + { + win_skip( "broken BCryptCreateHash\n" ); + return; + } + + ret = pBCryptDeriveKeyCapi(NULL, NULL, NULL, 0, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + ret = pBCryptDeriveKeyCapi(hash, NULL, NULL, 0, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + ret = pBCryptDeriveKeyCapi(hash, NULL, key, 0, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + ret = pBCryptDeriveKeyCapi(hash, NULL, key, 41, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + memset(key, 0, sizeof(key)); + ret = pBCryptDeriveKeyCapi(hash, NULL, key, 20, 0); + ok(!ret, "got %08x\n", ret); + ok(!memcmp(key, expect, sizeof(expect) - 1), "wrong key data\n"); + + ret = pBCryptDeriveKeyCapi(hash, NULL, key, 20, 0); + todo_wine ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + + ret = pBCryptHashData(hash, NULL, 0, 0); + todo_wine ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + + ret = pBCryptDestroyHash(hash); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptHashData(hash, (UCHAR *)"test", 4, 0); + ok(!ret, "got %08x\n", ret); + + /* padding */ + memset(key, 0, sizeof(key)); + ret = pBCryptDeriveKeyCapi(hash, NULL, key, 40, 0); + ok(!ret, "got %08x\n", ret); + ok(!memcmp(key, expect2, sizeof(expect2) - 1), "wrong key data\n"); + + ret = pBCryptCloseAlgorithmProvider(alg, 0); + ok(!ret, "got %08x\n", ret); +} + START_TEST(bcrypt) { HMODULE module; @@ -2370,6 +2436,7 @@ START_TEST(bcrypt) pBCryptCloseAlgorithmProvider = (void *)GetProcAddress(module, "BCryptCloseAlgorithmProvider"); pBCryptCreateHash = (void *)GetProcAddress(module, "BCryptCreateHash"); pBCryptDecrypt = (void *)GetProcAddress(module, "BCryptDecrypt"); + pBCryptDeriveKeyCapi = (void *)GetProcAddress(module, "BCryptDeriveKeyCapi"); pBCryptDeriveKeyPBKDF2 = (void *)GetProcAddress(module, "BCryptDeriveKeyPBKDF2"); pBCryptDestroyHash = (void *)GetProcAddress(module, "BCryptDestroyHash"); pBCryptDestroyKey = (void *)GetProcAddress(module, "BCryptDestroyKey"); @@ -2418,6 +2485,7 @@ START_TEST(bcrypt) test_BCryptSignHash(); test_BCryptEnumAlgorithms(); test_aes_vector(); + test_BcryptDeriveKeyCapi(); FreeLibrary(module); } diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 3908cbfb91..2b5a4fca42 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -8,7 +8,7 @@ @ stdcall BCryptDecrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptDecrypt @ stub BCryptDeleteContext @ stdcall BCryptDeriveKey(ptr wstr ptr ptr long ptr long) bcrypt.BCryptDeriveKey -@ stub BCryptDeriveKeyCapi +@ stdcall BCryptDeriveKeyCapi(ptr ptr ptr long long) bcrypt.BCryptDeriveKeyCapi @ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long) bcrypt.BCryptDeriveKeyPBKDF2 @ stdcall BCryptDestroyHash(ptr) bcrypt.BCryptDestroyHash @ stdcall BCryptDestroyKey(ptr) bcrypt.BCryptDestroyKey diff --git a/include/bcrypt.h b/include/bcrypt.h index 3dcab5f75a..62e6074f59 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -348,6 +348,7 @@ NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG); NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE, LPCWSTR, BCryptBufferDesc*, PUCHAR, ULONG, ULONG *, ULONG); +NTSTATUS WINAPI BCryptDeriveKeyCapi(BCRYPT_HASH_HANDLE, BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDeriveKeyPBKDF2(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, ULONGLONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE); NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE);

1 0

Louis Lenders : usp10: Add stub for ScriptGetFontAlternateGlyphs.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 8257fe88fb99ca0bdeec27b47b7cf835bda5c061 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8257fe88fb99ca0bdeec27b4… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun May 24 21:33:05 2020 +0200 usp10: Add stub for ScriptGetFontAlternateGlyphs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45536 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 12 ++++++++++++ dlls/usp10/usp10.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c9fe12a544..322091c547 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -4095,3 +4095,15 @@ HRESULT WINAPI ScriptGetFontFeatureTags( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANAL return SHAPE_GetFontFeatureTags(hdc, (ScriptCache *)*psc, psa, tagScript, tagLangSys, cMaxTags, pFeatureTags, pcTags); } + +HRESULT WINAPI ScriptGetFontAlternateGlyphs( HDC hdc, SCRIPT_CACHE *sc, SCRIPT_ANALYSIS *sa, OPENTYPE_TAG tag_script, OPENTYPE_TAG tag_langsys, OPENTYPE_TAG tag_feature, + WORD id, int size, WORD *list, int *count ) +{ + FIXME("(%p, %p, %p, %s, %s, %s, 0x%04x, %d, %p, %p)\n", hdc, sc, sa, debugstr_an((char*)&tag_script,4), debugstr_an((char*)&tag_langsys,4), + debugstr_an((char*)&tag_feature,4), id, size, list, count); + + if(count) + *count = 0; + + return E_NOTIMPL; +} diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 3e97d919a9..96bf47147a 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -6,7 +6,7 @@ @ stdcall ScriptCacheGetHeight(ptr ptr ptr) @ stdcall ScriptFreeCache(ptr) @ stdcall ScriptGetCMap(ptr ptr ptr long long ptr) -@ stub ScriptGetFontAlternateGlyphs +@ stdcall ScriptGetFontAlternateGlyphs(long ptr ptr long long long long long ptr ptr) @ stdcall ScriptGetFontFeatureTags(long ptr ptr long long long ptr ptr) @ stdcall ScriptGetFontLanguageTags(long ptr ptr long long ptr ptr) @ stdcall ScriptGetFontProperties(long ptr ptr)

1 0

Henri Verbeet : wined3d: Implement timestamp disjoint queries for the Vulkan adapter.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 23ad2662c3a23b1a1ddb406a11ad84bb7f6f9d4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=23ad2662c3a23b1a1ddb406a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 20:58:13 2020 +0430 wined3d: Implement timestamp disjoint queries for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 3b6f442f4a..69fc5e7474 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1660,12 +1660,21 @@ static const struct wined3d_query_ops wined3d_query_timestamp_vk_ops = .query_destroy = wined3d_query_vk_destroy, }; +static const struct wined3d_query_ops wined3d_query_timestamp_disjoint_vk_ops = +{ + .query_poll = wined3d_timestamp_disjoint_query_ops_poll, + .query_issue = wined3d_timestamp_disjoint_query_ops_issue, + .query_destroy = wined3d_query_vk_destroy, +}; + HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) { + struct wined3d_query_data_timestamp_disjoint *disjoint_data; const struct wined3d_query_ops *ops = &wined3d_query_vk_ops; struct wined3d_query_vk *query_vk; unsigned int data_size; + void *data; TRACE("device %p, type %#x, parent %p, parent_ops %p, query %p.\n", device, type, parent, parent_ops, query); @@ -1686,6 +1695,16 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer data_size = sizeof(uint64_t); break; + case WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT: + if (!wined3d_device_vk(device)->timestamp_bits) + { + WARN("Timestamp queries not supported.\n"); + return WINED3DERR_NOTAVAILABLE; + } + ops = &wined3d_query_timestamp_disjoint_vk_ops; + data_size = sizeof(struct wined3d_query_data_timestamp_disjoint); + break; + default: FIXME("Unhandled query type %#x.\n", type); return WINED3DERR_NOTAVAILABLE; @@ -1693,11 +1712,26 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer if (!(query_vk = heap_alloc_zero(sizeof(*query_vk) + data_size))) return E_OUTOFMEMORY; + data = query_vk + 1; - wined3d_query_init(&query_vk->q, device, type, query_vk + 1, data_size, ops, parent, parent_ops); + wined3d_query_init(&query_vk->q, device, type, data, data_size, ops, parent, parent_ops); list_init(&query_vk->entry); - if (type == WINED3D_QUERY_TYPE_OCCLUSION) - query_vk->control_flags = VK_QUERY_CONTROL_PRECISE_BIT; + + switch (type) + { + case WINED3D_QUERY_TYPE_OCCLUSION: + query_vk->control_flags = VK_QUERY_CONTROL_PRECISE_BIT; + break; + + case WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT: + disjoint_data = data; + disjoint_data->frequency = 1000000000 / wined3d_adapter_vk(device->adapter)->device_limits.timestampPeriod; + disjoint_data->disjoint = FALSE; + break; + + default: + break; + } TRACE("Created query %p.\n", query_vk); *query = &query_vk->q;

1 0

Henri Verbeet : wined3d: Implement timestamp queries for the Vulkan adapter.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 7101af57bfd49fd111aa3d9412d05f5f6f5d4e98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7101af57bfd49fd111aa3d94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 20:58:12 2020 +0430 wined3d: Implement timestamp queries for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 7 +++-- dlls/wined3d/context_vk.c | 6 ++++ dlls/wined3d/query.c | 66 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 78 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 84eda1e551..3cccda3b2c 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -292,7 +292,7 @@ static void adapter_vk_destroy(struct wined3d_adapter *adapter) } static HRESULT wined3d_select_vulkan_queue_family(const struct wined3d_adapter_vk *adapter_vk, - uint32_t *queue_family_index) + uint32_t *queue_family_index, uint32_t *timestamp_bits) { VkPhysicalDevice physical_device = adapter_vk->physical_device; const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; @@ -311,6 +311,7 @@ static HRESULT wined3d_select_vulkan_queue_family(const struct wined3d_adapter_v if (queue_properties[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) { *queue_family_index = i; + *timestamp_bits = queue_properties[i].timestampValidBits; heap_free(queue_properties); return WINED3D_OK; } @@ -496,13 +497,14 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi VkPhysicalDevice physical_device; VkDeviceCreateInfo device_info; uint32_t queue_family_index; + uint32_t timestamp_bits; VkResult vr; HRESULT hr; if (!(device_vk = heap_alloc_zero(sizeof(*device_vk)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_select_vulkan_queue_family(adapter_vk, &queue_family_index))) + if (FAILED(hr = wined3d_select_vulkan_queue_family(adapter_vk, &queue_family_index, &timestamp_bits))) goto fail; physical_device = adapter_vk->physical_device; @@ -564,6 +566,7 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi device_vk->vk_device = vk_device; VK_CALL(vkGetDeviceQueue(vk_device, queue_family_index, 0, &device_vk->vk_queue)); device_vk->vk_queue_family_index = queue_family_index; + device_vk->timestamp_bits = timestamp_bits; device_vk->vk_info = *vk_info; #define LOAD_DEVICE_PFN(name) \ diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 2964eb30cc..af29ef7e7a 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1227,6 +1227,10 @@ bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, free_pools = &context_vk->free_occlusion_query_pools; break; + case WINED3D_QUERY_TYPE_TIMESTAMP: + free_pools = &context_vk->free_timestamp_query_pools; + break; + default: FIXME("Unhandled query type %#x.\n", type); return false; @@ -1286,6 +1290,7 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) VK_CALL(vkDestroyCommandPool(device_vk->vk_device, context_vk->vk_command_pool, NULL)); wined3d_context_vk_cleanup_resources(context_vk); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_occlusion_query_pools); + wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_timestamp_query_pools); wine_rb_destroy(&context_vk->bo_slab_available, wined3d_context_vk_destroy_bo_slab, context_vk); heap_free(context_vk->pending_queries.queries); heap_free(context_vk->submitted.buffers); @@ -3057,6 +3062,7 @@ HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wi list_init(&context_vk->active_queries); list_init(&context_vk->free_occlusion_query_pools); + list_init(&context_vk->free_timestamp_query_pools); wine_rb_init(&context_vk->render_passes, wined3d_render_pass_vk_compare); wine_rb_init(&context_vk->pipeline_layouts, wined3d_pipeline_layout_vk_compare); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index b72ffd633c..3b6f442f4a 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1403,6 +1403,11 @@ bool wined3d_query_pool_vk_init(struct wined3d_query_pool_vk *pool_vk, pool_info.pipelineStatistics = 0; break; + case WINED3D_QUERY_TYPE_TIMESTAMP: + pool_info.queryType = VK_QUERY_TYPE_TIMESTAMP; + pool_info.pipelineStatistics = 0; + break; + default: FIXME("Unhandled query type %#x.\n", type); return false; @@ -1428,6 +1433,7 @@ bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, union { uint64_t occlusion; + uint64_t timestamp; } tmp, *result; if ((vr = VK_CALL(vkGetQueryPoolResults(device_vk->vk_device, pool_idx->pool_vk->vk_query_pool, @@ -1447,6 +1453,10 @@ bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, result->occlusion += tmp.occlusion; break; + case WINED3D_QUERY_TYPE_TIMESTAMP: + result->timestamp = tmp.timestamp; + break; + default: FIXME("Unhandled query type %#x.\n", query_vk->q.type); return false; @@ -1607,9 +1617,53 @@ static const struct wined3d_query_ops wined3d_query_vk_ops = .query_destroy = wined3d_query_vk_destroy, }; +static BOOL wined3d_query_timestamp_vk_issue(struct wined3d_query *query, uint32_t flags) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(query->device); + struct wined3d_query_vk *query_vk = wined3d_query_vk(query); + const struct wined3d_vk_info *vk_info; + struct wined3d_context_vk *context_vk; + VkCommandBuffer command_buffer; + + TRACE("query %p, flags %#x.\n", query, flags); + + if (flags & WINED3DISSUE_BEGIN) + TRACE("Ignoring WINED3DISSUE_BEGIN.\n"); + + if (flags & WINED3DISSUE_END) + { + context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); + vk_info = context_vk->vk_info; + + wined3d_context_vk_end_current_render_pass(context_vk); + command_buffer = wined3d_context_vk_get_command_buffer(context_vk); + if (!query_vk->pool_idx.pool_vk) + wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx); + VK_CALL(vkCmdResetQueryPool(command_buffer, query_vk->pool_idx.pool_vk->vk_query_pool, + query_vk->pool_idx.idx, 1)); + VK_CALL(vkCmdWriteTimestamp(command_buffer, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, + query_vk->pool_idx.pool_vk->vk_query_pool, query_vk->pool_idx.idx)); + wined3d_context_vk_reference_query(context_vk, query_vk); + + context_release(&context_vk->c); + + return TRUE; + } + + return FALSE; +} + +static const struct wined3d_query_ops wined3d_query_timestamp_vk_ops = +{ + .query_poll = wined3d_query_vk_poll, + .query_issue = wined3d_query_timestamp_vk_issue, + .query_destroy = wined3d_query_vk_destroy, +}; + HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) { + const struct wined3d_query_ops *ops = &wined3d_query_vk_ops; struct wined3d_query_vk *query_vk; unsigned int data_size; @@ -1622,6 +1676,16 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer data_size = sizeof(uint64_t); break; + case WINED3D_QUERY_TYPE_TIMESTAMP: + if (!wined3d_device_vk(device)->timestamp_bits) + { + WARN("Timestamp queries not supported.\n"); + return WINED3DERR_NOTAVAILABLE; + } + ops = &wined3d_query_timestamp_vk_ops; + data_size = sizeof(uint64_t); + break; + default: FIXME("Unhandled query type %#x.\n", type); return WINED3DERR_NOTAVAILABLE; @@ -1630,7 +1694,7 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer if (!(query_vk = heap_alloc_zero(sizeof(*query_vk) + data_size))) return E_OUTOFMEMORY; - wined3d_query_init(&query_vk->q, device, type, query_vk + 1, data_size, &wined3d_query_vk_ops, parent, parent_ops); + wined3d_query_init(&query_vk->q, device, type, query_vk + 1, data_size, ops, parent, parent_ops); list_init(&query_vk->entry); if (type == WINED3D_QUERY_TYPE_OCCLUSION) query_vk->control_flags = VK_QUERY_CONTROL_PRECISE_BIT; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5c92eecbf3..9f8c212fbf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2495,6 +2495,7 @@ struct wined3d_context_vk struct list active_queries; struct wined3d_pending_queries_vk pending_queries; struct list free_occlusion_query_pools; + struct list free_timestamp_query_pools; struct wined3d_retired_objects_vk retired; struct wine_rb_tree render_passes; @@ -3857,6 +3858,7 @@ struct wined3d_device_vk VkDevice vk_device; VkQueue vk_queue; uint32_t vk_queue_family_index; + uint32_t timestamp_bits; struct wined3d_vk_info vk_info;

1 0

Henri Verbeet : wined3d: Implement occlusion queries for the Vulkan adapter.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 8cb3d29cf0a3a15ff2b7203ac20ede26f3daae7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cb3d29cf0a3a15ff2b7203a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 20:58:11 2020 +0430 wined3d: Implement occlusion queries for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 15 ++- dlls/wined3d/context_vk.c | 157 +++++++++++++++++++++- dlls/wined3d/query.c | 287 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 86 ++++++++++++ 4 files changed, 539 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8cb3d29cf0a3a15ff2b7…

1 0

Henri Verbeet : wined3d: Move the swapchain cursor texture blit to wined3d_cs_exec_present().
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: c1f09c2461e6dfcf7baff03e70000a9d70e50fa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1f09c2461e6dfcf7baff03e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 20:58:10 2020 +0430 wined3d: Move the swapchain cursor texture blit to wined3d_cs_exec_present(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 27 ++++++++++++++++++++++++++- dlls/wined3d/swapchain.c | 26 -------------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b5a34a6ab6..ffd00c9b95 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -521,7 +521,7 @@ static void wined3d_cs_exec_nop(struct wined3d_cs *cs, const void *data) static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { - struct wined3d_texture *logo_texture, *back_buffer; + struct wined3d_texture *logo_texture, *cursor_texture, *back_buffer; const struct wined3d_cs_present *op = data; struct wined3d_swapchain *swapchain; unsigned int i; @@ -539,6 +539,31 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) &rect, WINED3D_BLT_SRC_CKEY, NULL, WINED3D_TEXF_POINT); } + if ((cursor_texture = swapchain->device->cursor_texture) + && swapchain->device->bCursorVisible && !swapchain->device->hardwareCursor) + { + RECT dst_rect = + { + swapchain->device->xScreenSpace - swapchain->device->xHotSpot, + swapchain->device->yScreenSpace - swapchain->device->yHotSpot, + swapchain->device->xScreenSpace + swapchain->device->cursorWidth - swapchain->device->xHotSpot, + swapchain->device->yScreenSpace + swapchain->device->cursorHeight - swapchain->device->yHotSpot, + }; + RECT src_rect = + { + 0, 0, cursor_texture->resource.width, cursor_texture->resource.height + }; + const RECT clip_rect = {0, 0, back_buffer->resource.width, back_buffer->resource.height}; + + TRACE("Rendering the software cursor.\n"); + + if (swapchain->state.desc.windowed) + MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&dst_rect, 2); + if (wined3d_clip_blit(&clip_rect, &dst_rect, &src_rect)) + wined3d_texture_blt(back_buffer, 0, &dst_rect, cursor_texture, 0, + &src_rect, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); + } + swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->swap_interval, op->flags); if (TRACE_ON(fps)) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a48b98aac3..289013f4e9 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -469,7 +469,6 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; const struct wined3d_fb_state *fb = &swapchain->device->cs->state.fb; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; - struct wined3d_texture *cursor_texture; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; struct wined3d_context *context; @@ -488,31 +487,6 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, swapchain_gl_set_swap_interval(swapchain, context_gl, swap_interval); - if ((cursor_texture = swapchain->device->cursor_texture) - && swapchain->device->bCursorVisible && !swapchain->device->hardwareCursor) - { - RECT dst_rect = - { - swapchain->device->xScreenSpace - swapchain->device->xHotSpot, - swapchain->device->yScreenSpace - swapchain->device->yHotSpot, - swapchain->device->xScreenSpace + swapchain->device->cursorWidth - swapchain->device->xHotSpot, - swapchain->device->yScreenSpace + swapchain->device->cursorHeight - swapchain->device->yHotSpot, - }; - RECT src_rect = - { - 0, 0, cursor_texture->resource.width, cursor_texture->resource.height - }; - const RECT clip_rect = {0, 0, back_buffer->resource.width, back_buffer->resource.height}; - - TRACE("Rendering the software cursor.\n"); - - if (desc->windowed) - MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&dst_rect, 2); - if (wined3d_clip_blit(&clip_rect, &dst_rect, &src_rect)) - wined3d_texture_blt(back_buffer, 0, &dst_rect, cursor_texture, 0, - &src_rect, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); - } - TRACE("Presenting DC %p.\n", context_gl->dc); if (!(render_to_fbo = swapchain->render_to_fbo)

1 0

Henri Verbeet : wined3d: Move the swapchain logo texture blit to wined3d_cs_exec_present().
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 4bae47cf17269479d70f4fe28e4c389fea0ee561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bae47cf17269479d70f4fe2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 20:58:09 2020 +0430 wined3d: Move the swapchain logo texture blit to wined3d_cs_exec_present(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 11 +++++++++++ dlls/wined3d/swapchain.c | 11 +---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 89e59b5373..b5a34a6ab6 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -521,13 +521,24 @@ static void wined3d_cs_exec_nop(struct wined3d_cs *cs, const void *data) static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { + struct wined3d_texture *logo_texture, *back_buffer; const struct wined3d_cs_present *op = data; struct wined3d_swapchain *swapchain; unsigned int i; swapchain = op->swapchain; + back_buffer = swapchain->back_buffers[0]; wined3d_swapchain_set_window(swapchain, op->dst_window_override); + if ((logo_texture = swapchain->device->logo_texture)) + { + RECT rect = {0, 0, logo_texture->resource.width, logo_texture->resource.height}; + + /* Blit the logo into the upper left corner of the back-buffer. */ + wined3d_texture_blt(back_buffer, 0, &rect, logo_texture, 0, + &rect, WINED3D_BLT_SRC_CKEY, NULL, WINED3D_TEXF_POINT); + } + swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->swap_interval, op->flags); if (TRACE_ON(fps)) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9020a99520..a48b98aac3 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -469,7 +469,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; const struct wined3d_fb_state *fb = &swapchain->device->cs->state.fb; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; - struct wined3d_texture *logo_texture, *cursor_texture; + struct wined3d_texture *cursor_texture; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; struct wined3d_context *context; @@ -488,15 +488,6 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, swapchain_gl_set_swap_interval(swapchain, context_gl, swap_interval); - if ((logo_texture = swapchain->device->logo_texture)) - { - RECT rect = {0, 0, logo_texture->resource.width, logo_texture->resource.height}; - - /* Blit the logo into the upper left corner of the drawable. */ - wined3d_texture_blt(back_buffer, 0, &rect, logo_texture, 0, &rect, - WINED3D_BLT_SRC_CKEY, NULL, WINED3D_TEXF_POINT); - } - if ((cursor_texture = swapchain->device->cursor_texture) && swapchain->device->bCursorVisible && !swapchain->device->hardwareCursor) {

1 0

Hans Leidekker : wbemprox: Get the disk drive serial number from mountmgr.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 84857d27067afaa1ae5774afe27086332263bfb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84857d27067afaa1ae5774af… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 26 10:18:43 2020 +0200 wbemprox: Get the disk drive serial number from mountmgr. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49160 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/wbemprox/tests/query.c | 26 ++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ddd12d6ebc..466611721a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -44,6 +44,7 @@ #include "ntsecapi.h" #include "winspool.h" #include "setupapi.h" +#include "ntddstor.h" #include "wine/asm.h" #include "wine/debug.h" @@ -140,7 +141,7 @@ static const struct column col_diskdrive[] = { L"MediaType", CIM_STRING }, { L"Model", CIM_STRING }, { L"PNPDeviceID", CIM_STRING }, - { L"SerialNumber", CIM_STRING }, + { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Size", CIM_UINT64 }, }; static const struct column col_diskdrivetodiskpartition[] = @@ -2081,6 +2082,42 @@ static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) } return free.QuadPart; } +static WCHAR *get_diskdrive_serialnumber( WCHAR letter ) +{ + WCHAR *ret = NULL; + STORAGE_DEVICE_DESCRIPTOR *desc; + HANDLE handle = INVALID_HANDLE_VALUE; + STORAGE_PROPERTY_QUERY query = {0}; + WCHAR drive[7]; + DWORD size; + + swprintf( drive, ARRAY_SIZE(drive), L"\\\\.\\%c:", letter ); + handle = CreateFileW( drive, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + if (handle == INVALID_HANDLE_VALUE) goto done; + + query.PropertyId = StorageDeviceProperty; + query.QueryType = PropertyStandardQuery; + + size = sizeof(*desc) + 256; + for (;;) + { + if (!(desc = heap_alloc( size ))) break; + if (DeviceIoControl( handle, IOCTL_STORAGE_QUERY_PROPERTY, &query, sizeof(query), desc, size, NULL, NULL )) + { + if (desc->SerialNumberOffset) ret = heap_strdupAW( (const char *)desc + desc->SerialNumberOffset ); + heap_free( desc ); + break; + } + heap_free( desc ); + if (GetLastError() == ERROR_MORE_DATA) size = desc->Size; + else break; + } + +done: + if (handle != INVALID_HANDLE_VALUE) CloseHandle( handle ); + if (!ret) ret = heap_strdupW( L"WINEHDISK" ); + return ret; +} static enum fill_status fill_diskdrive( struct table *table, const struct expr *cond ) { @@ -2114,7 +2151,7 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * rec->mediatype = (type == DRIVE_FIXED) ? L"Fixed hard disk" : L"Removable media"; rec->model = L"Wine Disk Drive"; rec->pnpdevice_id = L"IDE\\Disk\\VEN_WINE"; - rec->serialnumber = L"WINEHDISK"; + rec->serialnumber = get_diskdrive_serialnumber( root[0] ); get_freespace( root, &size ); rec->size = size; if (!match_row( table, row, cond, &status )) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a9b4910ebf..578e9308df 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1456,6 +1456,31 @@ static void test_Win32_DesktopMonitor( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_DiskDrive( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_DiskDrive" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_DisplayControllerConfiguration( IWbemServices *services ) { BSTR wql = SysAllocString( L"wql" ); @@ -1561,6 +1586,7 @@ START_TEST(query) test_Win32_ComputerSystemProduct( services ); test_Win32_Bios( services ); test_Win32_DesktopMonitor( services ); + test_Win32_DiskDrive( services ); test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); test_Win32_OperatingSystem( services );

1 0

Hans Leidekker : mountmgr: Return the disk serial from IOCTL_STORAGE_QUERY_PROPERTY(StorageDeviceProperty).
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 4ed26b63ca0305ba750c4f38002cf1eb674f688c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ed26b63ca0305ba750c4f38… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 26 10:18:42 2020 +0200 mountmgr: Return the disk serial from IOCTL_STORAGE_QUERY_PROPERTY(StorageDeviceProperty). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/dbus.c | 13 +++++---- dlls/mountmgr.sys/device.c | 69 +++++++++++++++++++++++++++++++++++--------- dlls/mountmgr.sys/diskarb.c | 2 +- dlls/mountmgr.sys/mountmgr.h | 2 +- 4 files changed, 66 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ed26b63ca0305ba750c…

1 0

Huw Davies : ntdll: Remove unnecessary page variable.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 51c9db55e6091985a4913bbd4512855d4bc08885 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51c9db55e6091985a4913bbd… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 26 10:57:24 2020 +0100 ntdll: Remove unnecessary page variable. get_page_vprot() doesn't require the base address. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 005c3ee441..3468b6f5be 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2624,9 +2624,7 @@ SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T { if (!(view->protect & VPROT_SYSTEM)) { - char *page = ROUND_ADDR( addr, page_mask ); - - while (bytes_read < size && (VIRTUAL_GetUnixProt( get_page_vprot( page )) & PROT_READ)) + while (bytes_read < size && (VIRTUAL_GetUnixProt( get_page_vprot( addr )) & PROT_READ)) { SIZE_T block_size = min( size - bytes_read, page_size - ((UINT_PTR)addr & page_mask) ); memcpy( buffer, addr, block_size ); @@ -2634,7 +2632,6 @@ SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T addr = (const void *)((const char *)addr + block_size); buffer = (void *)((char *)buffer + block_size); bytes_read += block_size; - page += page_size; } } }

1 0

Huw Davies : ntdll: Use the correct size when the read spans a page boundary.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: a98dd5a63eb1f2c86f140c2639a70f865ee99c32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a98dd5a63eb1f2c86f140c26… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 26 10:57:23 2020 +0100 ntdll: Use the correct size when the read spans a page boundary. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index f678b2387a..005c3ee441 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2628,7 +2628,7 @@ SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T while (bytes_read < size && (VIRTUAL_GetUnixProt( get_page_vprot( page )) & PROT_READ)) { - SIZE_T block_size = min( size, page_size - ((UINT_PTR)addr & page_mask) ); + SIZE_T block_size = min( size - bytes_read, page_size - ((UINT_PTR)addr & page_mask) ); memcpy( buffer, addr, block_size ); addr = (const void *)((const char *)addr + block_size);

1 0

Paul Gofman : ntoskrnl.exe: Implement KeRevertToUserAffinityThread() function.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: cda4fa293e26e788e95dc5d4656c15fb41cf6350 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cda4fa293e26e788e95dc5d4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 26 13:05:10 2020 +0300 ntoskrnl.exe: Implement KeRevertToUserAffinityThread() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index fc7828cf15..c4f2180c4c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2485,7 +2485,7 @@ KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity) */ void WINAPI KeRevertToUserAffinityThread(void) { - FIXME("() stub\n"); + KeRevertToUserAffinityThreadEx(0); } void WINAPI KeRevertToUserAffinityThreadEx(KAFFINITY affinity) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 458815a0f2..356c60a2e7 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1766,7 +1766,17 @@ static void test_affinity(void) mask = pKeSetSystemAffinityThreadEx(0x1); ok(mask == mask_all_cpus, "Got unexpected mask %#lx.\n", mask); - pKeRevertToUserAffinityThreadEx(mask_all_cpus); + pKeRevertToUserAffinityThreadEx(0); + + mask = pKeSetSystemAffinityThreadEx(0x1); + ok(!mask, "Got unexpected mask %#lx.\n", mask); + + KeRevertToUserAffinityThread(); + + mask = pKeSetSystemAffinityThreadEx(0x1); + ok(!mask, "Got unexpected mask %#lx.\n", mask); + + KeRevertToUserAffinityThread(); } static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)

1 0

Paul Gofman : ntoskrnl.exe: Implement KeRevertToUserAffinityThreadEx() function.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 7d4f4783a5d166b0d2987ca4c2b9188b405bdcbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d4f4783a5d166b0d2987ca4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 26 13:05:09 2020 +0300 ntoskrnl.exe: Implement KeRevertToUserAffinityThreadEx() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 24 +++++++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + dlls/ntoskrnl.exe/tests/driver.c | 16 +++++++++++++++- include/ddk/wdm.h | 1 + 5 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a0657b52c5..fc7828cf15 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2267,6 +2267,7 @@ static void *create_thread_object( HANDLE handle ) thread->header.Type = 6; thread->header.WaitListHead.Blink = INVALID_HANDLE_VALUE; /* mark as kernel object */ + thread->user_affinity = 0; if (!NtQueryInformationThread( handle, ThreadBasicInformation, &info, sizeof(info), NULL )) { @@ -2458,6 +2459,7 @@ VOID WINAPI KeSetSystemAffinityThread(KAFFINITY affinity) KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity) { DWORD_PTR system_affinity = KeQueryActiveProcessors(); + PKTHREAD thread = KeGetCurrentThread(); GROUP_AFFINITY old, new; TRACE("affinity %#lx.\n", affinity); @@ -2467,11 +2469,14 @@ KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity) NtQueryInformationThread(GetCurrentThread(), ThreadGroupInformation, &old, sizeof(old), NULL); + if (old.Mask != system_affinity) + thread->user_affinity = old.Mask; + memset(&new, 0, sizeof(new)); new.Mask = affinity; return NtSetInformationThread(GetCurrentThread(), ThreadGroupInformation, &new, sizeof(new)) - ? 0 : old.Mask; + ? 0 : thread->user_affinity; } @@ -2483,6 +2488,23 @@ void WINAPI KeRevertToUserAffinityThread(void) FIXME("() stub\n"); } +void WINAPI KeRevertToUserAffinityThreadEx(KAFFINITY affinity) +{ + DWORD_PTR system_affinity = KeQueryActiveProcessors(); + PRKTHREAD thread = KeGetCurrentThread(); + GROUP_AFFINITY new; + + TRACE("affinity %#lx.\n", affinity); + + affinity &= system_affinity; + + memset(&new, 0, sizeof(new)); + new.Mask = affinity ? affinity + : (thread->user_affinity ? thread->user_affinity : system_affinity); + + NtSetInformationThread(GetCurrentThread(), ThreadGroupInformation, &new, sizeof(new)); + thread->user_affinity = affinity; +} /*********************************************************************** * IoRegisterFileSystem (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 01a8e67376..3c7a9d1950 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -619,6 +619,7 @@ @ stdcall KeResetEvent(ptr) @ stub KeRestoreFloatingPointState @ stdcall KeRevertToUserAffinityThread() +@ stdcall KeRevertToUserAffinityThreadEx(long) @ stub KeRundownQueue @ stub KeSaveFloatingPointState @ stub KeSaveStateForHibernate diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 23f03c336d..a1e1b892e8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -49,6 +49,7 @@ struct _KTHREAD PEPROCESS process; CLIENT_ID id; unsigned int critical_region; + KAFFINITY user_affinity; }; struct _ETHREAD diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index c7b3c93f6d..458815a0f2 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1713,6 +1713,7 @@ static void test_executable_pool(void) static void test_affinity(void) { KAFFINITY (WINAPI *pKeSetSystemAffinityThreadEx)(KAFFINITY affinity); + void (WINAPI *pKeRevertToUserAffinityThreadEx)(KAFFINITY affinity); ULONG (WINAPI *pKeQueryActiveProcessorCountEx)(USHORT); KAFFINITY (WINAPI *pKeQueryActiveProcessors)(void); KAFFINITY mask, mask_all_cpus; @@ -1731,6 +1732,9 @@ static void test_affinity(void) pKeSetSystemAffinityThreadEx = get_proc_address("KeSetSystemAffinityThreadEx"); ok(!!pKeSetSystemAffinityThreadEx, "KeSetSystemAffinityThreadEx is not available.\n"); + pKeRevertToUserAffinityThreadEx = get_proc_address("KeRevertToUserAffinityThreadEx"); + ok(!!pKeRevertToUserAffinityThreadEx, "KeRevertToUserAffinityThreadEx is not available.\n"); + count = pKeQueryActiveProcessorCountEx(1); todo_wine ok(!count, "Got unexpected count %u.\n", count); @@ -1745,14 +1749,24 @@ static void test_affinity(void) mask = pKeQueryActiveProcessors(); ok(mask == mask_all_cpus, "Got unexpected mask %#lx.\n", mask); + pKeRevertToUserAffinityThreadEx(0x2); + mask = pKeSetSystemAffinityThreadEx(0); ok(!mask, "Got unexpected mask %#lx.\n", mask); + pKeRevertToUserAffinityThreadEx(0x2); + mask = pKeSetSystemAffinityThreadEx(0x1); - ok(mask == mask_all_cpus, "Got unexpected mask %#lx.\n", mask); + ok(mask == 0x2, "Got unexpected mask %#lx.\n", mask); mask = pKeSetSystemAffinityThreadEx(~(KAFFINITY)0); ok(mask == 0x1, "Got unexpected mask %#lx.\n", mask); + + pKeRevertToUserAffinityThreadEx(~(KAFFINITY)0); + mask = pKeSetSystemAffinityThreadEx(0x1); + ok(mask == mask_all_cpus, "Got unexpected mask %#lx.\n", mask); + + pKeRevertToUserAffinityThreadEx(mask_all_cpus); } static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 42ff0c72b1..b0ad0e70d3 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1706,6 +1706,7 @@ void WINAPI KeReleaseSpinLock(KSPIN_LOCK*,KIRQL); void WINAPI KeReleaseSpinLockFromDpcLevel(KSPIN_LOCK*); LONG WINAPI KeResetEvent(PRKEVENT); void WINAPI KeRevertToUserAffinityThread(void); +void WINAPI KeRevertToUserAffinityThreadEx(KAFFINITY affinity); LONG WINAPI KeSetEvent(PRKEVENT,KPRIORITY,BOOLEAN); KPRIORITY WINAPI KeSetPriorityThread(PKTHREAD,KPRIORITY); void WINAPI KeSetSystemAffinityThread(KAFFINITY);

1 0

Paul Gofman : ntoskrnl.exe: Implement KeSetSystemAffinityThread() function.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 631227563bf52b2f30a576286b8d8299f2f54ed4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=631227563bf52b2f30a57628… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 26 13:05:08 2020 +0300 ntoskrnl.exe: Implement KeSetSystemAffinityThread() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index dc6bbe866c..a0657b52c5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2450,9 +2450,9 @@ KPRIORITY WINAPI KeSetPriorityThread( PKTHREAD Thread, KPRIORITY Priority ) /*********************************************************************** * KeSetSystemAffinityThread (NTOSKRNL.EXE.@) */ -VOID WINAPI KeSetSystemAffinityThread(KAFFINITY Affinity) +VOID WINAPI KeSetSystemAffinityThread(KAFFINITY affinity) { - FIXME("(%lx) stub\n", Affinity); + KeSetSystemAffinityThreadEx(affinity); } KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity)

1 0

Paul Gofman : ntoskrnl.exe: Add KeSetSystemAffinityThreadEx() function.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: c3bc7689b12a9d62841850d65c786c9cd56725a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3bc7689b12a9d62841850d6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 26 13:05:07 2020 +0300 ntoskrnl.exe: Add KeSetSystemAffinityThreadEx() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + dlls/ntoskrnl.exe/tests/driver.c | 19 +++++++++++++++++-- include/ddk/wdm.h | 1 + 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c10c830738..dc6bbe866c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2455,6 +2455,25 @@ VOID WINAPI KeSetSystemAffinityThread(KAFFINITY Affinity) FIXME("(%lx) stub\n", Affinity); } +KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity) +{ + DWORD_PTR system_affinity = KeQueryActiveProcessors(); + GROUP_AFFINITY old, new; + + TRACE("affinity %#lx.\n", affinity); + + affinity &= system_affinity; + + NtQueryInformationThread(GetCurrentThread(), ThreadGroupInformation, + &old, sizeof(old), NULL); + + memset(&new, 0, sizeof(new)); + new.Mask = affinity; + + return NtSetInformationThread(GetCurrentThread(), ThreadGroupInformation, &new, sizeof(new)) + ? 0 : old.Mask; +} + /*********************************************************************** * KeRevertToUserAffinityThread (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index f80709a9a0..01a8e67376 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -634,6 +634,7 @@ @ stdcall KeSetPriorityThread(ptr long) @ stub KeSetProfileIrql @ stdcall KeSetSystemAffinityThread(long) +@ stdcall KeSetSystemAffinityThreadEx(long) @ stdcall KeSetTargetProcessorDpc(ptr long) @ stub KeSetTimeIncrement @ stub KeSetTimer diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 65be4a8d35..c7b3c93f6d 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1712,10 +1712,11 @@ static void test_executable_pool(void) static void test_affinity(void) { + KAFFINITY (WINAPI *pKeSetSystemAffinityThreadEx)(KAFFINITY affinity); ULONG (WINAPI *pKeQueryActiveProcessorCountEx)(USHORT); KAFFINITY (WINAPI *pKeQueryActiveProcessors)(void); + KAFFINITY mask, mask_all_cpus; ULONG cpu_count, count; - KAFFINITY mask; pKeQueryActiveProcessorCountEx = get_proc_address("KeQueryActiveProcessorCountEx"); if (!pKeQueryActiveProcessorCountEx) @@ -1727,6 +1728,9 @@ static void test_affinity(void) pKeQueryActiveProcessors = get_proc_address("KeQueryActiveProcessors"); ok(!!pKeQueryActiveProcessors, "KeQueryActiveProcessors is not available.\n"); + pKeSetSystemAffinityThreadEx = get_proc_address("KeSetSystemAffinityThreadEx"); + ok(!!pKeSetSystemAffinityThreadEx, "KeSetSystemAffinityThreadEx is not available.\n"); + count = pKeQueryActiveProcessorCountEx(1); todo_wine ok(!count, "Got unexpected count %u.\n", count); @@ -1736,8 +1740,19 @@ static void test_affinity(void) count = pKeQueryActiveProcessorCountEx(ALL_PROCESSOR_GROUPS); ok(count == cpu_count, "Got unexpected count %u.\n", count); + mask_all_cpus = ~((~0u) << cpu_count); + mask = pKeQueryActiveProcessors(); - ok(mask == ~((~0u) << cpu_count), "Got unexpected mask %#lx.\n", mask); + ok(mask == mask_all_cpus, "Got unexpected mask %#lx.\n", mask); + + mask = pKeSetSystemAffinityThreadEx(0); + ok(!mask, "Got unexpected mask %#lx.\n", mask); + + mask = pKeSetSystemAffinityThreadEx(0x1); + ok(mask == mask_all_cpus, "Got unexpected mask %#lx.\n", mask); + + mask = pKeSetSystemAffinityThreadEx(~(KAFFINITY)0); + ok(mask == 0x1, "Got unexpected mask %#lx.\n", mask); } static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 1f80a5af29..42ff0c72b1 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1709,6 +1709,7 @@ void WINAPI KeRevertToUserAffinityThread(void); LONG WINAPI KeSetEvent(PRKEVENT,KPRIORITY,BOOLEAN); KPRIORITY WINAPI KeSetPriorityThread(PKTHREAD,KPRIORITY); void WINAPI KeSetSystemAffinityThread(KAFFINITY); +KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity); BOOLEAN WINAPI KeSetTimerEx(KTIMER*,LARGE_INTEGER,LONG,KDPC*); NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG,void*[],WAIT_TYPE,KWAIT_REASON,KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*,KWAIT_BLOCK*); NTSTATUS WINAPI KeWaitForSingleObject(void*,KWAIT_REASON,KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*);

1 0

Paul Gofman : ntoskrnl.exe: Fix KeQueryActiveProcessors() function.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 25f4da665d4b552bc4fa1dc0a3cb0b6debb4940c URL: https://source.winehq.org/git/wine.git/?a=commit;h=25f4da665d4b552bc4fa1dc0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 26 13:05:06 2020 +0300 ntoskrnl.exe: Fix KeQueryActiveProcessors() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6d9ae44808..c10c830738 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2379,10 +2379,10 @@ LONG WINAPI KeInsertQueue(PRKQUEUE Queue, PLIST_ENTRY Entry) */ KAFFINITY WINAPI KeQueryActiveProcessors( void ) { - DWORD_PTR AffinityMask; + DWORD_PTR affinity_mask; - GetProcessAffinityMask( GetCurrentProcess(), &AffinityMask, NULL); - return AffinityMask; + GetProcessAffinityMask( GetCurrentProcess(), NULL, &affinity_mask); + return affinity_mask; } ULONG WINAPI KeQueryActiveProcessorCountEx(USHORT group_number)

1 0

Alexandre Julliard : kernel32: Remove string.c.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: c7760ce7a247eeb9f15b51d0ec68ca0961efc0b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7760ce7a247eeb9f15b51d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 14:57:31 2020 +0200 kernel32: Remove string.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/string.c | 113 ---------------------------------------------- dlls/kernel32/virtual.c | 79 ++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 114 deletions(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 28a15f8bbe..7822309de5 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -24,7 +24,6 @@ C_SRCS = \ process.c \ profile.c \ resource.c \ - string.c \ sync.c \ tape.c \ term.c \ diff --git a/dlls/kernel32/string.c b/dlls/kernel32/string.c deleted file mode 100644 index 9e1450ca58..0000000000 --- a/dlls/kernel32/string.c +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Kernel string functions - * - * Copyright 1993 Yngvi Sigurjonsson - * Copyright 1996 Alexandre Julliard - * Copyright 2001 Dmitry Timoshkov 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 "config.h" -#include "wine/port.h" - -#include <ctype.h> -#include <stdarg.h> -#include <string.h> - -#define WINE_NO_INLINE_STRING -#include "windef.h" -#include "winbase.h" -#include "wine/unicode.h" -#include "wine/exception.h" - - -/*********************************************************************** - * lstrcatA (KERNEL32.@) - * lstrcat (KERNEL32.@) - */ -LPSTR WINAPI lstrcatA( LPSTR dst, LPCSTR src ) -{ - __TRY - { - strcat( dst, src ); - } - __EXCEPT_PAGE_FAULT - { - SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; - } - __ENDTRY - return dst; -} - - -/*********************************************************************** - * lstrcatW (KERNEL32.@) - */ -LPWSTR WINAPI lstrcatW( LPWSTR dst, LPCWSTR src ) -{ - __TRY - { - strcatW( dst, src ); - } - __EXCEPT_PAGE_FAULT - { - SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; - } - __ENDTRY - return dst; -} - - -/*********************************************************************** - * lstrcpyA (KERNEL32.@) - * lstrcpy (KERNEL32.@) - */ -LPSTR WINAPI lstrcpyA( LPSTR dst, LPCSTR src ) -{ - __TRY - { - /* this is how Windows does it */ - memmove( dst, src, strlen(src)+1 ); - } - __EXCEPT_PAGE_FAULT - { - SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; - } - __ENDTRY - return dst; -} - - -/*********************************************************************** - * lstrcpyW (KERNEL32.@) - */ -LPWSTR WINAPI lstrcpyW( LPWSTR dst, LPCWSTR src ) -{ - __TRY - { - strcpyW( dst, src ); - } - __EXCEPT_PAGE_FAULT - { - SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; - } - __ENDTRY - return dst; -} diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 183a3fe05a..97581a5db1 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -30,6 +30,7 @@ # include <unistd.h> #endif +#define WINE_NO_INLINE_STRING #include "ntstatus.h" #define WIN32_NO_STATUS #define NONAMELESSUNION @@ -40,6 +41,7 @@ #include "winerror.h" #include "psapi.h" #include "wine/exception.h" +#include "wine/unicode.h" #include "wine/debug.h" #include "kernel_private.h" @@ -256,3 +258,80 @@ BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) __ENDTRY return FALSE; } +/*********************************************************************** + * lstrcatA (KERNEL32.@) + * lstrcat (KERNEL32.@) + */ +LPSTR WINAPI lstrcatA( LPSTR dst, LPCSTR src ) +{ + __TRY + { + strcat( dst, src ); + } + __EXCEPT( badptr_handler ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + __ENDTRY + return dst; +} + + +/*********************************************************************** + * lstrcatW (KERNEL32.@) + */ +LPWSTR WINAPI lstrcatW( LPWSTR dst, LPCWSTR src ) +{ + __TRY + { + strcatW( dst, src ); + } + __EXCEPT( badptr_handler ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + __ENDTRY + return dst; +} + + +/*********************************************************************** + * lstrcpyA (KERNEL32.@) + * lstrcpy (KERNEL32.@) + */ +LPSTR WINAPI lstrcpyA( LPSTR dst, LPCSTR src ) +{ + __TRY + { + /* this is how Windows does it */ + memmove( dst, src, strlen(src)+1 ); + } + __EXCEPT( badptr_handler ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + __ENDTRY + return dst; +} + + +/*********************************************************************** + * lstrcpyW (KERNEL32.@) + */ +LPWSTR WINAPI lstrcpyW( LPWSTR dst, LPCWSTR src ) +{ + __TRY + { + strcpyW( dst, src ); + } + __EXCEPT( badptr_handler ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + __ENDTRY + return dst; +}

1 0

Alexandre Julliard : kernel32: Remove time.c.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: f41e205dfcdbadc1f44a358310a692523bb91cab URL: https://source.winehq.org/git/wine.git/?a=commit;h=f41e205dfcdbadc1f44a3583… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 14:51:16 2020 +0200 kernel32: Remove time.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/kernel_private.h | 2 - dlls/kernel32/lcformat.c | 36 ++++++++++- dlls/kernel32/locale.c | 11 ++++ dlls/kernel32/sync.c | 29 +++++++++ dlls/kernel32/time.c | 135 ----------------------------------------- 6 files changed, 75 insertions(+), 139 deletions(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 801d8dd7fc..28a15f8bbe 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -29,7 +29,6 @@ C_SRCS = \ tape.c \ term.c \ thread.c \ - time.c \ toolhelp.c \ version.c \ virtual.c \ diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 7c1d548ff1..bcf2ee9a52 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -64,8 +64,6 @@ extern void FILE_SetDosError(void) DECLSPEC_HIDDEN; extern WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc ) DECLSPEC_HIDDEN; extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DECLSPEC_HIDDEN; -extern BOOL NLS_IsUnicodeOnlyLcid(LCID) DECLSPEC_HIDDEN; - /* computername.c */ extern void COMPUTERNAME_Init(void) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 165cb07dd4..91fab3dc45 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -320,7 +320,7 @@ static const NLS_FORMAT_NODE *NLS_GetFormats(LCID lcid, DWORD dwFlags) * * Determine if a locale is Unicode only, and thus invalid in ASCII calls. */ -BOOL NLS_IsUnicodeOnlyLcid(LCID lcid) +static BOOL NLS_IsUnicodeOnlyLcid(LCID lcid) { lcid = ConvertDefaultLocale(lcid); @@ -1767,3 +1767,37 @@ int WINAPI GetCurrencyFormatEx(LPCWSTR localename, DWORD flags, LPCWSTR value, return GetCurrencyFormatW( LocaleNameToLCID(localename, 0), flags, value, format, str, len); } + +/********************************************************************* + * GetCalendarInfoA (KERNEL32.@) + */ +int WINAPI GetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPSTR data, int size, DWORD *val ) +{ + int ret, sizeW = size; + LPWSTR dataW = NULL; + + if (NLS_IsUnicodeOnlyLcid(lcid)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if (!size && !(type & CAL_RETURN_NUMBER)) sizeW = GetCalendarInfoW( lcid, id, type, NULL, 0, NULL ); + if (!(dataW = HeapAlloc(GetProcessHeap(), 0, sizeW * sizeof(WCHAR)))) return 0; + + ret = GetCalendarInfoW( lcid, id, type, dataW, sizeW, val ); + if(ret && dataW && data) + ret = WideCharToMultiByte( CP_ACP, 0, dataW, -1, data, size, NULL, NULL ); + else if (type & CAL_RETURN_NUMBER) + ret *= sizeof(WCHAR); + HeapFree( GetProcessHeap(), 0, dataW ); + return ret; +} + +/********************************************************************* + * SetCalendarInfoA (KERNEL32.@) + */ +int WINAPI SetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPCSTR data) +{ + FIXME("(%08x,%08x,%08x,%s): stub\n", lcid, id, type, debugstr_a(data)); + return 0; +} diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 58389f6697..0ca4f39d26 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -172,6 +172,17 @@ BOOL WINAPI GetCPInfoExA( UINT codepage, DWORD dwFlags, LPCPINFOEXA cpinfo ) return TRUE; } + +/********************************************************************* + * GetDaylightFlag (KERNEL32.@) + */ +BOOL WINAPI GetDaylightFlag(void) +{ + TIME_ZONE_INFORMATION tzinfo; + return GetTimeZoneInformation( &tzinfo) == TIME_ZONE_ID_DAYLIGHT; +} + + /*********************************************************************** * EnumSystemCodePagesA (KERNEL32.@) */ diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index d0301e484d..4032315750 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -49,6 +49,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(sync); +static const struct _KUSER_SHARED_DATA *user_shared_data = (struct _KUSER_SHARED_DATA *)0x7ffe0000; + + static void get_create_object_attributes( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *nameW, SECURITY_ATTRIBUTES *sa, const WCHAR *name ) { @@ -100,6 +103,32 @@ static HANDLE normalize_handle_if_console(HANDLE handle) return handle; } +/****************************************************************************** + * GetTickCount64 (KERNEL32.@) + */ +ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) +{ + ULONG high, low; + + do + { + high = user_shared_data->u.TickCount.High1Time; + low = user_shared_data->u.TickCount.LowPart; + } + while (high != user_shared_data->u.TickCount.High2Time); + /* note: we ignore TickCountMultiplier */ + return (ULONGLONG)high << 32 | low; +} + +/*********************************************************************** + * GetTickCount (KERNEL32.@) + */ +DWORD WINAPI DECLSPEC_HOTPATCH GetTickCount(void) +{ + /* note: we ignore TickCountMultiplier */ + return user_shared_data->u.TickCount.LowPart; +} + /*********************************************************************** * RegisterWaitForSingleObject (KERNEL32.@) */ diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c deleted file mode 100644 index 94ccbfb2b9..0000000000 --- a/dlls/kernel32/time.c +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Win32 kernel time functions - * - * Copyright 1995 Martin von Loewis and Cameron Heide - * - * 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 "config.h" - -#include <string.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#include <stdarg.h> -#include <stdlib.h> -#include <time.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winternl.h" -#include "ddk/wdm.h" -#include "kernel_private.h" -#include "wine/unicode.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(time); - -static const struct _KUSER_SHARED_DATA *user_shared_data = (struct _KUSER_SHARED_DATA *)0x7ffe0000; - - -/********************************************************************* - * GetCalendarInfoA (KERNEL32.@) - * - */ -int WINAPI GetCalendarInfoA(LCID lcid, CALID Calendar, CALTYPE CalType, - LPSTR lpCalData, int cchData, LPDWORD lpValue) -{ - int ret, cchDataW = cchData; - LPWSTR lpCalDataW = NULL; - - if (NLS_IsUnicodeOnlyLcid(lcid)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (!cchData && !(CalType & CAL_RETURN_NUMBER)) - cchDataW = GetCalendarInfoW(lcid, Calendar, CalType, NULL, 0, NULL); - if (!(lpCalDataW = HeapAlloc(GetProcessHeap(), 0, cchDataW*sizeof(WCHAR)))) - return 0; - - ret = GetCalendarInfoW(lcid, Calendar, CalType, lpCalDataW, cchDataW, lpValue); - if(ret && lpCalDataW && lpCalData) - ret = WideCharToMultiByte(CP_ACP, 0, lpCalDataW, -1, lpCalData, cchData, NULL, NULL); - else if (CalType & CAL_RETURN_NUMBER) - ret *= sizeof(WCHAR); - HeapFree(GetProcessHeap(), 0, lpCalDataW); - - return ret; -} - -/********************************************************************* - * SetCalendarInfoA (KERNEL32.@) - * - */ -int WINAPI SetCalendarInfoA(LCID Locale, CALID Calendar, CALTYPE CalType, LPCSTR lpCalData) -{ - FIXME("(%08x,%08x,%08x,%s): stub\n", - Locale, Calendar, CalType, debugstr_a(lpCalData)); - return 0; -} - -/********************************************************************* - * GetDaylightFlag (KERNEL32.@) - * - * Specifies if daylight savings time is in operation. - * - * NOTES - * This function is called from the Win98's control applet timedate.cpl. - * - * RETURNS - * TRUE if daylight savings time is in operation. - * FALSE otherwise. - */ -BOOL WINAPI GetDaylightFlag(void) -{ - TIME_ZONE_INFORMATION tzinfo; - return GetTimeZoneInformation( &tzinfo) == TIME_ZONE_ID_DAYLIGHT; -} - -/****************************************************************************** - * GetTickCount64 (KERNEL32.@) - */ -ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) -{ - ULONG high, low; - - do - { - high = user_shared_data->u.TickCount.High1Time; - low = user_shared_data->u.TickCount.LowPart; - } - while (high != user_shared_data->u.TickCount.High2Time); - /* note: we ignore TickCountMultiplier */ - return (ULONGLONG)high << 32 | low; -} - -/*********************************************************************** - * GetTickCount (KERNEL32.@) - */ -DWORD WINAPI DECLSPEC_HOTPATCH GetTickCount(void) -{ - /* note: we ignore TickCountMultiplier */ - return user_shared_data->u.TickCount.LowPart; -}

1 0

Alexandre Julliard : kernel32: Remove environ.c.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 3c9cf9b65f14baa8e439c82cbff3be937f1f8534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c9cf9b65f14baa8e439c82c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 14:42:49 2020 +0200 kernel32: Remove environ.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/environ.c | 115 ----------------------------------------- dlls/kernel32/kernel_main.c | 45 ++++++++++++++-- dlls/kernel32/kernel_private.h | 6 --- dlls/kernel32/process.c | 20 +++++++ 5 files changed, 62 insertions(+), 125 deletions(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 38c5b55de7..801d8dd7fc 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -12,7 +12,6 @@ C_SRCS = \ console.c \ debugger.c \ editline.c \ - environ.c \ file.c \ heap.c \ kernel_main.c \ diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c deleted file mode 100644 index 2d80600f78..0000000000 --- a/dlls/kernel32/environ.c +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Process environment management - * - * Copyright 1996, 1998 Alexandre Julliard - * - * 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 "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#include <stdlib.h> -#include <string.h> -#include <assert.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/library.h" -#include "winternl.h" -#include "wine/unicode.h" -#include "wine/debug.h" - -#include "kernel_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(environ); - -/* Notes: - * - contrary to Microsoft docs, the environment strings do not appear - * to be sorted on Win95 (although they are on NT); so we don't bother - * to sort them either. - */ - -static STARTUPINFOA startup_infoA; - -/*********************************************************************** - * GetStartupInfoA (KERNEL32.@) - */ -VOID WINAPI GetStartupInfoA( LPSTARTUPINFOA info ) -{ - *info = startup_infoA; -} - -/****************************************************************** - * ENV_CopyStartupInformation (internal) - * - * Creates the STARTUPINFO information from the ntdll information - */ -void ENV_CopyStartupInformation(void) -{ - RTL_USER_PROCESS_PARAMETERS* rupp; - ANSI_STRING ansi; - - RtlAcquirePebLock(); - - rupp = NtCurrentTeb()->Peb->ProcessParameters; - - startup_infoA.cb = sizeof(startup_infoA); - startup_infoA.lpReserved = NULL; - startup_infoA.lpDesktop = RtlUnicodeStringToAnsiString( &ansi, &rupp->Desktop, TRUE ) == STATUS_SUCCESS ? - ansi.Buffer : NULL; - startup_infoA.lpTitle = RtlUnicodeStringToAnsiString( &ansi, &rupp->WindowTitle, TRUE ) == STATUS_SUCCESS ? - ansi.Buffer : NULL; - startup_infoA.dwX = rupp->dwX; - startup_infoA.dwY = rupp->dwY; - startup_infoA.dwXSize = rupp->dwXSize; - startup_infoA.dwYSize = rupp->dwYSize; - startup_infoA.dwXCountChars = rupp->dwXCountChars; - startup_infoA.dwYCountChars = rupp->dwYCountChars; - startup_infoA.dwFillAttribute = rupp->dwFillAttribute; - startup_infoA.dwFlags = rupp->dwFlags; - startup_infoA.wShowWindow = rupp->wShowWindow; - startup_infoA.cbReserved2 = rupp->RuntimeInfo.MaximumLength; - startup_infoA.lpReserved2 = rupp->RuntimeInfo.MaximumLength ? (void*)rupp->RuntimeInfo.Buffer : NULL; - startup_infoA.hStdInput = rupp->hStdInput ? rupp->hStdInput : INVALID_HANDLE_VALUE; - startup_infoA.hStdOutput = rupp->hStdOutput ? rupp->hStdOutput : INVALID_HANDLE_VALUE; - startup_infoA.hStdError = rupp->hStdError ? rupp->hStdError : INVALID_HANDLE_VALUE; - - RtlReleasePebLock(); -} - -/*********************************************************************** - * GetFirmwareEnvironmentVariableA (KERNEL32.@) - */ -DWORD WINAPI GetFirmwareEnvironmentVariableA(LPCSTR name, LPCSTR guid, PVOID buffer, DWORD size) -{ - FIXME("stub: %s %s %p %u\n", debugstr_a(name), debugstr_a(guid), buffer, size); - SetLastError(ERROR_INVALID_FUNCTION); - return 0; -} - -/*********************************************************************** - * GetFirmwareEnvironmentVariableW (KERNEL32.@) - */ -DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size) -{ - FIXME("stub: %s %s %p %u\n", debugstr_w(name), debugstr_w(guid), buffer, size); - SetLastError(ERROR_INVALID_FUNCTION); - return 0; -} diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index fbc2e8daee..d312f11081 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -33,7 +33,6 @@ #include "wincon.h" #include "winternl.h" -#include "wine/library.h" #include "kernel_private.h" #include "console_private.h" #include "wine/debug.h" @@ -42,6 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(process); extern int CDECL __wine_set_signal_handler(unsigned, int (*)(unsigned)); +static STARTUPINFOA startup_infoA; + /*********************************************************************** * set_entry_point */ @@ -77,6 +78,45 @@ static void set_entry_point( HMODULE module, const char *name, DWORD rva ) } +/*********************************************************************** + * GetStartupInfoA (KERNEL32.@) + */ +VOID WINAPI GetStartupInfoA( LPSTARTUPINFOA info ) +{ + *info = startup_infoA; +} + +static void copy_startup_info(void) +{ + RTL_USER_PROCESS_PARAMETERS* rupp; + ANSI_STRING ansi; + + RtlAcquirePebLock(); + + rupp = NtCurrentTeb()->Peb->ProcessParameters; + + startup_infoA.cb = sizeof(startup_infoA); + startup_infoA.lpReserved = NULL; + startup_infoA.lpDesktop = !RtlUnicodeStringToAnsiString( &ansi, &rupp->Desktop, TRUE ) ? ansi.Buffer : NULL; + startup_infoA.lpTitle = !RtlUnicodeStringToAnsiString( &ansi, &rupp->WindowTitle, TRUE ) ? ansi.Buffer : NULL; + startup_infoA.dwX = rupp->dwX; + startup_infoA.dwY = rupp->dwY; + startup_infoA.dwXSize = rupp->dwXSize; + startup_infoA.dwYSize = rupp->dwYSize; + startup_infoA.dwXCountChars = rupp->dwXCountChars; + startup_infoA.dwYCountChars = rupp->dwYCountChars; + startup_infoA.dwFillAttribute = rupp->dwFillAttribute; + startup_infoA.dwFlags = rupp->dwFlags; + startup_infoA.wShowWindow = rupp->wShowWindow; + startup_infoA.cbReserved2 = rupp->RuntimeInfo.MaximumLength; + startup_infoA.lpReserved2 = rupp->RuntimeInfo.MaximumLength ? (void*)rupp->RuntimeInfo.Buffer : NULL; + startup_infoA.hStdInput = rupp->hStdInput ? rupp->hStdInput : INVALID_HANDLE_VALUE; + startup_infoA.hStdOutput = rupp->hStdOutput ? rupp->hStdOutput : INVALID_HANDLE_VALUE; + startup_infoA.hStdError = rupp->hStdError ? rupp->hStdError : INVALID_HANDLE_VALUE; + + RtlReleasePebLock(); +} + /*********************************************************************** * KERNEL process initialisation routine */ @@ -94,8 +134,7 @@ static BOOL process_attach( HMODULE module ) CONSOLE_Init(params); - /* copy process information from ntdll */ - ENV_CopyStartupInformation(); + copy_startup_info(); if (!(GetVersion() & 0x80000000)) { diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index d845623265..7c1d548ff1 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -66,13 +66,7 @@ extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) extern BOOL NLS_IsUnicodeOnlyLcid(LCID) DECLSPEC_HIDDEN; -/* environ.c */ -extern void ENV_CopyStartupInformation(void) DECLSPEC_HIDDEN; - /* computername.c */ extern void COMPUTERNAME_Init(void) DECLSPEC_HIDDEN; -/* oldconfig.c */ -extern void convert_old_config(void) DECLSPEC_HIDDEN; - #endif diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 66fa4ad506..8f506fcf13 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -741,6 +741,26 @@ DWORD64 WINAPI GetEnabledXStateFeatures(void) return 0; } +/*********************************************************************** + * GetFirmwareEnvironmentVariableA (KERNEL32.@) + */ +DWORD WINAPI GetFirmwareEnvironmentVariableA(LPCSTR name, LPCSTR guid, PVOID buffer, DWORD size) +{ + FIXME("stub: %s %s %p %u\n", debugstr_a(name), debugstr_a(guid), buffer, size); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} + +/*********************************************************************** + * GetFirmwareEnvironmentVariableW (KERNEL32.@) + */ +DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size) +{ + FIXME("stub: %s %s %p %u\n", debugstr_w(name), debugstr_w(guid), buffer, size); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} + /********************************************************************** * GetNumaNodeProcessorMask (KERNEL32.@) */

1 0

Alexandre Julliard : kernel32: Remove cpu.c.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 1b653e020d4ac5bc0a356c643e2f573ae8a6977d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b653e020d4ac5bc0a356c64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 14:39:36 2020 +0200 kernel32: Remove cpu.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/cpu.c | 95 ----------------------------------------------- dlls/kernel32/process.c | 46 ++++++++++++++++++++--- 3 files changed, 41 insertions(+), 101 deletions(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index c32cb5e53f..38c5b55de7 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -10,7 +10,6 @@ C_SRCS = \ comm.c \ computername.c \ console.c \ - cpu.c \ debugger.c \ editline.c \ environ.c \ diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c deleted file mode 100644 index 63014ea1c9..0000000000 --- a/dlls/kernel32/cpu.c +++ /dev/null @@ -1,95 +0,0 @@ -/* - * What processor? - * - * Copyright 1995,1997 Morten Welinder - * Copyright 1997-1998 Marcus Meissner - * - * 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 "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif - - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "winternl.h" -#include "psapi.h" -#include "ddk/wdm.h" -#include "wine/unicode.h" -#include "kernel_private.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(reg); - -/*********************************************************************** - * GetActiveProcessorGroupCount (KERNEL32.@) - */ -WORD WINAPI GetActiveProcessorGroupCount(void) -{ - FIXME("semi-stub, always returning 1\n"); - return 1; -} - -/*********************************************************************** - * GetActiveProcessorCount (KERNEL32.@) - */ -DWORD WINAPI GetActiveProcessorCount(WORD group) -{ - SYSTEM_INFO si; - DWORD cpus; - - GetSystemInfo( &si ); - cpus = si.dwNumberOfProcessors; - - FIXME("semi-stub, returning %u\n", cpus); - return cpus; -} - -/*********************************************************************** - * GetMaximumProcessorCount (KERNEL32.@) - */ -DWORD WINAPI GetMaximumProcessorCount(WORD group) -{ - SYSTEM_INFO si; - DWORD cpus; - - GetSystemInfo( &si ); - cpus = si.dwNumberOfProcessors; - - FIXME("semi-stub, returning %u\n", cpus); - return cpus; -} - -/*********************************************************************** - * GetEnabledXStateFeatures (KERNEL32.@) - */ -DWORD64 WINAPI GetEnabledXStateFeatures(void) -{ - FIXME("\n"); - return 0; -} diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 9adf25ab48..66fa4ad506 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -53,7 +53,6 @@ #include "kernel_private.h" #include "psapi.h" #include "wine/exception.h" -#include "wine/library.h" #include "wine/server.h" #include "wine/unicode.h" #include "wine/asm.h" @@ -702,6 +701,46 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK return S_OK; } +/*********************************************************************** + * GetActiveProcessorGroupCount (KERNEL32.@) + */ +WORD WINAPI GetActiveProcessorGroupCount(void) +{ + FIXME("semi-stub, always returning 1\n"); + return 1; +} + +/*********************************************************************** + * GetActiveProcessorCount (KERNEL32.@) + */ +DWORD WINAPI GetActiveProcessorCount(WORD group) +{ + DWORD cpus = system_info.NumberOfProcessors; + + FIXME("semi-stub, returning %u\n", cpus); + return cpus; +} + +/*********************************************************************** + * GetMaximumProcessorCount (KERNEL32.@) + */ +DWORD WINAPI GetMaximumProcessorCount(WORD group) +{ + DWORD cpus = system_info.NumberOfProcessors; + + FIXME("semi-stub, returning %u\n", cpus); + return cpus; +} + +/*********************************************************************** + * GetEnabledXStateFeatures (KERNEL32.@) + */ +DWORD64 WINAPI GetEnabledXStateFeatures(void) +{ + FIXME("\n"); + return 0; +} + /********************************************************************** * GetNumaNodeProcessorMask (KERNEL32.@) */ @@ -737,12 +776,9 @@ BOOL WINAPI GetNumaAvailableMemoryNodeEx(USHORT node, PULONGLONG available_bytes */ BOOL WINAPI GetNumaProcessorNode(UCHAR processor, PUCHAR node) { - SYSTEM_INFO si; - TRACE("(%d, %p)\n", processor, node); - GetSystemInfo( &si ); - if (processor < si.dwNumberOfProcessors) + if (processor < system_info.NumberOfProcessors) { *node = 0; return TRUE;

1 0

Alexandre Julliard : kernel32: Remove actctx.c.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 30428c19c184d08c6b8ae39ef758847313822806 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30428c19c184d08c6b8ae39e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 14:38:20 2020 +0200 kernel32: Remove actctx.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/actctx.c | 142 ---------------------------------------------- dlls/kernel32/process.c | 101 +++++++++++++++++++++++++++++++++ 3 files changed, 101 insertions(+), 143 deletions(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index d9b1ca575c..c32cb5e53f 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -6,7 +6,6 @@ EXTRALIBS = $(COREFOUNDATION_LIBS) $(POLL_LIBS) $(RT_LIBS) EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b600000 C_SRCS = \ - actctx.c \ atom.c \ comm.c \ computername.c \ diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c deleted file mode 100644 index 794fbe8d0a..0000000000 --- a/dlls/kernel32/actctx.c +++ /dev/null @@ -1,142 +0,0 @@ -/* - * Activation contexts - * - * Copyright 2004 Jon Griffiths - * Copyright 2007 Eric Pouech - * Copyright 2007 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 "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winnls.h" -#include "winternl.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(actctx); - -/*********************************************************************** - * CreateActCtxA (KERNEL32.@) - * - * Create an activation context. - */ -HANDLE WINAPI DECLSPEC_HOTPATCH CreateActCtxA(PCACTCTXA pActCtx) -{ - ACTCTXW actw; - SIZE_T len; - HANDLE ret = INVALID_HANDLE_VALUE; - LPWSTR src = NULL, assdir = NULL, resname = NULL, appname = NULL; - - TRACE("%p %08x\n", pActCtx, pActCtx ? pActCtx->dwFlags : 0); - - if (!pActCtx || pActCtx->cbSize != sizeof(*pActCtx)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return INVALID_HANDLE_VALUE; - } - - actw.cbSize = sizeof(actw); - actw.dwFlags = pActCtx->dwFlags; - if (pActCtx->lpSource) - { - len = MultiByteToWideChar(CP_ACP, 0, pActCtx->lpSource, -1, NULL, 0); - src = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!src) return INVALID_HANDLE_VALUE; - MultiByteToWideChar(CP_ACP, 0, pActCtx->lpSource, -1, src, len); - } - actw.lpSource = src; - - if (actw.dwFlags & ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID) - actw.wProcessorArchitecture = pActCtx->wProcessorArchitecture; - if (actw.dwFlags & ACTCTX_FLAG_LANGID_VALID) - actw.wLangId = pActCtx->wLangId; - if (actw.dwFlags & ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID) - { - len = MultiByteToWideChar(CP_ACP, 0, pActCtx->lpAssemblyDirectory, -1, NULL, 0); - assdir = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!assdir) goto done; - MultiByteToWideChar(CP_ACP, 0, pActCtx->lpAssemblyDirectory, -1, assdir, len); - actw.lpAssemblyDirectory = assdir; - } - if (actw.dwFlags & ACTCTX_FLAG_RESOURCE_NAME_VALID) - { - if ((ULONG_PTR)pActCtx->lpResourceName >> 16) - { - len = MultiByteToWideChar(CP_ACP, 0, pActCtx->lpResourceName, -1, NULL, 0); - resname = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!resname) goto done; - MultiByteToWideChar(CP_ACP, 0, pActCtx->lpResourceName, -1, resname, len); - actw.lpResourceName = resname; - } - else actw.lpResourceName = (LPCWSTR)pActCtx->lpResourceName; - } - if (actw.dwFlags & ACTCTX_FLAG_APPLICATION_NAME_VALID) - { - len = MultiByteToWideChar(CP_ACP, 0, pActCtx->lpApplicationName, -1, NULL, 0); - appname = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!appname) goto done; - MultiByteToWideChar(CP_ACP, 0, pActCtx->lpApplicationName, -1, appname, len); - actw.lpApplicationName = appname; - } - if (actw.dwFlags & ACTCTX_FLAG_HMODULE_VALID) - actw.hModule = pActCtx->hModule; - - ret = CreateActCtxW(&actw); - -done: - HeapFree(GetProcessHeap(), 0, src); - HeapFree(GetProcessHeap(), 0, assdir); - HeapFree(GetProcessHeap(), 0, resname); - HeapFree(GetProcessHeap(), 0, appname); - return ret; -} - -/*********************************************************************** - * FindActCtxSectionStringA (KERNEL32.@) - * - * Find information about a string in an activation context. - */ -BOOL WINAPI FindActCtxSectionStringA(DWORD dwFlags, const GUID* lpExtGuid, - ULONG ulId, LPCSTR lpSearchStr, - PACTCTX_SECTION_KEYED_DATA pInfo) -{ - LPWSTR search_str; - DWORD len; - BOOL ret; - - TRACE("%08x %s %u %s %p\n", dwFlags, debugstr_guid(lpExtGuid), - ulId, debugstr_a(lpSearchStr), pInfo); - - if (!lpSearchStr || !pInfo) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - len = MultiByteToWideChar(CP_ACP, 0, lpSearchStr, -1, NULL, 0); - search_str = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, lpSearchStr, -1, search_str, len); - - ret = FindActCtxSectionStringW(dwFlags, lpExtGuid, ulId, search_str, pInfo); - - HeapFree(GetProcessHeap(), 0, search_str); - return ret; -} diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1c3ed9938f..9adf25ab48 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -515,6 +515,107 @@ HANDLE WINAPI KERNEL32_GetCurrentProcess(void) return (HANDLE)~(ULONG_PTR)0; } + +/*********************************************************************** + * CreateActCtxA (KERNEL32.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH CreateActCtxA( const ACTCTXA *actctx ) +{ + ACTCTXW actw; + SIZE_T len; + HANDLE ret = INVALID_HANDLE_VALUE; + LPWSTR src = NULL, assdir = NULL, resname = NULL, appname = NULL; + + TRACE("%p %08x\n", actctx, actctx ? actctx->dwFlags : 0); + + if (!actctx || actctx->cbSize != sizeof(*actctx)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + + actw.cbSize = sizeof(actw); + actw.dwFlags = actctx->dwFlags; + if (actctx->lpSource) + { + len = MultiByteToWideChar(CP_ACP, 0, actctx->lpSource, -1, NULL, 0); + src = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!src) return INVALID_HANDLE_VALUE; + MultiByteToWideChar(CP_ACP, 0, actctx->lpSource, -1, src, len); + } + actw.lpSource = src; + + if (actw.dwFlags & ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID) + actw.wProcessorArchitecture = actctx->wProcessorArchitecture; + if (actw.dwFlags & ACTCTX_FLAG_LANGID_VALID) + actw.wLangId = actctx->wLangId; + if (actw.dwFlags & ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID) + { + len = MultiByteToWideChar(CP_ACP, 0, actctx->lpAssemblyDirectory, -1, NULL, 0); + assdir = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!assdir) goto done; + MultiByteToWideChar(CP_ACP, 0, actctx->lpAssemblyDirectory, -1, assdir, len); + actw.lpAssemblyDirectory = assdir; + } + if (actw.dwFlags & ACTCTX_FLAG_RESOURCE_NAME_VALID) + { + if ((ULONG_PTR)actctx->lpResourceName >> 16) + { + len = MultiByteToWideChar(CP_ACP, 0, actctx->lpResourceName, -1, NULL, 0); + resname = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!resname) goto done; + MultiByteToWideChar(CP_ACP, 0, actctx->lpResourceName, -1, resname, len); + actw.lpResourceName = resname; + } + else actw.lpResourceName = (LPCWSTR)actctx->lpResourceName; + } + if (actw.dwFlags & ACTCTX_FLAG_APPLICATION_NAME_VALID) + { + len = MultiByteToWideChar(CP_ACP, 0, actctx->lpApplicationName, -1, NULL, 0); + appname = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!appname) goto done; + MultiByteToWideChar(CP_ACP, 0, actctx->lpApplicationName, -1, appname, len); + actw.lpApplicationName = appname; + } + if (actw.dwFlags & ACTCTX_FLAG_HMODULE_VALID) + actw.hModule = actctx->hModule; + + ret = CreateActCtxW(&actw); + +done: + HeapFree(GetProcessHeap(), 0, src); + HeapFree(GetProcessHeap(), 0, assdir); + HeapFree(GetProcessHeap(), 0, resname); + HeapFree(GetProcessHeap(), 0, appname); + return ret; +} + +/*********************************************************************** + * FindActCtxSectionStringA (KERNEL32.@) + */ +BOOL WINAPI FindActCtxSectionStringA( DWORD flags, const GUID *guid, ULONG id, const char *search, + ACTCTX_SECTION_KEYED_DATA *info ) +{ + LPWSTR searchW; + DWORD len; + BOOL ret; + + TRACE("%08x %s %u %s %p\n", flags, debugstr_guid(guid), id, debugstr_a(search), info); + + if (!search || !info) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + len = MultiByteToWideChar(CP_ACP, 0, search, -1, NULL, 0); + searchW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, search, -1, searchW, len); + ret = FindActCtxSectionStringW( flags, guid, id, searchW, info ); + HeapFree(GetProcessHeap(), 0, searchW); + return ret; +} + + /*********************************************************************** * CmdBatNotification (KERNEL32.@) *

1 0

Alexandre Julliard : kernel32: Reimplement DosDateTimeToFileTime/FileTimeToDosDateTime using ntdll functions.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: b6a38ea676081664a1fe0b318fe56339b255b6ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6a38ea676081664a1fe0b31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 14:05:10 2020 +0200 kernel32: Reimplement DosDateTimeToFileTime/FileTimeToDosDateTime using ntdll functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 --- configure.ac | 3 --- dlls/kernel32/file.c | 49 +++++++++++++++++++++++++++++++++++++ dlls/kernel32/time.c | 68 ---------------------------------------------------- include/config.h.in | 9 ------- 5 files changed, 49 insertions(+), 83 deletions(-) diff --git a/configure b/configure index a5516fe60e..b652ddbf79 100755 --- a/configure +++ b/configure @@ -7418,7 +7418,6 @@ for ac_header in \ mach/mach.h \ mach/machine.h \ machine/cpu.h \ - machine/limits.h \ machine/sysarch.h \ mntent.h \ ncurses.h \ @@ -7448,7 +7447,6 @@ for ac_header in \ sys/filio.h \ sys/ioctl.h \ sys/ipc.h \ - sys/limits.h \ sys/link.h \ sys/mman.h \ sys/modem.h \ @@ -17984,7 +17982,6 @@ for ac_func in \ sysinfo \ tcdrain \ thr_kill2 \ - timegm \ usleep do : diff --git a/configure.ac b/configure.ac index b43ec73929..c0f60fe694 100644 --- a/configure.ac +++ b/configure.ac @@ -473,7 +473,6 @@ AC_CHECK_HEADERS(\ mach/mach.h \ mach/machine.h \ machine/cpu.h \ - machine/limits.h \ machine/sysarch.h \ mntent.h \ ncurses.h \ @@ -503,7 +502,6 @@ AC_CHECK_HEADERS(\ sys/filio.h \ sys/ioctl.h \ sys/ipc.h \ - sys/limits.h \ sys/link.h \ sys/mman.h \ sys/modem.h \ @@ -2217,7 +2215,6 @@ AC_CHECK_FUNCS(\ sysinfo \ tcdrain \ thr_kill2 \ - timegm \ usleep ) CFLAGS="$ac_save_CFLAGS" diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 4f25331a89..29dd5791af 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -407,6 +407,55 @@ BOOL WINAPI KERNEL32_FlushFileBuffers( HANDLE file ) } +/*********************************************************************** + * DosDateTimeToFileTime (KERNEL32.@) + */ +BOOL WINAPI DosDateTimeToFileTime( WORD fatdate, WORD fattime, FILETIME *ft ) +{ + TIME_FIELDS fields; + LARGE_INTEGER time; + + fields.Year = (fatdate >> 9) + 1980; + fields.Month = ((fatdate >> 5) & 0x0f); + fields.Day = (fatdate & 0x1f); + fields.Hour = (fattime >> 11); + fields.Minute = (fattime >> 5) & 0x3f; + fields.Second = (fattime & 0x1f) * 2; + fields.Milliseconds = 0; + if (!RtlTimeFieldsToTime( &fields, &time )) return FALSE; + ft->dwLowDateTime = time.u.LowPart; + ft->dwHighDateTime = time.u.HighPart; + return TRUE; +} + + +/*********************************************************************** + * FileTimeToDosDateTime (KERNEL32.@) + */ +BOOL WINAPI FileTimeToDosDateTime( const FILETIME *ft, WORD *fatdate, WORD *fattime ) +{ + TIME_FIELDS fields; + LARGE_INTEGER time; + + if (!fatdate || !fattime) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + time.u.LowPart = ft->dwLowDateTime; + time.u.HighPart = ft->dwHighDateTime; + RtlTimeToTimeFields( &time, &fields ); + if (fields.Year < 1980) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + *fattime = (fields.Hour << 11) + (fields.Minute << 5) + (fields.Second / 2); + *fatdate = ((fields.Year - 1980) << 9) + (fields.Month << 5) + fields.Day; + return TRUE; +} + + /************************************************************************** * Operations on file names * **************************************************************************/ diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 4b959684c6..94ccbfb2b9 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -30,14 +30,6 @@ #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif -#ifdef HAVE_SYS_TIMES_H -# include <sys/times.h> -#endif -#ifdef HAVE_SYS_LIMITS_H -#include <sys/limits.h> -#elif defined(HAVE_MACHINE_LIMITS_H) -#include <machine/limits.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -116,66 +108,6 @@ BOOL WINAPI GetDaylightFlag(void) return GetTimeZoneInformation( &tzinfo) == TIME_ZONE_ID_DAYLIGHT; } -/*********************************************************************** - * DosDateTimeToFileTime (KERNEL32.@) - */ -BOOL WINAPI DosDateTimeToFileTime( WORD fatdate, WORD fattime, LPFILETIME ft) -{ - struct tm newtm; -#ifndef HAVE_TIMEGM - struct tm *gtm; - time_t time1, time2; -#endif - - newtm.tm_sec = (fattime & 0x1f) * 2; - newtm.tm_min = (fattime >> 5) & 0x3f; - newtm.tm_hour = (fattime >> 11); - newtm.tm_mday = (fatdate & 0x1f); - newtm.tm_mon = ((fatdate >> 5) & 0x0f) - 1; - newtm.tm_year = (fatdate >> 9) + 80; - newtm.tm_isdst = -1; -#ifdef HAVE_TIMEGM - RtlSecondsSince1970ToTime( timegm(&newtm), (LARGE_INTEGER *)ft ); -#else - time1 = mktime(&newtm); - gtm = gmtime(&time1); - time2 = mktime(gtm); - RtlSecondsSince1970ToTime( 2*time1-time2, (LARGE_INTEGER *)ft ); -#endif - return TRUE; -} - - -/*********************************************************************** - * FileTimeToDosDateTime (KERNEL32.@) - */ -BOOL WINAPI FileTimeToDosDateTime( const FILETIME *ft, LPWORD fatdate, - LPWORD fattime ) -{ - LARGE_INTEGER li; - ULONG t; - time_t unixtime; - struct tm* tm; - - if (!fatdate || !fattime) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - li.u.LowPart = ft->dwLowDateTime; - li.u.HighPart = ft->dwHighDateTime; - if (!RtlTimeToSecondsSince1970( &li, &t )) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - unixtime = t; - tm = gmtime( &unixtime ); - *fattime = (tm->tm_hour << 11) + (tm->tm_min << 5) + (tm->tm_sec / 2); - *fatdate = ((tm->tm_year - 80) << 9) + ((tm->tm_mon + 1) << 5) + tm->tm_mday; - return TRUE; -} - /****************************************************************************** * GetTickCount64 (KERNEL32.@) */ diff --git a/include/config.h.in b/include/config.h.in index 2642487312..720cbd4a5d 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -539,9 +539,6 @@ /* Define to 1 if you have the <machine/cpu.h> header file. */ #undef HAVE_MACHINE_CPU_H -/* Define to 1 if you have the <machine/limits.h> header file. */ -#undef HAVE_MACHINE_LIMITS_H - /* Define to 1 if you have the <machine/sysarch.h> header file. */ #undef HAVE_MACHINE_SYSARCH_H @@ -1021,9 +1018,6 @@ /* Define to 1 if you have the <sys/ipc.h> header file. */ #undef HAVE_SYS_IPC_H -/* Define to 1 if you have the <sys/limits.h> header file. */ -#undef HAVE_SYS_LIMITS_H - /* Define to 1 if you have the <sys/link.h> header file. */ #undef HAVE_SYS_LINK_H @@ -1162,9 +1156,6 @@ /* Define to 1 if you have the <tiffio.h> header file. */ #undef HAVE_TIFFIO_H -/* Define to 1 if you have the `timegm' function. */ -#undef HAVE_TIMEGM - /* Define to 1 if you have the `trunc' function. */ #undef HAVE_TRUNC

1 0

Alexandre Julliard : kernel32: Reimplement GetProcessVersion() in kernelbase.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: fc173ccca8734f6c6d54fcf56e763d4557e9eb48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc173ccca8734f6c6d54fcf5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 13:23:33 2020 +0200 kernel32: Reimplement GetProcessVersion() in kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 55 ----------------------------------------- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 23 +++++++++++++++++ 4 files changed, 25 insertions(+), 57 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a095a85e66..1a6fdbab01 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -793,7 +793,7 @@ # @ stub GetProcessorSystemCycleTime @ stdcall -import GetProcessTimes(long ptr ptr ptr ptr) # @ stub GetProcessUserModeExceptionPolicy -@ stdcall GetProcessVersion(long) +@ stdcall -import GetProcessVersion(long) @ stdcall GetProcessWorkingSetSize(long ptr ptr) @ stdcall -import GetProcessWorkingSetSizeEx(long ptr ptr ptr) @ stdcall -import GetProductInfo(long long long long ptr) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f628f96f36..1c3ed9938f 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -451,61 +451,6 @@ BOOL WINAPI GetProcessAffinityMask( HANDLE hProcess, PDWORD_PTR process_mask, PD } -/*********************************************************************** - * GetProcessVersion (KERNEL32.@) - */ -DWORD WINAPI GetProcessVersion( DWORD pid ) -{ - HANDLE process; - NTSTATUS status; - PROCESS_BASIC_INFORMATION pbi; - SIZE_T count; - PEB peb; - IMAGE_DOS_HEADER dos; - IMAGE_NT_HEADERS nt; - DWORD ver = 0; - - if (!pid || pid == GetCurrentProcessId()) - { - IMAGE_NT_HEADERS *pnt; - - if ((pnt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ))) - return ((pnt->OptionalHeader.MajorSubsystemVersion << 16) | - pnt->OptionalHeader.MinorSubsystemVersion); - return 0; - } - - process = OpenProcess(PROCESS_VM_READ | PROCESS_QUERY_INFORMATION, FALSE, pid); - if (!process) return 0; - - status = NtQueryInformationProcess(process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); - if (status) goto err; - - status = NtReadVirtualMemory(process, pbi.PebBaseAddress, &peb, sizeof(peb), &count); - if (status || count != sizeof(peb)) goto err; - - memset(&dos, 0, sizeof(dos)); - status = NtReadVirtualMemory(process, peb.ImageBaseAddress, &dos, sizeof(dos), &count); - if (status || count != sizeof(dos)) goto err; - if (dos.e_magic != IMAGE_DOS_SIGNATURE) goto err; - - memset(&nt, 0, sizeof(nt)); - status = NtReadVirtualMemory(process, (char *)peb.ImageBaseAddress + dos.e_lfanew, &nt, sizeof(nt), &count); - if (status || count != sizeof(nt)) goto err; - if (nt.Signature != IMAGE_NT_SIGNATURE) goto err; - - ver = MAKELONG(nt.OptionalHeader.MinorSubsystemVersion, nt.OptionalHeader.MajorSubsystemVersion); - -err: - CloseHandle(process); - - if (status != STATUS_SUCCESS) - SetLastError(RtlNtStatusToDosError(status)); - - return ver; -} - - /*********************************************************************** * SetProcessWorkingSetSize [KERNEL32.@] * Sets the min/max working set sizes for a specified process. diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index d85c36c6e5..986cd851ed 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -636,7 +636,7 @@ @ stdcall GetProcessPriorityBoost(long ptr) @ stdcall GetProcessShutdownParameters(ptr ptr) @ stdcall GetProcessTimes(long ptr ptr ptr ptr) -@ stdcall GetProcessVersion(long) kernel32.GetProcessVersion +@ stdcall GetProcessVersion(long) @ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr) # @ stub GetProcessorSystemCycleTime @ stdcall GetProductInfo(long long long long ptr) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 66e115ce69..a3b168543f 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -814,6 +814,29 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetProcessTimes( HANDLE process, FILETIME *create, } +/*********************************************************************** + * GetProcessVersion (kernelbase.@) + */ +DWORD WINAPI DECLSPEC_HOTPATCH GetProcessVersion( DWORD pid ) +{ + SECTION_IMAGE_INFORMATION info; + NTSTATUS status; + HANDLE process; + + if (pid && pid != GetCurrentProcessId()) + { + if (!(process = OpenProcess( PROCESS_QUERY_INFORMATION, FALSE, pid ))) return 0; + status = NtQueryInformationProcess( process, ProcessImageInformation, &info, sizeof(info), NULL ); + CloseHandle( process ); + } + else status = NtQueryInformationProcess( GetCurrentProcess(), ProcessImageInformation, + &info, sizeof(info), NULL ); + + if (!set_ntstatus( status )) return 0; + return MAKELONG( info.SubsystemVersionLow, info.SubsystemVersionHigh ); +} + + /*********************************************************************** * GetProcessWorkingSetSizeEx (kernelbase.@) */

1 0

Alexandre Julliard : ntdll: Implement ProcessImageInformation class in NtQueryInformationProcess().
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 54a7e592e44622ecd61160498fb5148a46b2e8db URL: https://source.winehq.org/git/wine.git/?a=commit;h=54a7e592e44622ecd6116049… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 13:23:21 2020 +0200 ntdll: Implement ProcessImageInformation class in NtQueryInformationProcess(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 23 +++++++++++++++++++++++ dlls/ntdll/tests/info.c | 32 ++++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 3 ++- server/file.h | 1 + server/mapping.c | 11 +++++++++++ server/process.c | 7 +++++++ server/protocol.def | 1 + server/trace.c | 1 + 8 files changed, 78 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 637bef0b65..1bef51b00b 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -621,6 +621,29 @@ NTSTATUS WINAPI NtQueryInformationProcess( else ret = STATUS_INVALID_PARAMETER; break; + + case ProcessImageInformation: + len = sizeof(SECTION_IMAGE_INFORMATION); + if (ProcessInformationLength == len) + { + if (ProcessInformation) + { + pe_image_info_t pe_info; + + SERVER_START_REQ( get_process_info ) + { + req->handle = wine_server_obj_handle( ProcessHandle ); + wine_server_set_reply( req, &pe_info, sizeof(pe_info) ); + if ((ret = wine_server_call( req )) == STATUS_SUCCESS) + virtual_fill_image_information( &pe_info, ProcessInformation ); + } + SERVER_END_REQ; + } + else ret = STATUS_ACCESS_VIOLATION; + } + else ret = STATUS_INFO_LENGTH_MISMATCH; + break; + default: FIXME("(%p,info_class=%d,%p,0x%08x,%p) Unknown information class\n", ProcessHandle,ProcessInformationClass, diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index f923cc7743..cf3f7b9f6f 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1821,6 +1821,34 @@ todo_wine heap_free(buffer); } +static void test_query_process_image_info(void) +{ + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + NTSTATUS status; + SECTION_IMAGE_INFORMATION info; + ULONG len; + + status = pNtQueryInformationProcess( NULL, ProcessImageInformation, &info, sizeof(info), &len ); + ok( status == STATUS_INVALID_HANDLE || broken(status == STATUS_INVALID_PARAMETER), /* winxp */ + "got %08x\n", status); + + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageInformation, &info, sizeof(info)-1, &len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status); + + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageInformation, &info, sizeof(info)+1, &len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status); + + memset( &info, 0xcc, sizeof(info) ); + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageInformation, &info, sizeof(info), &len ); + ok( status == STATUS_SUCCESS, "got %08x\n", status); + ok( len == sizeof(info), "wrong len %u\n", len ); + + ok( info.SubsystemVersionHigh == nt->OptionalHeader.MajorSubsystemVersion, "wrong major version %x/%x\n", + info.SubsystemVersionHigh, nt->OptionalHeader.MajorSubsystemVersion ); + ok( info.SubsystemVersionLow == nt->OptionalHeader.MinorSubsystemVersion, "wrong minor version %x/%x\n", + info.SubsystemVersionLow, nt->OptionalHeader.MinorSubsystemVersion ); +} + static void test_query_process_debug_object_handle(int argc, char **argv) { char cmdline[MAX_PATH]; @@ -2741,6 +2769,10 @@ START_TEST(info) trace("Starting test_process_debug_flags()\n"); test_query_process_debug_flags(argc, argv); + /* 0x25 ProcessImageInformation */ + trace("Starting test_process_image_info()\n"); + test_query_process_image_info(); + /* 0x4C SystemFirmwareTableInformation */ trace("Starting test_query_firmware()\n"); test_query_firmware(); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 2419671f0d..3e205d4165 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -962,6 +962,7 @@ struct get_process_info_reply client_cpu_t cpu; short int debugger_present; short int debug_children; + /* VARARG(image,pe_image_info); */ }; @@ -6684,7 +6685,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 603 +#define SERVER_PROTOCOL_VERSION 604 /* ### protocol_version end ### */ diff --git a/server/file.h b/server/file.h index aa5f6216c2..45215c588d 100644 --- a/server/file.h +++ b/server/file.h @@ -171,6 +171,7 @@ extern struct mapping *get_mapping_obj( struct process *process, obj_handle_t ha unsigned int access ); extern struct file *get_mapping_file( struct process *process, client_ptr_t base, unsigned int access, unsigned int sharing ); +extern const pe_image_info_t *get_mapping_image_info( struct process *process, client_ptr_t base ); extern void free_mapped_views( struct process *process ); extern int get_page_size(void); diff --git a/server/mapping.c b/server/mapping.c index 0fcada7f8f..2c34b8f3c8 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -127,6 +127,7 @@ struct memory_view struct fd *fd; /* fd for mapped file */ struct ranges *committed; /* list of committed ranges in this mapping */ struct shared_map *shared; /* temp file for shared PE mapping */ + pe_image_info_t image; /* image info (for PE image mapping) */ unsigned int flags; /* SEC_* flags */ client_ptr_t base; /* view base address (in process addr space) */ mem_size_t size; /* view size */ @@ -894,6 +895,15 @@ struct file *get_mapping_file( struct process *process, client_ptr_t base, return create_file_for_fd_obj( view->fd, access, sharing ); } +/* get the image info for a SEC_IMAGE mapping */ +const pe_image_info_t *get_mapping_image_info( struct process *process, client_ptr_t base ) +{ + struct memory_view *view = find_mapped_view( process, base ); + + if (!view || !(view->flags & SEC_IMAGE)) return NULL; + return &view->image; +} + static void mapping_dump( struct object *obj, int verbose ) { struct mapping *mapping = (struct mapping *)obj; @@ -1062,6 +1072,7 @@ DECL_HANDLER(map_view) view->fd = !is_fd_removable( mapping->fd ) ? (struct fd *)grab_object( mapping->fd ) : NULL; view->committed = mapping->committed ? (struct ranges *)grab_object( mapping->committed ) : NULL; view->shared = mapping->shared ? (struct shared_map *)grab_object( mapping->shared ) : NULL; + if (mapping->flags & SEC_IMAGE) view->image = mapping->image; list_add_tail( &current->process->views, &view->entry ); } diff --git a/server/process.c b/server/process.c index 6722addb09..ab3d448b00 100644 --- a/server/process.c +++ b/server/process.c @@ -1447,6 +1447,13 @@ DECL_HANDLER(get_process_info) reply->cpu = process->cpu; reply->debugger_present = !!process->debugger; reply->debug_children = process->debug_children; + if (get_reply_max_size()) + { + const pe_image_info_t *info; + struct process_dll *exe = get_process_exe_module( process ); + if (exe && (info = get_mapping_image_info( process, exe->base ))) + set_reply_data( info, min( sizeof(*info), get_reply_max_size() )); + } release_object( process ); } } diff --git a/server/protocol.def b/server/protocol.def index 2fb8e2ec80..86efb01cc3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -915,6 +915,7 @@ struct rawinput_device client_cpu_t cpu; /* CPU that this process is running on */ short int debugger_present; /* process is being debugged */ short int debug_children; /* inherit debugger to child processes */ + VARARG(image,pe_image_info); /* image info for main exe */ @END diff --git a/server/trace.c b/server/trace.c index ca2cbb9074..c5c006ce41 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1389,6 +1389,7 @@ static void dump_get_process_info_reply( const struct get_process_info_reply *re dump_client_cpu( ", cpu=", &req->cpu ); fprintf( stderr, ", debugger_present=%d", req->debugger_present ); fprintf( stderr, ", debug_children=%d", req->debug_children ); + dump_varargs_pe_image_info( ", image=", cur_size ); } static void dump_get_process_vm_counters_request( const struct get_process_vm_counters_request *req )

1 0

Alexandre Julliard : kernel32: Use set_ntstatus() in more places.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: e076fff578c9cedd07b5278640e64db4aa854651 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e076fff578c9cedd07b52786… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 12:29:06 2020 +0200 kernel32: Use set_ntstatus() in more places. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 7 +-- dlls/kernel32/debugger.c | 8 +-- dlls/kernel32/file.c | 10 ++-- dlls/kernel32/powermgnt.c | 16 ++---- dlls/kernel32/sync.c | 127 ++++++++++------------------------------------ dlls/kernel32/thread.c | 48 +++++------------- dlls/kernel32/toolhelp.c | 8 ++- 7 files changed, 53 insertions(+), 171 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e076fff578c9cedd07b5…

1 0

Alexandre Julliard : kernel32: Leave some more space for kernelbase.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 613389059006270fc89abdfb984c43e6fa742a9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=613389059006270fc89abdfb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 12:26:31 2020 +0200 kernel32: Leave some more space for kernelbase. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49208 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index b3877fe13b..d9b1ca575c 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -3,7 +3,7 @@ MODULE = kernel32.dll IMPORTLIB = kernel32 IMPORTS = winecrt0 kernelbase ntdll EXTRALIBS = $(COREFOUNDATION_LIBS) $(POLL_LIBS) $(RT_LIBS) -EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b400000 +EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b600000 C_SRCS = \ actctx.c \

1 0

Nikolay Sivov : dwrite: Use global cursor to glyph array for substitutions.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: c9814f90988224afe22adc41dc04eb49cb61f206 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9814f90988224afe22adc41… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 26 11:16:12 2020 +0300 dwrite: Use global cursor to glyph array for substitutions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 3 +- dlls/dwrite/opentype.c | 273 +++++++++++++++++++++++++++---------------- 2 files changed, 177 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c9814f90988224afe22a…

1 0

Nikolay Sivov : dwrite: Prefetch all lookup entry fields when collecting them.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 2b5500ce1213374b602cb3eead580f5dfc985b2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b5500ce1213374b602cb3ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 26 11:16:11 2020 +0300 dwrite: Prefetch all lookup entry fields when collecting them. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 98 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 59 insertions(+), 39 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 54d066e017..7e35feb7f5 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4159,7 +4159,12 @@ static void opentype_layout_apply_gpos_lookup(struct scriptshaping_context *cont struct lookup { unsigned short index; + unsigned short type; + unsigned short flags; + unsigned short subtable_count; + unsigned int mask; + unsigned int offset; }; struct lookups @@ -4176,11 +4181,45 @@ static int lookups_sorting_compare(const void *a, const void *b) return left->index < right->index ? -1 : left->index > right->index ? 1 : 0; }; +static BOOL opentype_layout_init_lookup(struct ot_gsubgpos_table *table, unsigned short lookup_index, unsigned int mask, + struct lookup *lookup) +{ + unsigned short subtable_count, lookup_type, flags; + const struct ot_lookup_table *lookup_table; + unsigned int offset; + + if (!(offset = table_read_be_word(&table->table, table->lookup_list + + FIELD_OFFSET(struct ot_lookup_list, lookup[lookup_index])))) + { + return FALSE; + } + + offset += table->lookup_list; + + if (!(lookup_table = table_read_ensure(&table->table, offset, sizeof(*lookup_table)))) + return FALSE; + + if (!(subtable_count = GET_BE_WORD(lookup_table->subtable_count))) + return FALSE; + + lookup_type = GET_BE_WORD(lookup_table->lookup_type); + flags = GET_BE_WORD(lookup_table->flags); + + lookup->index = lookup_index; + lookup->type = lookup_type; + lookup->flags = flags; + lookup->subtable_count = subtable_count; + lookup->mask = mask; + lookup->offset = offset; + + return TRUE; +} + static void opentype_layout_add_lookups(const struct ot_feature_list *feature_list, UINT16 total_lookup_count, struct ot_gsubgpos_table *table, struct shaping_feature *feature, struct lookups *lookups) { UINT16 feature_offset, lookup_count; - unsigned int i, j; + unsigned int i; /* Feature wasn't found */ if (feature->index == 0xffff) @@ -4211,10 +4250,8 @@ static void opentype_layout_add_lookups(const struct ot_feature_list *feature_li if (lookup_index >= total_lookup_count) continue; - j = lookups->count; - lookups->lookups[j].index = lookup_index; - lookups->lookups[j].mask = feature->mask; - lookups->count++; + if (opentype_layout_init_lookup(table, lookup_index, feature->mask, &lookups->lookups[lookups->count])) + lookups->count++; } } @@ -4424,7 +4461,7 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, heap_free(lookups.lookups); } -static BOOL opentype_layout_apply_gsub_single_substitution(struct glyph_iterator *iter, const struct ot_lookup *lookup) +static BOOL opentype_layout_apply_gsub_single_substitution(struct glyph_iterator *iter, const struct lookup *lookup) { UINT16 format, coverage, orig_glyph = iter->context->u.subst.glyphs[iter->pos], glyph = orig_glyph; struct scriptshaping_cache *cache = iter->context->cache; @@ -4550,16 +4587,19 @@ static BOOL opentype_layout_context_match_lookahead(struct glyph_iterator *iter, } static void opentype_layout_apply_gsub_lookup(struct scriptshaping_context *context, unsigned int first_glyph, - unsigned int glyph_count, int lookup_index, BOOL only_single); + unsigned int glyph_count, struct lookup *lookup, BOOL only_single); static BOOL opentype_layout_context_gsub_apply_lookup(struct glyph_iterator *iter, unsigned int count, unsigned int lookup_count, const UINT16 *lookup_records) { + struct lookup lookup = { 0 }; + if (lookup_count > 1) FIXME("Only first lookup used.\n"); - opentype_layout_apply_gsub_lookup(iter->context, iter->pos + GET_BE_WORD(lookup_records[0]), count, - GET_BE_WORD(lookup_records[1]), TRUE); + if (opentype_layout_init_lookup(&iter->context->cache->gsub, GET_BE_WORD(lookup_records[1]), 0, &lookup)) + opentype_layout_apply_gsub_lookup(iter->context, iter->pos + GET_BE_WORD(lookup_records[0]), count, + &lookup, TRUE); return TRUE; } @@ -4574,7 +4614,7 @@ static BOOL opentype_layout_apply_gsub_chain_context_lookup(struct glyph_iterato opentype_layout_context_gsub_apply_lookup(iter, input_count, lookup_count, lookup_records); } -static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct glyph_iterator *iter, const struct ot_lookup *lookup) +static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct glyph_iterator *iter, const struct lookup *lookup) { struct scriptshaping_cache *cache = iter->context->cache; UINT16 format, coverage; @@ -4661,34 +4701,14 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct glyph_i } static void opentype_layout_apply_gsub_lookup(struct scriptshaping_context *context, unsigned int first_glyph, - unsigned int glyph_count, int lookup_index, BOOL only_single) + unsigned int glyph_count, struct lookup *lookup, BOOL only_single) { - struct ot_gsubgpos_table *table = &context->cache->gsub; - const struct ot_lookup_table *lookup_table; struct glyph_iterator iter; - struct ot_lookup lookup; - WORD lookup_type; - lookup.offset = table_read_be_word(&table->table, table->lookup_list + FIELD_OFFSET(struct ot_lookup_list, lookup[lookup_index])); - if (!lookup.offset) + if (lookup->type != GSUB_LOOKUP_SINGLE_SUBST && only_single) return; - lookup.offset += table->lookup_list; - - if (!(lookup_table = table_read_ensure(&table->table, lookup.offset, sizeof(*lookup_table)))) - return; - - lookup.subtable_count = GET_BE_WORD(lookup_table->subtable_count); - if (!lookup.subtable_count) - return; - - lookup_type = GET_BE_WORD(lookup_table->lookup_type); - lookup.flags = GET_BE_WORD(lookup_table->flags); - - if (lookup_type != GSUB_LOOKUP_SINGLE_SUBST && only_single) - return; - - glyph_iterator_init(context, lookup.flags, first_glyph, glyph_count, &iter); + glyph_iterator_init(context, lookup->flags, first_glyph, glyph_count, &iter); while (iter.pos < first_glyph + iter.len) { @@ -4700,13 +4720,13 @@ static void opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont continue; } - switch (lookup_type) + switch (lookup->type) { case GSUB_LOOKUP_SINGLE_SUBST: - ret = opentype_layout_apply_gsub_single_substitution(&iter, &lookup); + ret = opentype_layout_apply_gsub_single_substitution(&iter, lookup); break; case GSUB_LOOKUP_CHAINING_CONTEXTUAL_SUBST: - ret = opentype_layout_apply_gsub_chain_context_substitution(&iter, &lookup); + ret = opentype_layout_apply_gsub_chain_context_substitution(&iter, lookup); break; case GSUB_LOOKUP_MULTIPLE_SUBST: case GSUB_LOOKUP_ALTERNATE_SUBST: @@ -4714,10 +4734,10 @@ static void opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont case GSUB_LOOKUP_CONTEXTUAL_SUBST: case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST: ret = FALSE; - WARN("Unimplemented lookup %d.\n", lookup_type); + WARN("Unimplemented lookup %d.\n", lookup->type); break; default: - WARN("Unknown lookup type %u.\n", lookup_type); + WARN("Unknown lookup type %u.\n", lookup->type); return; } @@ -4801,7 +4821,7 @@ HRESULT opentype_layout_apply_gsub_features(struct scriptshaping_context *contex opentype_layout_set_glyph_masks(context, features); for (i = 0; i < lookups.count; ++i) - opentype_layout_apply_gsub_lookup(context, 0, context->glyph_count, lookups.lookups[i].index, FALSE); + opentype_layout_apply_gsub_lookup(context, 0, context->glyph_count, &lookups.lookups[i], FALSE); heap_free(lookups.lookups);

1 0

Nikolay Sivov : dwrite: Use temporary buffers for GetGlyphs().
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 76b1f3fd729bbfb823d2fccb85f6fd49e7e0e04c URL: https://source.winehq.org/git/wine.git/?a=commit;h=76b1f3fd729bbfb823d2fccb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 26 11:16:10 2020 +0300 dwrite: Use temporary buffers for GetGlyphs(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 9 +++++++-- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/shape.c | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 786d68ac27..3754fe39a1 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1173,10 +1173,11 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, context.length = length; context.is_rtl = is_rtl; context.is_sideways = is_sideways; - context.u.subst.glyphs = glyphs; - context.u.subst.glyph_props = glyph_props; + context.u.subst.glyphs = heap_calloc(max_glyph_count, sizeof(*glyphs)); + context.u.subst.glyph_props = heap_calloc(max_glyph_count, sizeof(*glyph_props)); context.u.subst.clustermap = clustermap; context.u.subst.max_glyph_count = max_glyph_count; + context.u.subst.capacity = max_glyph_count; context.u.subst.digits = digits; context.language_tag = get_opentype_language(locale); context.user_features.features = features; @@ -1190,10 +1191,14 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, if (SUCCEEDED(hr)) { *actual_glyph_count = context.glyph_count; + memcpy(glyphs, context.u.subst.glyphs, context.glyph_count * sizeof(*glyphs)); + memcpy(glyph_props, context.u.subst.glyph_props, context.glyph_count * sizeof(*glyph_props)); hr = default_shaping_ops.set_text_glyphs_props(&context, clustermap, glyphs, *actual_glyph_count, text_props, glyph_props); } + heap_free(context.u.subst.glyph_props); + heap_free(context.u.subst.glyphs); heap_free(context.glyph_infos); return hr; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index dd25c619c1..ce278e5499 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -491,6 +491,7 @@ struct scriptshaping_context DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; UINT16 *clustermap; unsigned int max_glyph_count; + unsigned int capacity; const WCHAR *digits; } subst; } u; diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 77c5ba1f8a..b7b40d1211 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -400,5 +400,5 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i heap_free(features.features); - return S_OK; + return (context->glyph_count <= context->u.subst.max_glyph_count) ? S_OK : E_NOT_SUFFICIENT_BUFFER; }

1 0

Nikolay Sivov : dwrite: Only enable single substitution lookups for chained substitution.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 5625a8e52deb7a6a43586a2c4ca6d1ad2ba7401a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5625a8e52deb7a6a43586a2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 26 11:16:09 2020 +0300 dwrite: Only enable single substitution lookups for chained substitution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 5d90bad79c..54d066e017 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4550,7 +4550,7 @@ static BOOL opentype_layout_context_match_lookahead(struct glyph_iterator *iter, } static void opentype_layout_apply_gsub_lookup(struct scriptshaping_context *context, unsigned int first_glyph, - unsigned int glyph_count, int lookup_index); + unsigned int glyph_count, int lookup_index, BOOL only_single); static BOOL opentype_layout_context_gsub_apply_lookup(struct glyph_iterator *iter, unsigned int count, unsigned int lookup_count, const UINT16 *lookup_records) @@ -4559,7 +4559,7 @@ static BOOL opentype_layout_context_gsub_apply_lookup(struct glyph_iterator *ite FIXME("Only first lookup used.\n"); opentype_layout_apply_gsub_lookup(iter->context, iter->pos + GET_BE_WORD(lookup_records[0]), count, - GET_BE_WORD(lookup_records[1])); + GET_BE_WORD(lookup_records[1]), TRUE); return TRUE; } @@ -4661,7 +4661,7 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct glyph_i } static void opentype_layout_apply_gsub_lookup(struct scriptshaping_context *context, unsigned int first_glyph, - unsigned int glyph_count, int lookup_index) + unsigned int glyph_count, int lookup_index, BOOL only_single) { struct ot_gsubgpos_table *table = &context->cache->gsub; const struct ot_lookup_table *lookup_table; @@ -4685,6 +4685,9 @@ static void opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont lookup_type = GET_BE_WORD(lookup_table->lookup_type); lookup.flags = GET_BE_WORD(lookup_table->flags); + if (lookup_type != GSUB_LOOKUP_SINGLE_SUBST && only_single) + return; + glyph_iterator_init(context, lookup.flags, first_glyph, glyph_count, &iter); while (iter.pos < first_glyph + iter.len) @@ -4798,7 +4801,7 @@ HRESULT opentype_layout_apply_gsub_features(struct scriptshaping_context *contex opentype_layout_set_glyph_masks(context, features); for (i = 0; i < lookups.count; ++i) - opentype_layout_apply_gsub_lookup(context, 0, context->glyph_count, lookups.lookups[i].index); + opentype_layout_apply_gsub_lookup(context, 0, context->glyph_count, lookups.lookups[i].index, FALSE); heap_free(lookups.lookups);

1 0

Nikolay Sivov : dwrite: Update glyph properties on single substitution.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: e5c6a7beb302b37caef800e17b42bc4c49708a93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5c6a7beb302b37caef800e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 26 11:16:08 2020 +0300 dwrite: Update glyph properties on single substitution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index abf9cba105..5d90bad79c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3137,7 +3137,7 @@ static unsigned int opentype_set_glyph_props(struct scriptshaping_context *conte if (cache->gdef.classdef) { - glyph_class = opentype_layout_get_glyph_class(&cache->gdef.table, cache->gdef.classdef, context->u.subst.glyphs[g]); + glyph_class = opentype_layout_get_glyph_class(&cache->gdef.table, cache->gdef.classdef, glyph); } switch (glyph_class) @@ -3160,6 +3160,13 @@ static unsigned int opentype_set_glyph_props(struct scriptshaping_context *conte return props; } +static void opentype_set_subst_glyph_props(struct scriptshaping_context *context, unsigned int g, UINT16 glyph) +{ + unsigned int glyph_props = opentype_set_glyph_props(context, g, glyph); + context->u.subst.glyph_props[g].isDiacritic = !!(glyph_props == GLYPH_PROP_MARK); + context->u.subst.glyph_props[g].isZeroWidthSpace = !!(glyph_props == GLYPH_PROP_MARK); +} + struct coverage_compare_format1_context { UINT16 glyph; @@ -4419,15 +4426,14 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, static BOOL opentype_layout_apply_gsub_single_substitution(struct glyph_iterator *iter, const struct ot_lookup *lookup) { + UINT16 format, coverage, orig_glyph = iter->context->u.subst.glyphs[iter->pos], glyph = orig_glyph; struct scriptshaping_cache *cache = iter->context->cache; const struct dwrite_fonttable *gsub = &cache->gsub.table; - UINT16 format, coverage; unsigned int i; for (i = 0; i < lookup->subtable_count; ++i) { unsigned int subtable_offset = opentype_layout_get_gsub_subtable(cache, lookup->offset, i); - UINT16 glyph = iter->context->u.subst.glyphs[iter->pos]; unsigned int coverage_index; format = table_read_be_word(&cache->gsub.table, subtable_offset); @@ -4443,7 +4449,7 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct glyph_iterator if (coverage_index == GLYPH_NOT_COVERED) continue; - iter->context->u.subst.glyphs[iter->pos] = glyph + GET_BE_WORD(format1->delta); + glyph = orig_glyph + GET_BE_WORD(format1->delta); break; } else if (format == 2) @@ -4456,13 +4462,19 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct glyph_iterator if (coverage_index == GLYPH_NOT_COVERED || coverage_index >= count) continue; - iter->context->u.subst.glyphs[iter->pos] = GET_BE_WORD(format2->substitutes[coverage_index]); + glyph = GET_BE_WORD(format2->substitutes[coverage_index]); break; } else WARN("Unknown single substitution format %u.\n", format); } + if (glyph != orig_glyph) + { + iter->context->u.subst.glyphs[iter->pos] = glyph; + opentype_set_subst_glyph_props(iter->context, iter->pos, glyph); + } + return FALSE; } @@ -4762,11 +4774,7 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c context->u.subst.glyphs[g] = font->get_glyph(context->cache->context, codepoint); context->u.subst.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER; context->u.subst.glyph_props[g].isClusterStart = 1; - if (opentype_set_glyph_props(context, g, context->u.subst.glyphs[g]) == GLYPH_PROP_MARK) - { - context->u.subst.glyph_props[g].isDiacritic = 1; - context->u.subst.glyph_props[g].isZeroWidthSpace = 1; - } + opentype_set_subst_glyph_props(context, g, context->u.subst.glyphs[g]); context->glyph_count++; clustermap[i] = i;

1 0

Alex Henrie : ws2_32: Reimplement inet_ntop on top of ntdll functions.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: a294f755ceaeeb07bdf08e1cb445cbcd542fa533 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a294f755ceaeeb07bdf08e1c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 25 22:36:24 2020 -0600 ws2_32: Reimplement inet_ntop on top of ntdll functions. And add a couple of tests for IPv6 addresses that Windows represents using dot-decimal notation for the last 32 bits but GNU/Linux does not. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 --- configure.ac | 3 --- dlls/ws2_32/socket.c | 20 ++++++-------------- dlls/ws2_32/tests/sock.c | 6 ++++++ include/config.h.in | 9 --------- 5 files changed, 12 insertions(+), 29 deletions(-) diff --git a/configure b/configure index e2e03dc4ba..a5516fe60e 100755 --- a/configure +++ b/configure @@ -18296,9 +18296,6 @@ for ac_func in \ getprotobyname \ getprotobynumber \ getservbyport \ - inet_addr \ - inet_network \ - inet_ntop \ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index d81f5cc88c..b43ec73929 100644 --- a/configure.ac +++ b/configure.ac @@ -2249,9 +2249,6 @@ AC_CHECK_FUNCS(\ getprotobyname \ getprotobynumber \ getservbyport \ - inet_addr \ - inet_network \ - inet_ntop \ ) dnl Check for clock_gettime which may be in -lrt diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bdfe63ee19..199b7187a8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -8351,10 +8351,8 @@ int WINAPI WSARemoveServiceClass(LPGUID info) */ PCSTR WINAPI WS_inet_ntop( INT family, PVOID addr, PSTR buffer, SIZE_T len ) { -#ifdef HAVE_INET_NTOP - struct WS_in6_addr *in6; - struct WS_in_addr *in; - PCSTR pdst; + NTSTATUS status; + ULONG size = min( len, (ULONG)-1 ); TRACE("family %d, addr (%p), buffer (%p), len %ld\n", family, addr, buffer, len); if (!buffer) @@ -8367,14 +8365,12 @@ PCSTR WINAPI WS_inet_ntop( INT family, PVOID addr, PSTR buffer, SIZE_T len ) { case WS_AF_INET: { - in = addr; - pdst = inet_ntop( AF_INET, &in->WS_s_addr, buffer, len ); + status = RtlIpv4AddressToStringExA( (IN_ADDR *)addr, 0, buffer, &size ); break; } case WS_AF_INET6: { - in6 = addr; - pdst = inet_ntop( AF_INET6, in6->WS_s6_addr, buffer, len ); + status = RtlIpv6AddressToStringExA( (IN6_ADDR *)addr, 0, 0, buffer, &size ); break; } default: @@ -8382,13 +8378,9 @@ PCSTR WINAPI WS_inet_ntop( INT family, PVOID addr, PSTR buffer, SIZE_T len ) return NULL; } - if (!pdst) SetLastError( STATUS_INVALID_PARAMETER ); - return pdst; -#else - FIXME( "not supported on this platform\n" ); - SetLastError( WSAEAFNOSUPPORT ); + if (status == STATUS_SUCCESS) return buffer; + SetLastError( STATUS_INVALID_PARAMETER ); return NULL; -#endif } /*********************************************************************** diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c72dc7a77a..cd9a13937c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5008,6 +5008,12 @@ static void test_inet_pton(void) "0x12345678", NULL, NULL}, {AF_INET6, 0, 0, /* windows bug */ "::1:2:3:4:5:6:7", NULL, NULL}, + {AF_INET6, 1, 0, /* Test 30 */ + "::5efe:1.2.3.4", "::5efe:1.2.3.4", + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x5e\xfe\x01\x02\x03\x04"}, + {AF_INET6, 1, 0, + "::ffff:0:1.2.3.4", "::ffff:0:1.2.3.4", + "\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x00\x00\x01\x02\x03\x04"}, }; int i, ret; DWORD err; diff --git a/include/config.h.in b/include/config.h.in index d2933eee65..2642487312 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -296,18 +296,9 @@ /* Define to 1 if you have the `ilogbf' function. */ #undef HAVE_ILOGBF -/* Define to 1 if you have the `inet_addr' function. */ -#undef HAVE_INET_ADDR - /* Define to 1 if you have the <inet/mib2.h> header file. */ #undef HAVE_INET_MIB2_H -/* Define to 1 if you have the `inet_network' function. */ -#undef HAVE_INET_NETWORK - -/* Define to 1 if you have the `inet_ntop' function. */ -#undef HAVE_INET_NTOP - /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H

1 0

Alex Henrie : ntdll: Implement RtlIpv6AddressToString(Ex)[AW].
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 0af08318b75bd31928c31c875239c0f863ab4e0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0af08318b75bd31928c31c87… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 25 22:36:23 2020 -0600 ntdll: Implement RtlIpv6AddressToString(Ex)[AW]. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46788 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 8 +-- dlls/ntdll/rtl.c | 129 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/tests/rtl.c | 14 +--- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 8 +-- include/ip2string.h | 7 ++ 5 files changed, 147 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0af08318b75bd31928c3…

1 0

Alex Henrie : ntdll/tests: Add more RtlIpv6AddressToString tests.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: e5f69e81f351d8ca86391d41a78dbd52177a96ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5f69e81f351d8ca86391d41… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 25 22:36:22 2020 -0600 ntdll/tests: Add more RtlIpv6AddressToString tests. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 0cbf0b33ff..f83031b490 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1721,28 +1721,40 @@ static void test_RtlIpv6AddressToString(void) { /* ipv4 addresses & ISATAP addresses */ { "::13.1.68.3", { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, + { "::123.123.123.123", { 0, 0, 0, 0, 0, 0, 0x7b7b, 0x7b7b } }, + { "::ffff", { 0, 0, 0, 0, 0, 0, 0, 0xffff } }, + { "::0.1.0.0", { 0, 0, 0, 0, 0, 0, 0x100, 0 } }, { "::ffff:13.1.68.3", { 0, 0, 0, 0, 0, 0xffff, 0x10d, 0x344 } }, { "::feff:d01:4403", { 0, 0, 0, 0, 0, 0xfffe, 0x10d, 0x344 } }, { "::fffe:d01:4403", { 0, 0, 0, 0, 0, 0xfeff, 0x10d, 0x344 } }, { "::100:d01:4403", { 0, 0, 0, 0, 0, 1, 0x10d, 0x344 } }, { "::1:d01:4403", { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 } }, + { "::1:0:d01:4403", { 0, 0, 0, 0, 0x100, 0, 0x10d, 0x344 } }, + { "::fffe:d01:4403", { 0, 0, 0, 0, 0, 0xfeff, 0x10d, 0x344 } }, + { "::fffe:0:d01:4403", { 0, 0, 0, 0, 0xfeff, 0, 0x10d, 0x344 } }, { "::ffff:0:4403", { 0, 0, 0, 0, 0, 0xffff, 0, 0x344 } }, + { "::ffff:0.1.0.0", { 0, 0, 0, 0, 0, 0xffff, 0x100, 0 } }, { "::ffff:13.1.0.0", { 0, 0, 0, 0, 0, 0xffff, 0x10d, 0 } }, { "::ffff:0:0", { 0, 0, 0, 0, 0, 0xffff, 0, 0 } }, + { "::ffff:0:ffff", { 0, 0, 0, 0, 0, 0xffff, 0, 0xffff } }, + { "::ffff:0:0.1.0.0", { 0, 0, 0, 0, 0xffff, 0, 0x100, 0 } }, { "::ffff:0:13.1.68.3", { 0, 0, 0, 0, 0xffff, 0, 0x10d, 0x344 } }, { "::ffff:ffff:d01:4403", { 0, 0, 0, 0, 0xffff, 0xffff, 0x10d, 0x344 } }, { "::ffff:0:0:d01:4403", { 0, 0, 0, 0xffff, 0, 0, 0x10d, 0x344 } }, { "::ffff:255.255.255.255", { 0, 0, 0, 0, 0, 0xffff, 0xffff, 0xffff } }, { "::ffff:129.144.52.38", { 0, 0, 0, 0, 0, 0xffff, 0x9081, 0x2634 } }, + { "::5efe:0.0.0.0", { 0, 0, 0, 0, 0, 0xfe5e, 0, 0 } }, { "::5efe:129.144.52.38", { 0, 0, 0, 0, 0, 0xfe5e, 0x9081, 0x2634 } }, { "1111:2222:3333:4444:0:5efe:129.144.52.38", { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 } }, { "1111:2222:3333::5efe:129.144.52.38", { 0x1111, 0x2222, 0x3333, 0, 0, 0xfe5e, 0x9081, 0x2634 } }, { "1111:2222::5efe:129.144.52.38", { 0x1111, 0x2222, 0, 0, 0, 0xfe5e, 0x9081, 0x2634 } }, { "1111::5efe:129.144.52.38", { 0x1111, 0, 0, 0, 0, 0xfe5e, 0x9081, 0x2634 } }, + { "::300:5efe:8190:3426", { 0, 0, 0, 0, 3, 0xfe5e, 0x9081, 0x2634 } }, { "::200:5efe:129.144.52.38", { 0, 0, 0, 0, 2, 0xfe5e, 0x9081, 0x2634 } }, { "::100:5efe:8190:3426", { 0, 0, 0, 0, 1, 0xfe5e, 0x9081, 0x2634 } }, /* 'normal' addresses */ { "::1", { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, + { "::2", { 0, 0, 0, 0, 0, 0, 0, 0x200 } }, { "0:1:2:3:4:5:6:7", { 0, 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x700 } }, { "1080::8:800:200c:417a", { 0x8010, 0, 0, 0, 0x800, 0x8, 0x0c20, 0x7a41 } }, { "1111:2222:3333:4444:5555:6666:7b7b:7b7b", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, @@ -1777,7 +1789,6 @@ static void test_RtlIpv6AddressToString(void) { "2001:db8:85a3::8a2e:370:7334", { 0x120, 0xb80d, 0xa385, 0, 0, 0x2e8a, 0x7003, 0x3473 } }, { "3ffe:b00::1:0:0:a", { 0xfe3f, 0xb, 0, 0, 0x100, 0, 0, 0xa00 } }, { "::a:b:c:d:e", { 0, 0, 0, 0xa00, 0xb00, 0xc00, 0xd00, 0xe00 } }, - { "::123.123.123.123", { 0, 0, 0, 0, 0, 0, 0x7b7b, 0x7b7b } }, { "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", { 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } }, { "1111:2222:3333:4444:5555:6666:7777:1", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x100 } }, { "1111:2222:3333:4444:5555:6666:7777:8888", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888 } },

1 0

Alex Henrie : ntdll/tests: Drop RTL function workarounds for Windows <= 2000.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 917002c88f82e0f4253171af9332c1ba4fff8be9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=917002c88f82e0f4253171af… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 25 22:36:21 2020 -0600 ntdll/tests: Drop RTL function workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 459 ++++++++++++++----------------------------------- 1 file changed, 133 insertions(+), 326 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=917002c88f82e0f42531…

1 0

Alex Henrie : include: Add more RTL functions.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: e3d2d852a4cc717099bcd18fe1f4c9d748d66317 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3d2d852a4cc717099bcd18f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 25 22:36:20 2020 -0600 include: Add more RTL functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtl.c | 4 ++-- include/winnt.h | 1 + include/winternl.h | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index bccf26d7d6..003e4a1b3b 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -546,10 +546,10 @@ SIZE_T WINAPI RtlCompareMemory( const VOID *Source1, const VOID *Source2, SIZE_T * RETURNS * The byte position of the first byte at which Source1 is not dwVal. */ -SIZE_T WINAPI RtlCompareMemoryUlong(const ULONG *Source1, SIZE_T Length, ULONG dwVal) +SIZE_T WINAPI RtlCompareMemoryUlong(VOID *Source1, SIZE_T Length, ULONG dwVal) { SIZE_T i; - for(i = 0; i < Length/sizeof(ULONG) && Source1[i] == dwVal; i++); + for(i = 0; i < Length/sizeof(ULONG) && ((ULONG *)Source1)[i] == dwVal; i++); return i * sizeof(ULONG); } diff --git a/include/winnt.h b/include/winnt.h index 3e3ac338bc..ae9177842b 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6034,6 +6034,7 @@ typedef enum _CM_ERROR_CONTROL_TYPE } SERVICE_ERROR_TYPE; NTSYSAPI SIZE_T WINAPI RtlCompareMemory(const VOID*, const VOID*, SIZE_T); +NTSYSAPI SIZE_T WINAPI RtlCompareMemoryUlong(VOID*, SIZE_T, ULONG); #define RtlEqualMemory(Destination, Source, Length) (!memcmp((Destination),(Source),(Length))) #define RtlMoveMemory(Destination, Source, Length) memmove((Destination),(Source),(Length)) diff --git a/include/winternl.h b/include/winternl.h index e197a55a27..b70460f314 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2727,6 +2727,7 @@ NTSYSAPI NTSTATUS WINAPI NtWriteRequestData(HANDLE,PLPC_MESSAGE,ULONG,PVOID,ULO NTSYSAPI NTSTATUS WINAPI NtWriteVirtualMemory(HANDLE,void*,const void*,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI NtYieldExecution(void); +NTSYSAPI NTSTATUS WINAPI RtlAbsoluteToSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PULONG); NTSYSAPI void WINAPI RtlAcquirePebLock(void); NTSYSAPI BYTE WINAPI RtlAcquireResourceExclusive(LPRTL_RWLOCK,BYTE); NTSYSAPI BYTE WINAPI RtlAcquireResourceShared(LPRTL_RWLOCK,BYTE); @@ -2800,6 +2801,7 @@ NTSYSAPI NTSTATUS WINAPI RtlCustomCPToUnicodeN(CPTABLEINFO*,WCHAR*,DWORD,DWORD* NTSYSAPI void WINAPI RtlDeactivateActivationContext(DWORD,ULONG_PTR); NTSYSAPI PVOID WINAPI RtlDecodePointer(PVOID); NTSYSAPI NTSTATUS WINAPI RtlDecompressBuffer(USHORT,PUCHAR,ULONG,PUCHAR,ULONG,PULONG); +NTSYSAPI NTSTATUS WINAPI RtlDecompressFragment(USHORT,PUCHAR,ULONG,PUCHAR,ULONG,ULONG,PULONG,PVOID); NTSYSAPI NTSTATUS WINAPI RtlDeleteAce(PACL,DWORD); NTSYSAPI NTSTATUS WINAPI RtlDeleteAtomFromAtomTable(RTL_ATOM_TABLE,RTL_ATOM); NTSYSAPI NTSTATUS WINAPI RtlDeleteCriticalSection(RTL_CRITICAL_SECTION *);

1 0

Alex Henrie : include: Add RtlIpv4AddressToString(Ex)[AW].
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 9246024a8c32eecfbeb73269ee41df7357feaa0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9246024a8c32eecfbeb73269… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 25 22:36:19 2020 -0600 include: Add RtlIpv4AddressToString(Ex)[AW]. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ip2string.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/ip2string.h b/include/ip2string.h index 0753ee82a9..4c5f36c15f 100644 --- a/include/ip2string.h +++ b/include/ip2string.h @@ -23,6 +23,13 @@ extern "C" { #endif +char * WINAPI RtlIpv4AddressToStringA(const IN_ADDR *address, char *str); +WCHAR * WINAPI RtlIpv4AddressToStringW(const IN_ADDR *address, WCHAR *str); +#define RtlIpv4AddressToString WINELIB_NAME_AW(RtlIpv4AddressToString) +NTSTATUS WINAPI RtlIpv4AddressToStringExA(const IN_ADDR *address, USHORT port, char *str, ULONG *size); +NTSTATUS WINAPI RtlIpv4AddressToStringExW(const IN_ADDR *address, USHORT port, WCHAR *str, ULONG *size); +#define RtlIpv4AddressToStringEx WINELIB_NAME_AW(RtlIpv4AddressToStringEx) + NTSTATUS WINAPI RtlIpv4StringToAddressA(const char *str, BOOLEAN strict, const char **terminator, IN_ADDR *address); NTSTATUS WINAPI RtlIpv4StringToAddressW(const WCHAR *str, BOOLEAN strict, const WCHAR **terminator, IN_ADDR *address); #define RtlIpv4StringToAddress WINELIB_NAME_AW(RtlIpv4StringToAddress)

1 0

Alex Henrie : ntdll: Increase size of IPv6 address string buffers.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: bab2de00aaffc974bdc1be44dc8d006075c4c9cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bab2de00aaffc974bdc1be44… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 25 22:36:18 2020 -0600 ntdll: Increase size of IPv6 address string buffers. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 6134a5e702..bccf26d7d6 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1269,7 +1269,7 @@ NTSTATUS WINAPI RtlIpv6StringToAddressW(const WCHAR *str, const WCHAR **terminat */ NTSTATUS WINAPI RtlIpv6StringToAddressExA(const char *str, IN6_ADDR *address, ULONG *scope, USHORT *port) { - WCHAR wstr[64]; + WCHAR wstr[128]; TRACE("(%s, %p, %p, %p)\n", debugstr_a(str), address, scope, port); @@ -1286,7 +1286,7 @@ NTSTATUS WINAPI RtlIpv6StringToAddressExA(const char *str, IN6_ADDR *address, UL */ NTSTATUS WINAPI RtlIpv6StringToAddressA(const char *str, const char **terminator, IN6_ADDR *address) { - WCHAR wstr[64]; + WCHAR wstr[128]; const WCHAR *wterminator = NULL; NTSTATUS ret;

1 0

Jacek Caban : winegcc: Add support for -Wl,--whole-archive option.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 0db5f6cf1b2da3c69cbf2c7700c6301f40e1411a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0db5f6cf1b2da3c69cbf2c77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 25 20:34:31 2020 +0200 winegcc: Add support for -Wl,--whole-archive option. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index a1ba034009..776d2b6473 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1188,6 +1188,8 @@ static void build(struct options* opts) add_library(opts, lib_dirs, files, file + 2 ); else if (file[1] == 'x') lang = file; + else if(file[1] == 'W') + strarray_add(files, file); } /* add the default libraries, if needed */ @@ -1393,6 +1395,9 @@ static void build(struct options* opts) } strarray_add(link_args, name); break; + case 'W': + strarray_add(link_args, files->base[j]); + break; } } @@ -1932,6 +1937,11 @@ int main(int argc, char **argv) opts.debug_file = strdup( Wl->base[++j] ); continue; } + if (!strcmp(Wl->base[j], "--whole-archive") || !strcmp(Wl->base[j], "--no-whole-archive")) + { + strarray_add( opts.files, strmake( "-Wl,%s", Wl->base[j] )); + continue; + } if (!strcmp(Wl->base[j], "-static")) linking = -1; strarray_add(opts.linker_args, strmake("-Wl,%s",Wl->base[j])); }

1 0

Jacek Caban : winegcc: Add support for @file arguments.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: c5ee64a101a09366b02c18bb6f43ab9503d86af4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5ee64a101a09366b02c18bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 25 20:34:08 2020 +0200 winegcc: Add support for @file arguments. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index d350adc724..a1ba034009 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1623,7 +1623,45 @@ int main(int argc, char **argv) for (i = 1; i < argc; i++) { - strarray_add( opts.args, argv[i] ); + char *input_buffer = NULL, *iter, *opt, *out; + struct stat st; + int fd; + + if (argv[i][0] != '@' || (fd = open( argv[i] + 1, O_RDONLY | O_BINARY )) == -1) + { + strarray_add( opts.args, argv[i] ); + continue; + } + if ((fstat( fd, &st ) == -1)) error( "Cannot stat %s", argv[i] + 1 ); + if (st.st_size) + { + input_buffer = xmalloc( st.st_size + 1 ); + if (read( fd, input_buffer, st.st_size ) != st.st_size) error( "Cannot read %s\n", argv[i] + 1 ); + } + close( fd ); + for (iter = input_buffer; iter < input_buffer + st.st_size; iter++) + { + char quote = 0; + while (iter < input_buffer + st.st_size && isspace(*iter)) iter++; + if (iter == input_buffer + st.st_size) break; + opt = out = iter; + while (iter < input_buffer + st.st_size && (quote || !isspace(*iter))) + { + if (*iter == quote) + { + iter++; + quote = 0; + } + else if (*iter == '\'' || *iter == '"') quote = *iter++; + else + { + if (*iter == '\\' && iter + 1 < input_buffer + st.st_size) iter++; + *out++ = *iter++; + } + } + *out = 0; + strarray_add( opts.args, opt ); + } } /* parse options */

1 0

Jacek Caban : winegcc: Store main arguments in strarray.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: f42e4431fb0a57cac18258ee90bcbc5c6ff9f9e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f42e4431fb0a57cac18258ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 25 20:33:35 2020 +0200 winegcc: Store main arguments in strarray. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 167 +++++++++++++++++++++++++----------------------- 1 file changed, 87 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f42e4431fb0a57cac182…

1 0

Anton Baskanov : amstream: Don't crash if parent is NULL in AMAudioStream:: and AMDirectDrawStream::GetMultiMediaStream.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 4300981d6b997c0b4c70c3415d4bbcd694d1a7f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4300981d6b997c0b4c70c341… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon May 25 14:17:33 2020 -0500 amstream: Don't crash if parent is NULL in AMAudioStream:: and AMDirectDrawStream::GetMultiMediaStream. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 14 +++++++------- dlls/amstream/ddrawstream.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index d620abc6ec..265c3bf9f2 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -429,18 +429,18 @@ static ULONG WINAPI audio_IAMMediaStream_Release(IAMMediaStream *iface) /*** IMediaStream methods ***/ static HRESULT WINAPI audio_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *iface, - IMultiMediaStream** multi_media_stream) + IMultiMediaStream **mmstream) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); + struct audio_stream *stream = impl_from_IAMMediaStream(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); + TRACE("stream %p, mmstream %p.\n", stream, mmstream); - if (!multi_media_stream) + if (!mmstream) return E_POINTER; - IMultiMediaStream_AddRef(This->parent); - *multi_media_stream = This->parent; - + if (stream->parent) + IMultiMediaStream_AddRef(stream->parent); + *mmstream = stream->parent; return S_OK; } diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 6ef74eb7de..a4bfe948d2 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -125,18 +125,18 @@ static ULONG WINAPI ddraw_IAMMediaStream_Release(IAMMediaStream *iface) /*** IMediaStream methods ***/ static HRESULT WINAPI ddraw_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *iface, - IMultiMediaStream** multi_media_stream) + IMultiMediaStream **mmstream) { - struct ddraw_stream *This = impl_from_IAMMediaStream(iface); + struct ddraw_stream *stream = impl_from_IAMMediaStream(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); + TRACE("stream %p, mmstream %p.\n", stream, mmstream); - if (!multi_media_stream) + if (!mmstream) return E_POINTER; - IMultiMediaStream_AddRef(This->parent); - *multi_media_stream = This->parent; - + if (stream->parent) + IMultiMediaStream_AddRef(stream->parent); + *mmstream = stream->parent; return S_OK; }

1 0

Nikolay Sivov : include: Add CResamplerMediaObject class id.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: d45d34cdf5c2fc4b73aa6c07ff04079cdb9fe752 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d45d34cdf5c2fc4b73aa6c07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 26 01:58:46 2020 +0300 include: Add CResamplerMediaObject class id. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmcodecdsp.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index d4547cd881..61381bee6d 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -25,3 +25,8 @@ cpp_quote("DEFINE_GUID(MEDIASUBTYPE_I420,0x30323449,0x0000,0x0010,0x80,0x00,0x00 uuid(bbeea841-0a63-4f52-a7ab-a9b3a84ed38a) ] coclass CMP3DecMediaObject {} + +[ + uuid(f447b69e-1884-4a7e-8055-346f74d6edb3) +] +coclass CResamplerMediaObject {}

1 0

Zebediah Figura : amstream: Don't duplicate IMediaStream method implementations.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: f5aaca10affba65460206f6869fdf7fb10197468 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5aaca10affba65460206f68… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 25 14:17:32 2020 -0500 amstream: Don't duplicate IMediaStream method implementations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 61 +++++++++++------------------------------- dlls/amstream/ddrawstream.c | 65 ++++++++++++--------------------------------- 2 files changed, 32 insertions(+), 94 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 4e82d76da0..d620abc6ec 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -605,76 +605,45 @@ static ULONG WINAPI audio_IAudioMediaStream_Release(IAudioMediaStream *iface) return IAMMediaStream_Release(&This->IAMMediaStream_iface); } -/*** IMediaStream methods ***/ static HRESULT WINAPI audio_IAudioMediaStream_GetMultiMediaStream(IAudioMediaStream *iface, - IMultiMediaStream **multi_media_stream) + IMultiMediaStream **mmstream) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); - - TRACE("(%p/%p)->(%p)\n", iface, This, multi_media_stream); - - if (!multi_media_stream) - return E_POINTER; - - IMultiMediaStream_AddRef(This->parent); - *multi_media_stream = This->parent; - - return S_OK; + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); + return IAMMediaStream_GetMultiMediaStream(&stream->IAMMediaStream_iface, mmstream); } static HRESULT WINAPI audio_IAudioMediaStream_GetInformation(IAudioMediaStream *iface, MSPID *purpose_id, STREAM_TYPE *type) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); - - TRACE("(%p/%p)->(%p,%p)\n", iface, This, purpose_id, type); - - if (purpose_id) - *purpose_id = This->purpose_id; - if (type) - *type = This->stream_type; - - return S_OK; + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); + return IAMMediaStream_GetInformation(&stream->IAMMediaStream_iface, purpose_id, type); } static HRESULT WINAPI audio_IAudioMediaStream_SetSameFormat(IAudioMediaStream *iface, - IMediaStream *stream_format, DWORD flags) + IMediaStream *other, DWORD flags) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); - - FIXME("(%p/%p)->(%p,%x) stub!\n", iface, This, stream_format, flags); - - return S_FALSE; + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); + return IAMMediaStream_SetSameFormat(&stream->IAMMediaStream_iface, other, flags); } static HRESULT WINAPI audio_IAudioMediaStream_AllocateSample(IAudioMediaStream *iface, DWORD flags, IStreamSample **sample) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); - - FIXME("(%p/%p)->(%x,%p) stub!\n", iface, This, flags, sample); - - return S_FALSE; + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); + return IAMMediaStream_AllocateSample(&stream->IAMMediaStream_iface, flags, sample); } static HRESULT WINAPI audio_IAudioMediaStream_CreateSharedSample(IAudioMediaStream *iface, IStreamSample *existing_sample, DWORD flags, IStreamSample **sample) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); - - FIXME("(%p/%p)->(%p,%x,%p) stub!\n", iface, This, existing_sample, flags, sample); - - return S_FALSE; + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); + return IAMMediaStream_CreateSharedSample(&stream->IAMMediaStream_iface, existing_sample, flags, sample); } -static HRESULT WINAPI audio_IAudioMediaStream_SendEndOfStream(IAudioMediaStream *iface, - DWORD flags) +static HRESULT WINAPI audio_IAudioMediaStream_SendEndOfStream(IAudioMediaStream *iface, DWORD flags) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); - - FIXME("(%p/%p)->(%x) stub!\n", iface, This, flags); - - return S_FALSE; + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); + return IAMMediaStream_SendEndOfStream(&stream->IAMMediaStream_iface, flags); } /*** IAudioMediaStream methods ***/ diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 9c552f1a03..6ef74eb7de 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -292,76 +292,45 @@ static ULONG WINAPI ddraw_IDirectDrawMediaStream_Release(IDirectDrawMediaStream return IAMMediaStream_Release(&This->IAMMediaStream_iface); } -/*** IMediaStream methods ***/ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetMultiMediaStream(IDirectDrawMediaStream *iface, - IMultiMediaStream **multi_media_stream) + IMultiMediaStream **mmstream) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); - - TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); - - if (!multi_media_stream) - return E_POINTER; - - IMultiMediaStream_AddRef(This->parent); - *multi_media_stream = This->parent; - - return S_OK; + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + return IAMMediaStream_GetMultiMediaStream(&stream->IAMMediaStream_iface, mmstream); } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetInformation(IDirectDrawMediaStream *iface, MSPID *purpose_id, STREAM_TYPE *type) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); - - TRACE("(%p/%p)->(%p,%p)\n", This, iface, purpose_id, type); - - if (purpose_id) - *purpose_id = This->purpose_id; - if (type) - *type = This->stream_type; - - return S_OK; + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + return IAMMediaStream_GetInformation(&stream->IAMMediaStream_iface, purpose_id, type); } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetSameFormat(IDirectDrawMediaStream *iface, - IMediaStream *pStreamThatHasDesiredFormat, DWORD dwFlags) + IMediaStream *other, DWORD flags) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); - - FIXME("(%p/%p)->(%p,%x) stub!\n", This, iface, pStreamThatHasDesiredFormat, dwFlags); - - return S_FALSE; + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + return IAMMediaStream_SetSameFormat(&stream->IAMMediaStream_iface, other, flags); } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_AllocateSample(IDirectDrawMediaStream *iface, - DWORD dwFlags, IStreamSample **ppSample) + DWORD flags, IStreamSample **sample) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); - - FIXME("(%p/%p)->(%x,%p) stub!\n", This, iface, dwFlags, ppSample); - - return S_FALSE; + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + return IAMMediaStream_AllocateSample(&stream->IAMMediaStream_iface, flags, sample); } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_CreateSharedSample(IDirectDrawMediaStream *iface, - IStreamSample *pExistingSample, DWORD dwFlags, IStreamSample **ppSample) + IStreamSample *existing_sample, DWORD flags, IStreamSample **sample) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); - - FIXME("(%p/%p)->(%p,%x,%p) stub!\n", This, iface, pExistingSample, dwFlags, ppSample); - - return S_FALSE; + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + return IAMMediaStream_CreateSharedSample(&stream->IAMMediaStream_iface, existing_sample, flags, sample); } -static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SendEndOfStream(IDirectDrawMediaStream *iface, - DWORD dwFlags) +static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SendEndOfStream(IDirectDrawMediaStream *iface, DWORD flags) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); - - FIXME("(%p/%p)->(%x) stub!\n", This, iface, dwFlags); - - return S_FALSE; + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + return IAMMediaStream_SendEndOfStream(&stream->IAMMediaStream_iface, flags); } /*** IDirectDrawMediaStream methods ***/

1 0

Nikolay Sivov : mfplat: Add Media Engine attributes to tracing.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: ba920246e502afe7bc664c1881d528a27e980101 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba920246e502afe7bc664c18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 22:14:23 2020 +0300 mfplat: Add Media Engine attributes to tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 0a5958acb2..ea6a0659c5 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -39,6 +39,7 @@ #include "mfplat_private.h" #include "mfreadwrite.h" +#include "mfmediaengine.h" #include "propvarutil.h" #include "strsafe.h" @@ -1559,6 +1560,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_MPEG2_TIMECODE), X(MF_PMP_SERVER_CONTEXT), X(MFT_SUPPORT_DYNAMIC_FORMAT_CHANGE), + X(MF_MEDIA_ENGINE_TRACK_ID), X(MF_MT_CUSTOM_VIDEO_PRIMARIES), X(MF_MT_TIMESTAMP_CAN_BE_DTS), X(MFT_CODEC_MERIT_Attribute), @@ -1566,10 +1568,12 @@ const char *debugstr_attr(const GUID *guid) X(MF_LOW_LATENCY), X(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS), X(MF_MT_MPEG2_FLAGS), + X(MF_MEDIA_ENGINE_AUDIO_CATEGORY), X(MF_MT_PIXEL_ASPECT_RATIO), X(MF_TOPOLOGY_ENABLE_XVP_FOR_PLAYBACK), X(MFT_CONNECTED_STREAM_ATTRIBUTE), X(MF_MT_REALTIME_CONTENT), + X(MF_MEDIA_ENGINE_CONTENT_PROTECTION_FLAGS), X(MF_MT_WRAPPED_TYPE), X(MF_MT_DRM_FLAGS), X(MF_MT_AVG_BITRATE), @@ -1583,6 +1587,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING), X(MF_MT_AM_FORMAT_TYPE), X(MF_SESSION_APPROX_EVENT_OCCURRENCE_TIME), + X(MF_MEDIA_ENGINE_SYNCHRONOUS_CLOSE), X(MF_MT_H264_MAX_MB_PER_SEC), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_MAX_BUFFERS), X(MF_MT_AUDIO_BLOCK_ALIGNMENT), @@ -1597,10 +1602,13 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_H264_SUPPORTED_SLICE_MODES), X(MF_PD_LAST_MODIFIED_TIME), X(MF_PD_PLAYBACK_ELEMENT_ID), + X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE9), X(MF_MT_ALL_SAMPLES_INDEPENDENT), X(MF_PD_PREFERRED_LANGUAGE), X(MF_PD_PLAYBACK_BOUNDARY_TIME), + X(MF_MEDIA_ENGINE_TELEMETRY_APPLICATION_ID), X(MF_ACTIVATE_MFT_LOCKED), + X(MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT), X(MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING), X(MF_MT_FRAME_SIZE), X(MF_MT_H264_SIMULCAST_SUPPORT), @@ -1612,9 +1620,13 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_PALETTE), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_PROVIDER_DEVICE_ID), X(MF_TOPOLOGY_STATIC_PLAYBACK_OPTIMIZATIONS), + X(MF_MEDIA_ENGINE_NEEDKEY_CALLBACK), X(MF_MT_GEOMETRIC_APERTURE), X(MF_MT_ORIGINAL_WAVE_FORMAT_TAG), X(MF_MT_DV_AAUX_SRC_PACK_1), + X(MF_MEDIA_ENGINE_STREAM_CONTAINS_ALPHA_CHANNEL), + X(MF_MEDIA_ENGINE_MEDIA_PLAYER_MODE), + X(MF_MEDIA_ENGINE_EXTENSION), X(MF_MT_DEFAULT_STRIDE), X(MF_MT_ARBITRARY_FORMAT), X(MF_TRANSFORM_CATEGORY_Attribute), @@ -1632,12 +1644,14 @@ const char *debugstr_attr(const GUID *guid) X(MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME), X(MF_MT_VIDEO_ROTATION), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_SYMBOLIC_LINK), + X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE11), X(MF_MT_USER_DATA), X(MF_MT_MIN_MASTERING_LUMINANCE), X(MF_EVENT_STREAM_METADATA_SYSTEMID), X(MF_MT_AUDIO_CHANNEL_MASK), X(MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN), X(MF_READWRITE_DISABLE_CONVERTERS), + X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE_EDGE), X(MF_MT_MINIMUM_DISPLAY_APERTURE), X(MFSampleExtension_Token), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_CATEGORY), @@ -1646,12 +1660,13 @@ const char *debugstr_attr(const GUID *guid) X(MF_DISABLE_FRAME_CORRUPTION_INFO), X(MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES), X(MF_MT_VIDEO_NO_FRAME_ORDERING), + X(MF_MEDIA_ENGINE_PLAYBACK_VISUAL), X(MF_MT_VIDEO_CHROMA_SITING), X(MF_AUDIO_RENDERER_ATTRIBUTE_STREAM_CATEGORY), X(MFSampleExtension_3DVideo_SampleFormat), X(MF_MT_H264_RESOLUTION_SCALING), - X(MF_MT_MPEG2_LEVEL), X(MF_MT_VIDEO_LEVEL), + X(MF_MT_MPEG2_LEVEL), X(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET), X(MF_MT_SAMPLE_SIZE), X(MF_MT_AAC_PAYLOAD_TYPE), @@ -1682,6 +1697,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_BYTESTREAM_ORIGIN_NAME), X(MF_BYTESTREAM_CONTENT_TYPE), X(MF_MT_DEPTH_MEASUREMENT), + X(MF_MEDIA_ENGINE_COMPATIBILITY_MODE_WIN10), X(MF_MT_VIDEO_3D_NUM_VIEWS), X(MF_BYTESTREAM_DURATION), X(MF_SD_SAMI_LANGUAGE), @@ -1701,6 +1717,8 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_VIDEO_3D_FIRST_IS_LEFT), X(MFT_DECODER_FINAL_VIDEO_RESOLUTION_HINT), X(MF_PD_ADAPTIVE_STREAMING), + X(MF_MEDIA_ENGINE_SOURCE_RESOLVER_CONFIG_STORE), + X(MF_MEDIA_ENGINE_COMPATIBILITY_MODE_WWA_EDGE), X(MF_MT_H264_SUPPORTED_USAGES), X(MFT_PREFERRED_OUTPUTTYPE_Attribute), X(MFSampleExtension_Timestamp), @@ -1708,6 +1726,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_SUBTYPE), X(MF_TRANSFORM_ASYNC), X(MF_TOPONODE_STREAMID), + X(MF_MEDIA_ENGINE_PLAYBACK_HWND), X(MF_TOPONODE_NOSHUTDOWN_ON_REMOVE), X(MF_MT_VIDEO_LIGHTING), X(MF_SD_MUTUALLY_EXCLUSIVE), @@ -1722,9 +1741,11 @@ const char *debugstr_attr(const GUID *guid) X(MF_SINK_WRITER_D3D_MANAGER), X(MFSampleExtension_3DVideo), X(MF_MT_H264_USAGE), + X(MF_MEDIA_ENGINE_EME_CALLBACK), X(MF_EVENT_SOURCE_FAKE_START), X(MF_EVENT_SOURCE_PROJECTSTART), X(MF_EVENT_SOURCE_ACTUAL_START), + X(MF_MEDIA_ENGINE_CONTENT_PROTECTION_MANAGER), X(MF_MT_AUDIO_SAMPLES_PER_BLOCK), X(MFT_ENUM_HARDWARE_URL_Attribute), X(MF_SOURCE_READER_ASYNC_CALLBACK), @@ -1741,6 +1762,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_SPATIAL_AUDIO_MAX_METADATA_ITEMS), X(MF_MT_MPEG2_ONE_FRAME_PER_PACKET), X(MF_MT_INTERLACE_MODE), + X(MF_MEDIA_ENGINE_CALLBACK), X(MF_MT_VIDEO_RENDERER_EXTENSION_PROFILE), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_HW_SOURCE), X(MF_MT_AUDIO_PREFER_WAVEFORMATEX), @@ -1767,9 +1789,11 @@ const char *debugstr_attr(const GUID *guid) X(MF_EVENT_START_PRESENTATION_TIME), X(MF_EVENT_SESSIONCAPS), X(MF_EVENT_PRESENTATION_TIME_OFFSET), + X(MF_MEDIA_ENGINE_AUDIO_ENDPOINT_ROLE), X(MF_EVENT_SESSIONCAPS_DELTA), X(MF_EVENT_START_PRESENTATION_TIME_AT_OUTPUT), X(MFSampleExtension_DecodeTimestamp), + X(MF_MEDIA_ENGINE_COMPATIBILITY_MODE), X(MF_MT_VIDEO_H264_NO_FMOASO), X(MF_MT_AVG_BIT_ERROR_RATE), X(MF_MT_VIDEO_PRIMARIES), @@ -1777,7 +1801,9 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_H264_RATE_CONTROL_MODES), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK), X(MF_READWRITE_D3D_OPTIONAL), + X(MF_MEDIA_ENGINE_DXGI_MANAGER), X(MF_READWRITE_MMCSS_CLASS_AUDIO), + X(MF_MEDIA_ENGINE_COREWINDOW), X(MF_SOURCE_READER_DISABLE_CAMERA_PLUGINS), X(MF_MT_MPEG4_TRACK_TYPE), X(MF_MT_PAN_SCAN_APERTURE), @@ -1785,6 +1811,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_ORIGINAL_4CC), X(MF_PD_AUDIO_ISVARIABLEBITRATE), X(MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS), + X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE), X(MF_AUDIO_RENDERER_ATTRIBUTE_SESSION_ID), X(MF_MT_MPEG2_CONTENT_PACKET), X(MFT_PROCESS_LOCAL_Attribute), @@ -1793,6 +1820,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_VIDEO_NOMINAL_RANGE), X(MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION), X(MF_MT_MPEG_SEQUENCE_HEADER), + X(MF_MEDIA_ENGINE_OPM_HWND), X(MF_MT_AUDIO_SAMPLES_PER_SECOND), X(MF_MT_SPATIAL_AUDIO_DATA_PRESENT), X(MF_MT_FRAME_RATE), @@ -1822,6 +1850,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_TOPOLOGY_DXVA_MODE), X(MF_TOPONODE_LOCKED), X(MF_TOPONODE_WORKQUEUE_ID), + X(MF_MEDIA_ENGINE_CONTINUE_ON_CODEC_ERROR), X(MF_TOPONODE_WORKQUEUE_MMCSS_CLASS), X(MF_TOPONODE_DECRYPTOR), X(MF_EVENT_DO_THINNING), @@ -1829,6 +1858,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_TOPOLOGY_HARDWARE_MODE), X(MF_SOURCE_READER_DISABLE_DXVA), X(MF_MT_FORWARD_CUSTOM_NALU), + X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE10), X(MF_TOPONODE_ERROR_MAJORTYPE), X(MF_MT_SECURE), X(MFT_FIELDOFUSE_UNLOCK_Attribute),

1 0

Nikolay Sivov : include: Add IMFMediaEngineEx definition.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 38aeedcc80b53d98ac52b5a8ecf225025f82bb5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=38aeedcc80b53d98ac52b5a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 21:57:47 2020 +0300 include: Add IMFMediaEngineEx definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfmediaengine.idl | 73 +++++++++++++++++++++++++++++++++++++++++++++++ include/mftransform.idl | 6 ++++ 2 files changed, 79 insertions(+) diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index 556d2fba2b..e5d91a5732 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -194,6 +194,79 @@ interface IMFMediaEngine : IUnknown HRESULT OnVideoStreamTick([out] LONGLONG *time); } +typedef enum MF_MEDIA_ENGINE_STATISTIC +{ + MF_MEDIA_ENGINE_STATISTIC_FRAMES_RENDERED, + MF_MEDIA_ENGINE_STATISTIC_FRAMES_DROPPED, + MF_MEDIA_ENGINE_STATISTIC_BYTES_DOWNLOADED, + MF_MEDIA_ENGINE_STATISTIC_BUFFER_PROGRESS, + MF_MEDIA_ENGINE_STATISTIC_FRAMES_PER_SECOND, + MF_MEDIA_ENGINE_STATISTIC_PLAYBACK_JITTER, + MF_MEDIA_ENGINE_STATISTIC_FRAMES_CORRUPTED, + MF_MEDIA_ENGINE_STATISTIC_TOTAL_FRAME_DELAY, +} MF_MEDIA_ENGINE_STATISTIC; + +typedef enum MF_MEDIA_ENGINE_S3D_PACKING_MODE +{ + MF_MEDIA_ENGINE_S3D_PACKING_MODE_NONE, + MF_MEDIA_ENGINE_S3D_PACKING_MODE_SIDE_BY_SIDE, + MF_MEDIA_ENGINE_S3D_PACKING_MODE_TOP_BOTTOM +} MF_MEDIA_ENGINE_S3D_PACKING_MODE; + +typedef enum MF_MEDIA_ENGINE_SEEK_MODE +{ + MF_MEDIA_ENGINE_SEEK_MODE_NORMAL, + MF_MEDIA_ENGINE_SEEK_MODE_APPROXIMATE, +} MF_MEDIA_ENGINE_SEEK_MODE; + +[ + object, + uuid(83015ead-b1e6-40d0-a98a-37145ffe1ad1), + local, + pointer_default(unique) +] +interface IMFMediaEngineEx : IMFMediaEngine +{ + HRESULT SetSourceFromByteStream([in] IMFByteStream *bytestream, [in] BSTR url); + HRESULT GetStatistics([in] MF_MEDIA_ENGINE_STATISTIC stat_id, [out] PROPVARIANT *stat); + HRESULT UpdateVideoStream([in] const MFVideoNormalizedRect *src, + [in] const RECT *dst, [in] const MFARGB *border_color); + double GetBalance(); + HRESULT SetBalance([in] double balance); + BOOL IsPlaybackRateSupported([in] double rate); + HRESULT FrameStep([in] BOOL forward); + HRESULT GetResourceCharacteristics([out] DWORD *flags); + HRESULT GetPresentationAttribute([in] REFGUID attribute, [out] PROPVARIANT *value); + HRESULT GetNumberOfStreams([out] DWORD *stream_count); + HRESULT GetStreamAttribute([in] DWORD stream_index, [in] REFGUID attribute, [out] PROPVARIANT *value); + HRESULT GetStreamSelection([in] DWORD stream_index, [out] BOOL *enabled); + HRESULT SetStreamSelection([in] DWORD stream_index, [in] BOOL enabled); + HRESULT ApplyStreamSelections(); + HRESULT IsProtected([out] BOOL *protected); + HRESULT InsertVideoEffect([in] IUnknown *effect, [in] BOOL is_optional); + HRESULT InsertAudioEffect([in] IUnknown *effect, [in] BOOL is_optional); + HRESULT RemoveAllEffects(); + HRESULT SetTimelineMarkerTimer([in] double timeout); + HRESULT GetTimelineMarkerTimer([out] double *timeout); + HRESULT CancelTimelineMarkerTimer(); + BOOL IsStereo3D(); + HRESULT GetStereo3DFramePackingMode([out] MF_MEDIA_ENGINE_S3D_PACKING_MODE *mode); + HRESULT SetStereo3DFramePackingMode([in] MF_MEDIA_ENGINE_S3D_PACKING_MODE mode); + HRESULT GetStereo3DRenderMode([out] MF3DVideoOutputType *output_type); + HRESULT SetStereo3DRenderMode([in] MF3DVideoOutputType output_type); + HRESULT EnableWindowlessSwapchainMode([in] BOOL enable); + HRESULT GetVideoSwapchainHandle([out] HANDLE *swapchain); + HRESULT EnableHorizontalMirrorMode([in] BOOL enable); + HRESULT GetAudioStreamCategory([out] UINT32 *category); + HRESULT SetAudioStreamCategory([in] UINT32 category); + HRESULT GetAudioEndpointRole([out] UINT32 *role); + HRESULT SetAudioEndpointRole([in] UINT32 role); + HRESULT GetRealTimeMode([out] BOOL *enabled); + HRESULT SetRealTimeMode([in] BOOL enable); + HRESULT SetCurrentTimeEx([in] double seektime, [in] MF_MEDIA_ENGINE_SEEK_MODE mode); + HRESULT EnableTimeUpdateTimer([in] BOOL enable); +} + [ object, uuid(4d645ace-26aa-4688-9be1-df3516990b93), diff --git a/include/mftransform.idl b/include/mftransform.idl index 6b9c79572a..1b402a5cc7 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -107,6 +107,12 @@ enum _MFT_DRAIN_TYPE MFT_DRAIN_NO_TAILS = 0x00000001 }; +typedef enum _MF3DVideoOutputType +{ + MF3DVideoOutputType_BaseView, + MF3DVideoOutputType_Stereo +} MF3DVideoOutputType; + typedef struct _MFT_INPUT_STREAM_INFO { LONGLONG hnsMaxLatency;

1 0

Paul Gofman : ntoskrnl.exe: Return zero for unknown msr registers.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 6ceb6c7f47c225c117dd514ffdb15a0cb4317753 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ceb6c7f47c225c117dd514f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 25 11:19:30 2020 +0300 ntoskrnl.exe: Return zero for unknown msr registers. rdmsr should fault if called with the register not supported by CPU. But until we want to support the full range of CPU specific registers returning zero is probably a better fallback. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/instr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 68140c09ef..44f2ed4f51 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -815,7 +815,11 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) context->Rax = (ULONG)syscall_address; break; } - default: return ExceptionContinueSearch; + default: + FIXME("reg %#x, returning 0.\n", reg); + context->Rdx = 0; + context->Rax = 0; + break; } context->Rip += prefixlen + 2; return ExceptionContinueExecution;

1 0

Aaro Altonen : msado15: Implement _Command get/put CommandType.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 6255b031af691988f96c4e648c4f0975575f0487 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6255b031af691988f96c4e64… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Mon May 25 17:01:30 2020 +0300 msado15: Implement _Command get/put CommandType. Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/command.c | 34 ++++++++++++++++++++++++++++------ dlls/msado15/tests/msado15.c | 13 +++++++++++++ 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index a96fd73990..9081f1554f 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -31,8 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct command { - _Command Command_iface; - LONG ref; + _Command Command_iface; + LONG ref; + CommandTypeEnum type; }; static inline struct command *impl_from_Command( _Command *iface ) @@ -193,14 +194,34 @@ static HRESULT WINAPI command_get_Parameters( _Command *iface, Parameters **para static HRESULT WINAPI command_put_CommandType( _Command *iface, CommandTypeEnum type ) { - FIXME( "%p, %d\n", iface, type ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + + TRACE( "%p, %d\n", iface, type ); + + switch (type) + { + case adCmdUnspecified: + case adCmdUnknown: + case adCmdText: + case adCmdTable: + case adCmdStoredProc: + case adCmdFile: + case adCmdTableDirect: + command->type = type; + return S_OK; + } + + return MAKE_ADO_HRESULT( adErrInvalidArgument ); } static HRESULT WINAPI command_get_CommandType( _Command *iface, CommandTypeEnum *type ) { - FIXME( "%p, %p\n", iface, type ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + + TRACE( "%p, %p\n", iface, type ); + + *type = command->type; + return S_OK; } static HRESULT WINAPI command_get_Name(_Command *iface, BSTR *name) @@ -305,6 +326,7 @@ HRESULT Command_create( void **obj ) if (!(command = heap_alloc( sizeof(*command) ))) return E_OUTOFMEMORY; command->Command_iface.lpVtbl = &command_vtbl; + command->type = adCmdUnknown; command->ref = 1; *obj = &command->Command_iface; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index fb77936bba..b17430a93d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -742,6 +742,7 @@ static void test_Command(void) _ADO *ado; Command15 *command15; Command25 *command25; + CommandTypeEnum cmd_type = adCmdUnspecified; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); ok( hr == S_OK, "got %08x\n", hr ); @@ -758,6 +759,18 @@ static void test_Command(void) ok( hr == S_OK, "got %08x\n", hr ); Command25_Release( command25 ); + hr = _Command_get_CommandType( command, &cmd_type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cmd_type == adCmdUnknown, "got %08x\n", cmd_type ); + + _Command_put_CommandType( command, adCmdText ); + hr = _Command_get_CommandType( command, &cmd_type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cmd_type == adCmdText, "got %08x\n", cmd_type ); + + hr = _Command_put_CommandType( command, 0xdeadbeef ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); + _Command_Release( command ); }

1 0

Alexandre Julliard : server: Update shared user data timestamps on every request.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 1ae10889647c1c84c36660749508a42e99e64a5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ae10889647c1c84c3666074… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 25 20:25:50 2020 +0200 server: Update shared user data timestamps on every request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 50 +++++++++++++++++++++++++++++++++++++++++++---- server/file.h | 1 + server/mapping.c | 59 ++++---------------------------------------------------- 3 files changed, 51 insertions(+), 59 deletions(-) diff --git a/server/fd.c b/server/fd.c index 39fb419f25..06d1d81bdb 100644 --- a/server/fd.c +++ b/server/fd.c @@ -104,6 +104,7 @@ #include "winternl.h" #include "winioctl.h" +#include "ddk/wdm.h" #if defined(HAVE_SYS_EPOLL_H) && defined(HAVE_EPOLL_CREATE) # include <sys/epoll.h> @@ -374,6 +375,46 @@ static struct list rel_timeout_list = LIST_INIT(rel_timeout_list); /* sorted rel timeout_t current_time; timeout_t monotonic_time; +struct _KUSER_SHARED_DATA *user_shared_data = NULL; +static const int user_shared_data_timeout = 16; + +static void set_user_shared_data_time(void) +{ + timeout_t tick_count = monotonic_time / 10000; + + /* on X86 there should be total store order guarantees, so volatile is enough + * to ensure the stores aren't reordered by the compiler, and then they will + * always be seen in-order from other CPUs. On other archs, we need atomic + * intrinsics to guarantee that. */ +#if defined(__i386__) || defined(__x86_64__) + user_shared_data->SystemTime.High2Time = current_time >> 32; + user_shared_data->SystemTime.LowPart = current_time; + user_shared_data->SystemTime.High1Time = current_time >> 32; + + user_shared_data->InterruptTime.High2Time = monotonic_time >> 32; + user_shared_data->InterruptTime.LowPart = monotonic_time; + user_shared_data->InterruptTime.High1Time = monotonic_time >> 32; + + user_shared_data->TickCount.High2Time = tick_count >> 32; + user_shared_data->TickCount.LowPart = tick_count; + user_shared_data->TickCount.High1Time = tick_count >> 32; + *(volatile ULONG *)&user_shared_data->TickCountLowDeprecated = tick_count; +#else + __atomic_store_n(&user_shared_data->SystemTime.High2Time, current_time >> 32, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->SystemTime.LowPart, current_time, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->SystemTime.High1Time, current_time >> 32, __ATOMIC_SEQ_CST); + + __atomic_store_n(&user_shared_data->InterruptTime.High2Time, monotonic_time >> 32, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->InterruptTime.LowPart, monotonic_time, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->InterruptTime.High1Time, monotonic_time >> 32, __ATOMIC_SEQ_CST); + + __atomic_store_n(&user_shared_data->TickCount.High2Time, tick_count >> 32, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->TickCount.LowPart, tick_count, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->TickCount.High1Time, tick_count >> 32, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->TickCountLowDeprecated, tick_count, __ATOMIC_SEQ_CST); +#endif +} + void set_current_time(void) { static const timeout_t ticks_1601_to_1970 = (timeout_t)86400 * (369 * 365 + 89) * TICKS_PER_SEC; @@ -381,6 +422,7 @@ void set_current_time(void) gettimeofday( &now, NULL ); current_time = (timeout_t)now.tv_sec * TICKS_PER_SEC + now.tv_usec * 10 + ticks_1601_to_1970; monotonic_time = monotonic_counter(); + if (user_shared_data) set_user_shared_data_time(); } /* add a timeout user */ @@ -865,10 +907,11 @@ static void remove_poll_user( struct fd *fd, int user ) /* process pending timeouts and return the time until the next timeout, in milliseconds */ static int get_next_timeout(void) { + int ret = user_shared_data ? user_shared_data_timeout : -1; + if (!list_empty( &abs_timeout_list ) || !list_empty( &rel_timeout_list )) { struct list expired_list, *ptr; - int ret = -1; /* first remove all expired timers from the list */ @@ -911,7 +954,7 @@ static int get_next_timeout(void) struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); int diff = (timeout->when - current_time + 9999) / 10000; if (diff < 0) diff = 0; - ret = diff; + if (ret == -1 || diff < ret) ret = diff; } if ((ptr = list_head( &rel_timeout_list )) != NULL) @@ -921,9 +964,8 @@ static int get_next_timeout(void) if (diff < 0) diff = 0; if (ret == -1 || diff < ret) ret = diff; } - return ret; } - return -1; /* no pending timeouts */ + return ret; } /* server main poll() loop */ diff --git a/server/file.h b/server/file.h index 4c454de4d4..aa5f6216c2 100644 --- a/server/file.h +++ b/server/file.h @@ -130,6 +130,7 @@ static inline struct fd *get_obj_fd( struct object *obj ) { return obj->ops->get struct timeout_user; extern timeout_t current_time; extern timeout_t monotonic_time; +extern struct _KUSER_SHARED_DATA *user_shared_data; #define TICKS_PER_SEC 10000000 diff --git a/server/mapping.c b/server/mapping.c index ffd20450df..0fcada7f8f 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -945,66 +945,15 @@ int get_page_size(void) return page_mask + 1; } -static KSHARED_USER_DATA *kusd = MAP_FAILED; -static const timeout_t kusd_timeout = 16 * -TICKS_PER_SEC / 1000; - -static void kusd_set_current_time( void *private ) -{ - ULONG system_time_high = current_time >> 32; - ULONG system_time_low = current_time & 0xffffffff; - ULONG interrupt_time_high = monotonic_time >> 32; - ULONG interrupt_time_low = monotonic_time & 0xffffffff; - ULONG tick_count_high = (monotonic_time * 1000 / TICKS_PER_SEC) >> 32; - ULONG tick_count_low = (monotonic_time * 1000 / TICKS_PER_SEC) & 0xffffffff; - KSHARED_USER_DATA *ptr = kusd; - - add_timeout_user( kusd_timeout, kusd_set_current_time, NULL ); - - /* on X86 there should be total store order guarantees, so volatile is enough - * to ensure the stores aren't reordered by the compiler, and then they will - * always be seen in-order from other CPUs. On other archs, we need atomic - * intrinsics to guarantee that. */ -#if defined(__i386__) || defined(__x86_64__) - ptr->SystemTime.High2Time = system_time_high; - ptr->SystemTime.LowPart = system_time_low; - ptr->SystemTime.High1Time = system_time_high; - - ptr->InterruptTime.High2Time = interrupt_time_high; - ptr->InterruptTime.LowPart = interrupt_time_low; - ptr->InterruptTime.High1Time = interrupt_time_high; - - ptr->TickCount.High2Time = tick_count_high; - ptr->TickCount.LowPart = tick_count_low; - ptr->TickCount.High1Time = tick_count_high; - *(volatile ULONG *)&ptr->TickCountLowDeprecated = tick_count_low; -#else - __atomic_store_n(&ptr->SystemTime.High2Time, system_time_high, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->SystemTime.LowPart, system_time_low, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->SystemTime.High1Time, system_time_high, __ATOMIC_SEQ_CST); - - __atomic_store_n(&ptr->InterruptTime.High2Time, interrupt_time_high, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->InterruptTime.LowPart, interrupt_time_low, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->InterruptTime.High1Time, interrupt_time_high, __ATOMIC_SEQ_CST); - - __atomic_store_n(&ptr->TickCount.High2Time, tick_count_high, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->TickCount.LowPart, tick_count_low, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->TickCount.High1Time, tick_count_high, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->TickCountLowDeprecated, tick_count_low, __ATOMIC_SEQ_CST); -#endif -} - void init_kusd_mapping( struct mapping *mapping ) { - if (kusd != MAP_FAILED) return; + void *ptr; + if (user_shared_data) return; grab_object( mapping ); make_object_static( &mapping->obj ); - - if ((kusd = mmap( NULL, mapping->size, PROT_WRITE, MAP_SHARED, - get_unix_fd( mapping->fd ), 0 )) == MAP_FAILED) - set_error( STATUS_NO_MEMORY ); - else - kusd_set_current_time( NULL ); + ptr = mmap( NULL, mapping->size, PROT_WRITE, MAP_SHARED, get_unix_fd( mapping->fd ), 0 ); + if (ptr != MAP_FAILED) user_shared_data = ptr; } /* create a file mapping */

1 0

Jacek Caban : rpcndr.h: Avoid error_status_t redefinition.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 4444d19ee37cfc20504dae2ea807458367410544 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4444d19ee37cfc20504dae2e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 25 19:43:55 2020 +0200 rpcndr.h: Avoid error_status_t redefinition. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/rpcndr.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/rpcndr.h b/include/rpcndr.h index 27b9096827..13711f2f2d 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -444,7 +444,11 @@ typedef struct _FULL_PTR_XLAT_TABLES { struct IRpcStubBuffer; +#ifndef _ERROR_STATUS_T_DEFINED typedef ULONG error_status_t; +#define _ERROR_STATUS_T_DEFINED +#endif + typedef void * NDR_CCONTEXT; typedef struct _SCONTEXT_QUEUE {

1 0

Paul Gofman : ntdll: Fill ActiveGroupCount field in _KUSER_SHARED_DATA.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: ca56ef6739383350f2bff6a8be174e1181ed6e1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca56ef6739383350f2bff6a8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 25 18:42:02 2020 +0300 ntdll: Fill ActiveGroupCount field in _KUSER_SHARED_DATA. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 3 +++ dlls/ntdll/thread.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 59c2224816..beab744178 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -531,6 +531,9 @@ static void test_user_shared_data(void) ok(user_shared_data->ActiveProcessorCount == NtCurrentTeb()->Peb->NumberOfProcessors || broken(!user_shared_data->ActiveProcessorCount) /* before Win7 */, "Got unexpected ActiveProcessorCount %u.\n", user_shared_data->ActiveProcessorCount); + ok(user_shared_data->ActiveGroupCount == 1 + || broken(!user_shared_data->ActiveGroupCount) /* before Win7 */, + "Got unexpected ActiveGroupCount %u.\n", user_shared_data->ActiveGroupCount); } START_TEST(virtual) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 78574d0c5d..3d370f7a98 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -239,6 +239,7 @@ static void fill_user_shared_data( struct _KUSER_SHARED_DATA *data ) break; } data->ActiveProcessorCount = NtCurrentTeb()->Peb->NumberOfProcessors; + data->ActiveGroupCount = 1; } HANDLE user_shared_data_init_done(void)

1 0

Paul Gofman : ntdll: Fill ActiveProcessorCount field in _KUSER_SHARED_DATA.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 1306bd941b7052a97910795a86aeae873f4fcb08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1306bd941b7052a97910795a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 25 18:42:01 2020 +0300 ntdll: Fill ActiveProcessorCount field in _KUSER_SHARED_DATA. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 3 +++ dlls/ntdll/thread.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 3b0d74daeb..59c2224816 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -528,6 +528,9 @@ static void test_user_shared_data(void) ok(user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] /* Supported since Pentium CPUs. */, "_RDTSC not available.\n"); #endif + ok(user_shared_data->ActiveProcessorCount == NtCurrentTeb()->Peb->NumberOfProcessors + || broken(!user_shared_data->ActiveProcessorCount) /* before Win7 */, + "Got unexpected ActiveProcessorCount %u.\n", user_shared_data->ActiveProcessorCount); } START_TEST(virtual) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 19e09c7e38..78574d0c5d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -238,6 +238,7 @@ static void fill_user_shared_data( struct _KUSER_SHARED_DATA *data ) features[PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE] = !!(sci.FeatureSet & CPU_FEATURE_ARM_V8_CRYPTO); break; } + data->ActiveProcessorCount = NtCurrentTeb()->Peb->NumberOfProcessors; } HANDLE user_shared_data_init_done(void)

1 0

Paul Gofman : include/ddk: Fix struct _KUSER_SHARED_DATA definition.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 0def647b6e5d9dc1648b0021e6a7a40bfdaaf2fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=0def647b6e5d9dc1648b0021… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 25 18:42:00 2020 +0300 include/ddk: Fix struct _KUSER_SHARED_DATA definition. HeapTracingPid, CritSecTracingPid are present in NT 6.0. But NT 6.0 has UserModeGlobalLogger array size of 8 instead of 16. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 790d1a1247..1f80a5af29 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1258,8 +1258,6 @@ typedef struct _KUSER_SHARED_DATA { ULONG EnclaveFeatureMask[4]; /* 0x36c */ ULONG TelemetryCoverageRound; /* 0x37c */ USHORT UserModeGlobalLogger[16]; /* 0x380 */ - ULONG HeapTracingPid[2]; /* 0x390 */ - ULONG CritSecTracingPid[2]; /* 0x398 */ ULONG ImageFileExecutionOptions; /* 0x3a0 */ ULONG LangGenerationCount; /* 0x3a4 */ ULONG ActiveProcessorAffinity; /* 0x3a8 */

1 0

Nikolay Sivov : dwrite: Simplify single substitution helper.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: db3eb6fc0babee4b99b615732b7c05caaf59e14b URL: https://source.winehq.org/git/wine.git/?a=commit;h=db3eb6fc0babee4b99b61573… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 14:54:31 2020 +0300 dwrite: Simplify single substitution helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index bb62488330..abf9cba105 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4420,6 +4420,7 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, static BOOL opentype_layout_apply_gsub_single_substitution(struct glyph_iterator *iter, const struct ot_lookup *lookup) { struct scriptshaping_cache *cache = iter->context->cache; + const struct dwrite_fonttable *gsub = &cache->gsub.table; UINT16 format, coverage; unsigned int i; @@ -4436,10 +4437,9 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct glyph_iterator if (format == 1) { - const struct ot_gsub_singlesubst_format1 *format1 = table_read_ensure(&cache->gsub.table, subtable_offset, - sizeof(*format1)); + const struct ot_gsub_singlesubst_format1 *format1 = table_read_ensure(gsub, subtable_offset, sizeof(*format1)); - coverage_index = opentype_layout_is_glyph_covered(&cache->gsub.table, subtable_offset + coverage, glyph); + coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); if (coverage_index == GLYPH_NOT_COVERED) continue; @@ -4448,12 +4448,11 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct glyph_iterator } else if (format == 2) { - UINT16 count = table_read_be_word(&cache->gsub.table, subtable_offset + - FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count)); - const struct ot_gsub_singlesubst_format2 *format2 = table_read_ensure(&cache->gsub.table, subtable_offset, + UINT16 count = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count)); + const struct ot_gsub_singlesubst_format2 *format2 = table_read_ensure(gsub, subtable_offset, FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count) + count * sizeof(UINT16)); - coverage_index = opentype_layout_is_glyph_covered(&cache->gsub.table, subtable_offset + coverage, glyph); + coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); if (coverage_index == GLYPH_NOT_COVERED || coverage_index >= count) continue;

1 0

Nikolay Sivov : dwrite: Use prefetched glyph class to match with lookup mask.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 7f427f258d82d80fb903147dc16fbafe1eda90bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f427f258d82d80fb903147d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 14:54:30 2020 +0300 dwrite: Use prefetched glyph class to match with lookup mask. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 0b9c6067b5..bb62488330 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3425,21 +3425,21 @@ static void glyph_iterator_init(struct scriptshaping_context *context, unsigned iter->len = len; } -static BOOL glyph_iterator_match(const struct glyph_iterator *iter) +static BOOL lookup_is_glyph_match(unsigned int glyph_props, unsigned int lookup_flags) { - struct scriptshaping_cache *cache = iter->context->cache; + if (glyph_props & lookup_flags & LOOKUP_FLAG_IGNORE_MASK) + return FALSE; - if (cache->gdef.classdef) - { - unsigned int glyph_class = opentype_layout_get_glyph_class(&cache->gdef.table, cache->gdef.classdef, - iter->context->u.pos.glyphs[iter->pos]); - if ((1 << glyph_class) & iter->flags & LOOKUP_FLAG_IGNORE_MASK) - return FALSE; - } + /* FIXME: match mark properties */ return TRUE; } +static BOOL glyph_iterator_match(const struct glyph_iterator *iter) +{ + return lookup_is_glyph_match(iter->context->glyph_infos[iter->pos].props, iter->flags); +} + static BOOL glyph_iterator_next(struct glyph_iterator *iter) { while (iter->pos + iter->len < iter->context->glyph_count)

1 0

Nikolay Sivov : dwrite: Set glyph class properties when applying GPOS.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: b1f215dd7840a2b7da9fd15de88b791522f8cb13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1f215dd7840a2b7da9fd15d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 14:54:29 2020 +0300 dwrite: Set glyph class properties when applying GPOS. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 68 +++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 814e65b6cc..0b9c6067b5 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3130,6 +3130,36 @@ static unsigned int opentype_layout_get_glyph_class(const struct dwrite_fonttabl return glyph_class; } +static unsigned int opentype_set_glyph_props(struct scriptshaping_context *context, unsigned int g, UINT16 glyph) +{ + struct scriptshaping_cache *cache = context->cache; + unsigned int glyph_class = 0, props; + + if (cache->gdef.classdef) + { + glyph_class = opentype_layout_get_glyph_class(&cache->gdef.table, cache->gdef.classdef, context->u.subst.glyphs[g]); + } + + switch (glyph_class) + { + case GDEF_CLASS_BASE: + props = GLYPH_PROP_BASE; + break; + case GDEF_CLASS_LIGATURE: + props = GLYPH_PROP_LIGATURE; + break; + case GDEF_CLASS_MARK: + props = GLYPH_PROP_MARK; + break; + default: + props = 0; + } + + context->glyph_infos[g].props = props; + + return props; +} + struct coverage_compare_format1_context { UINT16 glyph; @@ -4377,6 +4407,8 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gpos, &lookups); + for (i = 0; i < context->glyph_count; ++i) + opentype_set_glyph_props(context, i, context->u.pos.glyphs[i]); opentype_layout_set_glyph_masks(context, features); for (i = 0; i < lookups.count; ++i) @@ -4691,36 +4723,6 @@ static unsigned int unicode_get_mirrored_char(unsigned int codepoint) return mirror ? mirror : codepoint; } -static void opentype_subst_set_glyph_props(struct scriptshaping_context *context, unsigned int g) -{ - struct scriptshaping_cache *cache = context->cache; - unsigned int glyph_class = 0, props; - - if (cache->gdef.classdef) - { - glyph_class = opentype_layout_get_glyph_class(&cache->gdef.table, cache->gdef.classdef, context->u.subst.glyphs[g]); - } - - switch (glyph_class) - { - case GDEF_CLASS_BASE: - props = GLYPH_PROP_BASE; - break; - case GDEF_CLASS_LIGATURE: - props = GLYPH_PROP_LIGATURE; - break; - case GDEF_CLASS_MARK: - props = GLYPH_PROP_MARK; - context->u.subst.glyph_props[g].isDiacritic = 1; - context->u.subst.glyph_props[g].isZeroWidthSpace = 1; - break; - default: - props = 0; - } - - context->glyph_infos[g].props = props; -} - static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, const struct shaping_features *features) { unsigned int rtlm_mask = shaping_features_get_mask(features, DWRITE_MAKE_OPENTYPE_TAG('r','t','l','m'), NULL); @@ -4761,7 +4763,11 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c context->u.subst.glyphs[g] = font->get_glyph(context->cache->context, codepoint); context->u.subst.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER; context->u.subst.glyph_props[g].isClusterStart = 1; - opentype_subst_set_glyph_props(context, g); + if (opentype_set_glyph_props(context, g, context->u.subst.glyphs[g]) == GLYPH_PROP_MARK) + { + context->u.subst.glyph_props[g].isDiacritic = 1; + context->u.subst.glyph_props[g].isZeroWidthSpace = 1; + } context->glyph_count++; clustermap[i] = i;

1 0

Nikolay Sivov : dwrite: Set glyph class for all initial glyphs.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: a99e46654721da84e818b2bae9904cff8178d34e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a99e46654721da84e818b2ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 14:54:28 2020 +0300 dwrite: Set glyph class for all initial glyphs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 4cf1523f47..dd25c619c1 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -465,6 +465,7 @@ struct scriptshaping_cache struct shaping_glyph_info { unsigned int mask; + unsigned int props; }; struct scriptshaping_context diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 77ae1e8447..814e65b6cc 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -494,6 +494,13 @@ enum gsub_gpos_lookup_flags LOOKUP_FLAG_IGNORE_MASK = 0xe, }; +enum glyph_prop_flags +{ + GLYPH_PROP_BASE = LOOKUP_FLAG_IGNORE_BASE, + GLYPH_PROP_LIGATURE = LOOKUP_FLAG_IGNORE_LIGATURES, + GLYPH_PROP_MARK = LOOKUP_FLAG_IGNORE_MARKS, +}; + enum gpos_lookup_type { GPOS_LOOKUP_SINGLE_ADJUSTMENT = 1, @@ -4684,6 +4691,36 @@ static unsigned int unicode_get_mirrored_char(unsigned int codepoint) return mirror ? mirror : codepoint; } +static void opentype_subst_set_glyph_props(struct scriptshaping_context *context, unsigned int g) +{ + struct scriptshaping_cache *cache = context->cache; + unsigned int glyph_class = 0, props; + + if (cache->gdef.classdef) + { + glyph_class = opentype_layout_get_glyph_class(&cache->gdef.table, cache->gdef.classdef, context->u.subst.glyphs[g]); + } + + switch (glyph_class) + { + case GDEF_CLASS_BASE: + props = GLYPH_PROP_BASE; + break; + case GDEF_CLASS_LIGATURE: + props = GLYPH_PROP_LIGATURE; + break; + case GDEF_CLASS_MARK: + props = GLYPH_PROP_MARK; + context->u.subst.glyph_props[g].isDiacritic = 1; + context->u.subst.glyph_props[g].isZeroWidthSpace = 1; + break; + default: + props = 0; + } + + context->glyph_infos[g].props = props; +} + static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, const struct shaping_features *features) { unsigned int rtlm_mask = shaping_features_get_mask(features, DWRITE_MAKE_OPENTYPE_TAG('r','t','l','m'), NULL); @@ -4724,6 +4761,7 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c context->u.subst.glyphs[g] = font->get_glyph(context->cache->context, codepoint); context->u.subst.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER; context->u.subst.glyph_props[g].isClusterStart = 1; + opentype_subst_set_glyph_props(context, g); context->glyph_count++; clustermap[i] = i;

1 0

Nikolay Sivov : dwrite: Fix array indexing when merging features.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 4490f8a2745ecf7d78425090b889a6af00e7e1a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4490f8a2745ecf7d78425090… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 14:54:27 2020 +0300 dwrite: Fix array indexing when merging features. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/shape.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 3d25898cf7..77c5ba1f8a 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -231,7 +231,7 @@ static int features_sorting_compare(const void *a, const void *b) static void shape_merge_features(struct scriptshaping_context *context, struct shaping_features *features) { const DWRITE_TYPOGRAPHIC_FEATURES **user_features = context->user_features.features; - unsigned int j = 0, i; + unsigned int i, j; /* For now only consider global, enabled user features. */ if (user_features && context->user_features.range_lengths) @@ -250,7 +250,7 @@ static void shape_merge_features(struct scriptshaping_context *context, struct s /* Sort and merge duplicates. */ qsort(features->features, features->count, sizeof(*features->features), features_sorting_compare); - for (i = 1; i < features->count; ++i) + for (i = 1, j = 0; i < features->count; ++i) { if (features->features[i].tag != features->features[j].tag) features->features[++j] = features->features[i];

1 0

Thomas Faber : ntdll/tests: Fix a test failure on Server 2003.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 2a2607e2a3ff5064ddd1bd9759b42b9c09187e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a2607e2a3ff5064ddd1bd97… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat May 23 15:10:47 2020 +0200 ntdll/tests: Fix a test failure on Server 2003. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 72afb0a376..a5e6faa461 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1640,8 +1640,8 @@ static void test_thread_context(void) ok( context.Esp == expect.Esp - 12 || context.Esp == expect.Esp - 16, "wrong Esp %08x/%08x\n", context.Esp, expect.Esp ); /* Eip is somewhere close to the NtGetContextThread implementation */ - ok( (char *)context.Eip >= (char *)pNtGetContextThread - 0x10000 && - (char *)context.Eip <= (char *)pNtGetContextThread + 0x10000, + ok( (char *)context.Eip >= (char *)pNtGetContextThread - 0x40000 && + (char *)context.Eip <= (char *)pNtGetContextThread + 0x40000, "wrong Eip %08x/%08x\n", context.Eip, (DWORD)pNtGetContextThread ); /* segment registers clear the high word */ ok( context.SegCs == LOWORD(expect.SegCs), "wrong SegCs %08x/%08x\n", context.SegCs, expect.SegCs );

1 0

Damjan Jovanovic : ntdll: Reserve the area whenever possible in reserve_area() on FreeBSD.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 8c3e6c378de0a05a097f3e7ff43edf951934d9a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c3e6c378de0a05a097f3e7f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat May 23 12:07:28 2020 +0200 ntdll: Reserve the area whenever possible in reserve_area() on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 88cd1eb1cf..8fa43a40e6 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -135,7 +135,11 @@ static void reserve_area( void *addr, void *end ) if (!size) return; +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + ptr = mmap( addr, size, PROT_NONE, flags | MAP_FIXED | MAP_EXCL, -1, 0 ); +#else ptr = mmap( addr, size, PROT_NONE, flags, -1, 0 ); +#endif if (ptr == addr) { mmap_add_reserved_area( addr, size );

1 0

Damjan Jovanovic : libwine: Fix a regression in the return value check for mmap() on FreeBSD.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: e0138c4a6a7a87f1d25badd43e05490e706bc666 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0138c4a6a7a87f1d25badd4… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat May 23 11:01:49 2020 +0200 libwine: Fix a regression in the return value check for mmap() on FreeBSD. This fixes a regression from my previous patch in commit 55ba3648379d90642f174e74809b84130d6d1ddc, which was checking for mmap() returning NULL instead of MAP_FAILED. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49225 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 0fbe2efea7..af91b3e352 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -215,7 +215,7 @@ void *wine_anon_mmap( void *start, size_t size, int prot, int flags ) /* If available, this will attempt a fixed mapping in-kernel */ flags |= MAP_TRYFIXED; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - if ( start && mmap( start, size, prot, flags | MAP_FIXED | MAP_EXCL, get_fdzero(), 0 ) ) + if ( start && mmap( start, size, prot, flags | MAP_FIXED | MAP_EXCL, get_fdzero(), 0 ) != MAP_FAILED ) return start; #elif defined(__svr4__) || defined(__NetBSD__) || defined(__APPLE__) if ( try_mmap_fixed( start, size, prot, flags, get_fdzero(), 0 ) )

1 0

Zebediah Figura : amstream: Simplify flush_receive_queue() a bit.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 410934a762a048fbff8d35927a70ce55f97a9d63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=410934a762a048fbff8d3592… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 22 16:25:51 2020 -0500 amstream: Simplify flush_receive_queue() a bit. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 68b8b84f50..4e82d76da0 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -95,13 +95,10 @@ static void remove_queued_update(IAudioStreamSampleImpl *sample) static void flush_receive_queue(struct audio_stream *stream) { - while (!list_empty(&stream->receive_queue)) - { - struct queued_receive *receive = - LIST_ENTRY(list_head(&stream->receive_queue), struct queued_receive, entry); + struct list *entry; - remove_queued_receive(receive); - } + while ((entry = list_head(&stream->receive_queue))) + remove_queued_receive(LIST_ENTRY(entry, struct queued_receive, entry)); } static void process_update(IAudioStreamSampleImpl *sample, struct queued_receive *receive)

1 0

Matteo Bruni : ntdll: Use memcpy() in set_float_reg().
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 2e5c2c7cdb11cae3a2b78bb0794368f431538efb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e5c2c7cdb11cae3a2b78bb0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 22 20:39:59 2020 +0200 ntdll: Use memcpy() in set_float_reg(). The source address might not be aligned although the compiler can expect alignment when using a plain assignment. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 31af1e98d3..e92470e960 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3298,7 +3298,8 @@ static void set_int_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_pt static void set_float_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr, int reg, M128A *val ) { - *(&context->u.s.Xmm0 + reg) = *val; + /* Use a memcpy() to avoid issues if val is misaligned. */ + memcpy(&context->u.s.Xmm0 + reg, val, sizeof(*val)); if (ctx_ptr) ctx_ptr->u.FloatingContext[reg] = val; }

1 0

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 May 2020