May 2023 - Wine-Commits - list.winehq.org

Anton Baskanov : dsound/tests: Test that the shifted frequency is limited to DSBFREQUENCY_MAX.
by Alexandre Julliard May 24, 2023

May 24, 2023

Module: wine Branch: master Commit: 3d5f2f879649d706bc17f6f6aea2723dba02602b URL: https://gitlab.winehq.org/wine/wine/-/commit/3d5f2f879649d706bc17f6f6aea272… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 24 09:31:33 2023 +0700 dsound/tests: Test that the shifted frequency is limited to DSBFREQUENCY_MAX. --- dlls/dsound/tests/ds3d.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index e7e1ab7ab81..77d3f09ec13 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1449,6 +1449,10 @@ static void test_doppler(GUID *guid, BOOL play) check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -240, 22050, 44100); check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, 240, 22050, 14700); + /* The shifted frequency is limited to DSBFREQUENCY_MAX. */ + /* Wine TODO: The frequency is not limited. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -90, 176400, 200000); + IDirectSound3DListener_Release(listener); ref = IDirectSoundBuffer_Release(primary); ok(!ref, "Got outstanding refcount %ld.\n", ref);

1 0

Anton Baskanov : dsound: Clamp the shifted frequency to [DSBFREQUENCY_MIN, DSBFREQUENCY_MAX].
by Alexandre Julliard May 24, 2023

May 24, 2023

