- Wine-Commits - list.winehq.org

Alexandre Julliard : Release 8.7.
by Alexandre Julliard April 28, 2023

April 28, 2023

Module: wine Branch: master Commit: c732d2458994d3242741552c47d45d8b04eeb915 URL: https://gitlab.winehq.org/wine/wine/-/commit/c732d2458994d3242741552c47d45d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 28 22:02:23 2023 +0200 Release 8.7. --- ANNOUNCE | 774 ++++++++++++++++++++++++++------------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 330 insertions(+), 465 deletions(-)

1 0

Connor McAdams : uiautomationcore: Retrieve runtime ID on UiaReturnRawElementProvider thread to prevent a deadlock.
by Alexandre Julliard April 28, 2023

April 28, 2023

Module: wine Branch: master Commit: b04acc81d0ae7b354b37025ddb98a3394d5a54d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/b04acc81d0ae7b354b37025ddb98a3… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Feb 16 13:21:20 2023 -0500 uiautomationcore: Retrieve runtime ID on UiaReturnRawElementProvider thread to prevent a deadlock. If we pass a node to the provider thread that contains a provider that was created in an STA with the ProviderOptions_UseComThreading flag set, we can deadlock when attempting to get a runtime ID from the proxy due to the message queue not being pumped. To avoid this, retrieve the runtime ID before passing the node to the provider thread. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 32 +++++++++++++++ dlls/uiautomationcore/uia_provider.c | 64 ++++++++++++++++-------------- 2 files changed, 66 insertions(+), 30 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index cf680b6a733..35f2f18ffcf 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -6305,6 +6305,16 @@ static const struct prov_method_sequence node_from_hwnd9[] = { { 0 } }; +static const struct prov_method_sequence node_from_hwnd10[] = { + NODE_CREATE_SEQ(&Provider), + /* Next two only done on Windows 8+. */ + { &Provider, FRAG_GET_RUNTIME_ID, METHOD_OPTIONAL }, + { &Provider, FRAG_GET_RUNTIME_ID, METHOD_OPTIONAL }, + { &Provider, PROV_GET_PROVIDER_OPTIONS }, + { &Provider, FRAG_GET_RUNTIME_ID, METHOD_OPTIONAL }, /* Only done on Win11+. */ + { 0 } +}; + static const struct prov_method_sequence disconnect_prov1[] = { { &Provider_child, PROV_GET_PROVIDER_OPTIONS }, /* Win10v1507 and below call this. */ @@ -6576,6 +6586,28 @@ static DWORD WINAPI uia_node_from_handle_test_thread(LPVOID param) Sleep(50); ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); + /* ProviderOptions_UseComThreading test from a separate thread. */ + SET_EXPECT(winproc_GETOBJECT_UiaRoot); + /* Only sent on Win7. */ + SET_EXPECT(winproc_GETOBJECT_CLIENT); + prov_root = &Provider.IRawElementProviderSimple_iface; + initialize_provider(&Provider, ProviderOptions_ServerSideProvider | ProviderOptions_UseComThreading, NULL, FALSE); + Provider.frag_root = NULL; + Provider.runtime_id[0] = Provider.runtime_id[1] = 0xdeadbeef; + hr = UiaNodeFromHandle(hwnd, &node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref); + CHECK_CALLED(winproc_GETOBJECT_UiaRoot); + called_winproc_GETOBJECT_CLIENT = expect_winproc_GETOBJECT_CLIENT = 0; + + ok_method_sequence(node_from_hwnd10, "node_from_hwnd10"); + + ok(UiaNodeRelease(node), "UiaNodeRelease returned FALSE\n"); + /* Win10v1809 can be slow to call Release on Provider. */ + if (Provider.ref != 1) + Sleep(50); + ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); + if (!pUiaDisconnectProvider) { win_skip("UiaDisconnectProvider not exported by uiautomationcore.dll\n"); diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index ffab31d9953..a00e9312ff7 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1744,19 +1744,15 @@ exit: LeaveCriticalSection(&provider_thread_cs); } -static HRESULT uia_provider_thread_add_node(HUIANODE node) +static HRESULT uia_provider_thread_add_node(HUIANODE node, SAFEARRAY *rt_id) { struct uia_node *node_data = impl_from_IWineUiaNode((IWineUiaNode *)node); int prov_type = get_node_provider_type_at_idx(node_data, 0); struct uia_provider *prov_data; - SAFEARRAY *sa; - HRESULT hr; + HRESULT hr = S_OK; prov_data = impl_from_IWineUiaProvider(node_data->prov[prov_type]); node_data->nested_node = prov_data->return_nested_node = TRUE; - hr = UiaGetRuntimeId(node, &sa); - if (FAILED(hr)) - return hr; TRACE("Adding node %p\n", node); @@ -1764,38 +1760,40 @@ static HRESULT uia_provider_thread_add_node(HUIANODE node) list_add_tail(&provider_thread.nodes_list, &node_data->prov_thread_list_entry); /* If we have a runtime ID, create an entry in the rb tree. */ - if (sa) + if (rt_id) { struct uia_provider_thread_map_entry *prov_map; struct rb_entry *rb_entry; - if ((rb_entry = rb_get(&provider_thread.node_map, sa))) - { + if ((rb_entry = rb_get(&provider_thread.node_map, rt_id))) prov_map = RB_ENTRY_VALUE(rb_entry, struct uia_provider_thread_map_entry, entry); - SafeArrayDestroy(sa); - } else { prov_map = heap_alloc_zero(sizeof(*prov_map)); if (!prov_map) { - SafeArrayDestroy(sa); - LeaveCriticalSection(&provider_thread_cs); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto exit; } - prov_map->runtime_id = sa; + hr = SafeArrayCopy(rt_id, &prov_map->runtime_id); + if (FAILED(hr)) + { + heap_free(prov_map); + goto exit; + } list_init(&prov_map->nodes_list); - rb_put(&provider_thread.node_map, sa, &prov_map->entry); + rb_put(&provider_thread.node_map, prov_map->runtime_id, &prov_map->entry); } list_add_tail(&prov_map->nodes_list, &node_data->node_map_list_entry); node_data->map = prov_map; } +exit: LeaveCriticalSection(&provider_thread_cs); - return S_OK; + return hr; } #define WM_GET_OBJECT_UIA_NODE (WM_USER + 1) @@ -1807,13 +1805,13 @@ static LRESULT CALLBACK uia_provider_thread_msg_proc(HWND hwnd, UINT msg, WPARAM { case WM_GET_OBJECT_UIA_NODE: { + SAFEARRAY *rt_id = (SAFEARRAY *)wparam; HUIANODE node = (HUIANODE)lparam; LRESULT lr; - if (FAILED(uia_provider_thread_add_node(node))) + if (FAILED(uia_provider_thread_add_node(node, rt_id))) { WARN("Failed to add node %p to provider thread list.\n", node); - UiaNodeRelease(node); return 0; } @@ -1828,11 +1826,6 @@ static LRESULT CALLBACK uia_provider_thread_msg_proc(HWND hwnd, UINT msg, WPARAM lr = 0; } - /* - * LresultFromObject increases refcnt by 1. If LresultFromObject - * failed, this is expected to release the node. - */ - UiaNodeRelease(node); return lr; } @@ -1948,13 +1941,24 @@ void uia_stop_provider_thread(void) */ LRESULT uia_lresult_from_node(HUIANODE huianode) { - if (!uia_start_provider_thread()) - { - UiaNodeRelease(huianode); - return 0; - } + SAFEARRAY *rt_id; + LRESULT lr = 0; + HRESULT hr; + + hr = UiaGetRuntimeId(huianode, &rt_id); + if (SUCCEEDED(hr) && uia_start_provider_thread()) + lr = SendMessageW(provider_thread.hwnd, WM_GET_OBJECT_UIA_NODE, (WPARAM)rt_id, (LPARAM)huianode); + + if (FAILED(hr)) + WARN("UiaGetRuntimeId failed with hr %#lx\n", hr); - return SendMessageW(provider_thread.hwnd, WM_GET_OBJECT_UIA_NODE, 0, (LPARAM)huianode); + /* + * LresultFromObject increases refcnt by 1. If LresultFromObject + * failed or wasn't called, this is expected to release the node. + */ + UiaNodeRelease(huianode); + SafeArrayDestroy(rt_id); + return lr; } /***********************************************************************

