December 2021 - Wine-commits

Eric Pouech : kernelbase: Don't hardcode magic constants.
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: 488a00c3be2e4ef0dd0c945ac96e0f1a49c449f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=488a00c3be2e4ef0dd0c945a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Dec 18 09:13:12 2021 +0100 kernelbase: Don't hardcode magic constants. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 0e4a3eb9b6b..12187b92e5c 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -33,6 +33,7 @@ #include "kernelbase.h" #include "wine/debug.h" +#include "wine/condrv.h" WINE_DEFAULT_DEBUG_CHANNEL(process); @@ -189,7 +190,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename RtlFreeUnicodeString( &newdirW ); if (flags & CREATE_NEW_PROCESS_GROUP) params->ConsoleFlags = 1; - if (flags & CREATE_NEW_CONSOLE) params->ConsoleHandle = (HANDLE)1; /* KERNEL32_CONSOLE_ALLOC */ + if (flags & CREATE_NEW_CONSOLE) params->ConsoleHandle = CONSOLE_HANDLE_ALLOC; else if (!(flags & DETACHED_PROCESS)) params->ConsoleHandle = NtCurrentTeb()->Peb->ProcessParameters->ConsoleHandle; if (startup->dwFlags & STARTF_USESTDHANDLES)

1 0

Eric Pouech : cmd: Don't crash on 'if exist' without parameter.
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: 535da77552deb74198f0fe8fedae3bbab5115ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=535da77552deb74198f0fe8f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Dec 20 10:29:01 2021 +0100 cmd: Don't crash on 'if exist' without parameter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51598 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d0a954d90fa..d14e69e072a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2811,8 +2811,9 @@ int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate) WCHAR *param = WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE); int len = lstrlenW(param); + if (!len) goto syntax_err; /* FindFirstFile does not like a directory path ending in '\', append a '.' */ - if (len && param[len-1] == '\\') lstrcatW(param, L"."); + if (param[len-1] == '\\') lstrcatW(param, L"."); hff = FindFirstFileW(param, &fd); *test = (hff != INVALID_HANDLE_VALUE );

1 0

