June 2023 - Wine-commits - list.winehq.org

Rémi Bernon : winex11: Replace the clipping message HWND with a BOOL flag.
by Alexandre Julliard 15 Jun '23

15 Jun '23

Module: wine Branch: master Commit: 272f712b605174e946da1dc65f927a23ee92a572 URL: https://gitlab.winehq.org/wine/wine/-/commit/272f712b605174e946da1dc65f927a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 14 00:12:03 2023 +0200 winex11: Replace the clipping message HWND with a BOOL flag. We don't need the window anymore, it was only used to send ClipCursor notifications. This improves cursor clipping performance a lot as it avoids re-creating a window every time. --- dlls/winex11.drv/mouse.c | 28 +++++++--------------------- dlls/winex11.drv/x11drv.h | 2 +- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 7eb08d242eb..f2375a807b2 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -348,11 +348,8 @@ static void disable_xinput2(void) static BOOL grab_clipping_window( const RECT *clip ) { #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H - static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; struct x11drv_thread_data *data = x11drv_thread_data(); - UNICODE_STRING class_name = RTL_CONSTANT_STRING( messageW ); Window clip_window; - HWND msg_hwnd = 0; HCURSOR cursor; POINT pos; @@ -364,11 +361,6 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!data) return FALSE; if (!(clip_window = init_clip_window())) return TRUE; - if (!(msg_hwnd = NtUserCreateWindowEx( 0, &class_name, &class_name, NULL, 0, 0, 0, 0, 0, - HWND_MESSAGE, 0, NtCurrentTeb()->Peb->ImageBaseAddress, - NULL, 0, NULL, 0, FALSE ))) - return TRUE; - if (keyboard_grabbed) { WARN( "refusing to clip to %s\n", wine_dbgstr_rect(clip) ); @@ -376,26 +368,25 @@ static BOOL grab_clipping_window( const RECT *clip ) } /* enable XInput2 unless we are already clipping */ - if (!data->clip_hwnd) enable_xinput2(); + if (!data->clipping_cursor) enable_xinput2(); if (data->xi2_state != xi_enabled) { WARN( "XInput2 not supported, refusing to clip to %s\n", wine_dbgstr_rect(clip) ); - NtUserDestroyWindow( msg_hwnd ); NtUserClipCursor( NULL ); return TRUE; } TRACE( "clipping to %s win %lx\n", wine_dbgstr_rect(clip), clip_window ); - if (!data->clip_hwnd) XUnmapWindow( data->display, clip_window ); + if (!data->clipping_cursor) XUnmapWindow( data->display, clip_window ); pos = virtual_screen_to_root( clip->left, clip->top ); XMoveResizeWindow( data->display, clip_window, pos.x, pos.y, max( 1, clip->right - clip->left ), max( 1, clip->bottom - clip->top ) ); XMapWindow( data->display, clip_window ); /* if the rectangle is shrinking we may get a pointer warp */ - if (!data->clip_hwnd || clip->left > clip_rect.left || clip->top > clip_rect.top || + if (!data->clipping_cursor || clip->left > clip_rect.left || clip->top > clip_rect.top || clip->right < clip_rect.right || clip->bottom < clip_rect.bottom) data->warp_serial = NextRequest( data->display ); @@ -418,11 +409,10 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!clipping_cursor) { disable_xinput2(); - NtUserDestroyWindow( msg_hwnd ); return FALSE; } clip_rect = *clip; - data->clip_hwnd = msg_hwnd; + data->clipping_cursor = TRUE; return TRUE; #else WARN( "XInput2 was not available at compile time\n" ); @@ -446,8 +436,7 @@ void ungrab_clipping_window(void) XUnmapWindow( data->display, clip_window ); if (clipping_cursor) XUngrabPointer( data->display, CurrentTime ); clipping_cursor = FALSE; - NtUserDestroyWindow( data->clip_hwnd ); - data->clip_hwnd = 0; + data->clipping_cursor = FALSE; disable_xinput2(); } @@ -495,7 +484,7 @@ static void map_event_coords( HWND hwnd, Window window, Window event_root, int x if (!hwnd) { thread_data = x11drv_thread_data(); - if (!thread_data->clip_hwnd) return; + if (!thread_data->clipping_cursor) return; if (thread_data->clip_window != window) return; pt.x += clip_rect.left; pt.y += clip_rect.top; @@ -539,10 +528,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU if (!hwnd) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); - HWND clip_hwnd = thread_data->clip_hwnd; - - if (!clip_hwnd) return; - if (thread_data->clip_window != window) return; + if (!thread_data->clipping_cursor || thread_data->clip_window != window) return; __wine_send_input( hwnd, input, NULL ); return; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 26b4ffd9a1d..ef3f620dc52 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -388,7 +388,7 @@ struct x11drv_thread_data Window selection_wnd; /* window used for selection interactions */ unsigned long warp_serial; /* serial number of last pointer warp request */ Window clip_window; /* window used for cursor clipping */ - HWND clip_hwnd; /* message window stored in desktop while clipping is active */ + BOOL clipping_cursor; /* whether thread is currently clipping the cursor */ #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */ void *xi2_devices; /* list of XInput2 devices (valid when state is enabled) */