1 0

Connor McAdams : uiautomationcore: Implement UiaNodeFromFocus.
by Alexandre Julliard April 28, 2023

April 28, 2023

Module: wine Branch: master Commit: e070e9b476551817cd868d38c3758d2a1ecd0e9d URL: https://gitlab.winehq.org/wine/wine/-/commit/e070e9b476551817cd868d38c3758d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Apr 25 13:33:57 2023 -0400 uiautomationcore: Implement UiaNodeFromFocus. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 23 +++-- dlls/uiautomationcore/uia_classes.idl | 1 + dlls/uiautomationcore/uia_client.c | 148 ++++++++++++++++++++++++++++- 3 files changed, 158 insertions(+), 14 deletions(-)

1 0

Connor McAdams : uiautomationcore: Add UiaNodeFromFocus stub.
by Alexandre Julliard April 28, 2023

April 28, 2023

Module: wine Branch: master Commit: ba927e507b7d40f3df9067ed42eec5cdbe56e3e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ba927e507b7d40f3df9067ed42eec5… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Mar 24 12:13:17 2023 -0400 uiautomationcore: Add UiaNodeFromFocus stub. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 264 ++++++++++++++++++++++++++-- dlls/uiautomationcore/uia_client.c | 9 + dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 4 files changed, 259 insertions(+), 17 deletions(-)

