December 2022 - Wine-commits

Alex Henrie : winecfg: Use standard C functions for memory allocation.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 1f4532d5c63f8e53f968b998970b24e5c0d0b0b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f4532d5c63f8e53f968b998970b24… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 4 20:36:22 2022 -0700 winecfg: Use standard C functions for memory allocation. --- programs/winecfg/about.c | 8 +++--- programs/winecfg/appdefaults.c | 17 ++++++----- programs/winecfg/audio.c | 11 ++++---- programs/winecfg/drive.c | 24 ++++++++-------- programs/winecfg/driveui.c | 24 ++++++++-------- programs/winecfg/libraries.c | 32 ++++++++++----------- programs/winecfg/theme.c | 36 +++++++++++------------- programs/winecfg/winecfg.c | 64 ++++++++++++++++++++---------------------- programs/winecfg/winecfg.h | 24 ++++------------ programs/winecfg/x11drvdlg.c | 18 ++++++------ 10 files changed, 119 insertions(+), 139 deletions(-)

1 0

Alex Henrie : winecfg: Annotate allocation functions with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: b8b55de6290281013d4388d6f8a56409139f32e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/b8b55de6290281013d4388d6f8a564… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 4 20:36:22 2022 -0700 winecfg: Annotate allocation functions with __WINE_(DEALLOC|MALLOC). --- programs/winecfg/winecfg.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index fe635cccdd0..f3f3ad2addf 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -54,14 +54,15 @@ extern WCHAR* current_app; /* NULL means editing global settings */ void set_reg_key(HKEY root, const WCHAR *path, const WCHAR *name, const WCHAR *value); void set_reg_key_dword(HKEY root, const WCHAR *path, const WCHAR *name, DWORD value); -WCHAR *get_reg_key(HKEY root, const WCHAR *path, const WCHAR *name, const WCHAR *def); +WCHAR *get_reg_key(HKEY root, const WCHAR *path, const WCHAR *name, const WCHAR *def) + __WINE_DEALLOC(free) __WINE_MALLOC; BOOL reg_key_exists(HKEY root, const WCHAR *path, const WCHAR *name); void apply(void); -WCHAR **enumerate_values(HKEY root, const WCHAR *path); +WCHAR **enumerate_values(HKEY root, const WCHAR *path) __WINE_DEALLOC(free) __WINE_MALLOC; /* Load a string from the resources. Allocated with malloc */ -WCHAR* load_string (UINT id); +WCHAR* load_string(UINT id) __WINE_DEALLOC(free) __WINE_MALLOC; /* returns a string of the form "AppDefaults\\appname.exe\\section", or just "section" if the user is editing the global settings.

1 0

Eric Pouech : wineconsole: Set launched process name as created console title.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: cd0e949519cce5bda73d661a3bfbec2993bd3724 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd0e949519cce5bda73d661a3bfbec… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Dec 4 11:21:44 2022 +0100 wineconsole: Set launched process name as created console title. wineconsole was setting created console's title to '????\wineconsole.exe'. This was preventing conhost to load its configuration according to first running command path. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/wineconsole/wineconsole.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 1924bf791e6..aeeee11aa86 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -41,36 +41,38 @@ int WINAPI wWinMain( HINSTANCE inst, HINSTANCE prev, WCHAR *cmdline, INT show ) static WCHAR default_cmd[] = L"cmd"; - FreeConsole(); /* make sure we're not connected to inherited console */ - if (!AllocConsole()) - { - ERR( "failed to allocate console: %lu\n", GetLastError() ); - return 1; - } - if (!*cmd) cmd = default_cmd; - startup.dwFlags = STARTF_USESTDHANDLES; - startup.hStdInput = CreateFileW( L"CONIN$", GENERIC_READ | GENERIC_WRITE, 0, NULL, - OPEN_EXISTING, 0, 0 ); - startup.hStdOutput = CreateFileW( L"CONOUT$", GENERIC_READ | GENERIC_WRITE, 0, NULL, - OPEN_EXISTING, 0, 0 ); - startup.hStdError = startup.hStdOutput; - - if (!CreateProcessW( NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info )) + if (!CreateProcessW( NULL, cmd, NULL, NULL, FALSE, CREATE_NEW_CONSOLE, NULL, NULL, &startup, &info )) { + HANDLE hStdInput, hStdOutput; WCHAR format[256], *buf; INPUT_RECORD ir; DWORD len; + exit_code = GetLastError(); - WARN( "CreateProcess failed: %lu\n", exit_code ); + WARN( "CreateProcess '%ls' failed: %lu\n", cmd, exit_code ); + + /* create a new console to display error messages in it */ + FreeConsole(); /* make sure we're not connected to any console */ + if (!AllocConsole()) + { + ERR( "failed to allocate console: %lu\n", GetLastError() ); + return 1; + } + + hStdInput = CreateFileW( L"CONIN$", GENERIC_READ | GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, 0, 0 ); + hStdOutput = CreateFileW( L"CONOUT$", GENERIC_READ | GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, 0, 0 ); + LoadStringW( GetModuleHandleW( NULL ), IDS_CMD_LAUNCH_FAILED, format, ARRAY_SIZE(format) ); len = wcslen( format ) + wcslen( cmd ); if ((buf = malloc( len * sizeof(WCHAR) ))) { swprintf( buf, len, format, cmd ); - WriteConsoleW( startup.hStdOutput, buf, wcslen(buf), &len, NULL); - while (ReadConsoleInputW( startup.hStdInput, &ir, 1, &len ) && ir.EventType == MOUSE_EVENT); + WriteConsoleW( hStdOutput, buf, wcslen(buf), &len, NULL); + while (ReadConsoleInputW( hStdInput, &ir, 1, &len ) && ir.EventType == MOUSE_EVENT); } return exit_code; }