1 0

Ziqing Hui : winegstreamer: Implement Flush for WMV decoder DMO.
by Alexandre Julliard 15 Jun '23

15 Jun '23

Module: wine Branch: master Commit: 8e3f316cc9fb7bb9a384986b19b6978ed671b6aa URL: https://gitlab.winehq.org/wine/wine/-/commit/8e3f316cc9fb7bb9a384986b19b697… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jun 14 10:20:39 2023 +0800 winegstreamer: Implement Flush for WMV decoder DMO. --- dlls/mf/tests/transform.c | 3 --- dlls/winegstreamer/wmv_decoder.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 1eb0fd2c719..9ba1dfc9660 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -6392,10 +6392,8 @@ static void test_wmv_decoder_media_object(void) hr = IMediaObject_ProcessInput(media_object, 0, &input_media_buffer->IMediaBuffer_iface, 0, 0, 0); ok(hr == S_OK, "ProcessInput returned %#lx.\n", hr); hr = IMediaObject_Flush(media_object); - todo_wine ok(hr == S_OK, "Flush returned %#lx.\n", hr); hr = IMediaObject_Flush(media_object); - todo_wine ok(hr == S_OK, "Flush returned %#lx.\n", hr); output_media_buffer->length = 0; output_data_buffer.pBuffer = &output_media_buffer->IMediaBuffer_iface; @@ -6405,7 +6403,6 @@ static void test_wmv_decoder_media_object(void) hr = IMediaObject_ProcessOutput(media_object, 0, 1, &output_data_buffer, &status); todo_wine ok(hr == S_FALSE, "ProcessOutput returned %#lx.\n", hr); - todo_wine ok(output_media_buffer->length == 0, "Unexpected length %#lx.\n", output_media_buffer->length); /* Test ProcessOutput with setting framerate. */ diff --git a/dlls/winegstreamer/wmv_decoder.c b/dlls/winegstreamer/wmv_decoder.c index 32dbbbbe686..d6c95cbd526 100644 --- a/dlls/winegstreamer/wmv_decoder.c +++ b/dlls/winegstreamer/wmv_decoder.c @@ -657,8 +657,17 @@ static HRESULT WINAPI media_object_SetInputMaxLatency(IMediaObject *iface, DWORD static HRESULT WINAPI media_object_Flush(IMediaObject *iface) { - FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + struct wmv_decoder *decoder = impl_from_IMediaObject(iface); + HRESULT hr; + + TRACE("iface %p.\n", iface); + + if (FAILED(hr = wg_transform_flush(decoder->wg_transform))) + return hr; + + wg_sample_queue_flush(decoder->wg_sample_queue, TRUE); + + return S_OK; } static HRESULT WINAPI media_object_Discontinuity(IMediaObject *iface, DWORD index)

1 0

Alex Henrie : rpcrt4: Don't use GetProcAddress for ole32 functions.
by Alexandre Julliard 15 Jun '23

15 Jun '23