1 0

Piotr Caban : wineps: Handle EMRI_DEVMODE record in spool files.
by Alexandre Julliard April 28, 2023

April 28, 2023

Module: wine Branch: master Commit: cdb0be727240470568cf164071e83be488bf9d7c URL: https://gitlab.winehq.org/wine/wine/-/commit/cdb0be727240470568cf164071e83b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 27 18:29:56 2023 +0200 wineps: Handle EMRI_DEVMODE record in spool files. --- dlls/wineps.drv/init.c | 2 +- dlls/wineps.drv/printproc.c | 26 +++++++++++++++++++++++++- dlls/wineps.drv/psdrv.h | 1 + 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 01cfa07e591..39c7e2a4a7f 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -436,7 +436,7 @@ static BOOL CDECL PSDRV_DeleteDC( PHYSDEV dev ) /********************************************************************** * ResetDC (WINEPS.@) */ -static BOOL CDECL PSDRV_ResetDC( PHYSDEV dev, const DEVMODEW *lpInitData ) +BOOL CDECL PSDRV_ResetDC( PHYSDEV dev, const DEVMODEW *lpInitData ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 9b96b2c1465..9786f5f83df 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -3228,6 +3228,30 @@ BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) switch (record.ulID) { + case EMRI_DEVMODE: + { + DEVMODEW *devmode = NULL; + + if (record.cjSize) + { + devmode = malloc(record.cjSize); + if (!devmode) + goto cleanup; + ret = ReadPrinter(spool_data, devmode, record.cjSize, &r); + if (ret && r != record.cjSize) + { + SetLastError(ERROR_INVALID_DATA); + ret = FALSE; + } + } + + if (ret) + ret = PSDRV_ResetDC(&data->pdev->dev, devmode); + free(devmode); + if (!ret) + goto cleanup; + break; + } case EMRI_METAFILE_DATA: pos.QuadPart = record.cjSize; ret = SeekPrinter(spool_data, pos, NULL, FILE_CURRENT, FALSE); @@ -3242,7 +3266,7 @@ BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) { cur.QuadPart += record.cjSize; ret = ReadPrinter(spool_data, &pos, sizeof(pos), &r); - if (r != sizeof(pos)) + if (ret && r != sizeof(pos)) { SetLastError(ERROR_INVALID_DATA); ret = FALSE; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 81cb0206e7e..bfa2807ce6f 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -467,6 +467,7 @@ extern INT CDECL PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) DECLSPEC_HID extern BOOL CDECL PSDRV_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL CDECL PSDRV_ResetDC( PHYSDEV dev, const DEVMODEW *lpInitData ) DECLSPEC_HIDDEN; extern void PSDRV_MergeDevmodes(PSDRV_DEVMODE *dm1, const PSDRV_DEVMODE *dm2, PRINTERINFO *pi) DECLSPEC_HIDDEN; extern BOOL PSDRV_GetFontMetrics(void) DECLSPEC_HIDDEN;

