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

Eric Pouech : cmd: Move prompt handling into line reading.
by Alexandre Julliard 24 Jun '24

24 Jun '24

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 24 Jun '24

24 Jun '24

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

Eric Pouech : cmd: Move depth count inside builder.
by Alexandre Julliard 24 Jun '24

24 Jun '24

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

Rémi Bernon : winex11: Move window surface creation functions to bitblt.c.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: e9ca13a6f736ff54d80805a050f174f2fce835a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/e9ca13a6f736ff54d80805a050f174… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 12 10:13:15 2024 +0200 winex11: Move window surface creation functions to bitblt.c. --- dlls/winex11.drv/bitblt.c | 100 +++++++++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/window.c | 96 -------------------------------------------- dlls/winex11.drv/x11drv.h | 3 +- 3 files changed, 99 insertions(+), 100 deletions(-)

1 0

Rémi Bernon : winemac: Move window surface creation functions to surface.c.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 834da273c1d3896dc4cf5b54e24253743a8412fa URL: https://gitlab.winehq.org/wine/wine/-/commit/834da273c1d3896dc4cf5b54e24253… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 21 10:14:59 2024 +0200 winemac: Move window surface creation functions to surface.c. --- dlls/winemac.drv/macdrv.h | 3 -- dlls/winemac.drv/surface.c | 98 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/window.c | 91 ------------------------------------------ 3 files changed, 95 insertions(+), 97 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 31835164e71..811947f723c 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -207,10 +207,7 @@ extern void init_win_context(void); extern macdrv_window macdrv_get_cocoa_window(HWND hwnd, BOOL require_on_screen); extern RGNDATA *get_region_data(HRGN hrgn, HDC hdc_lptodp); extern void activate_on_following_focus(void); -extern struct window_surface *create_surface(HWND hwnd, macdrv_window window, const RECT *rect, - struct window_surface *old_surface, BOOL use_alpha); extern void set_surface_use_alpha(struct window_surface *window_surface, BOOL use_alpha); -extern void surface_clip_to_visible_rect(struct window_surface *window_surface, const RECT *visible_rect); extern void macdrv_handle_event(const macdrv_event *event); diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 37e2c466926..bd40a2a2db2 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -127,8 +127,8 @@ static struct macdrv_window_surface *get_mac_surface(struct window_surface *surf /*********************************************************************** * create_surface */ -struct window_surface *create_surface(HWND hwnd, macdrv_window window, const RECT *rect, - struct window_surface *old_surface, BOOL use_alpha) +static struct window_surface *create_surface(HWND hwnd, macdrv_window window, const RECT *rect, + struct window_surface *old_surface, BOOL use_alpha) { struct macdrv_window_surface *surface; int width = rect->right - rect->left, height = rect->bottom - rect->top; @@ -265,7 +265,7 @@ done: * Intersect the accumulated drawn region with a new visible rect, * effectively discarding stale drawing in the surface slack area. */ -void surface_clip_to_visible_rect(struct window_surface *window_surface, const RECT *visible_rect) +static void surface_clip_to_visible_rect(struct window_surface *window_surface, const RECT *visible_rect) { struct macdrv_window_surface *surface = get_mac_surface(window_surface); RECT rect = *visible_rect; @@ -277,3 +277,95 @@ void surface_clip_to_visible_rect(struct window_surface *window_surface, const R intersect_rect(&window_surface->bounds, &window_surface->bounds, &rect); window_surface_unlock(window_surface); } + + +static inline RECT get_surface_rect(const RECT *visible_rect) +{ + RECT rect = *visible_rect; + + OffsetRect(&rect, -visible_rect->left, -visible_rect->top); + rect.left &= ~127; + rect.top &= ~127; + rect.right = max(rect.left + 128, (rect.right + 127) & ~127); + rect.bottom = max(rect.top + 128, (rect.bottom + 127) & ~127); + return rect; +} + + +/*********************************************************************** + * CreateWindowSurface (MACDRV.@) + */ +BOOL macdrv_CreateWindowSurface(HWND hwnd, UINT swp_flags, const RECT *visible_rect, struct window_surface **surface) +{ + struct macdrv_win_data *data; + DWORD style = NtUserGetWindowLongW(hwnd, GWL_STYLE); + 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 = get_win_data(hwnd))) return TRUE; /* use default surface */ + + if (*surface) window_surface_release(*surface); + *surface = NULL; + + surface_rect = get_surface_rect(visible_rect); + if (data->surface) + { + if (EqualRect(&data->surface->rect, &surface_rect)) + { + /* existing surface is good enough */ + surface_clip_to_visible_rect(data->surface, visible_rect); + window_surface_add_ref(data->surface); + *surface = data->surface; + goto done; + } + } + else if (!(swp_flags & SWP_SHOWWINDOW) && !(style & WS_VISIBLE)) goto done; + + *surface = create_surface(data->hwnd, data->cocoa_window, &surface_rect, data->surface, FALSE); + +done: + release_win_data(data); + return TRUE; +} + + +/*********************************************************************** + * CreateLayeredWindow (MACDRV.@) + */ +BOOL macdrv_CreateLayeredWindow(HWND hwnd, const RECT *window_rect, COLORREF color_key, + struct window_surface **window_surface) +{ + struct window_surface *surface; + struct macdrv_win_data *data; + RECT rect; + + if (!(data = get_win_data(hwnd))) return FALSE; + + data->layered = TRUE; + data->ulw_layered = TRUE; + + rect = *window_rect; + OffsetRect(&rect, -window_rect->left, -window_rect->top); + + surface = data->surface; + if (!surface || !EqualRect(&surface->rect, &rect)) + { + data->surface = create_surface(data->hwnd, data->cocoa_window, &rect, NULL, TRUE); + macdrv_set_window_surface(data->cocoa_window, data->surface); + if (surface) window_surface_release(surface); + surface = data->surface; + if (data->unminimized_surface) + { + window_surface_release(data->unminimized_surface); + data->unminimized_surface = NULL; + } + } + else set_surface_use_alpha(surface, TRUE); + + if ((*window_surface = surface)) window_surface_add_ref(surface); + + release_win_data(data); + + return TRUE; +} diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 012189249a4..35198f45607 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1890,46 +1890,6 @@ done: } -/*********************************************************************** - * CreateLayeredWindow (MACDRV.@) - */ -BOOL macdrv_CreateLayeredWindow(HWND hwnd, const RECT *window_rect, COLORREF color_key, - struct window_surface **window_surface) -{ - struct window_surface *surface; - struct macdrv_win_data *data; - RECT rect; - - if (!(data = get_win_data(hwnd))) return FALSE; - - data->layered = TRUE; - data->ulw_layered = TRUE; - - rect = *window_rect; - OffsetRect(&rect, -window_rect->left, -window_rect->top); - - surface = data->surface; - if (!surface || !EqualRect(&surface->rect, &rect)) - { - data->surface = create_surface(data->hwnd, data->cocoa_window, &rect, NULL, TRUE); - macdrv_set_window_surface(data->cocoa_window, data->surface); - if (surface) window_surface_release(surface); - surface = data->surface; - if (data->unminimized_surface) - { - window_surface_release(data->unminimized_surface); - data->unminimized_surface = NULL; - } - } - else set_surface_use_alpha(surface, TRUE); - - if ((*window_surface = surface)) window_surface_add_ref(surface); - - release_win_data(data); - - return TRUE; -} - /*********************************************************************** * UpdateLayeredWindow (MACDRV.@) */ @@ -1984,19 +1944,6 @@ LRESULT macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) } -static inline RECT get_surface_rect(const RECT *visible_rect) -{ - RECT rect = *visible_rect; - - OffsetRect(&rect, -visible_rect->left, -visible_rect->top); - rect.left &= ~127; - rect.top &= ~127; - rect.right = max(rect.left + 128, (rect.right + 127) & ~127); - rect.bottom = max(rect.top + 128, (rect.bottom + 127) & ~127); - return rect; -} - - /*********************************************************************** * WindowPosChanging (MACDRV.@) */ @@ -2028,44 +1975,6 @@ done: } -/*********************************************************************** - * CreateWindowSurface (MACDRV.@) - */ -BOOL macdrv_CreateWindowSurface(HWND hwnd, UINT swp_flags, const RECT *visible_rect, struct window_surface **surface) -{ - struct macdrv_win_data *data; - DWORD style = NtUserGetWindowLongW(hwnd, GWL_STYLE); - 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 = get_win_data(hwnd))) return TRUE; /* use default surface */ - - if (*surface) window_surface_release(*surface); - *surface = NULL; - - surface_rect = get_surface_rect(visible_rect); - if (data->surface) - { - if (EqualRect(&data->surface->rect, &surface_rect)) - { - /* existing surface is good enough */ - surface_clip_to_visible_rect(data->surface, visible_rect); - window_surface_add_ref(data->surface); - *surface = data->surface; - goto done; - } - } - else if (!(swp_flags & SWP_SHOWWINDOW) && !(style & WS_VISIBLE)) goto done; - - *surface = create_surface(data->hwnd, data->cocoa_window, &surface_rect, data->surface, FALSE); - -done: - release_win_data(data); - return TRUE; -} - - /*********************************************************************** * WindowPosChanged (MACDRV.@) */

