June 2024 - Wine-Commits - list.winehq.org

Ziqing Hui : winegstreamer/aac_decoder: Support clearing media types.
by Alexandre Julliard June 28, 2024

June 28, 2024

Module: wine Branch: master Commit: 19d6a0177d743c1b471d5fb5692dfba23ca12c2b URL: https://gitlab.winehq.org/wine/wine/-/commit/19d6a0177d743c1b471d5fb5692dfb… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jun 26 16:22:17 2024 +0800 winegstreamer/aac_decoder: Support clearing media types. --- dlls/winegstreamer/aac_decoder.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/winegstreamer/aac_decoder.c b/dlls/winegstreamer/aac_decoder.c index 2cf605bc56c..d8e8246e1ca 100644 --- a/dlls/winegstreamer/aac_decoder.c +++ b/dlls/winegstreamer/aac_decoder.c @@ -324,6 +324,27 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM if (id) return MF_E_INVALIDSTREAMNUMBER; + if (!type) + { + if (decoder->input_type) + { + IMFMediaType_Release(decoder->input_type); + decoder->input_type = NULL; + } + if (decoder->output_type) + { + IMFMediaType_Release(decoder->output_type); + decoder->output_type = NULL; + } + if (decoder->wg_transform) + { + wg_transform_destroy(decoder->wg_transform); + decoder->wg_transform = 0; + } + + return S_OK; + } + if (FAILED(hr = MFCreateWaveFormatExFromMFMediaType(type, (WAVEFORMATEX **)&format, &size, MFWaveFormatExConvertFlag_ForceExtensible))) return hr; @@ -364,6 +385,23 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF if (id) return MF_E_INVALIDSTREAMNUMBER; + + if (!type) + { + if (decoder->output_type) + { + IMFMediaType_Release(decoder->output_type); + decoder->input_type = NULL; + } + if (decoder->wg_transform) + { + wg_transform_destroy(decoder->wg_transform); + decoder->wg_transform = 0; + } + + return S_OK; + } + if (!decoder->input_type) return MF_E_TRANSFORM_TYPE_NOT_SET;

1 0

Ziqing Hui : winegstreamer/color_converter: Support clearing media types.
by Alexandre Julliard June 28, 2024

June 28, 2024

Module: wine Branch: master Commit: c34eb9693346d1cfa071db53a28e8c3283dd1aa2 URL: https://gitlab.winehq.org/wine/wine/-/commit/c34eb9693346d1cfa071db53a28e8c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jun 26 16:27:44 2024 +0800 winegstreamer/color_converter: Support clearing media types. --- dlls/winegstreamer/color_convert.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/winegstreamer/color_convert.c b/dlls/winegstreamer/color_convert.c index 4b60628e8ba..21d2aa67e64 100644 --- a/dlls/winegstreamer/color_convert.c +++ b/dlls/winegstreamer/color_convert.c @@ -360,6 +360,22 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM TRACE("iface %p, id %#lx, type %p, flags %#lx.\n", iface, id, type, flags); + if (!type) + { + if (impl->input_type) + { + IMFMediaType_Release(impl->input_type); + impl->input_type = NULL; + } + if (impl->wg_transform) + { + wg_transform_destroy(impl->wg_transform); + impl->wg_transform = 0; + } + + return S_OK; + } + if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)) || FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) return MF_E_ATTRIBUTENOTFOUND; @@ -422,6 +438,22 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF TRACE("iface %p, id %#lx, type %p, flags %#lx.\n", iface, id, type, flags); + if (!type) + { + if (impl->output_type) + { + IMFMediaType_Release(impl->output_type); + impl->output_type = NULL; + } + if (impl->wg_transform) + { + wg_transform_destroy(impl->wg_transform); + impl->wg_transform = 0; + } + + return S_OK; + } + if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)) || FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) return MF_E_ATTRIBUTENOTFOUND;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard June 28, 2024

June 28, 2024

Module: wine Branch: master Commit: fe3a33baec83905a909a2e06a7ddc642c43b5559 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe3a33baec83905a909a2e06a7ddc6… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Jun 28 01:14:13 2024 +0300 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 3104927bef8..b7293d1cc0f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2024-06-27 08:36+0300\n" +"PO-Revision-Date: 2024-06-28 01:14+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14590,10 +14590,8 @@ msgid "End of line" msgstr "Eilutės pabaiga" #: programs/cmd/cmd.rc:413 -#, fuzzy -#| msgid "End of file.\n" msgid "End of file" -msgstr "Failo pabaiga.\n" +msgstr "Failo pabaiga" #: programs/conhost/conhost.rc:54 msgid "Cursor size"