1 0

Paul Gofman : wined3d: Add a comment about mismatched samplers.
by Alexandre Julliard April 28, 2023

April 28, 2023

Module: wine Branch: master Commit: 8665935e2f5b2112b09995e9406988ba1291ba95 URL: https://gitlab.winehq.org/wine/wine/-/commit/8665935e2f5b2112b09995e9406988… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Apr 27 20:33:29 2023 -0600 wined3d: Add a comment about mismatched samplers. --- dlls/d3d9/tests/visual.c | 1 + dlls/wined3d/shader.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b50b1a22772..cb0a2549b2e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26554,6 +26554,7 @@ static void test_mismatched_sample_types(void) { {"2d_2d", (IDirect3DBaseTexture9 **)&tex_2d, &ps_2d, 0x00707070}, {"3d_3d", (IDirect3DBaseTexture9 **)&volume, &ps_3d, 0x00303030}, + /* Star Wars: The Old Republic uses mismatched samplers for rendering water. */ {"2d_3d", (IDirect3DBaseTexture9 **)&tex_2d, &ps_3d, 0x00707070, SAMPLE_ZERO}, {"3d_2d", (IDirect3DBaseTexture9 **)&volume, &ps_2d, 0x00303030, SAMPLE_ZERO | RANDOM_W}, }; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9924a2d806e..7ee68a3436d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2897,6 +2897,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 if ((texture = state->textures[i])) { + /* Star Wars: The Old Republic uses mismatched samplers for rendering water. */ if (texture->resource.type == WINED3D_RTYPE_TEXTURE_2D && resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_3D && !(texture->resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP))

1 0

Davide Beatrici : winepulse: Use mmdevapi's AudioSessionControl.
by Alexandre Julliard April 28, 2023

April 28, 2023