1 0

Robert Wilhelm : wshom.ocx: Implement WshNetwork2_GetIDsOfNames.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 52818894585311e6872ec881592941517c619eed URL: https://gitlab.winehq.org/wine/wine/-/commit/52818894585311e6872ec881592941… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Thu Dec 1 18:12:19 2022 +0100 wshom.ocx: Implement WshNetwork2_GetIDsOfNames. --- dlls/wshom.ocx/network.c | 15 +++++++++++++-- dlls/wshom.ocx/wshom_main.c | 3 ++- dlls/wshom.ocx/wshom_private.h | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c index 764a1d8b25a..fc4e30040ea 100644 --- a/dlls/wshom.ocx/network.c +++ b/dlls/wshom.ocx/network.c @@ -74,8 +74,19 @@ static HRESULT WINAPI WshNetwork2_GetTypeInfo(IWshNetwork2 *iface, UINT iTInfo, static HRESULT WINAPI WshNetwork2_GetIDsOfNames(IWshNetwork2 *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - FIXME("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IWshNetwork2_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI WshNetwork2_Invoke(IWshNetwork2 *iface, DISPID dispIdMember, REFIID riid, LCID lcid, diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index aed9f2dedf4..dda72f2796e 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -40,7 +40,8 @@ static REFIID tid_ids[] = { &IID_IWshEnvironment, &IID_IWshExec, &IID_IWshShell3, - &IID_IWshShortcut + &IID_IWshShortcut, + &IID_IWshNetwork2 }; static HRESULT load_typelib(void) diff --git a/dlls/wshom.ocx/wshom_private.h b/dlls/wshom.ocx/wshom_private.h index c2a66bf0610..709b8817342 100644 --- a/dlls/wshom.ocx/wshom_private.h +++ b/dlls/wshom.ocx/wshom_private.h @@ -33,6 +33,7 @@ typedef enum tid_t { IWshExec_tid, IWshShell3_tid, IWshShortcut_tid, + IWshNetwork2_tid, LAST_tid } tid_t;

1 0

Robert Wilhelm : wshom.ocx: Implement WshNetwork2_Invoke.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 848269ebb19cedfc4604b103296e9ddb95d2a71e URL: https://gitlab.winehq.org/wine/wine/-/commit/848269ebb19cedfc4604b103296e9d… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Thu Dec 1 22:30:12 2022 +0100 wshom.ocx: Implement WshNetwork2_Invoke. --- dlls/wshom.ocx/network.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c index fc4e30040ea..c33f4347762 100644 --- a/dlls/wshom.ocx/network.c +++ b/dlls/wshom.ocx/network.c @@ -26,6 +26,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wshom); +static IWshNetwork2 WshNetwork2; + static HRESULT WINAPI WshNetwork2_QueryInterface(IWshNetwork2 *iface, REFIID riid, void **ppv) { TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppv); @@ -92,9 +94,21 @@ static HRESULT WINAPI WshNetwork2_GetIDsOfNames(IWshNetwork2 *iface, REFIID riid static HRESULT WINAPI WshNetwork2_Invoke(IWshNetwork2 *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - FIXME("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + hr = get_typeinfo(IWshNetwork2_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &WshNetwork2, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI WshNetwork2_get_UserDomain(IWshNetwork2 *iface, BSTR *user_domain)

1 0

Alex Henrie : comctl32: Annotate (Re)Alloc with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 9aaf04687abd2fcc955dac0e5409ffa7e57bf0a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/9aaf04687abd2fcc955dac0e5409ff… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 1 19:40:20 2022 -0700 comctl32: Annotate (Re)Alloc with __WINE_(DEALLOC|MALLOC). --- dlls/comctl32/comctl32.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index f9ed8b84ffd..7dfdf089eb1 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -214,9 +214,9 @@ typedef struct /* undocumented functions */ -LPVOID WINAPI Alloc (DWORD) __WINE_ALLOC_SIZE(1); -LPVOID WINAPI ReAlloc (LPVOID, DWORD) __WINE_ALLOC_SIZE(2); BOOL WINAPI Free (LPVOID); +void * WINAPI Alloc (DWORD) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(Free) __WINE_MALLOC; +void * WINAPI ReAlloc (void *, DWORD) __WINE_ALLOC_SIZE(2) __WINE_DEALLOC(Free); DWORD WINAPI GetSize (LPVOID); INT WINAPI Str_GetPtrA (LPCSTR, LPSTR, INT);

1 0