1 0

Paul Gofman : ddraw: Preserve d3d device state in ddraw_surface_create().
by Alexandre Julliard June 27, 2024

June 27, 2024

Module: wine Branch: master Commit: 69138c85edbc5c38fccb27e0f93b8e85aa26bcc5 URL: https://gitlab.winehq.org/wine/wine/-/commit/69138c85edbc5c38fccb27e0f93b8e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 18 12:52:54 2024 -0600 ddraw: Preserve d3d device state in ddraw_surface_create(). --- dlls/ddraw/surface.c | 18 +----------------- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 8 ++++---- 4 files changed, 9 insertions(+), 25 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 71179b01a0b..203f02bbd2d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6771,35 +6771,19 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if (ddraw->cooperative_level & DDSCL_EXCLUSIVE) { struct wined3d_swapchain_desc swapchain_desc; - struct d3d_device *device; wined3d_swapchain_get_desc(ddraw->wined3d_swapchain, &swapchain_desc); swapchain_desc.backbuffer_width = mode.width; swapchain_desc.backbuffer_height = mode.height; swapchain_desc.backbuffer_format = mode.format_id; - LIST_FOR_EACH_ENTRY(device, &ddraw->d3ddevice_list, struct d3d_device, ddraw_entry) - { - if (device->recording) - wined3d_stateblock_decref(device->recording); - device->recording = NULL; - device->update_state = device->state; - wined3d_stateblock_reset(device->state); - } - if (FAILED(hr = wined3d_device_reset(ddraw->wined3d_device, - &swapchain_desc, NULL, ddraw_reset_enum_callback, TRUE))) + &swapchain_desc, NULL, ddraw_reset_enum_callback, FALSE))) { ERR("Failed to reset device.\n"); free(texture); return hr_ddraw_from_wined3d(hr); } - - LIST_FOR_EACH_ENTRY(device, &ddraw->d3ddevice_list, struct d3d_device, ddraw_entry) - { - wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, - !!swapchain_desc.enable_auto_depth_stencil); - } } } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 79ffe51a6f8..66fceafbc8d 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -16705,10 +16705,10 @@ static void test_d3d_state_reset(void) hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_FOGCOLOR, &state); ok(hr == DD_OK, "got %#lx.\n", hr); - todo_wine ok(state == 0x00282828, "got %#lx.\n", state); + ok(state == 0x00282828, "got %#lx.\n", state); hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &state); ok(hr == DD_OK, "got %#lx.\n", hr); - todo_wine ok(state == TRUE, "got %#lx.\n", state); + ok(state == TRUE, "got %#lx.\n", state); hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "got %#lx.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 278d2b21da0..a952eb683a5 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -19809,10 +19809,10 @@ static void test_d3d_state_reset(void) hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_FOGCOLOR, &state); ok(hr == DD_OK, "got %#lx.\n", hr); - todo_wine ok(state == 0x00282828, "got %#lx.\n", state); + ok(state == 0x00282828, "got %#lx.\n", state); hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &state); ok(hr == DD_OK, "got %#lx.\n", hr); - todo_wine ok(state == TRUE, "got %#lx.\n", state); + ok(state == TRUE, "got %#lx.\n", state); hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "got %#lx.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 709030ecdbe..04fe5a2049b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -20251,15 +20251,15 @@ static void test_d3d_state_reset(void) hr = IDirect3DDevice7_GetViewport(device, &vp2); ok(hr == DD_OK, "got %#lx.\n", hr); - todo_wine ok(vp2.dwWidth == vp1.dwWidth, "got %ld, expected %ld.\n", vp2.dwWidth, vp1.dwWidth); - todo_wine ok(vp2.dwHeight == vp1.dwHeight, "got %ld, expected %ld.\n", vp2.dwHeight, vp1.dwHeight); + ok(vp2.dwWidth == vp1.dwWidth, "got %ld, expected %ld.\n", vp2.dwWidth, vp1.dwWidth); + ok(vp2.dwHeight == vp1.dwHeight, "got %ld, expected %ld.\n", vp2.dwHeight, vp1.dwHeight); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_FOGCOLOR, &state); ok(hr == DD_OK, "got %#lx.\n", hr); - todo_wine ok(state == 0x00282828, "got %#lx.\n", state); + ok(state == 0x00282828, "got %#lx.\n", state); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &state); ok(hr == DD_OK, "got %#lx.\n", hr); - todo_wine ok(state == TRUE, "got %#lx.\n", state); + ok(state == TRUE, "got %#lx.\n", state); hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "got %#lx.\n", hr);