Module: wine Branch: master Commit: cbd47ebc83acc314a9c2a2c02c0e00cd4055261b URL: https://gitlab.winehq.org/wine/wine/-/commit/cbd47ebc83acc314a9c2a2c02c0e00… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Apr 27 23:58:36 2023 +0200 winepulse: Use mmdevapi's AudioSessionControl. --- dlls/winepulse.drv/Makefile.in | 4 +- dlls/winepulse.drv/mmdevdrv.c | 251 +---------------------------------------- 2 files changed, 6 insertions(+), 249 deletions(-) diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in index 7a78f4e854e..8a6d6f1ae91 100644 --- a/dlls/winepulse.drv/Makefile.in +++ b/dlls/winepulse.drv/Makefile.in @@ -1,9 +1,11 @@ MODULE = winepulse.drv UNIXLIB = winepulse.so IMPORTS = dxguid uuid winmm user32 advapi32 ole32 version +PARENTSRC = ../mmdevapi UNIX_LIBS = $(PULSE_LIBS) $(PTHREAD_LIBS) -lm UNIX_CFLAGS = $(PULSE_CFLAGS) C_SRCS = \ mmdevdrv.c \ - pulse.c + pulse.c \ + session.c diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 920d7a964eb..5f2a8b8609d 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -83,12 +83,12 @@ static CRITICAL_SECTION_DEBUG session_cs_debug = { }; static CRITICAL_SECTION session_cs = { &session_cs_debug, -1, 0, 0, 0, 0 }; -static void sessions_lock(void) +void DECLSPEC_HIDDEN sessions_lock(void) { EnterCriticalSection(&session_cs); } -static void sessions_unlock(void) +void DECLSPEC_HIDDEN sessions_unlock(void) { LeaveCriticalSection(&session_cs); } @@ -127,7 +127,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; -static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; +extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; static const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; static const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; static const IAudioClockVtbl AudioClock_Vtbl; @@ -151,11 +151,6 @@ static inline ACImpl *impl_from_IAudioCaptureClient(IAudioCaptureClient *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioCaptureClient_iface); } -static inline AudioSessionWrapper *impl_from_IAudioSessionControl2(IAudioSessionControl2 *iface) -{ - return CONTAINING_RECORD(iface, AudioSessionWrapper, IAudioSessionControl2_iface); -} - static inline AudioSessionWrapper *impl_from_ISimpleAudioVolume(ISimpleAudioVolume *iface) { return CONTAINING_RECORD(iface, AudioSessionWrapper, ISimpleAudioVolume_iface); @@ -1892,246 +1887,6 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) return ret; } -static HRESULT WINAPI AudioSessionControl_QueryInterface( - IAudioSessionControl2 *iface, REFIID riid, void **ppv) -{ - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); - - if (!ppv) - return E_POINTER; - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IAudioSessionControl) || - IsEqualIID(riid, &IID_IAudioSessionControl2)) - *ppv = iface; - if (*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("Unknown interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI AudioSessionControl_AddRef(IAudioSessionControl2 *iface) -{ - AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); - ULONG ref; - ref = InterlockedIncrement(&This->ref); - TRACE("(%p) Refcount now %lu\n", This, ref); - return ref; -} - -static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) -{ - AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); - ULONG ref; - ref = InterlockedDecrement(&This->ref); - TRACE("(%p) Refcount now %lu\n", This, ref); - if (!ref) { - if (This->client) { - This->client->session_wrapper = NULL; - IAudioClient3_Release(&This->client->IAudioClient3_iface); - } - HeapFree(GetProcessHeap(), 0, This); - } - return ref; -} - -static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, - AudioSessionState *state) -{ - AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); - ACImpl *client; - - TRACE("(%p)->(%p)\n", This, state); - - if (!state) - return NULL_PTR_ERR; - - sessions_lock(); - if (list_empty(&This->session->clients)) { - *state = AudioSessionStateExpired; - goto out; - } - LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry) { - struct is_started_params params; - - if (!client->stream) - continue; - - params.stream = client->stream; - pulse_call(is_started, &params); - if (params.result == S_OK) { - *state = AudioSessionStateActive; - goto out; - } - } - *state = AudioSessionStateInactive; - -out: - sessions_unlock(); - return S_OK; -} - -static HRESULT WINAPI AudioSessionControl_GetDisplayName( - IAudioSessionControl2 *iface, WCHAR **name) -{ - AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); - - FIXME("(%p)->(%p) - stub\n", This, name); - - return E_NOTIMPL; -} - -static HRESULT WINAPI AudioSessionControl_SetDisplayName( - IAudioSessionControl2 *iface, const WCHAR *name, const GUID *session) -{ - AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); - - FIXME("(%p)->(%p, %s) - stub\n", This, name, debugstr_guid(session)); - - return E_NOTIMPL; -} - -static HRESULT WINAPI AudioSessionControl_GetIconPath( - IAudioSessionControl2 *iface, WCHAR **path) -{ - AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); - - FIXME("(%p)->(%p) - stub\n", This, path); - - return E_NOTIMPL; -} - -static HRESULT WINAPI AudioSessionControl_SetIconPath( - IAudioSessionControl2 *iface, const WCHAR *path, const GUID *session) -{ - AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); - - FIXME("(%p)->(%p, %s) - stub\n", This, path, debugstr_guid(session)); - - return E_NOTIMPL; -} - -static HRESULT WINAPI AudioSessionControl_GetGroupingParam( - IAudioSessionControl2 *iface, GUID *group) -{ - AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); - - FIXME("(%p)->(%p) - stub\n", This, group); - - return E_NOTIMPL; -} - -static HRESULT WINAPI AudioSessionControl_SetGroupingParam( - IAudioSessionControl2 *iface, const GUID *group, const GUID *session) -{ - AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); - - FIXME("(%p)->(%s, %s) - stub\n", This, debugstr_guid(group), - debugstr_guid(session)); - - return E_NOTIMPL; -} - -static HRESULT WINAPI AudioSessionControl_RegisterAudioSessionNotification( - IAudioSessionControl2 *iface, IAudioSessionEvents *events) -{ - AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); - - FIXME("(%p)->(%p) - stub\n", This, events); - - return S_OK; -} - -static HRESULT WINAPI AudioSessionControl_UnregisterAudioSessionNotification( - IAudioSessionControl2 *iface, IAudioSessionEvents *events) -{ - AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); - - FIXME("(%p)->(%p) - stub\n", This, events); - - return S_OK; -} - -static HRESULT WINAPI AudioSessionControl_GetSessionIdentifier( - IAudioSessionControl2 *iface, WCHAR **id) -{ - AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); - - FIXME("(%p)->(%p) - stub\n", This, id); - - return E_NOTIMPL; -} - -static HRESULT WINAPI AudioSessionControl_GetSessionInstanceIdentifier( - IAudioSessionControl2 *iface, WCHAR **id) -{ - AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); - - FIXME("(%p)->(%p) - stub\n", This, id); - - return E_NOTIMPL; -} - -static HRESULT WINAPI AudioSessionControl_GetProcessId( - IAudioSessionControl2 *iface, DWORD *pid) -{ - AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); - - TRACE("(%p)->(%p)\n", This, pid); - - if (!pid) - return E_POINTER; - - *pid = GetCurrentProcessId(); - - return S_OK; -} - -static HRESULT WINAPI AudioSessionControl_IsSystemSoundsSession( - IAudioSessionControl2 *iface) -{ - AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); - - TRACE("(%p)\n", This); - - return S_FALSE; -} - -static HRESULT WINAPI AudioSessionControl_SetDuckingPreference( - IAudioSessionControl2 *iface, BOOL optout) -{ - AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); - - TRACE("(%p)->(%d)\n", This, optout); - - return S_OK; -} - -static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl = -{ - AudioSessionControl_QueryInterface, - AudioSessionControl_AddRef, - AudioSessionControl_Release, - AudioSessionControl_GetState, - AudioSessionControl_GetDisplayName, - AudioSessionControl_SetDisplayName, - AudioSessionControl_GetIconPath, - AudioSessionControl_SetIconPath, - AudioSessionControl_GetGroupingParam, - AudioSessionControl_SetGroupingParam, - AudioSessionControl_RegisterAudioSessionNotification, - AudioSessionControl_UnregisterAudioSessionNotification, - AudioSessionControl_GetSessionIdentifier, - AudioSessionControl_GetSessionInstanceIdentifier, - AudioSessionControl_GetProcessId, - AudioSessionControl_IsSystemSoundsSession, - AudioSessionControl_SetDuckingPreference -}; - static HRESULT WINAPI SimpleAudioVolume_QueryInterface( ISimpleAudioVolume *iface, REFIID riid, void **ppv) {

