- Wine-Commits - list.winehq.org

Rémi Bernon : winewayland: Move window surface creation functions to window_surface.c.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: ef7f9fed607f0d8e922deeb6aaa1cc6289e63f2e URL: https://gitlab.winehq.org/wine/wine/-/commit/ef7f9fed607f0d8e922deeb6aaa1cc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 11 11:44:25 2024 +0200 winewayland: Move window surface creation functions to window_surface.c. --- dlls/winewayland.drv/waylanddrv.h | 25 ++++++++++++++- dlls/winewayland.drv/window.c | 57 ++--------------------------------- dlls/winewayland.drv/window_surface.c | 39 +++++++++++++++++++++++- 3 files changed, 64 insertions(+), 57 deletions(-) diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 4b92c9bf1ba..d0a8977f887 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -272,11 +272,34 @@ void wayland_shm_buffer_unref(struct wayland_shm_buffer *shm_buffer); * Wayland window surface */ -struct window_surface *wayland_window_surface_create(HWND hwnd, const RECT *rect); void wayland_window_surface_update_wayland_surface(struct window_surface *surface, struct wayland_surface *wayland_surface); void wayland_window_flush(HWND hwnd); +/********************************************************************** + * Wayland Window + */ + +/* private window data */ +struct wayland_win_data +{ + struct rb_entry entry; + /* hwnd that this private data belongs to */ + HWND hwnd; + /* wayland surface (if any) for this window */ + struct wayland_surface *wayland_surface; + /* wine window_surface backing this window */ + struct window_surface *window_surface; + /* USER window rectangle relative to win32 parent window client area */ + RECT window_rect; + /* USER client rectangle relative to win32 parent window client area */ + RECT client_rect; + BOOL managed; +}; + +struct wayland_win_data *wayland_win_data_get(HWND hwnd); +void wayland_win_data_release(struct wayland_win_data *data); + /********************************************************************** * Wayland Keyboard */ diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index c006505bc90..060a25d50c6 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -56,23 +56,6 @@ static BOOL set_window_pos(HWND hwnd, HWND after, INT x, INT y, INT cx, INT cy, } -/* private window data */ -struct wayland_win_data -{ - struct rb_entry entry; - /* hwnd that this private data belongs to */ - HWND hwnd; - /* wayland surface (if any) for this window */ - struct wayland_surface *wayland_surface; - /* wine window_surface backing this window */ - struct window_surface *window_surface; - /* USER window rectangle relative to win32 parent window client area */ - RECT window_rect; - /* USER client rectangle relative to win32 parent window client area */ - RECT client_rect; - BOOL managed; -}; - static int wayland_win_data_cmp_rb(const void *key, const struct rb_entry *entry) { @@ -153,7 +136,7 @@ static void wayland_win_data_destroy(struct wayland_win_data *data) * * Lock and return the data structure associated with a window. */ -static struct wayland_win_data *wayland_win_data_get(HWND hwnd) +struct wayland_win_data *wayland_win_data_get(HWND hwnd) { struct rb_entry *rb_entry; @@ -172,7 +155,7 @@ static struct wayland_win_data *wayland_win_data_get(HWND hwnd) * * Release the data returned by wayland_win_data_get. */ -static void wayland_win_data_release(struct wayland_win_data *data) +void wayland_win_data_release(struct wayland_win_data *data) { assert(data); pthread_mutex_unlock(&win_data_mutex); @@ -471,42 +454,6 @@ done: } -/*********************************************************************** - * WAYLAND_CreateWindowSurface - */ -BOOL WAYLAND_CreateWindowSurface(HWND hwnd, UINT swp_flags, const RECT *visible_rect, struct window_surface **surface) -{ - struct wayland_win_data *data; - RECT surface_rect; - - TRACE("hwnd %p, swp_flags %08x, visible %s, surface %p\n", hwnd, swp_flags, wine_dbgstr_rect(visible_rect), surface); - - if (!(data = wayland_win_data_get(hwnd))) return TRUE; /* use default surface */ - - /* Release the dummy surface wine provides for toplevels. */ - if (*surface) window_surface_release(*surface); - *surface = NULL; - - surface_rect = *visible_rect; - OffsetRect(&surface_rect, -surface_rect.left, -surface_rect.top); - - /* Check if we can reuse our current window surface. */ - if (data->window_surface && - EqualRect(&data->window_surface->rect, &surface_rect)) - { - window_surface_add_ref(data->window_surface); - *surface = data->window_surface; - TRACE("reusing surface %p\n", *surface); - goto done; - } - - *surface = wayland_window_surface_create(data->hwnd, &surface_rect); - -done: - wayland_win_data_release(data); - return TRUE; -} - /*********************************************************************** * WAYLAND_WindowPosChanged */ diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c index 888fa74c085..9377b05b4ce 100644 --- a/dlls/winewayland.drv/window_surface.c +++ b/dlls/winewayland.drv/window_surface.c @@ -449,7 +449,7 @@ static const struct window_surface_funcs wayland_window_surface_funcs = /*********************************************************************** * wayland_window_surface_create */ -struct window_surface *wayland_window_surface_create(HWND hwnd, const RECT *rect) +static struct window_surface *wayland_window_surface_create(HWND hwnd, const RECT *rect) { char buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; BITMAPINFO *info = (BITMAPINFO *)buffer; @@ -516,3 +516,40 @@ void wayland_window_surface_update_wayland_surface(struct window_surface *window window_surface_unlock(window_surface); } + + +/*********************************************************************** + * WAYLAND_CreateWindowSurface + */ +BOOL WAYLAND_CreateWindowSurface(HWND hwnd, UINT swp_flags, const RECT *visible_rect, struct window_surface **surface) +{ + struct wayland_win_data *data; + RECT surface_rect; + + TRACE("hwnd %p, swp_flags %08x, visible %s, surface %p\n", hwnd, swp_flags, wine_dbgstr_rect(visible_rect), surface); + + if (!(data = wayland_win_data_get(hwnd))) return TRUE; /* use default surface */ + + /* Release the dummy surface wine provides for toplevels. */ + if (*surface) window_surface_release(*surface); + *surface = NULL; + + surface_rect = *visible_rect; + OffsetRect(&surface_rect, -surface_rect.left, -surface_rect.top); + + /* Check if we can reuse our current window surface. */ + if (data->window_surface && + EqualRect(&data->window_surface->rect, &surface_rect)) + { + window_surface_add_ref(data->window_surface); + *surface = data->window_surface; + TRACE("reusing surface %p\n", *surface); + goto done; + } + + *surface = wayland_window_surface_create(data->hwnd, &surface_rect); + +done: + wayland_win_data_release(data); + return TRUE; +}