Module: wine Branch: master Commit: b923aea7343a384cf03dd47b086138aecfd770b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b923aea7343a384cf03dd47b086138… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 24 10:20:30 2023 +0700 dsound: Clamp the shifted frequency to [DSBFREQUENCY_MIN, DSBFREQUENCY_MAX]. --- dlls/dsound/sound3d.c | 2 +- dlls/dsound/tests/ds3d.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 9a975324607..c22a3d5509f 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -312,7 +312,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) flFreq = dsb->ds3db_freq * (DEFAULT_VELOCITY/(DEFAULT_VELOCITY + flLimitedVel)); TRACE("doppler: Relative velocity (component) = %f => Doppler shift: %ld Hz -> %f Hz\n", flRelativeVel, dsb->ds3db_freq, flFreq); - dsb->freq = flFreq; + dsb->freq = max(DSBFREQUENCY_MIN, min(DSBFREQUENCY_MAX, (DWORD)flFreq)); } DSOUND_RecalcFormat(dsb); diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 77d3f09ec13..9c149dbcd9b 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1450,7 +1450,6 @@ static void test_doppler(GUID *guid, BOOL play) check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, 240, 22050, 14700); /* The shifted frequency is limited to DSBFREQUENCY_MAX. */ - /* Wine TODO: The frequency is not limited. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -90, 176400, 200000); IDirectSound3DListener_Release(listener);

1 0

Anton Baskanov : dsound: Limit the Doppler shift to +-0.5 speed of sound.
by Alexandre Julliard May 24, 2023

May 24, 2023

Module: wine Branch: master Commit: 315e998951b2e4aca7c56cbb4c2f988bf508b481 URL: https://gitlab.winehq.org/wine/wine/-/commit/315e998951b2e4aca7c56cbb4c2f98… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 24 09:19:43 2023 +0700 dsound: Limit the Doppler shift to +-0.5 speed of sound. --- dlls/dsound/sound3d.c | 5 +++-- dlls/dsound/tests/ds3d.c | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 7cccef6cfe4..9a975324607 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -168,7 +168,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) float a, ingain; /* doppler shift related stuff */ D3DVECTOR vRelativeVel; - D3DVALUE flFreq, flRelativeVel; + D3DVALUE flFreq, flRelativeVel, flLimitedVel; TRACE("(%p)\n",dsb); @@ -307,8 +307,9 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) NOTE: if buffer moves TOWARDS the listener, its velocity component is NEGATIVE if buffer moves AWAY from listener, its velocity component is POSITIVE */ flRelativeVel = ProjectVector(&vRelativeVel, &vDistance); + flLimitedVel = max(-DEFAULT_VELOCITY/2, min(DEFAULT_VELOCITY/2, flRelativeVel)); /* formula taken from Gianicoli D.: Physics, 4th edition: */ - flFreq = dsb->ds3db_freq * (DEFAULT_VELOCITY/(DEFAULT_VELOCITY + flRelativeVel)); + flFreq = dsb->ds3db_freq * (DEFAULT_VELOCITY/(DEFAULT_VELOCITY + flLimitedVel)); TRACE("doppler: Relative velocity (component) = %f => Doppler shift: %ld Hz -> %f Hz\n", flRelativeVel, dsb->ds3db_freq, flFreq); dsb->freq = flFreq; diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 99a1f16cf8e..e7e1ab7ab81 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1446,9 +1446,7 @@ static void test_doppler(GUID *guid, BOOL play) check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, -90, 1, 0, 22050, 17640); /* The Doppler shift is limited to +-0.5 speed of sound. */ - /* Wine TODO: The frequency is not limited. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -240, 22050, 44100); - /* Wine TODO: The frequency is not limited. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, 240, 22050, 14700); IDirectSound3DListener_Release(listener);

1 0

Anton Baskanov : dsound/tests: Test that the Doppler shift is limited to +-0.5 speed of sound.
by Alexandre Julliard May 24, 2023

May 24, 2023

Module: wine Branch: master Commit: 8acc3b83e81e23ebe8c62c068ef6c934b6916e8c URL: https://gitlab.winehq.org/wine/wine/-/commit/8acc3b83e81e23ebe8c62c068ef6c9… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 24 09:14:07 2023 +0700 dsound/tests: Test that the Doppler shift is limited to +-0.5 speed of sound. --- dlls/dsound/tests/ds3d.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 5fa558f7c87..99a1f16cf8e 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1445,6 +1445,12 @@ static void test_doppler(GUID *guid, BOOL play) check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 90, 1, 0, 22050, 29400); check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, -90, 1, 0, 22050, 17640); + /* The Doppler shift is limited to +-0.5 speed of sound. */ + /* Wine TODO: The frequency is not limited. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -240, 22050, 44100); + /* Wine TODO: The frequency is not limited. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, 240, 22050, 14700); + IDirectSound3DListener_Release(listener); ref = IDirectSoundBuffer_Release(primary); ok(!ref, "Got outstanding refcount %ld.\n", ref);

1 0

Anton Baskanov : dsound: Use relative velocity to compute Doppler shift.
by Alexandre Julliard May 24, 2023

May 24, 2023

Module: wine Branch: master Commit: 81feccb7e31bcc442932e521859a4dbf33c4575a URL: https://gitlab.winehq.org/wine/wine/-/commit/81feccb7e31bcc442932e521859a4d… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 24 00:19:44 2023 +0700 dsound: Use relative velocity to compute Doppler shift. It's less physically correct but closer to the native behavior. --- dlls/dsound/sound3d.c | 18 ++++++++---------- dlls/dsound/tests/ds3d.c | 2 -- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index b062917b219..7cccef6cfe4 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -167,7 +167,8 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) int i, num_main_speakers; float a, ingain; /* doppler shift related stuff */ - D3DVALUE flFreq, flBufferVel, flListenerVel; + D3DVECTOR vRelativeVel; + D3DVALUE flFreq, flRelativeVel; TRACE("(%p)\n",dsb); @@ -292,6 +293,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) dsb->freq = dsb->ds3db_freq; /* doppler shift*/ + vRelativeVel = VectorBetweenTwoPoints(&dsb->device->ds3dl.vVelocity, &dsb->ds3db_ds3db.vVelocity); if (!VectorMagnitude(&dsb->ds3db_ds3db.vVelocity) && !VectorMagnitude(&dsb->device->ds3dl.vVelocity)) { TRACE("doppler: Buffer and Listener don't have velocities\n"); @@ -301,18 +303,14 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) dsb->ds3db_ds3db.vVelocity.z == dsb->device->ds3dl.vVelocity.z) && !(vDistance.x == 0.0f && vDistance.y == 0.0f && vDistance.z == 0.0f)) { - /* calculate length of ds3db_ds3db.vVelocity component which causes Doppler Effect + /* calculate length of vRelativeVel component which causes Doppler Effect NOTE: if buffer moves TOWARDS the listener, its velocity component is NEGATIVE if buffer moves AWAY from listener, its velocity component is POSITIVE */ - flBufferVel = ProjectVector(&dsb->ds3db_ds3db.vVelocity, &vDistance); - /* calculate length of ds3dl.vVelocity component which causes Doppler Effect - NOTE: if listener moves TOWARDS the buffer, its velocity component is POSITIVE - if listener moves AWAY from buffer, its velocity component is NEGATIVE */ - flListenerVel = ProjectVector(&dsb->device->ds3dl.vVelocity, &vDistance); + flRelativeVel = ProjectVector(&vRelativeVel, &vDistance); /* formula taken from Gianicoli D.: Physics, 4th edition: */ - flFreq = dsb->ds3db_freq * ((DEFAULT_VELOCITY + flListenerVel)/(DEFAULT_VELOCITY + flBufferVel)); - TRACE("doppler: Buffer velocity (component) = %f, Listener velocity (component) = %f => Doppler shift: %ld Hz -> %f Hz\n", - flBufferVel, flListenerVel, dsb->ds3db_freq, flFreq); + flFreq = dsb->ds3db_freq * (DEFAULT_VELOCITY/(DEFAULT_VELOCITY + flRelativeVel)); + TRACE("doppler: Relative velocity (component) = %f => Doppler shift: %ld Hz -> %f Hz\n", + flRelativeVel, dsb->ds3db_freq, flFreq); dsb->freq = flFreq; } diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index bfd632f3a00..5fa558f7c87 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1442,9 +1442,7 @@ static void test_doppler(GUID *guid, BOOL play) check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0, -90, 22050, 22050); /* The Doppler shift does not depend on the frame of reference. */ - /* Wine TODO: The frequency is too low. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 90, 1, 0, 22050, 29400); - /* Wine TODO: The frequency is too low. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, -90, 1, 0, 22050, 17640); IDirectSound3DListener_Release(listener);

1 0

Anton Baskanov : dsound/tests: Test Doppler shift with moving listener.
by Alexandre Julliard May 24, 2023

May 24, 2023

Module: wine Branch: master Commit: 8c26e7e592038dd6452cc174867d9ee909125d56 URL: https://gitlab.winehq.org/wine/wine/-/commit/8c26e7e592038dd6452cc174867d9e… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 24 00:16:03 2023 +0700 dsound/tests: Test Doppler shift with moving listener. --- dlls/dsound/tests/ds3d.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 5e6ba4d204e..bfd632f3a00 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1441,6 +1441,12 @@ static void test_doppler(GUID *guid, BOOL play) check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0, -90, 22050, 22050); + /* The Doppler shift does not depend on the frame of reference. */ + /* Wine TODO: The frequency is too low. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 90, 1, 0, 22050, 29400); + /* Wine TODO: The frequency is too low. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, -90, 1, 0, 22050, 17640); + IDirectSound3DListener_Release(listener); ref = IDirectSoundBuffer_Release(primary); ok(!ref, "Got outstanding refcount %ld.\n", ref);

1 0

André Zwing : winedump: Recognize RISC-V PEs.
by Alexandre Julliard May 24, 2023

May 24, 2023

Module: wine Branch: master Commit: dfe94187c0ed71e9d43dfb80e72e4ea58e3044c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfe94187c0ed71e9d43dfb80e72e4e… Author: André Zwing <nerv(a)dawncrow.de> Date: Tue May 23 20:24:33 2023 +0200 winedump: Recognize RISC-V PEs. --- include/winnt.h | 3 +++ tools/winedump/pe.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 64408126cba..66746d7f6ae 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2651,6 +2651,9 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_FILE_MACHINE_ARM64EC 0xa641 #define IMAGE_FILE_MACHINE_ARM64X 0xa64e #define IMAGE_FILE_MACHINE_ARM64 0xaa64 +#define IMAGE_FILE_MACHINE_RISCV32 0x5032 +#define IMAGE_FILE_MACHINE_RISCV64 0x5064 +#define IMAGE_FILE_MACHINE_RISCV128 0x5128 #define IMAGE_FILE_MACHINE_CEE 0xc0ee #define IMAGE_SIZEOF_FILE_HEADER 20 diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index bf3aa6b4d69..5c2898b6dbc 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -59,6 +59,9 @@ const char *get_machine_str(int mach) case IMAGE_FILE_MACHINE_CHPE_X86: return "CHPE-x86"; case IMAGE_FILE_MACHINE_ARM64EC: return "ARM64EC"; case IMAGE_FILE_MACHINE_ARM64X: return "ARM64X"; + case IMAGE_FILE_MACHINE_RISCV32: return "RISC-V 32-bit"; + case IMAGE_FILE_MACHINE_RISCV64: return "RISC-V 64-bit"; + case IMAGE_FILE_MACHINE_RISCV128: return "RISC-V 128-bit"; } return "???"; }

1 0

Alexandre Julliard : start: Implement the /machine option.
by Alexandre Julliard May 24, 2023

May 24, 2023

Module: wine Branch: master Commit: 0b23d22bd6cc820468bac2eec1ac4e3d4564d2cb URL: https://gitlab.winehq.org/wine/wine/-/commit/0b23d22bd6cc820468bac2eec1ac4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 09:14:50 2023 +0200 start: Implement the /machine option. --- po/ar.po | 13 +++++++------ po/ast.po | 13 +++++++------ po/bg.po | 13 +++++++------ po/ca.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/cs.po | 13 +++++++------ po/da.po | 13 +++++++------ po/de.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/el.po | 13 +++++++------ po/en.po | 20 +++++++++++--------- po/en_US.po | 20 +++++++++++--------- po/eo.po | 13 +++++++------ po/es.po | 13 +++++++------ po/fa.po | 13 +++++++------ po/fi.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/fr.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/he.po | 13 +++++++------ po/hi.po | 13 +++++++------ po/hr.po | 13 +++++++------ po/hu.po | 13 +++++++------ po/it.po | 13 +++++++------ po/ja.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/ko.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/lt.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/ml.po | 13 +++++++------ po/nb_NO.po | 13 +++++++------ po/nl.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/or.po | 13 +++++++------ po/pa.po | 13 +++++++------ po/pl.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/pt_BR.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/pt_PT.po | 13 +++++++------ po/rm.po | 13 +++++++------ po/ro.po | 13 +++++++------ po/ru.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/si.po | 13 +++++++------ po/sk.po | 13 +++++++------ po/sl.po | 13 +++++++------ po/sr_RS(a)cyrillic.po | 13 +++++++------ po/sr_RS(a)latin.po | 13 +++++++------ po/sv.po | 13 +++++++------ po/ta.po | 13 +++++++------ po/te.po | 13 +++++++------ po/th.po | 13 +++++++------ po/tr.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/uk.po | 13 +++++++------ po/wa.po | 13 +++++++------ po/wine.pot | 13 +++++++------ po/zh_CN.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/zh_TW.po | 45 +++++++++++++++++++++++++++++++++++++++------ programs/start/start.c | 47 +++++++++++++++++++++++++++++------------------ programs/start/start.rc | 7 +++---- 51 files changed, 831 insertions(+), 322 deletions(-)

1 0

Alexandre Julliard : start: Use CRT allocation functions.
by Alexandre Julliard May 24, 2023

May 24, 2023

Module: wine Branch: master Commit: 850e3bcc5da106b58256d41cb93695a93dae853d URL: https://gitlab.winehq.org/wine/wine/-/commit/850e3bcc5da106b58256d41cb93695… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 09:13:16 2023 +0200 start: Use CRT allocation functions. --- programs/start/start.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index 8eff595d44b..4c53c1eca20 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -51,11 +51,11 @@ static void output(const WCHAR *message) char *mesA; /* Convert to OEM, then output */ len = WideCharToMultiByte( GetOEMCP(), 0, message, wlen, NULL, 0, NULL, NULL ); - mesA = HeapAlloc(GetProcessHeap(), 0, len*sizeof(char)); + mesA = malloc(len); if (!mesA) return; WideCharToMultiByte( GetOEMCP(), 0, message, wlen, mesA, len, NULL, NULL ); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), mesA, len, &count, FALSE); - HeapFree(GetProcessHeap(), 0, mesA); + free(mesA); } } @@ -207,7 +207,7 @@ static WCHAR *get_parent_dir(WCHAR* path) else len = last_slash - path + 1; - result = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + result = malloc( len * sizeof(WCHAR) ); CopyMemory(result, path, (len-1)*sizeof(WCHAR)); result[len-1] = '\0'; @@ -387,10 +387,8 @@ static BOOL search_path(const WCHAR *firstParam, WCHAR **full_path) } if (found) { - int needed_size = lstrlenW(thisDir) + 1; - *full_path = HeapAlloc(GetProcessHeap(), 0, needed_size * sizeof(WCHAR)); - if (*full_path) - lstrcpyW(*full_path, thisDir); + *full_path = wcsdup(thisDir); + if (!*full_path) fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, firstParam); return TRUE; } } @@ -535,11 +533,7 @@ static void parse_command_line( int argc, WCHAR *argv[] ) { WCHAR *fullpath; - if (search_path(file, &fullpath)) - { - if (!fullpath) fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, file); - opts.sei.lpFile = fullpath; - } + if (search_path(file, &fullpath)) opts.sei.lpFile = fullpath; else opts.sei.lpFile = file; } } @@ -555,12 +549,12 @@ int __cdecl wmain (int argc, WCHAR *argv[]) WCHAR *commandline; STARTUPINFOW startup_info; PROCESS_INFORMATION process_information; + int len = lstrlenW(opts.sei.lpFile) + 4 + lstrlenW(opts.sei.lpParameters); /* explorer on windows always quotes the filename when running a binary on windows (see bug 5224) so we have to use CreateProcessW in this case */ - commandline = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(opts.sei.lpFile)+4+lstrlenW(opts.sei.lpParameters))*sizeof(WCHAR)); - swprintf(commandline, lstrlenW(opts.sei.lpFile) + 4 + lstrlenW(opts.sei.lpParameters), - L"\"%s\" %s", opts.sei.lpFile, opts.sei.lpParameters); + commandline = malloc(len * sizeof(WCHAR)); + swprintf(commandline, len, L"\"%s\" %s", opts.sei.lpFile, opts.sei.lpParameters); ZeroMemory(&startup_info, sizeof(startup_info)); startup_info.cb = sizeof(startup_info); @@ -597,13 +591,13 @@ int __cdecl wmain (int argc, WCHAR *argv[]) { WCHAR *start, *ptr; - env = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + env = malloc(size * sizeof(WCHAR)); if (!env) fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, opts.sei.lpFile); GetEnvironmentVariableW(L"PATHEXT", env, size); filename_len = lstrlenW(filename); - name = HeapAlloc(GetProcessHeap(), 0, (filename_len + size) * sizeof(WCHAR)); + name = malloc((filename_len + size) * sizeof(WCHAR)); if (!name) fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, opts.sei.lpFile); @@ -621,13 +615,7 @@ int __cdecl wmain (int argc, WCHAR *argv[]) memcpy(&name[filename_len], start, (ptr - start) * sizeof(WCHAR)); name[filename_len + (ptr - start)] = 0; - if (ShellExecuteExW(&opts.sei)) - { - HeapFree(GetProcessHeap(), 0, name); - HeapFree(GetProcessHeap(), 0, env); - goto done; - } - + if (ShellExecuteExW(&opts.sei)) goto done; start = ptr + 1; }

1 0

Alexandre Julliard : start: Add a separate helper to parse command line options.
by Alexandre Julliard May 24, 2023

May 24, 2023

Module: wine Branch: master Commit: df0483aa9bdf0512072fd9dfaad059b1d5882ce8 URL: https://gitlab.winehq.org/wine/wine/-/commit/df0483aa9bdf0512072fd9dfaad059… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 09:12:54 2023 +0200 start: Add a separate helper to parse command line options. --- programs/start/start.c | 377 +++++++++++++++++++++++-------------------------- 1 file changed, 177 insertions(+), 200 deletions(-)

1 0