1 0

Rémi Bernon : winewayland: Move window surface creation functions to window_surface.c.
by Alexandre Julliard 24 Jun '24

24 Jun '24

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 24 Jun '24

24 Jun '24

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

Alexandre Julliard : makefiles: Hardcode the fonts directory.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 13159b0767b8b5e3a9f9203f6e316738359cc7cf URL: https://gitlab.winehq.org/wine/wine/-/commit/13159b0767b8b5e3a9f9203f6e3167… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 13:44:54 2024 +0200 makefiles: Hardcode the fonts directory. It's Wine-specific anyway. --- configure | 4 ---- configure.ac | 1 - dlls/win32u/Makefile.in | 2 -- dlls/win32u/font.c | 20 ++++---------------- tools/makedep.c | 6 +++--- 5 files changed, 7 insertions(+), 26 deletions(-) diff --git a/configure b/configure index e77f0893dd8..26b537c2088 100755 --- a/configure +++ b/configure @@ -869,7 +869,6 @@ CC SET_MAKE srcdir nlsdir -fontdir dlldir host_os host_vendor @@ -4678,8 +4677,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac dlldir=\${libdir}/wine -fontdir=\${datadir}/wine/fonts - nlsdir=\${datadir}/wine/nls @@ -23982,7 +23979,6 @@ host_cpu = $host_cpu host_vendor = $host_vendor host_os = $host_os dlldir = $dlldir -fontdir = $fontdir nlsdir = $nlsdir srcdir = $srcdir SET_MAKE = $SET_MAKE diff --git a/configure.ac b/configure.ac index e828083fc91..ac0f3ea051d 100644 --- a/configure.ac +++ b/configure.ac @@ -92,7 +92,6 @@ AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine i AC_CANONICAL_HOST AC_SUBST(dlldir,[\${libdir}/wine]) -AC_SUBST(fontdir,[\${datadir}/wine/fonts]) AC_SUBST(nlsdir,[\${datadir}/wine/nls]) AC_SUBST(srcdir) diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index 61c06e900a4..6326a3cd302 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -56,5 +56,3 @@ SOURCES = \ vulkan.c \ window.c \ winstation.c - -font_EXTRADEFS = -DWINE_FONT_DIR=\"`${MAKEDEP} -R ${datadir}/wine ${fontdir}`\" diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 7e70cccf568..8fb3128f5e0 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -462,10 +462,6 @@ static const struct nls_update_font_list static pthread_mutex_t font_lock = PTHREAD_MUTEX_INITIALIZER; -#ifndef WINE_FONT_DIR -#define WINE_FONT_DIR "fonts" -#endif - #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) #define GET_BE_DWORD(x) (x) @@ -476,20 +472,12 @@ static pthread_mutex_t font_lock = PTHREAD_MUTEX_INITIALIZER; static void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) { - const char *dir; + const char *dir = ntdll_get_build_dir(); ULONG len = MAX_PATH; - if ((dir = ntdll_get_data_dir())) - { - wine_unix_to_nt_file_name( dir, path, &len ); - asciiz_to_unicode( path + len - 1, "\\" WINE_FONT_DIR "\\" ); - } - else if ((dir = ntdll_get_build_dir())) - { - wine_unix_to_nt_file_name( dir, path, &len ); - asciiz_to_unicode( path + len - 1, "\\fonts\\" ); - } - + if (!dir) dir = ntdll_get_data_dir(); + wine_unix_to_nt_file_name( dir, path, &len ); + asciiz_to_unicode( path + len - 1, "\\fonts\\" ); if (file) lstrcatW( path, file ); } diff --git a/tools/makedep.c b/tools/makedep.c index 29c83e3f73f..61e30ed89a6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2664,7 +2664,7 @@ static struct strarray get_removable_dirs( struct strarray files ) static void output_uninstall_rules( struct makefile *make ) { static const char *dirs_order[] = - { "$(includedir)", "$(mandir)", "$(fontdir)", "$(nlsdir)", "$(datadir)", "$(dlldir)" }; + { "$(includedir)", "$(mandir)", "$(nlsdir)", "$(datadir)", "$(dlldir)" }; struct strarray uninstall_dirs; unsigned int i, j; @@ -2987,7 +2987,7 @@ static void output_source_sfd( struct makefile *make, struct incl_file *source, } if (source->file->flags & FLAG_INSTALL) { - add_install_rule( make, source->name, 0, ttf_obj, strmake( "D$(fontdir)/%s", ttf_obj )); + add_install_rule( make, source->name, 0, ttf_obj, strmake( "D$(datadir)/wine/fonts/%s", ttf_obj )); output_srcdir_symlink( make, ttf_obj ); } @@ -3005,7 +3005,7 @@ static void output_source_sfd( struct makefile *make, struct incl_file *source, tools_path( make, "sfnt2fon" ), ttf_file ); output( "\t%s%s -q -o $@ %s %s\n", cmd_prefix( "GEN" ), tools_path( make, "sfnt2fon" ), ttf_file, args ); - add_install_rule( make, source->name, 0, xstrdup(font), strmake( "d$(fontdir)/%s", font )); + add_install_rule( make, source->name, 0, xstrdup(font), strmake( "d$(datadir)/wine/fonts/%s", font )); } } }