1 0

Alexandre Julliard : makedep: Add a helper to get a root-relative directory path.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: 58de2dec0813dc395dc78cff90636d2f82501df7 URL: https://gitlab.winehq.org/wine/wine/-/commit/58de2dec0813dc395dc78cff90636d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 13:39:49 2024 +0200 makedep: Add a helper to get a root-relative directory path. --- tools/makedep.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 58b77a3fd43..29c83e3f73f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -539,6 +539,31 @@ static char *get_relative_path( const char *from, const char *dest ) } +/******************************************************************* + * get_root_relative_path + * + * Get relative path from obj dir to root. + */ +static const char *get_root_relative_path( struct makefile *make ) +{ + const char *dir = make->obj_dir; + char *ret, *p; + unsigned int dotdots = 0; + + if (!dir) return "."; + while (*dir) + { + dotdots++; + while (*dir && *dir != '/') dir++; + while (*dir == '/') dir++; + } + ret = xmalloc( 3 * dotdots ); + for (p = ret; dotdots; dotdots--, p += 3) memcpy( p, "../", 3 ); + p[-1] = 0; /* remove trailing slash */ + return ret; +} + + /******************************************************************* * concat_paths */ @@ -2491,7 +2516,7 @@ static void output_srcdir_symlink( struct makefile *make, const char *obj ) src_name = src_file; if (src_name[0] != '/' && make->obj_dir) - src_name = concat_paths( get_relative_path( make->obj_dir, "" ), src_name ); + src_name = concat_paths( get_root_relative_path( make ), src_name ); output_symlink_rule( src_name, dst_file, 0 ); strarray_add( &make->all_targets[0], obj ); @@ -4159,7 +4184,7 @@ static void output_stub_makefile( struct makefile *make ) output_filenames( targets ); output_filenames( make->clean_files ); output( ":\n" ); - output( "\t(a)cd %s && $(MAKE) %s/$@\n", get_relative_path( make->obj_dir, "" ), make->obj_dir ); + output( "\t(a)cd %s && $(MAKE) %s/$@\n", get_root_relative_path( make ), make->obj_dir ); output( ".PHONY:" ); output_filenames( targets ); output( "\n" );