1 0

Hans Leidekker : wpcap: Handle different layout of the native packet header structure on 32-bit.
by Alexandre Julliard June 27, 2024

June 27, 2024

Module: wine Branch: master Commit: 727472ab7d60e285a28fb67fd5e3e21907dd060a URL: https://gitlab.winehq.org/wine/wine/-/commit/727472ab7d60e285a28fb67fd5e3e2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 27 09:56:45 2024 +0200 wpcap: Handle different layout of the native packet header structure on 32-bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56871 --- dlls/wpcap/unixlib.c | 52 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/dlls/wpcap/unixlib.c b/dlls/wpcap/unixlib.c index 4f5c2337b10..6db4800d16b 100644 --- a/dlls/wpcap/unixlib.c +++ b/dlls/wpcap/unixlib.c @@ -145,13 +145,25 @@ static NTSTATUS wrap_datalink_val_to_name( void *args ) static NTSTATUS wrap_dump( void *args ) { const struct dump_params *params = args; - struct pcap_pkthdr hdr_unix; - hdr_unix.ts.tv_sec = params->hdr->ts.tv_sec; - hdr_unix.ts.tv_usec = params->hdr->ts.tv_usec; - hdr_unix.caplen = params->hdr->caplen; - hdr_unix.len = params->hdr->len; - pcap_dump( params->user, &hdr_unix, params->packet ); + if (sizeof(void *) == 4) + { + struct pcap_pkthdr_win32 hdr32; + hdr32.ts.tv_sec = params->hdr->ts.tv_sec; + hdr32.ts.tv_usec = params->hdr->ts.tv_usec; + hdr32.caplen = params->hdr->caplen; + hdr32.len = params->hdr->len; + pcap_dump( params->user, (const struct pcap_pkthdr *)&hdr32, params->packet ); + } + else + { + struct pcap_pkthdr hdr64; + hdr64.ts.tv_sec = params->hdr->ts.tv_sec; + hdr64.ts.tv_usec = params->hdr->ts.tv_usec; + hdr64.caplen = params->hdr->caplen; + hdr64.len = params->hdr->len; + pcap_dump( params->user, &hdr64, params->packet ); + } return STATUS_SUCCESS; } @@ -300,16 +312,30 @@ static NTSTATUS wrap_minor_version( void *args ) static NTSTATUS wrap_next_ex( void *args ) { struct next_ex_params *params = args; - struct pcap_pkthdr *hdr_unix; int ret; - if ((ret = pcap_next_ex( (pcap_t *)(ULONG_PTR)params->handle, &hdr_unix, params->data )) == 1) + if (sizeof(void *) == 4) { - if (hdr_unix->ts.tv_sec > INT_MAX || hdr_unix->ts.tv_usec > INT_MAX) WARN( "truncating timeval values(s)\n" ); - params->hdr->ts.tv_sec = hdr_unix->ts.tv_sec; - params->hdr->ts.tv_usec = hdr_unix->ts.tv_usec; - params->hdr->caplen = hdr_unix->caplen; - params->hdr->len = hdr_unix->len; + struct pcap_pkthdr_win32 *hdr32; + if ((ret = pcap_next_ex( (pcap_t *)(ULONG_PTR)params->handle, (struct pcap_pkthdr **)&hdr32, params->data )) == 1) + { + params->hdr->ts.tv_sec = hdr32->ts.tv_sec; + params->hdr->ts.tv_usec = hdr32->ts.tv_usec; + params->hdr->caplen = hdr32->caplen; + params->hdr->len = hdr32->len; + } + } + else + { + struct pcap_pkthdr *hdr64; + if ((ret = pcap_next_ex( (pcap_t *)(ULONG_PTR)params->handle, &hdr64, params->data )) == 1) + { + if (hdr64->ts.tv_sec > INT_MAX || hdr64->ts.tv_usec > INT_MAX) WARN( "truncating timeval values(s)\n" ); + params->hdr->ts.tv_sec = hdr64->ts.tv_sec; + params->hdr->ts.tv_usec = hdr64->ts.tv_usec; + params->hdr->caplen = hdr64->caplen; + params->hdr->len = hdr64->len; + } } return ret; }