1 0

Alexandre Julliard : makefiles: Hardcode the nls directory.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: f0ee51026b723d74b36626074f1860e80f54ad68 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0ee51026b723d74b36626074f1860… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 13:47:08 2024 +0200 makefiles: Hardcode the nls directory. It's Wine-specific anyway. --- configure | 4 ---- configure.ac | 1 - server/Makefile.in | 2 +- tools/makedep.c | 4 ++-- tools/wmc/Makefile.in | 4 ++-- tools/wrc/Makefile.in | 4 ++-- 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 26b537c2088..460701f00ed 100755 --- a/configure +++ b/configure @@ -868,7 +868,6 @@ CFLAGS CC SET_MAKE srcdir -nlsdir dlldir host_os host_vendor @@ -4677,8 +4676,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac dlldir=\${libdir}/wine -nlsdir=\${datadir}/wine/nls - @@ -23979,7 +23976,6 @@ host_cpu = $host_cpu host_vendor = $host_vendor host_os = $host_os dlldir = $dlldir -nlsdir = $nlsdir srcdir = $srcdir SET_MAKE = $SET_MAKE CC = $CC diff --git a/configure.ac b/configure.ac index ac0f3ea051d..745f703709f 100644 --- a/configure.ac +++ b/configure.ac @@ -92,7 +92,6 @@ AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine i AC_CANONICAL_HOST AC_SUBST(dlldir,[\${libdir}/wine]) -AC_SUBST(nlsdir,[\${datadir}/wine/nls]) AC_SUBST(srcdir) dnl **** Check for some programs **** diff --git a/server/Makefile.in b/server/Makefile.in index 7b46b924c46..8ba6baf0c30 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -49,4 +49,4 @@ SOURCES = \ UNIX_LIBS = $(LDEXECFLAGS) $(RT_LIBS) $(INOTIFY_LIBS) $(PROCSTAT_LIBS) -unicode_EXTRADEFS = -DNLSDIR="\"${nlsdir}\"" -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\" +unicode_EXTRADEFS = -DNLSDIR="\"${datadir}/wine/nls\"" -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine/nls`\" diff --git a/tools/makedep.c b/tools/makedep.c index 61e30ed89a6..2b24c9584a3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2664,7 +2664,7 @@ static struct strarray get_removable_dirs( struct strarray files ) static void output_uninstall_rules( struct makefile *make ) { static const char *dirs_order[] = - { "$(includedir)", "$(mandir)", "$(nlsdir)", "$(datadir)", "$(dlldir)" }; + { "$(includedir)", "$(mandir)", "$(datadir)", "$(dlldir)" }; struct strarray uninstall_dirs; unsigned int i, j; @@ -3042,7 +3042,7 @@ static void output_source_svg( struct makefile *make, struct incl_file *source, static void output_source_nls( struct makefile *make, struct incl_file *source, const char *obj ) { add_install_rule( make, source->name, 0, source->name, - strmake( "D$(nlsdir)/%s", source->name )); + strmake( "D$(datadir)/wine/nls/%s", source->name )); output_srcdir_symlink( make, strmake( "%s.nls", obj )); } diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index 022315c8ce1..1c2c72360b7 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -12,7 +12,7 @@ SOURCES = \ write.c wmc_EXTRADEFS = \ - -DNLSDIR="\"${nlsdir}\"" \ - -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\" + -DNLSDIR="\"${datadir}/wine/nls\"" \ + -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine/nls`\" INSTALL_DEV = $(PROGRAMS) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 06547d2b851..54cde2e98fd 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -15,9 +15,9 @@ SOURCES = \ wrc.man.in wrc_EXTRADEFS = \ - -DNLSDIR="\"${nlsdir}\"" \ + -DNLSDIR="\"${datadir}/wine/nls\"" \ -DINCLUDEDIR="\"${includedir}\"" \ - -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\" \ + -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine/nls`\" \ -DBIN_TO_INCLUDEDIR=\"`${MAKEDEP} -R ${bindir} ${includedir}`\" INSTALL_DEV = $(PROGRAMS)