1 0

Eric Pouech : cmd: Move depth count inside builder.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: 2f5456316c7610648ec9d60fff4182e5288552b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f5456316c7610648ec9d60fff4182… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jun 17 11:43:59 2024 +0200 cmd: Move depth count inside builder. (and temporarly using parenthesis count to store curDepth). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 239 +++++++++++++++++++++++------------------------- 1 file changed, 115 insertions(+), 124 deletions(-)

1 0

Eric Pouech : cmd: Factorize code for reading a new line for parser.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: 8ad0923515122533423f9135d0880939a7455b27 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ad0923515122533423f9135d08809… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed May 1 14:53:47 2024 +0200 cmd: Factorize code for reading a new line for parser. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 173 +++++++++++++++++++++--------------------------- 1 file changed, 77 insertions(+), 96 deletions(-)

1 0

Davide Beatrici : mmdevapi: Implement IAudioClient3_GetCurrentSharedModeEnginePeriod.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: b34b5d84a6b5387a5d44cad34558676f01de5f4f URL: https://gitlab.winehq.org/wine/wine/-/commit/b34b5d84a6b5387a5d44cad3455867… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Jun 21 22:38:56 2024 +0200 mmdevapi: Implement IAudioClient3_GetCurrentSharedModeEnginePeriod. --- dlls/mmdevapi/client.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index e0344aefa54..132b6abae5e 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -1026,8 +1026,18 @@ static HRESULT WINAPI client_GetCurrentSharedModeEnginePeriod(IAudioClient3 *ifa UINT32 *cur_period_frames) { struct audio_client *This = impl_from_IAudioClient3(iface); - FIXME("(%p)->(%p, %p) - stub\n", This, cur_format, cur_period_frames); - return E_NOTIMPL; + UINT32 dummy; + HRESULT hr; + + TRACE("(%p)->(%p, %p)\n", This, cur_format, cur_period_frames); + + if (!cur_format || !cur_period_frames) + return E_POINTER; + + if (FAILED(hr = client_GetMixFormat(iface, cur_format))) + return hr; + + return client_GetSharedModeEnginePeriod(iface, *cur_format, cur_period_frames, &dummy, &dummy, &dummy); } static HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, DWORD flags,

1 0

Davide Beatrici : mmdevapi: Complete IAudioClient3_GetSharedModeEnginePeriod.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: 235d527fa51b7d1ef25f9944d2bd69f05f67ce96 URL: https://gitlab.winehq.org/wine/wine/-/commit/235d527fa51b7d1ef25f9944d2bd69… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 20 20:03:51 2024 +0200 mmdevapi: Complete IAudioClient3_GetSharedModeEnginePeriod. --- dlls/mmdevapi/client.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 1d6eefd5dbb..e0344aefa54 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -1002,17 +1002,23 @@ static HRESULT WINAPI client_GetSharedModeEnginePeriod(IAudioClient3 *iface, UINT32 *max_period_frames) { struct audio_client *This = impl_from_IAudioClient3(iface); - FIXME("(%p)->(%p, %p, %p, %p, %p) - partial stub\n", + REFERENCE_TIME def_period, min_period; + HRESULT hr; + + TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, format, default_period_frames, unit_period_frames, min_period_frames, max_period_frames); - *default_period_frames = - *min_period_frames = - *max_period_frames = - format->nSamplesPerSec / 100; /* ~10ms */ - *unit_period_frames = 1; - return S_OK; + if (FAILED(hr = get_periods(This, &def_period, &min_period))) + return hr; + + *default_period_frames = def_period * format->nSamplesPerSec / (REFERENCE_TIME)10000000; + *min_period_frames = min_period * format->nSamplesPerSec / (REFERENCE_TIME)10000000; + *max_period_frames = *default_period_frames; + *unit_period_frames = 1; + + return hr; } static HRESULT WINAPI client_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface,