Module: wine Branch: master Commit: f0b0c7f4641d129e6b306534084e77cc4cfd1e94 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0b0c7f4641d129e6b306534084e77… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 6 22:18:05 2023 -0600 rpcrt4: Don't use GetProcAddress for ole32 functions. It's more elegant to put ole32 in the DELAYIMPORTS. --- dlls/rpcrt4/Makefile.in | 2 +- dlls/rpcrt4/ndr_ole.c | 62 +++++++++++-------------------------------------- 2 files changed, 14 insertions(+), 50 deletions(-) diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index 2aa2a5376aa..3542118d1a0 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_RPCRT4_ -DMSWMSG MODULE = rpcrt4.dll IMPORTLIB = rpcrt4 IMPORTS = uuid advapi32 -DELAYIMPORTS = iphlpapi wininet secur32 user32 ws2_32 oleaut32 +DELAYIMPORTS = iphlpapi wininet secur32 user32 ws2_32 ole32 oleaut32 ndr_types_EXTRAIDLFLAGS = -Oicf diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 2fdc7b55335..69ce3e1871b 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -44,33 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -static HMODULE hOLE; - -static HRESULT (WINAPI *COM_GetMarshalSizeMax)(ULONG *,REFIID,LPUNKNOWN,DWORD,LPVOID,DWORD); -static HRESULT (WINAPI *COM_MarshalInterface)(LPSTREAM,REFIID,LPUNKNOWN,DWORD,LPVOID,DWORD); -static HRESULT (WINAPI *COM_UnmarshalInterface)(LPSTREAM,REFIID,LPVOID*); -static HRESULT (WINAPI *COM_ReleaseMarshalData)(LPSTREAM); -static HRESULT (WINAPI *COM_GetClassObject)(REFCLSID,DWORD,COSERVERINFO *,REFIID,LPVOID *); -static HRESULT (WINAPI *COM_GetPSClsid)(REFIID,CLSID *); -static LPVOID (WINAPI *COM_MemAlloc)(ULONG); -static void (WINAPI *COM_MemFree)(LPVOID); - -static HMODULE LoadCOM(void) -{ - if (hOLE) return hOLE; - hOLE = LoadLibraryA("OLE32.DLL"); - if (!hOLE) return 0; - COM_GetMarshalSizeMax = (LPVOID)GetProcAddress(hOLE, "CoGetMarshalSizeMax"); - COM_MarshalInterface = (LPVOID)GetProcAddress(hOLE, "CoMarshalInterface"); - COM_UnmarshalInterface = (LPVOID)GetProcAddress(hOLE, "CoUnmarshalInterface"); - COM_ReleaseMarshalData = (LPVOID)GetProcAddress(hOLE, "CoReleaseMarshalData"); - COM_GetClassObject = (LPVOID)GetProcAddress(hOLE, "CoGetClassObject"); - COM_GetPSClsid = (LPVOID)GetProcAddress(hOLE, "CoGetPSClsid"); - COM_MemAlloc = (LPVOID)GetProcAddress(hOLE, "CoTaskMemAlloc"); - COM_MemFree = (LPVOID)GetProcAddress(hOLE, "CoTaskMemFree"); - return hOLE; -} - /* CoMarshalInterface/CoUnmarshalInterface works on streams, * so implement a simple stream on top of the RPC buffer * (which also implements the MInterfacePointer structure) */ @@ -313,14 +286,13 @@ unsigned char * WINAPI NdrInterfacePointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); pStubMsg->MaxCount = 0; - if (!LoadCOM()) return NULL; if (pStubMsg->Buffer + sizeof(DWORD) <= (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { hr = RpcStream_Create(pStubMsg, TRUE, NULL, &stream); if (hr == S_OK) { if (pMemory) - hr = COM_MarshalInterface(stream, riid, (LPUNKNOWN)pMemory, - pStubMsg->dwDestContext, pStubMsg->pvDestContext, - MSHLFLAGS_NORMAL); + hr = CoMarshalInterface(stream, riid, (IUnknown *)pMemory, + pStubMsg->dwDestContext, pStubMsg->pvDestContext, + MSHLFLAGS_NORMAL); IStream_Release(stream); } @@ -343,7 +315,6 @@ unsigned char * WINAPI NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg HRESULT hr; TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); - if (!LoadCOM()) return NULL; /* Avoid reference leaks for [in, out] pointers. */ if (pStubMsg->IsClient && *unk) @@ -356,7 +327,7 @@ unsigned char * WINAPI NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg hr = RpcStream_Create(pStubMsg, FALSE, &size, &stream); if (hr == S_OK) { if (size != 0) - hr = COM_UnmarshalInterface(stream, &IID_NULL, (void **)unk); + hr = CoUnmarshalInterface(stream, &IID_NULL, (void **)unk); IStream_Release(stream); } @@ -378,10 +349,9 @@ void WINAPI NdrInterfacePointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, ULONG size = 0; TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); - if (!LoadCOM()) return; - COM_GetMarshalSizeMax(&size, riid, (LPUNKNOWN)pMemory, - pStubMsg->dwDestContext, pStubMsg->pvDestContext, - MSHLFLAGS_NORMAL); + CoGetMarshalSizeMax(&size, riid, (IUnknown *)pMemory, + pStubMsg->dwDestContext, pStubMsg->pvDestContext, + MSHLFLAGS_NORMAL); TRACE("size=%ld\n", size); pStubMsg->BufferLength += sizeof(DWORD) + size; } @@ -422,8 +392,7 @@ void WINAPI NdrInterfacePointerFree(PMIDL_STUB_MESSAGE pStubMsg, */ void * WINAPI NdrOleAllocate(SIZE_T Size) { - if (!LoadCOM()) return NULL; - return COM_MemAlloc(Size); + return CoTaskMemAlloc(Size); } /*********************************************************************** @@ -431,8 +400,7 @@ void * WINAPI NdrOleAllocate(SIZE_T Size) */ void WINAPI NdrOleFree(void *NodeToFree) { - if (!LoadCOM()) return; - COM_MemFree(NodeToFree); + CoTaskMemFree(NodeToFree); } /*********************************************************************** @@ -445,12 +413,10 @@ HRESULT create_proxy(REFIID iid, IUnknown *pUnkOuter, IRpcProxyBuffer **pproxy, IPSFactoryBuffer *psfac; HRESULT r; - if(!LoadCOM()) return E_FAIL; - - r = COM_GetPSClsid( iid, &clsid ); + r = CoGetPSClsid(iid, &clsid); if(FAILED(r)) return r; - r = COM_GetClassObject( &clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IPSFactoryBuffer, (void**)&psfac ); + r = CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IPSFactoryBuffer, (void **)&psfac); if(FAILED(r)) return r; r = IPSFactoryBuffer_CreateProxy(psfac, pUnkOuter, iid, pproxy, ppv); @@ -469,12 +435,10 @@ HRESULT create_stub(REFIID iid, IUnknown *pUnk, IRpcStubBuffer **ppstub) IPSFactoryBuffer *psfac; HRESULT r; - if(!LoadCOM()) return E_FAIL; - - r = COM_GetPSClsid( iid, &clsid ); + r = CoGetPSClsid(iid, &clsid); if(FAILED(r)) return r; - r = COM_GetClassObject( &clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IPSFactoryBuffer, (void**)&psfac ); + r = CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IPSFactoryBuffer, (void **)&psfac); if(FAILED(r)) return r; r = IPSFactoryBuffer_CreateStub(psfac, iid, pUnk, ppstub);

1 0

Fabian Maurer : mmdevapi: Don't redefine stream_handle (gcc 4.3).
by Alexandre Julliard 15 Jun '23

15 Jun '23

Module: wine Branch: master Commit: a58ec769890883bb7cb15c916a3f6dee76f8b8c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/a58ec769890883bb7cb15c916a3f6d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jun 13 21:31:02 2023 +0200 mmdevapi: Don't redefine stream_handle (gcc 4.3). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/mmdevapi/client.c | 2 +- dlls/mmdevapi/mmdevapi_private.h | 2 +- dlls/mmdevapi/mmdevdrv.h | 2 -- dlls/mmdevapi/session.c | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index b1b178e00a5..8eb6d6867dc 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -28,8 +28,8 @@ #include <wine/debug.h> #include <wine/unixlib.h> -#include "mmdevdrv.h" #include "unixlib.h" +#include "mmdevdrv.h" WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); diff --git a/dlls/mmdevapi/mmdevapi_private.h b/dlls/mmdevapi/mmdevapi_private.h index 5abde115951..1cd8412b6ea 100644 --- a/dlls/mmdevapi/mmdevapi_private.h +++ b/dlls/mmdevapi/mmdevapi_private.h @@ -23,8 +23,8 @@ #include <wine/list.h> #include <wine/unixlib.h> -#include "mmdevdrv.h" #include "unixlib.h" +#include "mmdevdrv.h" extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN; diff --git a/dlls/mmdevapi/mmdevdrv.h b/dlls/mmdevapi/mmdevdrv.h index 5c26b1b34d8..df21859cbad 100644 --- a/dlls/mmdevapi/mmdevdrv.h +++ b/dlls/mmdevapi/mmdevdrv.h @@ -19,8 +19,6 @@ #include <wine/list.h> -typedef UINT64 stream_handle; - typedef struct audio_client ACImpl; typedef struct audio_session { diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c index e0625b59993..6762dad255e 100644 --- a/dlls/mmdevapi/session.c +++ b/dlls/mmdevapi/session.c @@ -28,8 +28,8 @@ #include <wine/debug.h> #include <wine/unixlib.h> -#include "mmdevdrv.h" #include "unixlib.h" +#include "mmdevdrv.h" #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)

1 0

Bernhard Kölbl : mf: Clear queued topologies on session shutdown.
by Alexandre Julliard 15 Jun '23

15 Jun '23

Module: wine Branch: master Commit: bea37208fe2fc0ebff0d3c0fce5f98ce8f98b88b URL: https://gitlab.winehq.org/wine/wine/-/commit/bea37208fe2fc0ebff0d3c0fce5f98… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue May 30 23:25:27 2023 +0200 mf: Clear queued topologies on session shutdown. Programs might expect objects inside the queued toplogy to be freed, before they eventually call release on the session itself. This fixes reference leaks to stored objects in queued topology nodes, even when IMFMediaSession_Shutdown() was called. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/mf/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 8b29c8487fb..3641cc74b83 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2225,6 +2225,7 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) IMFPresentationClock_Release(session->clock); session->clock = NULL; session_clear_presentation(session); + session_clear_queued_topologies(session); session_submit_simple_command(session, SESSION_CMD_SHUTDOWN); } LeaveCriticalSection(&session->cs);

1 0

Bernhard Kölbl : mf: Don't leak sink in session_get_renderer_node_service().
by Alexandre Julliard 15 Jun '23

15 Jun '23

Module: wine Branch: master Commit: f19a0fb6c2dd4d3980ade77aa5a86d3eb48f2672 URL: https://gitlab.winehq.org/wine/wine/-/commit/f19a0fb6c2dd4d3980ade77aa5a86d… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri Jun 2 19:10:48 2023 +0200 mf: Don't leak sink in session_get_renderer_node_service(). Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/mf/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 3641cc74b83..555a71dcdf7 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2397,6 +2397,7 @@ static HRESULT session_get_renderer_node_service(struct media_session *session, if (FAILED(hr = MFGetService((IUnknown *)sink, service, riid, obj))) WARN("Failed to get service from renderer node, %#lx.\n", hr); } + IMFMediaSink_Release(sink); } IMFStreamSink_Release(stream_sink); }

1 0

Nikolay Sivov : scrrun/dictionary: Compare key values in addition to their hashes.
by Alexandre Julliard 14 Jun '23

14 Jun '23

Module: wine Branch: master Commit: e6229b52735a182864dcd0a2bad7117fc0446004 URL: https://gitlab.winehq.org/wine/wine/-/commit/e6229b52735a182864dcd0a2bad711… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 14 06:45:23 2023 +0200 scrrun/dictionary: Compare key values in addition to their hashes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/scrrun/dictionary.c | 91 +++++++++++++++++++++++++++++++++++------- dlls/scrrun/tests/dictionary.c | 68 ++++++++++++++++++++++++++++--- 2 files changed, 139 insertions(+), 20 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index bb9c3610d1b..d69b513efc2 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -101,7 +101,28 @@ static inline struct list *get_bucket_head(struct dictionary *dict, DWORD hash) static inline BOOL is_string_key(const VARIANT *key) { - return V_VT(key) == VT_BSTR || V_VT(key) == (VT_BSTR|VT_BYREF); + return V_VT(key) == VT_BSTR; +} + +static inline BOOL is_ptr_key(const VARIANT *key) +{ + return V_VT(key) == VT_UNKNOWN || V_VT(key) == VT_DISPATCH; +} + +static inline BOOL is_numeric_key(const VARIANT *key) +{ + switch (V_VT(key)) + { + case VT_UI1: + case VT_I2: + case VT_I4: + case VT_DATE: + case VT_R4: + case VT_R8: + return TRUE; + default: + return FALSE; + } } /* Only for VT_BSTR or VT_BSTR|VT_BYREF types */ @@ -126,28 +147,59 @@ static inline int strcmp_key(const struct dictionary *dict, const VARIANT *key1, return dict->method == BinaryCompare ? wcscmp(str1, str2) : wcsicmp(str1, str2); } -static BOOL is_matching_key(const struct dictionary *dict, const struct keyitem_pair *pair, const VARIANT *key, DWORD hash) +static inline BOOL numeric_key_eq(const VARIANT *key1, const VARIANT *key2) { - if (is_string_key(key) && is_string_key(&pair->key)) { - if (hash != pair->hash) - return FALSE; + VARIANT v1, v2; - return strcmp_key(dict, key, &pair->key) == 0; - } + VariantInit(&v1); + if (FAILED(VariantChangeType(&v1, key1, 0, VT_R4))) + return FALSE; - if ((is_string_key(key) && !is_string_key(&pair->key)) || - (!is_string_key(key) && is_string_key(&pair->key))) + VariantInit(&v2); + if (FAILED(VariantChangeType(&v2, key2, 0, VT_R4))) return FALSE; - /* for numeric keys only check hash */ - return hash == pair->hash; + return V_R4(&v1) == V_R4(&v2); +} + +static BOOL is_matching_key(const struct dictionary *dict, const struct keyitem_pair *pair, const VARIANT *key, DWORD hash) +{ + if (is_string_key(key) != is_string_key(&pair->key)) + { + return FALSE; + } + else if (is_string_key(key) && is_string_key(&pair->key)) + { + return hash == pair->hash && !strcmp_key(dict, key, &pair->key); + } + else if (is_ptr_key(key) != is_ptr_key(&pair->key)) + { + return FALSE; + } + else if (is_ptr_key(key) && is_ptr_key(&pair->key)) + { + return hash == pair->hash && V_UNKNOWN(key) == V_UNKNOWN(&pair->key); + } + else if (is_numeric_key(key) != is_numeric_key(&pair->key)) + { + return FALSE; + } + else if (is_numeric_key(key) && is_numeric_key(&pair->key)) + { + return hash == pair->hash && numeric_key_eq(key, &pair->key); + } + else + { + WARN("Unexpected key type %#x.\n", V_VT(key)); + return FALSE; + } } static struct keyitem_pair *get_keyitem_pair(struct dictionary *dict, VARIANT *key) { struct keyitem_pair *pair; struct list *head, *entry; - VARIANT hash; + VARIANT hash, v; HRESULT hr; hr = IDictionary_get_HashVal(&dict->IDictionary_iface, key, &hash); @@ -158,12 +210,23 @@ static struct keyitem_pair *get_keyitem_pair(struct dictionary *dict, VARIANT *k if (!head->next || list_empty(head)) return NULL; + VariantInit(&v); + if (FAILED(VariantCopyInd(&v, key))) + return NULL; + entry = list_head(head); - do { + do + { pair = LIST_ENTRY(entry, struct keyitem_pair, bucket); - if (is_matching_key(dict, pair, key, V_I4(&hash))) return pair; + if (is_matching_key(dict, pair, &v, V_I4(&hash))) + { + VariantClear(&v); + return pair; + } } while ((entry = list_next(head, entry))); + VariantClear(&v); + return NULL; } diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 16a195955ac..3232ef7321a 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -341,7 +341,7 @@ static void test_hash_value(void) }; static const FLOAT float_hash_tests[] = { - 0.0, -1.0, 100.0, 1.0, 255.0, 1.234 + 0.0, -1.0, 100.0, 1.0, 255.0, 1.234, 2175.0, 6259.0 }; IDictionary *dict; @@ -848,6 +848,29 @@ static void test_Keys(void) VariantClear(&keys); + hr = IDictionary_RemoveAll(dict); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + /* Integer key type. */ + V_VT(&key) = VT_I4; + V_I4(&key) = 0; + VariantInit(&item); + hr = IDictionary_Add(dict, &key, &item); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + VariantInit(&keys); + hr = IDictionary_Keys(dict, &keys); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&keys) == (VT_ARRAY|VT_VARIANT), "got %d\n", V_VT(&keys)); + + VariantInit(&key); + index = 0; + hr = SafeArrayGetElement(V_ARRAY(&keys), &index, &key); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&key) == VT_I4, "got %d\n", V_VT(&key)); + + VariantClear(&keys); + IDictionary_Release(dict); } @@ -910,7 +933,7 @@ static void test_Item(void) static void test_Add(void) { - VARIANT key, item; + VARIANT item, key1, key2, hash1, hash2; IDictionary *dict; HRESULT hr; BSTR str; @@ -920,19 +943,52 @@ static void test_Add(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = SysAllocString(L"testW"); - V_VT(&key) = VT_I2; - V_I2(&key) = 1; + V_VT(&key1) = VT_I2; + V_I2(&key1) = 1; V_VT(&item) = VT_BSTR|VT_BYREF; V_BSTRREF(&item) = &str; - hr = IDictionary_Add(dict, &key, &item); + hr = IDictionary_Add(dict, &key1, &item); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IDictionary_get_Item(dict, &key, &item); + hr = IDictionary_get_Item(dict, &key1, &item); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&item) == VT_BSTR, "got %d\n", V_VT(&item)); SysFreeString(str); + /* Items with matching key hashes, float keys. */ + V_VT(&key1) = VT_R4; + V_R4(&key1) = 2175.0; + + V_VT(&key2) = VT_R4; + V_R4(&key2) = 6259.0; + + VariantInit(&hash1); + hr = IDictionary_get_HashVal(dict, &key1, &hash1); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + VariantInit(&hash2); + hr = IDictionary_get_HashVal(dict, &key1, &hash2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&hash1) == VT_I4, "Unexpected type %d.\n", V_VT(&hash1)); + ok(V_VT(&hash2) == VT_I4, "Unexpected type %d.\n", V_VT(&hash2)); + ok(V_I4(&hash1) == V_I4(&hash2), "Unexpected hash %#lx.\n", V_I4(&hash1)); + + V_VT(&item) = VT_BSTR; + V_BSTR(&item) = SysAllocString(L"float1"); + + hr = IDictionary_Add(dict, &key1, &item); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IDictionary_Add(dict, &key2, &item); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + V_VT(&key1) = VT_I4; + V_I4(&key1) = 2175; + + hr = IDictionary_Add(dict, &key1, &item); + ok(hr == CTL_E_KEY_ALREADY_EXISTS, "Unexpected hr %#lx.\n", hr); + + VariantClear(&item); + IDictionary_Release(dict); }