1 0

Alexandre Julliard : makefiles: Hardcode the dll directory.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 0fb9e616bcfb4ba25f29f96dfbfd9f88d90ddeb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/0fb9e616bcfb4ba25f29f96dfbfd9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 13:57:34 2024 +0200 makefiles: Hardcode the dll directory. It's Wine-specific anyway. --- configure | 6 +----- configure.ac | 3 +-- dlls/ntdll/Makefile.in | 2 +- loader/Makefile.in | 2 +- tools/makedep.c | 10 +++++----- tools/widl/Makefile.in | 4 ++-- 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 460701f00ed..64afddd6a51 100755 --- a/configure +++ b/configure @@ -868,7 +868,6 @@ CFLAGS CC SET_MAKE srcdir -dlldir host_os host_vendor host_cpu @@ -4674,8 +4673,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -dlldir=\${libdir}/wine - @@ -6470,7 +6467,7 @@ MAKEDEP=$wine_makedep RUNTESTFLAGS="-q -P wine" -SED_CMD="LC_ALL=C sed -e 's,@bindir@,\${bindir},g' -e 's,@dlldir@,\${dlldir},g' -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g'" +SED_CMD="LC_ALL=C sed -e 's,@bindir@,\${bindir},g' -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g'" if test -n "$host_alias" -a "$host_alias" != "$build_alias" @@ -23975,7 +23972,6 @@ host = $host host_cpu = $host_cpu host_vendor = $host_vendor host_os = $host_os -dlldir = $dlldir srcdir = $srcdir SET_MAKE = $SET_MAKE CC = $CC diff --git a/configure.ac b/configure.ac index 745f703709f..8c2f0f3e09b 100644 --- a/configure.ac +++ b/configure.ac @@ -91,7 +91,6 @@ AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine i AC_CANONICAL_HOST -AC_SUBST(dlldir,[\${libdir}/wine]) AC_SUBST(srcdir) dnl **** Check for some programs **** @@ -196,7 +195,7 @@ fi AC_SUBST(toolsdir,[$wine_cv_toolsdir]) AC_SUBST(MAKEDEP,[$wine_makedep]) AC_SUBST(RUNTESTFLAGS,["-q -P wine"]) -AC_SUBST(SED_CMD,["LC_ALL=C sed -e 's,@bindir@,\${bindir},g' -e 's,@dlldir@,\${dlldir},g' -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g'"]) +AC_SUBST(SED_CMD,["LC_ALL=C sed -e 's,@bindir@,\${bindir},g' -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g'"]) if test -n "$host_alias" -a "$host_alias" != "$build_alias" then diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index b519bcd655f..e17e3f72b92 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -76,5 +76,5 @@ EXTRA_OBJS = unix/version.o unix_loader_EXTRADEFS = \ -DBINDIR=\"${bindir}\" \ -DSYSTEMDLLPATH=\"${system_dllpath}\" \ - -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \ + -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${libdir}/wine ${bindir}`\" \ -DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\" diff --git a/loader/Makefile.in b/loader/Makefile.in index 30413fc8677..5a9fdabfd97 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -16,7 +16,7 @@ UNIX_CFLAGS = -fPIE preloader_EXTRADEFS = -fno-builtin -main_EXTRADEFS = -DDLLDIR=\"${dlldir}\" -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\" +main_EXTRADEFS = -DDLLDIR=\"${libdir}/wine\" -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${libdir}/wine`\" wine_OBJS = main.o wine_DEPS = $(WINELOADER_DEPENDS) diff --git a/tools/makedep.c b/tools/makedep.c index 2b24c9584a3..cf22bc7bf07 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2664,7 +2664,7 @@ static struct strarray get_removable_dirs( struct strarray files ) static void output_uninstall_rules( struct makefile *make ) { static const char *dirs_order[] = - { "$(includedir)", "$(mandir)", "$(datadir)", "$(dlldir)" }; + { "$(includedir)", "$(mandir)", "$(datadir)" }; struct strarray uninstall_dirs; unsigned int i, j; @@ -3383,7 +3383,7 @@ static void output_fake_module( struct makefile *make, const char *spec_file ) if (make->disabled[arch]) return; strarray_add( &make->all_targets[arch], name ); - add_install_rule( make, make->module, arch, name, strmake( "d$(dlldir)/%s", name )); + add_install_rule( make, make->module, arch, name, strmake( "d$(libdir)/wine/%s", name )); output( "%s:", obj_dir_path( make, name )); if (spec_file) output_filename( spec_file ); @@ -3460,7 +3460,7 @@ static void output_module( struct makefile *make, unsigned int arch ) strarray_add( &make->all_targets[link_arch], module_name ); if (make->data_only) add_install_rule( make, make->module, link_arch, module_name, - strmake( "d$(dlldir)/%s%s", arch_pe_dirs[arch], make->module )); + strmake( "d$(libdir)/wine/%s%s", arch_pe_dirs[arch], make->module )); else add_install_rule( make, make->module, link_arch, module_name, strmake( "%c%s%s%s", '0' + arch, arch_install_dirs[arch], make->module, @@ -4554,7 +4554,7 @@ int main( int argc, char *argv[] ) arch_dirs[0] = ""; arch_pe_dirs[0] = strmake( "%s-windows/", archs.str[0] ); - arch_install_dirs[0] = unix_lib_supported ? strmake( "$(dlldir)/%s-unix/", archs.str[0] ) : "$(dlldir)/"; + arch_install_dirs[0] = unix_lib_supported ? strmake( "$(libdir)/wine/%s-unix/", archs.str[0] ) : "$(libdir)/wine/"; strip_progs[0] = "\"$(STRIP)\""; for (arch = 1; arch < archs.count; arch++) @@ -4564,7 +4564,7 @@ int main( int argc, char *argv[] ) strarray_add( &target_flags[arch], target ); arch_dirs[arch] = strmake( "%s-windows/", archs.str[arch] ); arch_pe_dirs[arch] = arch_dirs[arch]; - arch_install_dirs[arch] = strmake( "$(dlldir)/%s", arch_dirs[arch] ); + arch_install_dirs[arch] = strmake( "$(libdir)/wine/%s", arch_dirs[arch] ); strip_progs[arch] = strmake( "%s-strip", target ); dll_ext[arch] = ""; } diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index da6d843b2a8..fee965d49db 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -26,8 +26,8 @@ SOURCES = \ widl_EXTRADEFS = \ -DINCLUDEDIR="\"${includedir}\"" \ - -DDLLDIR="\"${dlldir}\"" \ + -DDLLDIR="\"${libdir}/wine\"" \ -DBIN_TO_INCLUDEDIR=\"`${MAKEDEP} -R ${bindir} ${includedir}`\" \ - -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\" + -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${libdir}/wine`\" INSTALL_DEV = $(PROGRAMS)

1 0