1 0

Eric Pouech : cmd: Remove unrelated parameter to WCMD_show_prompt.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: f45588c57f5650df548430fc77192824c82044ac URL: https://gitlab.winehq.org/wine/wine/-/commit/f45588c57f5650df548430fc771928… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 6 10:11:55 2024 +0200 cmd: Remove unrelated parameter to WCMD_show_prompt. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index aa7a74cc104..d97aff3bcd3 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -322,8 +322,8 @@ void WCMD_print_error (void) { * */ -static void WCMD_show_prompt (BOOL newLine) { - +static void WCMD_show_prompt(void) +{ int status; WCHAR out_string[MAX_PATH], curdir[MAX_PATH], prompt_string[MAX_PATH]; WCHAR *p, *q; @@ -335,10 +335,6 @@ static void WCMD_show_prompt (BOOL newLine) { } p = prompt_string; q = out_string; - if (newLine) { - *q++ = '\r'; - *q++ = '\n'; - } *q = '\0'; while (*p != '\0') { if (*p != '$') { @@ -2570,7 +2566,8 @@ static WCHAR *fetch_next_line(BOOL feed, BOOL first_line, HANDLE from, WCHAR* bu const size_t len = wcslen(L"echo."); size_t curr_size = wcslen(buffer); size_t min_len = curr_size < len ? curr_size : len; - WCMD_show_prompt(TRUE); + WCMD_output_asis(L"\r\n"); + WCMD_show_prompt(); WCMD_output_asis(buffer); /* I don't know why Windows puts a space here but it does */ /* Except for lines starting with 'echo.', 'echo:' or 'echo/'. Ask MS why */ @@ -3644,7 +3641,6 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) WCHAR *cmd = NULL; WCHAR string[1024]; WCHAR envvar[4]; - BOOL promptNewLine = TRUE; BOOL opt_q; int opt_t = 0; WCHAR comspec[MAX_PATH]; @@ -3998,16 +3994,17 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) interactive = TRUE; if (!opt_k) WCMD_version (); + if (echo_mode) WCMD_output_asis(L"\r\n"); while (TRUE) { /* Read until EOF (which for std input is never, but if redirect in place, may occur */ - if (echo_mode) WCMD_show_prompt(promptNewLine); + if (echo_mode) WCMD_show_prompt(); if (!WCMD_ReadAndParseLine(NULL, &toExecute, GetStdHandle(STD_INPUT_HANDLE))) break; WCMD_process_commands(toExecute, FALSE, FALSE); node_dispose_tree(toExecute); - promptNewLine = !!toExecute; + if (toExecute && echo_mode) WCMD_output_asis(L"\r\n"); toExecute = NULL; } return 0;

1 0

Eric Pouech : cmd: Move prompt handling into line reading.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: 3a8aad4834c18d459cfa86a2c21be3f5ca18429e URL: https://gitlab.winehq.org/wine/wine/-/commit/3a8aad4834c18d459cfa86a2c21be3… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Jun 19 09:15:25 2024 +0200 cmd: Move prompt handling into line reading. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index d97aff3bcd3..8d854c356bf 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2540,8 +2540,16 @@ static BOOL node_builder_generate(struct node_builder *builder, CMD_NODE **node) static WCHAR *fetch_next_line(BOOL feed, BOOL first_line, HANDLE from, WCHAR* buffer) { - if (!context && !first_line) - WCMD_output_asis( WCMD_LoadMessage(WCMD_MOREPROMPT)); + /* display prompt */ + if (interactive && !context) + { + /* native does is this way... not symmetrical wrt. echo_mode */ + if (!first_line) + WCMD_output_asis(WCMD_LoadMessage(WCMD_MOREPROMPT)); + else if (echo_mode) + WCMD_show_prompt(); + } + if (feed && !WCMD_fgets(buffer, MAXSTRING, from)) { buffer[0] = L'\0'; @@ -3999,7 +4007,6 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) /* Read until EOF (which for std input is never, but if redirect in place, may occur */ - if (echo_mode) WCMD_show_prompt(); if (!WCMD_ReadAndParseLine(NULL, &toExecute, GetStdHandle(STD_INPUT_HANDLE))) break; WCMD_process_commands(toExecute, FALSE, FALSE);