Francois Gouget : winetest: Send the tests output to stdout when given "-o -".
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: 2da7e5de237deb3281e7469bd55cfaf710e4ee22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2da7e5de237deb3281e7469b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 20 11:46:18 2021 +0100 winetest: Send the tests output to stdout when given "-o -". This makes it easier to use WineTest with tools that capture stdout, such as the TestBot. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 7ced565447b..0c431a903d7 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1051,7 +1051,8 @@ run_tests (char *logname, char *outdir) sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = TRUE; - logfile = CreateFileA( logname, GENERIC_READ|GENERIC_WRITE, + logfile = strcmp(logname, "-") == 0 ? GetStdHandle( STD_OUTPUT_HANDLE ) : + CreateFileA( logname, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, &sa, CREATE_ALWAYS, 0, NULL ); @@ -1175,7 +1176,7 @@ run_tests (char *logname, char *outdir) report (R_DELTA, 0, "Running: Done"); report (R_STATUS, "Cleaning up - %u failures", failures); - CloseHandle( logfile ); + if (strcmp(logname, "-") != 0) CloseHandle( logfile ); logfile = 0; if (newdir) remove_dir (tempdir);

1 0

Rémi Bernon : dinput: Keep action names when converting back to ansi.
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: dd1f3434d6ef5f1e7357fcfe29c209d2def907a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd1f3434d6ef5f1e7357fcfe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 20 17:47:15 2021 +0100 dinput: Keep action names when converting back to ansi. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52198 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 3c7b6ced169..a773dacbec5 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -150,7 +150,6 @@ static void diactionformat_wtoa( const DIACTIONFORMATW *in, DIACTIONFORMATA *out out->rgoAction[i].guidInstance = in->rgoAction[i].guidInstance; out->rgoAction[i].dwObjID = in->rgoAction[i].dwObjID; out->rgoAction[i].dwHow = in->rgoAction[i].dwHow; - out->rgoAction[i].lptszActionName = 0; } out->guidActionMap = in->guidActionMap;

1 0

Rémi Bernon : dinput: Ignore NULL callback in IDirectInput_ConfigureDevices.
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: a37346c6bb45b345de4fdc756f64806b541e35d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37346c6bb45b345de4fdc75… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 20 17:47:16 2021 +0100 dinput: Ignore NULL callback in IDirectInput_ConfigureDevices. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52198 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index a773dacbec5..10b96a1e059 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -829,7 +829,6 @@ static HRESULT WINAPI dinput8_a_ConfigureDevices( IDirectInput8A *iface_a, LPDIC HRESULT hr; DWORD i; - if (!callback) return DIERR_INVALIDPARAM; if (FAILED(hr = diconfiguredevicesparams_atow( params_a, &params_w ))) return hr; format_w.dwNumActions = format_a->dwNumActions;

1 0

Rémi Bernon : dinput: Convert wide action format back to ansi in ConfigureDevices.
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: e5131028b94818e4b5cfc3252ab51cdac62477ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5131028b94818e4b5cfc325… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 20 17:47:17 2021 +0100 dinput: Convert wide action format back to ansi in ConfigureDevices. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52198 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 10b96a1e059..b7ec426b2e0 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -840,6 +840,7 @@ static HRESULT WINAPI dinput8_a_ConfigureDevices( IDirectInput8A *iface_a, LPDIC params_w.lprgFormats = &format_w; if (SUCCEEDED(hr)) hr = IDirectInput8_ConfigureDevices( iface_w, callback, &params_w, flags, ref ); + if (SUCCEEDED(hr)) diactionformat_wtoa( &format_w, format_a ); if (!format_w.hInstString) {

1 0

Rémi Bernon : dinput: Ignore objects without a collection in init_pid_caps.
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: 531297a8b4c3125c92b2bd0d10058bc753939fd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=531297a8b4c3125c92b2bd0d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 20 17:47:18 2021 +0100 dinput: Ignore objects without a collection in init_pid_caps. This makes sure we don't try to set effect_state report id from objects without a collection, causing some false warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 682af063ff1..64ddce3c7b0 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1732,6 +1732,9 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap FIXME( "multiple " #rep " report ids!\n" ); \ } while (0) + if (!instance->wCollectionNumber) + return DIENUM_CONTINUE; + if (instance->wCollectionNumber == effect_state->collection) SET_REPORT_ID( effect_state );

1 0

Alex Henrie : quartz: Fix memory leaks on error paths in FilterMapper3_RegisterFilter (cppcheck).
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: 8e081d32bd35f5a2acdef10bd541ee039038e5ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e081d32bd35f5a2acdef10b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 19 21:56:08 2021 -0700 quartz: Fix memory leaks on error paths in FilterMapper3_RegisterFilter (cppcheck). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 230273891d4..a95f0ca7832 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -894,12 +894,16 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(IFilterMapper3 *iface, if (FAILED(hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser))) + { + free(display_name); return hr; + } if (FAILED(hr = IParseDisplayName_ParseDisplayName(parser, NULL, display_name, &eaten, &moniker))) { ERR("Failed to parse display name, hr %#x.\n", hr); IParseDisplayName_Release(parser); + free(display_name); return hr; } @@ -909,6 +913,7 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(IFilterMapper3 *iface, { ERR("Failed to get property bag, hr %#x.\n", hr); IMoniker_Release(moniker); + free(display_name); return hr; }

1 0

Alex Henrie : mountmgr: Change scope of variable pvd in VOLUME_GetSuperblockLabel (cppcheck).
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: 656d7f58a11c53d2c1f5c0b6073324ecaded4088 URL: https://source.winehq.org/git/wine.git/?a=commit;h=656d7f58a11c53d2c1f5c0b6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 19 21:54:21 2021 -0700 mountmgr: Change scope of variable pvd in VOLUME_GetSuperblockLabel (cppcheck). The data in pvd was being accessed through the label_ptr variable after pvd went out of scope. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index d4f77012bbe..b8a0040195d 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -398,6 +398,7 @@ static void VOLUME_GetSuperblockLabel( struct volume *volume, HANDLE handle, con { const BYTE *label_ptr = NULL; DWORD label_len; + BYTE pvd[BLOCK_SIZE]; switch (volume->fs_type) { @@ -435,32 +436,28 @@ static void VOLUME_GetSuperblockLabel( struct volume *volume, HANDLE handle, con break; } case FS_UDF: + if(!UDF_Find_PVD(handle, pvd)) { - BYTE pvd[BLOCK_SIZE]; - - if(!UDF_Find_PVD(handle, pvd)) - { - label_len = 0; - break; - } + label_len = 0; + break; + } - /* [E] 3/10.1.4 and [U] 2.1.1 */ - if(pvd[24]==8) - { - label_ptr = pvd + 24 + 1; - label_len = pvd[24+32-1]; - break; - } - else - { - unsigned int i; + /* [E] 3/10.1.4 and [U] 2.1.1 */ + if(pvd[24]==8) + { + label_ptr = pvd + 24 + 1; + label_len = pvd[24+32-1]; + break; + } + else + { + unsigned int i; - label_len = 1 + pvd[24+32-1]; - for (i = 0; i < label_len; i += 2) - volume->label[i/2] = (pvd[24+1+i] << 8) | pvd[24+1+i+1]; - volume->label[label_len] = 0; - return; - } + label_len = 1 + pvd[24+32-1]; + for (i = 0; i < label_len; i += 2) + volume->label[i/2] = (pvd[24+1+i] << 8) | pvd[24+1+i+1]; + volume->label[label_len] = 0; + return; } } if (label_len) RtlMultiByteToUnicodeN( volume->label, sizeof(volume->label) - sizeof(WCHAR),

1 0

Alexandre Julliard : Import c2man.pl from the Wine tree.
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: tools Branch: master Commit: fcc613fc13c2174e6114d144c7c288d304672a38 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fcc613fc13c2174e6114d14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 20 10:52:46 2021 +0100 Import c2man.pl from the Wine tree. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- c2man.pl | 2380 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2380 insertions(+) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=fcc613fc13c2174e611…

1 0