1 0

Alex Henrie : shell32: Fix memory leak on error path in FolderItems_Constructor (scan-build).
by Alexandre Julliard 14 Jun '23

14 Jun '23

Module: wine Branch: master Commit: 9c4d30ad70af063d806c8724c4f05de7a63e4d6a URL: https://gitlab.winehq.org/wine/wine/-/commit/9c4d30ad70af063d806c8724c4f05d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 11 22:47:18 2023 -0600 shell32: Fix memory leak on error path in FolderItems_Constructor (scan-build). --- dlls/shell32/shelldispatch.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 01353bda82d..dd58c755c61 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1682,6 +1682,7 @@ static HRESULT FolderItems_Constructor(FolderImpl *folder, FolderItems **ret) return S_OK; failed: + FolderItemsImpl_Release(&This->FolderItems3_iface); if (enumidlist) IEnumIDList_Release(enumidlist); return hr;

1 0

Akihiro Sagawa : commdlg: Fix dialog template parser when caption starts with a DBCS character.
by Alexandre Julliard 14 Jun '23

14 Jun '23

Module: wine Branch: master Commit: c43a4aee7785fef67acd86b4b13467b33b8066d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/c43a4aee7785fef67acd86b4b13467… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jun 13 23:04:41 2023 +0900 commdlg: Fix dialog template parser when caption starts with a DBCS character. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55043 --- dlls/commdlg.dll16/filedlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c index b292561b077..33feda55ca3 100644 --- a/dlls/commdlg.dll16/filedlg.c +++ b/dlls/commdlg.dll16/filedlg.c @@ -114,7 +114,7 @@ static LPDLGTEMPLATEA convert_dialog( const char *p, DWORD size ) } else copy_string( &out, &p, end - out ); - if (*p & 0x80) /* window */ + if ((BYTE)*p == 0xff) /* window */ { *out++ = 0xffff; *out++ = get_word( &p );

1 0

Shaun Ren : sapi: Partially implement ISpMMSysAudio::SetState.
by Alexandre Julliard 14 Jun '23

14 Jun '23

Module: wine Branch: master Commit: 107d95165a0902828124bb1d9bf5adda987c9810 URL: https://gitlab.winehq.org/wine/wine/-/commit/107d95165a0902828124bb1d9bf5ad… Author: Shaun Ren <sren(a)codeweavers.com> Date: Sat May 27 17:20:03 2023 -0400 sapi: Partially implement ISpMMSysAudio::SetState. --- dlls/sapi/mmaudio.c | 73 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/sapi/tests/mmaudio.c | 62 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/mmaudio.c b/dlls/sapi/mmaudio.c index 690e540122b..20e6cc5064f 100644 --- a/dlls/sapi/mmaudio.c +++ b/dlls/sapi/mmaudio.c @@ -53,7 +53,13 @@ struct mmaudio enum flow_type flow; ISpObjectToken *token; UINT device_id; + SPAUDIOSTATE state; WAVEFORMATEX *wfx; + union + { + HWAVEIN in; + HWAVEOUT out; + } hwave; CRITICAL_SECTION cs; }; @@ -363,6 +369,8 @@ static ULONG WINAPI mmsysaudio_Release(ISpMMSysAudio *iface) if (!ref) { + ISpMMSysAudio_SetState(iface, SPAS_CLOSED, 0); + if (This->token) ISpObjectToken_Release(This->token); heap_free(This->wfx); DeleteCriticalSection(&This->cs); @@ -481,9 +489,45 @@ static HRESULT WINAPI mmsysaudio_GetFormat(ISpMMSysAudio *iface, GUID *format, W static HRESULT WINAPI mmsysaudio_SetState(ISpMMSysAudio *iface, SPAUDIOSTATE state, ULONGLONG reserved) { - FIXME("(%p, %u, %s): stub.\n", iface, state, wine_dbgstr_longlong(reserved)); + struct mmaudio *This = impl_from_ISpMMSysAudio(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("(%p, %u, %s).\n", iface, state, wine_dbgstr_longlong(reserved)); + + if (state != SPAS_CLOSED && state != SPAS_RUN) + { + FIXME("state %#x not implemented.\n", state); + return E_NOTIMPL; + } + + EnterCriticalSection(&This->cs); + + if (This->state == state) + goto done; + + if (This->state == SPAS_CLOSED) + { + if (waveOutOpen(&This->hwave.out, This->device_id, This->wfx, 0, 0, 0) != MMSYSERR_NOERROR) + { + hr = SPERR_GENERIC_MMSYS_ERROR; + goto done; + } + } + + if (state == SPAS_CLOSED && This->state != SPAS_CLOSED) + { + if (waveOutClose(This->hwave.out) != MMSYSERR_NOERROR) + { + hr = SPERR_GENERIC_MMSYS_ERROR; + goto done; + } + } + + This->state = state; + +done: + LeaveCriticalSection(&This->cs); + return hr; } static HRESULT WINAPI mmsysaudio_SetFormat(ISpMMSysAudio *iface, const GUID *guid, const WAVEFORMATEX *wfx) @@ -499,6 +543,18 @@ static HRESULT WINAPI mmsysaudio_SetFormat(ISpMMSysAudio *iface, const GUID *gui EnterCriticalSection(&This->cs); + if (!memcmp(wfx, This->wfx, sizeof(*wfx)) && !memcmp(wfx + 1, This->wfx + 1, wfx->cbSize)) + { + LeaveCriticalSection(&This->cs); + return S_OK; + } + + if (This->state != SPAS_CLOSED) + { + LeaveCriticalSection(&This->cs); + return SPERR_DEVICE_BUSY; + } + /* Determine whether the device supports the requested format. */ res = waveOutOpen(NULL, This->device_id, wfx, 0, 0, WAVE_FORMAT_QUERY); if (res != MMSYSERR_NOERROR) @@ -609,7 +665,19 @@ static HRESULT WINAPI mmsysaudio_SetDeviceId(ISpMMSysAudio *iface, UINT id) return E_INVALIDARG; EnterCriticalSection(&This->cs); + + if (id == This->device_id) + { + LeaveCriticalSection(&This->cs); + return S_OK; + } + if (This->state != SPAS_CLOSED) + { + LeaveCriticalSection(&This->cs); + return SPERR_DEVICE_BUSY; + } This->device_id = id; + LeaveCriticalSection(&This->cs); return S_OK; @@ -693,6 +761,7 @@ static HRESULT mmaudio_create(IUnknown *outer, REFIID iid, void **obj, enum flow This->flow = flow; This->token = NULL; This->device_id = WAVE_MAPPER; + This->state = SPAS_CLOSED; if (!(This->wfx = heap_alloc(sizeof(*This->wfx)))) { diff --git a/dlls/sapi/tests/mmaudio.c b/dlls/sapi/tests/mmaudio.c index 8611242e2b7..85a3570f490 100644 --- a/dlls/sapi/tests/mmaudio.c +++ b/dlls/sapi/tests/mmaudio.c @@ -158,11 +158,73 @@ static void test_formats(void) ISpMMSysAudio_Release(mmaudio); } +static void test_audio_out(void) +{ + ISpMMSysAudio *mmaudio; + GUID fmtid; + WAVEFORMATEX *wfx = NULL; + UINT devid; + HRESULT hr; + + if (waveOutGetNumDevs() == 0) { + skip("no wave out devices.\n"); + return; + } + + hr = CoCreateInstance(&CLSID_SpMMAudioOut, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpMMSysAudio, (void **)&mmaudio); + ok(hr == S_OK, "failed to create SPMMAudioOut instance: %#lx.\n", hr); + + hr = ISpMMSysAudio_SetState(mmaudio, SPAS_CLOSED, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = ISpMMSysAudio_GetFormat(mmaudio, &fmtid, &wfx); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(IsEqualGUID(&fmtid, &SPDFID_WaveFormatEx), "got %s.\n", wine_dbgstr_guid(&fmtid)); + ok(wfx != NULL, "wfx == NULL.\n"); + + hr = ISpMMSysAudio_SetFormat(mmaudio, &fmtid, wfx); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = ISpMMSysAudio_SetDeviceId(mmaudio, WAVE_MAPPER); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = ISpMMSysAudio_SetState(mmaudio, SPAS_RUN, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = ISpMMSysAudio_SetDeviceId(mmaudio, WAVE_MAPPER); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = ISpMMSysAudio_SetDeviceId(mmaudio, 0); + ok(hr == SPERR_DEVICE_BUSY, "got %#lx.\n", hr); + + hr = ISpMMSysAudio_SetFormat(mmaudio, &fmtid, wfx); + ok(hr == S_OK, "got %#lx.\n", hr); + + wfx->nChannels = wfx->nChannels == 1 ? 2 : 1; + wfx->nAvgBytesPerSec = wfx->nSamplesPerSec * wfx->nChannels * wfx->wBitsPerSample / 8; + wfx->nBlockAlign = wfx->nChannels * wfx->wBitsPerSample / 8; + hr = ISpMMSysAudio_SetFormat(mmaudio, &fmtid, wfx); + ok(hr == SPERR_DEVICE_BUSY, "got %#lx.\n", hr); + + devid = 0xdeadbeef; + hr = ISpMMSysAudio_GetDeviceId(mmaudio, &devid); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(devid == WAVE_MAPPER, "got %#x.\n", devid); + + hr = ISpMMSysAudio_SetState(mmaudio, SPAS_CLOSED, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + + CoTaskMemFree(wfx); + ISpMMSysAudio_Release(mmaudio); +} + START_TEST(mmaudio) { CoInitialize(NULL); test_interfaces(); test_device_id(); test_formats(); + test_audio_out(); CoUninitialize(); }

1 0