1 0

Eric Pouech : cmd: Fix a couple of issues wrt. variable expansion.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: fc4b9c645a11b348ae8a3d556c82c73f0f2b2054 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc4b9c645a11b348ae8a3d556c82c7… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 18 11:52:06 2024 +0200 cmd: Fix a couple of issues wrt. variable expansion. Ensure expansion at parse time is only done once. Simply handleExpansion() code. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_cmdline.cmd.exp | 2 +- programs/cmd/wcmdmain.c | 64 ++++++++++++++------------------- 2 files changed, 28 insertions(+), 38 deletions(-) diff --git a/programs/cmd/tests/test_cmdline.cmd.exp b/programs/cmd/tests/test_cmdline.cmd.exp index 946e353fcf3..afd4a4eefdf 100644 --- a/programs/cmd/tests/test_cmdline.cmd.exp +++ b/programs/cmd/tests/test_cmdline.cmd.exp @@ -42,7 +42,7 @@ one = %1 3 4 5 -(a)todo_wine@var contents: 11 +var contents: 11 var=33(a)space@ 99 ------ Testing invocation of batch files ---------- diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8d854c356bf..4d8bea209b9 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -784,7 +784,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR startchar) * rather than at parse time, i.e. delayed expansion and for loops need to be * processed */ -static void handleExpansion(WCHAR *cmd, BOOL atExecute, BOOL delayed) { +static void handleExpansion(WCHAR *cmd, BOOL atExecute) { /* For commands in a context (batch program): */ /* Expand environment variables in a batch file %{0-9} first */ @@ -798,6 +798,7 @@ static void handleExpansion(WCHAR *cmd, BOOL atExecute, BOOL delayed) { WCHAR *p = cmd; WCHAR *t; int i; + BOOL delayed = atExecute ? delayedsubst : FALSE; WCHAR *delayedp = NULL; WCHAR startchar = '%'; WCHAR *normalp; @@ -811,15 +812,16 @@ static void handleExpansion(WCHAR *cmd, BOOL atExecute, BOOL delayed) { } } - /* Find the next environment variable delimiter */ - normalp = wcschr(p, '%'); - if (delayed) delayedp = wcschr(p, '!'); - if (!normalp) p = delayedp; - else if (!delayedp) p = normalp; - else p = min(p,delayedp); - if (p) startchar = *p; - - while (p) { + for (;;) + { + /* Find the next environment variable delimiter */ + normalp = wcschr(p, '%'); + if (delayed) delayedp = wcschr(p, '!'); + if (!normalp) p = delayedp; + else if (!delayedp) p = normalp; + else p = min(p,delayedp); + if (!p) break; + startchar = *p; WINE_TRACE("Translate command:%s %d (at: %s)\n", wine_dbgstr_w(cmd), atExecute, wine_dbgstr_w(p)); @@ -867,17 +869,7 @@ static void handleExpansion(WCHAR *cmd, BOOL atExecute, BOOL delayed) { p++; } } - - /* Find the next environment variable delimiter */ - normalp = wcschr(p, '%'); - if (delayed) delayedp = wcschr(p, '!'); - if (!normalp) p = delayedp; - else if (!delayedp) p = normalp; - else p = min(p,delayedp); - if (p) startchar = *p; } - - return; } @@ -1633,7 +1625,7 @@ static BOOL set_std_redirections(CMD_REDIRECTION *redir, WCHAR *in_pipe) case REDIR_READ_FROM: if (in_pipe) continue; /* give precedence to pipe */ wcscpy(expanded_filename, redir->file); - handleExpansion(expanded_filename, context != NULL, delayedsubst); + handleExpansion(expanded_filename, TRUE); h = CreateFileW(expanded_filename, GENERIC_READ, FILE_SHARE_READ, &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) @@ -1648,7 +1640,7 @@ static BOOL set_std_redirections(CMD_REDIRECTION *redir, WCHAR *in_pipe) { DWORD disposition = redir->kind == REDIR_WRITE_TO ? CREATE_ALWAYS : OPEN_ALWAYS; wcscpy(expanded_filename, redir->file); - handleExpansion(expanded_filename, context != NULL, delayedsubst); + handleExpansion(expanded_filename, TRUE); h = CreateFileW(expanded_filename, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_DELETE, &sa, disposition, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) @@ -1716,7 +1708,7 @@ static void execute_single_command(const WCHAR *command, CMD_NODE **cmdList, BOO } parms_start = WCMD_skip_leading_spaces (&whichcmd[count]); - handleExpansion(new_cmd, (context != NULL), delayedsubst); + handleExpansion(new_cmd, TRUE); /* * Changing default drive has to be handled as a special case, anything @@ -2077,7 +2069,6 @@ static CMD_COMMAND *WCMD_createCommand(WCHAR *command, int *commandLen, if (*p == L'<') { filename = WCMD_parameter(p + 1, 0, NULL, FALSE, FALSE); - handleExpansion(filename, context != NULL, FALSE); *insrt = redirection_create_file(REDIR_READ_FROM, 0, filename); } else @@ -2095,7 +2086,6 @@ static CMD_COMMAND *WCMD_createCommand(WCHAR *command, int *commandLen, else { filename = WCMD_parameter(p, 0, NULL, FALSE, FALSE); - handleExpansion(filename, context != NULL, FALSE); *insrt = redirection_create_file(op, fd, filename); } } @@ -2563,7 +2553,7 @@ static WCHAR *fetch_next_line(BOOL feed, BOOL first_line, HANDLE from, WCHAR* bu WCMD_output_asis_stderr(L"\r\n"); } /* Replace env vars if in a batch context */ - if (context) handleExpansion(buffer, FALSE, FALSE); + handleExpansion(buffer, FALSE); buffer = WCMD_skip_leading_spaces(buffer); /* Show prompt before batch line IF echo is on and in batch program */ @@ -3102,7 +3092,7 @@ BOOL if_condition_evaluate(CMD_IF_CONDITION *cond, int *test) int level; wcscpy(expanded_left, cond->operand); - handleExpansion(expanded_left, context != NULL, delayedsubst); + handleExpansion(expanded_left, TRUE); level = wcstol(expanded_left, &endptr, 10); if (*endptr) return FALSE; *test = errorlevel >= level; @@ -3115,7 +3105,7 @@ BOOL if_condition_evaluate(CMD_IF_CONDITION *cond, int *test) HANDLE hff; wcscpy(expanded_left, cond->operand); - handleExpansion(expanded_left, context != NULL, delayedsubst); + handleExpansion(expanded_left, TRUE); if ((len = wcslen(expanded_left))) { /* FindFirstFile does not like a directory path ending in '\' or '/', so append a '.' */ @@ -3131,14 +3121,14 @@ BOOL if_condition_evaluate(CMD_IF_CONDITION *cond, int *test) break; case CMD_IF_DEFINED: wcscpy(expanded_left, cond->operand); - handleExpansion(expanded_left, context != NULL, delayedsubst); + handleExpansion(expanded_left, TRUE); *test = GetEnvironmentVariableW(expanded_left, NULL, 0) > 0; break; case CMD_IF_BINOP_EQUAL: wcscpy(expanded_left, cond->left); - handleExpansion(expanded_left, context != NULL, delayedsubst); + handleExpansion(expanded_left, TRUE); wcscpy(expanded_right, cond->right); - handleExpansion(expanded_right, context != NULL, delayedsubst); + handleExpansion(expanded_right, TRUE); /* == is a special case, as it always compares strings */ *test = (*cmp)(expanded_left, expanded_right) == 0; @@ -3150,9 +3140,9 @@ BOOL if_condition_evaluate(CMD_IF_CONDITION *cond, int *test) int cmp_val; wcscpy(expanded_left, cond->left); - handleExpansion(expanded_left, context != NULL, delayedsubst); + handleExpansion(expanded_left, TRUE); wcscpy(expanded_right, cond->right); - handleExpansion(expanded_right, context != NULL, delayedsubst); + handleExpansion(expanded_right, TRUE); /* Check if we have plain integers (in decimal, octal or hexadecimal notation) */ left_int = wcstol(expanded_left, &end_left, 0); @@ -3366,7 +3356,7 @@ static CMD_NODE *for_control_execute_fileset(CMD_FOR_CONTROL *for_ctrl, CMD_NODE int i; wcscpy(set, for_ctrl->set); - handleExpansion(set, context != NULL, delayedsubst); + handleExpansion(set, TRUE); args = WCMD_skip_leading_spaces(set); for (len = wcslen(args); len && (args[len - 1] == L' ' || args[len - 1] == L'\t'); len--) @@ -3442,7 +3432,7 @@ static CMD_NODE *for_control_execute_set(CMD_FOR_CONTROL *for_ctrl, const WCHAR len = 0; wcscpy(set, for_ctrl->set); - handleExpansion(set, context != NULL, delayedsubst); + handleExpansion(set, TRUE); for (i = 0; ; i++) { WCHAR *element = WCMD_parameter(set, i, NULL, TRUE, FALSE); @@ -3505,7 +3495,7 @@ static CMD_NODE *for_control_execute_walk_files(CMD_FOR_CONTROL *for_ctrl, CMD_N WCHAR buffer[MAXSTRING]; wcscpy(buffer, for_ctrl->root_dir); - handleExpansion(buffer, context != NULL, delayedsubst); + handleExpansion(buffer, TRUE); dirs_to_walk = WCMD_dir_stack_create(buffer, NULL); } else dirs_to_walk = WCMD_dir_stack_create(NULL, NULL); @@ -3534,7 +3524,7 @@ static CMD_NODE *for_control_execute_numbers(CMD_FOR_CONTROL *for_ctrl, CMD_NODE int i; wcscpy(set, for_ctrl->set); - handleExpansion(set, context != NULL, delayedsubst); + handleExpansion(set, TRUE); /* Note: native doesn't check the actual number of parameters, and set * them by default to 0.

1 0

Aida Jonikienė : ntdll: Fix params_mask type in NtRaiseHardError().
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: 5eafe53e5449a5a2602d947a3f1d0864a2f6e476 URL: https://gitlab.winehq.org/wine/wine/-/commit/5eafe53e5449a5a2602d947a3f1d08… Author: Aida Jonikienė <aidas957(a)gmail.com> Date: Tue Mar 5 10:06:23 2024 +0200 ntdll: Fix params_mask type in NtRaiseHardError(). Real-world app testing reveals that parameter isn't used as a pointer (so change it to an integer). --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/signal_arm64ec.c | 2 +- dlls/ntdll/unix/system.c | 4 ++-- include/winternl.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f82146c6d39..9147cdca3cd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -340,7 +340,7 @@ @ stdcall -syscall NtQueueApcThread(long ptr long long long) @ stdcall -syscall NtQueueApcThreadEx(long long ptr long long long) @ stdcall -syscall NtRaiseException(ptr ptr long) -@ stdcall -syscall NtRaiseHardError(long long ptr ptr long ptr) +@ stdcall -syscall NtRaiseHardError(long long long ptr long ptr) @ stdcall -syscall NtReadFile(long long ptr ptr ptr ptr long ptr ptr) @ stdcall -syscall NtReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) # @ stub NtReadRequestData @@ -1389,7 +1389,7 @@ @ stdcall -private -syscall ZwQueueApcThread(long ptr long long long) NtQueueApcThread @ stdcall -private -syscall ZwQueueApcThreadEx(long long ptr long long long) NtQueueApcThreadEx @ stdcall -private -syscall ZwRaiseException(ptr ptr long) NtRaiseException -@ stdcall -private -syscall ZwRaiseHardError(long long ptr ptr long ptr) NtRaiseHardError +@ stdcall -private -syscall ZwRaiseHardError(long long long ptr long ptr) NtRaiseHardError @ stdcall -private -syscall ZwReadFile(long long ptr ptr ptr ptr long ptr ptr) NtReadFile @ stdcall -private -syscall ZwReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) NtReadFileScatter # @ stub ZwReadRequestData diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 44b026fc044..393d5f7e697 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -270,7 +270,7 @@ DEFINE_SYSCALL(NtQueryVolumeInformationFile, (HANDLE handle, IO_STATUS_BLOCK *io DEFINE_SYSCALL(NtQueueApcThread, (HANDLE handle, PNTAPCFUNC func, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3)) DEFINE_SYSCALL(NtQueueApcThreadEx, (HANDLE handle, HANDLE reserve_handle, PNTAPCFUNC func, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3)) DEFINE_WRAPPED_SYSCALL(NtRaiseException, (EXCEPTION_RECORD *rec, ARM64_NT_CONTEXT *context, BOOL first_chance)) -DEFINE_SYSCALL(NtRaiseHardError, (NTSTATUS status, ULONG count, UNICODE_STRING *params_mask, void **params, HARDERROR_RESPONSE_OPTION option, HARDERROR_RESPONSE *response)) +DEFINE_SYSCALL(NtRaiseHardError, (NTSTATUS status, ULONG count, ULONG params_mask, void **params, HARDERROR_RESPONSE_OPTION option, HARDERROR_RESPONSE *response)) DEFINE_SYSCALL(NtReadFile, (HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, void *buffer, ULONG length, LARGE_INTEGER *offset, ULONG *key)) DEFINE_SYSCALL(NtReadFileScatter, (HANDLE file, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, FILE_SEGMENT_ELEMENT *segments, ULONG length, LARGE_INTEGER *offset, ULONG *key)) DEFINE_SYSCALL(NtReadVirtualMemory, (HANDLE process, const void *addr, void *buffer, SIZE_T size, SIZE_T *bytes_read)) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index eb5e60af7b9..efb6e7f4579 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -4073,10 +4073,10 @@ NTSTATUS WINAPI NtDisplayString( UNICODE_STRING *string ) * NtRaiseHardError (NTDLL.@) */ NTSTATUS WINAPI NtRaiseHardError( NTSTATUS status, ULONG count, - UNICODE_STRING *params_mask, void **params, + ULONG params_mask, void **params, HARDERROR_RESPONSE_OPTION option, HARDERROR_RESPONSE *response ) { - FIXME( "%08x stub\n", (int)status ); + FIXME( "%#08x %u %#x %p %u %p: stub\n", (int)status, (int)count, (int)params_mask, params, option, response ); return STATUS_NOT_IMPLEMENTED; } diff --git a/include/winternl.h b/include/winternl.h index 22cdceeaedb..8406d4b8d46 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4564,7 +4564,7 @@ NTSYSAPI NTSTATUS WINAPI NtQueryLicenseValue(const UNICODE_STRING *,ULONG *,PVO NTSYSAPI NTSTATUS WINAPI NtQueryVirtualMemory(HANDLE,LPCVOID,MEMORY_INFORMATION_CLASS,PVOID,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI NtQueryVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); NTSYSAPI NTSTATUS WINAPI NtRaiseException(PEXCEPTION_RECORD,PCONTEXT,BOOL); -NTSYSAPI NTSTATUS WINAPI NtRaiseHardError(NTSTATUS,ULONG,PUNICODE_STRING,PVOID*,HARDERROR_RESPONSE_OPTION,PHARDERROR_RESPONSE); +NTSYSAPI NTSTATUS WINAPI NtRaiseHardError(NTSTATUS,ULONG,ULONG,PVOID*,HARDERROR_RESPONSE_OPTION,PHARDERROR_RESPONSE); NTSYSAPI NTSTATUS WINAPI NtReadFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,PLARGE_INTEGER,PULONG); NTSYSAPI NTSTATUS WINAPI NtReadFileScatter(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,FILE_SEGMENT_ELEMENT*,ULONG,PLARGE_INTEGER,PULONG); NTSYSAPI NTSTATUS WINAPI NtReadRequestData(HANDLE,PLPC_MESSAGE,ULONG,PVOID,ULONG,PULONG);

1 0