1 0

Elizabeth Figura : wined3d: Recheck whether a query is active after wined3d_context_vk_get_command_buffer().
by Alexandre Julliard June 27, 2024

June 27, 2024

Module: wine Branch: master Commit: 8cd5eca45c10cb6cda30b6b98e30581188a0e190 URL: https://gitlab.winehq.org/wine/wine/-/commit/8cd5eca45c10cb6cda30b6b98e3058… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Jun 20 12:44:13 2024 -0500 wined3d: Recheck whether a query is active after wined3d_context_vk_get_command_buffer(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56836 --- dlls/wined3d/query.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index a6e7698aa67..a58ffbcf3d0 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1705,8 +1705,16 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) /* If the query was already ended because the command buffer was * flushed or the render pass ended, we don't need to end it here. */ if (query_vk->flags & WINED3D_QUERY_VK_FLAG_ACTIVE) - { vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk); + + /* wined3d_context_vk_get_command_buffer() might have triggered + * submission of the previous command buffer (due to retired + * resource accumulation or periodic submit). + * This will have suspended the query, and if it's a render pass + * query, it won't have been resumed and therefore shouldn't be ended + * here. Therefore we need to check whether it's active again. */ + if (query_vk->flags & WINED3D_QUERY_VK_FLAG_ACTIVE) + { if (!(query_vk->flags & WINED3D_QUERY_VK_FLAG_RENDER_PASS)) wined3d_context_vk_end_current_render_pass(context_vk); wined3d_query_vk_end(query_vk, context_vk, vk_command_buffer);

1 0

Jacek Caban : jscript: Use designated initializers for builtin_info_t.
by Alexandre Julliard June 27, 2024

June 27, 2024

Module: wine Branch: master Commit: 4e79e45635682eeaed44f51285b36e63b26ffe07 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e79e45635682eeaed44f51285b36e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 27 11:56:45 2024 +0200 jscript: Use designated initializers for builtin_info_t. --- dlls/jscript/array.c | 32 +++++++++---------- dlls/jscript/arraybuf.c | 64 ++++++++++++------------------------- dlls/jscript/bool.c | 17 ++++------ dlls/jscript/date.c | 25 +++++---------- dlls/jscript/dispex.c | 8 +---- dlls/jscript/engine.c | 14 +++------ dlls/jscript/enumerator.c | 30 +++++------------- dlls/jscript/error.c | 18 ++++------- dlls/jscript/function.c | 80 ++++++++++++++++++----------------------------- dlls/jscript/global.c | 9 ++---- dlls/jscript/jscript.c | 9 +----- dlls/jscript/json.c | 9 ++---- dlls/jscript/jsregexp.c | 42 ++++++++++--------------- dlls/jscript/math.c | 8 ++--- dlls/jscript/number.c | 15 +++------ dlls/jscript/object.c | 27 ++++++---------- dlls/jscript/set.c | 76 +++++++++++++++++--------------------------- dlls/jscript/string.c | 34 +++++++++----------- dlls/jscript/vbarray.c | 11 +++---- 19 files changed, 185 insertions(+), 343 deletions(-)

1 0

Jacek Caban : jscript: Fix PROP_DELETED handling in delete_prop.
by Alexandre Julliard June 27, 2024

June 27, 2024