1 0

Piotr Caban : gdi32: Support creating EMRI_DEVMODE records in spool files.
by Alexandre Julliard April 28, 2023

April 28, 2023

Module: wine Branch: master Commit: 4496c64aa1ea820cd91e4b0ae140f4affaaf17b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4496c64aa1ea820cd91e4b0ae140f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 27 17:50:14 2023 +0200 gdi32: Support creating EMRI_DEVMODE records in spool files. --- dlls/gdi32/dc.c | 51 ++++++++++++++++++++++++++++++++++++++++++------ dlls/gdi32/emfdc.c | 13 +++++++++++- dlls/gdi32/gdi_private.h | 3 ++- 3 files changed, 59 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 72e30647943..b1ca342f8e3 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -54,7 +54,8 @@ struct graphics_driver enum print_flags { CALL_START_PAGE = 0x1, - CALL_END_PAGE = 0x2 + CALL_END_PAGE = 0x2, + WRITE_DEVMODE = 0x4, }; struct print @@ -62,6 +63,7 @@ struct print HANDLE printer; WCHAR *output; enum print_flags flags; + DEVMODEW *devmode; }; DC_ATTR *get_dc_attr( HDC hdc ) @@ -202,6 +204,29 @@ done: return driver->entry_point; } +static BOOL print_copy_devmode( struct print *print, const DEVMODEW *devmode ) +{ + size_t size; + + if (!print) return TRUE; + if (!print->devmode && !devmode) return TRUE; + HeapFree( GetProcessHeap(), 0, print->devmode ); + + if (!devmode) + { + print->devmode = NULL; + print->flags |= WRITE_DEVMODE; + return TRUE; + } + + size = devmode->dmSize + devmode->dmDriverExtra; + print->devmode = HeapAlloc( GetProcessHeap(), 0, size ); + if (!print->devmode) return FALSE; + memcpy(print->devmode, devmode, size); + print->flags |= WRITE_DEVMODE; + return TRUE; +} + /*********************************************************************** * CreateDCW (GDI32.@) */ @@ -262,10 +287,13 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, ClosePrinter( hspool ); return 0; } - else if (!(print = HeapAlloc( GetProcessHeap(), 0, sizeof(*print) ))) + else if (!(print = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*print) )) || + !print_copy_devmode( print, devmode )) { + HeapFree( GetProcessHeap(), 0, print ); ClosePrinter( hspool ); HeapFree( GetProcessHeap(), 0, port ); + return 0; } if (display) @@ -295,13 +323,13 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, } print->printer = hspool; print->output = port; - print->flags = 0; dc_attr->print = (UINT_PTR)print; } else if (hspool) { ClosePrinter( hspool ); HeapFree( GetProcessHeap(), 0, port ); + HeapFree( GetProcessHeap(), 0, print->devmode ); HeapFree( GetProcessHeap(), 0, print ); } @@ -431,6 +459,7 @@ static void delete_print_dc( DC_ATTR *dc_attr ) ClosePrinter( print->printer ); HeapFree( GetProcessHeap(), 0, print->output ); + HeapFree( GetProcessHeap(), 0, print->devmode ); HeapFree( GetProcessHeap(), 0, print ); dc_attr->print = 0; } @@ -471,7 +500,15 @@ HDC WINAPI ResetDCA( HDC hdc, const DEVMODEA *devmode ) */ HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode ) { - return NtGdiResetDC( hdc, devmode, NULL, NULL, NULL ) ? hdc : 0; + struct print *print; + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return 0; + print = get_dc_print( dc_attr ); + if (print && print->flags & CALL_END_PAGE) return 0; + if (!NtGdiResetDC( hdc, devmode, NULL, NULL, NULL )) return 0; + if (print && !print_copy_devmode( print, devmode )) return 0; + return hdc; } /*********************************************************************** @@ -2404,9 +2441,11 @@ INT WINAPI EndPage( HDC hdc ) print = get_dc_print( dc_attr ); if (print) { - print->flags = (print->flags & ~CALL_END_PAGE) | CALL_START_PAGE; + BOOL write = print->flags & WRITE_DEVMODE; + + print->flags = (print->flags & ~(CALL_END_PAGE | WRITE_DEVMODE)) | CALL_START_PAGE; if (dc_attr->emf) - return spool_end_page( dc_attr, print->printer ); + return spool_end_page( dc_attr, print->printer, print->devmode, write ); } return NtGdiEndPage( hdc ); } diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index f580f21fc1e..ef316fe42a1 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2807,7 +2807,7 @@ int spool_start_page( DC_ATTR *dc_attr, HANDLE hspool ) return StartPagePrinter( hspool ); } -int spool_end_page( DC_ATTR *dc_attr, HANDLE hspool ) +int spool_end_page( DC_ATTR *dc_attr, HANDLE hspool, const DEVMODEW *devmode, BOOL write_devmode ) { struct record_hdr { @@ -2831,9 +2831,20 @@ int spool_end_page( DC_ATTR *dc_attr, HANDLE hspool ) if (!WritePrinter( hspool, &record_hdr, sizeof(record_hdr), &written )) return 0; if (!WritePrinter( hspool, emf->emh, emf->emh->nBytes, &written )) return 0; + if (write_devmode) + { + record_hdr.ulID = EMRI_DEVMODE; + record_hdr.cjSize = devmode ? devmode->dmSize + devmode->dmDriverExtra : 0; + if (!WritePrinter( hspool, &record_hdr, sizeof(record_hdr), &written )) return 0; + if (devmode && !WritePrinter( hspool, (BYTE *)devmode, + record_hdr.cjSize, &written )) return 0; + } + metafile_ext.hdr.ulID = EMRI_METAFILE_EXT; metafile_ext.hdr.cjSize = sizeof(metafile_ext) - sizeof(struct record_hdr); metafile_ext.pos.QuadPart = emf->emh->nBytes + sizeof(record_hdr); + if (write_devmode) + metafile_ext.pos.QuadPart += record_hdr.cjSize + sizeof(record_hdr); if (!WritePrinter( hspool, &metafile_ext, sizeof(metafile_ext), &written )) return 0; emf_reset( dc_attr, NULL ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 6f8f4630b6f..b8f914fe1f4 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -283,7 +283,8 @@ extern HENHMETAFILE EMF_Create_HENHMETAFILE( ENHMETAHEADER *emh, DWORD filesize, extern BOOL spool_start_doc( DC_ATTR *dc_attr, HANDLE hspool, const DOCINFOW *doc_info ) DECLSPEC_HIDDEN; extern int spool_start_page( DC_ATTR *dc_attr, HANDLE hspool ) DECLSPEC_HIDDEN; -extern int spool_end_page( DC_ATTR *dc_attr, HANDLE hspool ) DECLSPEC_HIDDEN; +extern int spool_end_page( DC_ATTR *dc_attr, HANDLE hspool, const DEVMODEW *devmode, + BOOL write_devmode ) DECLSPEC_HIDDEN; extern int spool_end_doc( DC_ATTR *dc_attr, HANDLE hspool ) DECLSPEC_HIDDEN; extern int spool_abort_doc( DC_ATTR *dc_attr, HANDLE hspool ) DECLSPEC_HIDDEN;

1 0

Piotr Caban : gdi32: Implicitly call StartPage while drawing on printer DC.
by Alexandre Julliard April 28, 2023

April 28, 2023

Module: wine Branch: master Commit: 2b8de93005d4e3940dee266f18e9ed0f23a37b08 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b8de93005d4e3940dee266f18e9ed… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 27 16:54:57 2023 +0200 gdi32: Implicitly call StartPage while drawing on printer DC. --- dlls/gdi32/dc.c | 90 +++++++++++++++++++++++++++++++++++++++++++----- dlls/gdi32/emfdc.c | 14 -------- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/text.c | 1 + 4 files changed, 85 insertions(+), 22 deletions(-)

1 0

Piotr Caban : localspl: Add partial support for PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS attribute.
by Alexandre Julliard April 28, 2023

April 28, 2023

Module: wine Branch: master Commit: 70d84f70628a2a2a0bbb81713200347a24ad718e URL: https://gitlab.winehq.org/wine/wine/-/commit/70d84f70628a2a2a0bbb8171320034… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 27 14:34:39 2023 +0200 localspl: Add partial support for PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS attribute. --- dlls/localspl/provider.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 56014461012..9e990c75e0f 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3816,7 +3816,8 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) pp->close(hpp); print_proc_unload(pp); - DeleteFileW(job->filename); + if (!(printer->info->attributes & PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS)) + DeleteFileW(job->filename); free_job(job); LeaveCriticalSection(&printer->info->jobs_cs); return ret;

1 0