Alex Henrie : wiaservc: Remove unused function wiaservc_strdup.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 0f7307b9df5b99f6296511340de1b47156215fff URL: https://gitlab.winehq.org/wine/wine/-/commit/0f7307b9df5b99f6296511340de1b4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 4 21:29:25 2022 -0700 wiaservc: Remove unused function wiaservc_strdup. This function has not been used since commit ee9698c55f647a3e9fea0ea71b2d01d6b91c430c. --- dlls/wiaservc/wiaservc_private.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/wiaservc/wiaservc_private.h b/dlls/wiaservc/wiaservc_private.h index 33c9ba10fc0..c8bdbaaa53f 100644 --- a/dlls/wiaservc/wiaservc_private.h +++ b/dlls/wiaservc/wiaservc_private.h @@ -36,13 +36,4 @@ typedef struct HRESULT wiadevmgr_Constructor(IWiaDevMgr **ppObj) DECLSPEC_HIDDEN; -/* Little helper functions */ -static inline char * -wiaservc_strdup(const char *s) -{ - size_t n = strlen(s) + 1; - char *d = HeapAlloc(GetProcessHeap(), 0, n); - return d ? memcpy(d, s, n) : NULL; -} - #endif /* __WIASERVC_PRIVATE__ */

1 0

Sven Baars : win32u: Use WMCHAR_MAP_SENDMESSAGE for NtUserSendMessage.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: e959299182d3807a439658ce824434acf0e92c14 URL: https://gitlab.winehq.org/wine/wine/-/commit/e959299182d3807a439658ce824434… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Dec 5 10:24:54 2022 +0100 win32u: Use WMCHAR_MAP_SENDMESSAGE for NtUserSendMessage. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52877 --- dlls/win32u/message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 6f78c99921a..8db81a57065 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2995,7 +2995,7 @@ static LRESULT send_window_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l info.lparam = lparam; info.flags = SMTO_NORMAL; info.timeout = 0; - info.wm_char = WMCHAR_MAP_SENDMESSAGETIMEOUT; + info.wm_char = WMCHAR_MAP_SENDMESSAGE; info.params = client_params; process_message( &info, &res, ansi );

1 0

Robert Wilhelm : wshom.ocx: Downgrade FIXME to WARN for unsupported interfaces.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 04a84bc7e968c8b5fd6bb992215d0d2db6f89b50 URL: https://gitlab.winehq.org/wine/wine/-/commit/04a84bc7e968c8b5fd6bb992215d0d… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Thu Dec 1 12:41:54 2022 +0100 wshom.ocx: Downgrade FIXME to WARN for unsupported interfaces. Scripting always checks for DispatchEx interface before falling back to Dispatch. --- dlls/wshom.ocx/network.c | 16 +++++++++------- dlls/wshom.ocx/tests/wshom.c | 2 ++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c index dcc52c02ed7..764a1d8b25a 100644 --- a/dlls/wshom.ocx/network.c +++ b/dlls/wshom.ocx/network.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "dispex.h" #include "wshom_private.h" #include "wshom.h" @@ -30,17 +33,16 @@ static HRESULT WINAPI WshNetwork2_QueryInterface(IWshNetwork2 *iface, REFIID rii if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDispatch) || IsEqualGUID(riid, &IID_IWshNetwork) || - IsEqualGUID(riid, &IID_IWshNetwork2)) - { + IsEqualGUID(riid, &IID_IWshNetwork2)) { *ppv = iface; - }else { - FIXME("Unknown iface %s\n", debugstr_guid(riid)); + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + else { + WARN("interface not supported %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; } static ULONG WINAPI WshNetwork2_AddRef(IWshNetwork2 *iface) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index d84eb0441ff..5b3b7f81720 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -700,6 +700,8 @@ static void test_wshnetwork(void) check_interface(disp, &IID_IWshNetwork, TRUE); check_interface(disp, &IID_IWshNetwork2, TRUE); + check_interface(disp, &IID_IDispatchEx, FALSE); + check_interface(disp, &IID_IObjectWithSite, FALSE); IDispatch_Release(disp); }

1 0

Sven Baars : mmdevapi/tests: Mark some more capture tests as flaky.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 0eeb471c8c630c2a2279e29ca47a6937ba798d95 URL: https://gitlab.winehq.org/wine/wine/-/commit/0eeb471c8c630c2a2279e29ca47a69… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Nov 25 11:07:23 2022 +0100 mmdevapi/tests: Mark some more capture tests as flaky. --- dlls/mmdevapi/tests/capture.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index e7865457cbe..f3b426a7f9a 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -307,7 +307,9 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) hr==S_OK ? (UINT)pos : -1, pad, flags, frames); if(hr == S_OK){ + flaky_wine ok(pos == sum, "Position %u expected %u\n", (UINT)pos, sum); + flaky_wine ok(!flags, "flags %lu\n", flags); hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); @@ -334,6 +336,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(pad > sum, "restarted GCP %u\n", pad); /* GCP is still near buffer size */ if(frames){ + flaky_wine ok(pos == sum, "Position %u expected %u\n", (UINT)pos, sum); ok(!flags, "flags %lu\n", flags);

1 0