Module: wine Branch: master Commit: 26720d1c8b73cd52091b8ba942928273af95846a URL: https://gitlab.winehq.org/wine/wine/-/commit/26720d1c8b73cd52091b8ba9429282… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 27 12:58:52 2024 +0200 jscript: Fix PROP_DELETED handling in delete_prop. --- dlls/jscript/dispex.c | 2 +- dlls/jscript/tests/lang.js | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 57882bf499e..493dcf7fbc9 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2029,7 +2029,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc static HRESULT delete_prop(dispex_prop_t *prop, BOOL *ret) { - if(prop->type == PROP_PROTREF) { + if(prop->type == PROP_PROTREF || prop->type == PROP_DELETED) { *ret = TRUE; return S_OK; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 30d8a338fd3..2ddfc3a8341 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1712,6 +1712,18 @@ try { } })(); +(function() { + function constr() {} + constr.prototype = { prop: 1 }; + var o = new constr(), r; + ok(o.prop === 1, "o.prop = " + o.prop); + r = delete constr.prototype.prop; + ok(r === true, "delete returned " + r); + ok(o.prop === undefined, "o.prop = " + o.prop); + r = delete o["prop"]; + ok(r === true, "delete returned " + r); +})(); + if (false) if (true) ok(false, "if evaluated");

1 0

Eric Pouech : cmd: Support help for IF and FOR commands.
by Alexandre Julliard June 27, 2024

June 27, 2024

Module: wine Branch: master Commit: 6932e8bd0e063d12338eeaa9526dfd176101fdc8 URL: https://gitlab.winehq.org/wine/wine/-/commit/6932e8bd0e063d12338eeaa9526dfd… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jun 24 10:51:27 2024 +0200 cmd: Support help for IF and FOR commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 9ad9bc44866..c891e7525b1 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -986,6 +986,16 @@ static const char *debugstr_redirection(const CMD_REDIRECTION *redir) } } +static CMD_COMMAND *command_create(const WCHAR *ptr, size_t len) +{ + CMD_COMMAND *ret = xalloc(sizeof(CMD_COMMAND)); + + ret->command = xalloc((len + 1) * sizeof(WCHAR)); + memcpy(ret->command, ptr, len * sizeof(WCHAR)); + ret->command[len] = L'\0'; + return ret; +} + static void command_dispose(CMD_COMMAND *cmd) { if (cmd) @@ -2417,6 +2427,13 @@ static BOOL node_builder_parse(struct node_builder *builder, CMD_NODE **result) node_builder_consume(builder); tkn = node_builder_peek_next_token(builder, &pmt); ERROR_IF(tkn != TKN_COMMAND); + if (!wcscmp(pmt.command->command, L"/?")) + { + node_builder_consume(builder); + command_dispose(pmt.command); + left = node_create_single(command_create(L"help if", 7)); + break; + } ERROR_IF(!if_condition_parse(pmt.command->command, &end, &cond)); command_dispose(pmt.command); node_builder_consume(builder); @@ -2451,6 +2468,13 @@ static BOOL node_builder_parse(struct node_builder *builder, CMD_NODE **result) node_builder_consume(builder); tkn = node_builder_peek_next_token(builder, &pmt); ERROR_IF(tkn != TKN_COMMAND); + if (!wcscmp(pmt.command->command, L"/?")) + { + node_builder_consume(builder); + command_dispose(pmt.command); + left = node_create_single(command_create(L"help for", 8)); + break; + } node_builder_consume(builder); for_ctrl = for_control_parse(pmt.command->command); command_dispose(pmt.command); @@ -2627,12 +2651,7 @@ static void lexer_push_command(struct node_builder *builder, } if (*commandLen) { - tkn_pmt.command = xalloc(sizeof(CMD_COMMAND)); - - tkn_pmt.command->command = xalloc((*commandLen + 1) * sizeof(WCHAR)); - memcpy(tkn_pmt.command->command, command, *commandLen * sizeof(WCHAR)); - tkn_pmt.command->command[*commandLen] = L'\0'; - + tkn_pmt.command = command_create(command, *commandLen); node_builder_push_token_parameter(builder, TKN_COMMAND, tkn_pmt); } /* Reset the lengths */

1 0

Eric Pouech : cmd: Return sub-block return code for IF and FOR.
by Alexandre Julliard June 27, 2024

June 27, 2024

Module: wine Branch: master Commit: aeeea45da3eae97ce20ea17f1086b0a4c6df7dbf URL: https://gitlab.winehq.org/wine/wine/-/commit/aeeea45da3eae97ce20ea17f1086b0… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 20 17:34:12 2024 +0200 cmd: Return sub-block return code for IF and FOR. Cleaning-up previous method for end-of-block vs error in IF and FOR commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 86 +++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 45 deletions(-)

1 0