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

Eric Pouech : cmd: Let redirections be handled by node instead of command.
by Alexandre Julliard 26 Jun '24

26 Jun '24

Module: wine Branch: master Commit: cd50aa7d9c123f7be190f5f76d8d78e6a7cbac47 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd50aa7d9c123f7be190f5f76d8d78… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jun 17 11:33:21 2024 +0200 cmd: Let redirections be handled by node instead of command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 6 ++--- programs/cmd/wcmd.h | 12 ++++++--- programs/cmd/wcmdmain.c | 71 +++++++++++++++++++++++++++++++++++++------------ 3 files changed, 65 insertions(+), 24 deletions(-)

1 0

Eric Pouech : cmd: Move code around to avoid forward declaration.
by Alexandre Julliard 26 Jun '24

26 Jun '24

Module: wine Branch: master Commit: cb56c7b7bde9a29e52bfc208bb7078c291fc245d URL: https://gitlab.winehq.org/wine/wine/-/commit/cb56c7b7bde9a29e52bfc208bb7078… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 20 16:46:44 2024 +0200 cmd: Move code around to avoid forward declaration. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 98 ++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 13ed0e09bab..e2c60f3b8c0 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1098,55 +1098,6 @@ void for_control_append_set(CMD_FOR_CONTROL *for_ctrl, const WCHAR *set) for_ctrl->set = xstrdupW(set); } -/*************************************************************************** - * node_dispose_tree - * - * Frees the storage held for a parsed command line - * - This is not done in the process_commands, as eventually the current - * pointer will be modified within the commands, and hence a single free - * routine is simpler - */ -void node_dispose_tree(CMD_NODE *cmds) -{ - /* Loop through the commands, freeing them one by one */ - while (cmds) - { - CMD_NODE *thisCmd = cmds; - cmds = CMD_node_next(cmds); - if (thisCmd->op == CMD_SINGLE) - { - redirection_dispose_list(thisCmd->redirects); - command_dispose(thisCmd->command); - } - else - node_dispose_tree(thisCmd->left); - free(thisCmd); - } -} - -static CMD_NODE *node_create_single(CMD_COMMAND *c, CMD_REDIRECTION *redir) -{ - CMD_NODE *new = xalloc(sizeof(CMD_NODE)); - - new->op = CMD_SINGLE; - new->command = c; - new->redirects = redir; - - return new; -} - -static CMD_NODE *node_create_binary(CMD_OPERATOR op, CMD_NODE *l, CMD_NODE *r) -{ - CMD_NODE *new = xalloc(sizeof(CMD_NODE)); - - new->op = op; - new->left = l; - new->right = r; - new->redirects = NULL; - - return new; -} - void if_condition_dispose(CMD_IF_CONDITION *cond) { switch (cond->op) @@ -1287,6 +1238,55 @@ const char *debugstr_if_condition(const CMD_IF_CONDITION *cond) } } +/*************************************************************************** + * node_dispose_tree + * + * Frees the storage held for a parsed command line + * - This is not done in the process_commands, as eventually the current + * pointer will be modified within the commands, and hence a single free + * routine is simpler + */ +void node_dispose_tree(CMD_NODE *cmds) +{ + /* Loop through the commands, freeing them one by one */ + while (cmds) + { + CMD_NODE *thisCmd = cmds; + cmds = CMD_node_next(cmds); + if (thisCmd->op == CMD_SINGLE) + { + redirection_dispose_list(thisCmd->redirects); + command_dispose(thisCmd->command); + } + else + node_dispose_tree(thisCmd->left); + free(thisCmd); + } +} + +static CMD_NODE *node_create_single(CMD_COMMAND *c, CMD_REDIRECTION *redir) +{ + CMD_NODE *new = xalloc(sizeof(CMD_NODE)); + + new->op = CMD_SINGLE; + new->command = c; + new->redirects = redir; + + return new; +} + +static CMD_NODE *node_create_binary(CMD_OPERATOR op, CMD_NODE *l, CMD_NODE *r) +{ + CMD_NODE *new = xalloc(sizeof(CMD_NODE)); + + new->op = op; + new->left = l; + new->right = r; + new->redirects = NULL; + + return new; +} + static void init_msvcrt_io_block(STARTUPINFOW* st) { STARTUPINFOW st_p;

1 0

Elizabeth Figura : quartz/tests: Test IVMRWindowlessControl::GetNativeWindowSize() on the default presenter.
by Alexandre Julliard 26 Jun '24

26 Jun '24

Module: wine Branch: master Commit: 626b0faf30f3315bd413903303cb6ee093936f1e URL: https://gitlab.winehq.org/wine/wine/-/commit/626b0faf30f3315bd413903303cb6e… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Jun 25 19:01:20 2024 -0500 quartz/tests: Test IVMRWindowlessControl::GetNativeWindowSize() on the default presenter. --- dlls/quartz/tests/vmr7.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index d35f4d5c01c..23bcbdce790 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -3850,6 +3850,69 @@ static void test_default_presenter_allocate(void) DestroyWindow(window); } +static void test_default_presenter_window(void) +{ + IDirectDrawSurface7 *frontbuffer; + IVMRSurfaceAllocator *allocator; + IVMRWindowlessControl *control; + VMRALLOCATIONINFO info; + LONG width, height; + DWORD count; + HRESULT hr; + LONG ref; + + BITMAPINFOHEADER bitmap_header = + { + .biSize = sizeof(BITMAPINFOHEADER), + .biWidth = 320, + .biHeight = 240, + .biCompression = BI_RGB, + .biBitCount = 32, + .biPlanes = 1, + }; + + hr = CoCreateInstance(&CLSID_AllocPresenter, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRSurfaceAllocator, (void **)&allocator); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + count = 2; + info.dwFlags = AMAP_DIRECTED_FLIP | AMAP_ALLOW_SYSMEM; + info.dwMinBuffers = count; + info.dwMaxBuffers = count; + info.dwInterlaceFlags = 0; + info.szNativeSize.cx = 420; + info.szAspectRatio.cx = 400; + info.szNativeSize.cy = 180; + info.szAspectRatio.cy = 200; + info.lpHdr = &bitmap_header; + info.lpPixFmt = NULL; + + hr = IVMRSurfaceAllocator_AllocateSurface(allocator, 0, &info, &count, &frontbuffer); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IVMRSurfaceAllocator_QueryInterface(allocator, &IID_IVMRWindowlessControl, (void **)&control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + width = height = 0xdeadbeef; + hr = IVMRWindowlessControl_GetNativeVideoSize(control, &width, &height, NULL, NULL); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine ok(width == 420, "Got width %ld.\n", width); + todo_wine ok(height == 180, "Got height %ld.\n", height); + + width = height = 0xdeadbeef; + hr = IVMRWindowlessControl_GetNativeVideoSize(control, NULL, NULL, &width, &height); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine ok(width == 400, "Got width %ld.\n", width); + todo_wine ok(height == 200, "Got height %ld.\n", height); + + hr = IVMRSurfaceAllocator_FreeSurface(allocator, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + IVMRWindowlessControl_Release(control); + ref = IVMRSurfaceAllocator_Release(allocator); + ok(!ref, "Got outstanding refcount %ld.\n", ref); +} + START_TEST(vmr7) { CoInitialize(NULL); @@ -3870,6 +3933,7 @@ START_TEST(vmr7) test_windowless_size(); test_unconnected_eos(); test_default_presenter_allocate(); + test_default_presenter_window(); test_renderless_formats(); CoUninitialize();

1 0

Elizabeth Figura : quartz: Implement IVMRWindowlessControl::GetNativeVideoSize().
by Alexandre Julliard 26 Jun '24

26 Jun '24

Module: wine Branch: master Commit: 2b6035fcff40fa9ccc1f74e9afa2fac42b80ab4a URL: https://gitlab.winehq.org/wine/wine/-/commit/2b6035fcff40fa9ccc1f74e9afa2fa… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Jun 25 19:03:04 2024 -0500 quartz: Implement IVMRWindowlessControl::GetNativeVideoSize(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54935 --- dlls/quartz/tests/vmr7.c | 12 ++++++------ dlls/quartz/vmr7_presenter.c | 25 +++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 23bcbdce790..ff15ad9c81d 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -3895,15 +3895,15 @@ static void test_default_presenter_window(void) width = height = 0xdeadbeef; hr = IVMRWindowlessControl_GetNativeVideoSize(control, &width, &height, NULL, NULL); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(width == 420, "Got width %ld.\n", width); - todo_wine ok(height == 180, "Got height %ld.\n", height); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(width == 420, "Got width %ld.\n", width); + ok(height == 180, "Got height %ld.\n", height); width = height = 0xdeadbeef; hr = IVMRWindowlessControl_GetNativeVideoSize(control, NULL, NULL, &width, &height); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(width == 400, "Got width %ld.\n", width); - todo_wine ok(height == 200, "Got height %ld.\n", height); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(width == 400, "Got width %ld.\n", width); + ok(height == 200, "Got height %ld.\n", height); hr = IVMRSurfaceAllocator_FreeSurface(allocator, 0); ok(hr == S_OK, "Got hr %#lx.\n", hr); diff --git a/dlls/quartz/vmr7_presenter.c b/dlls/quartz/vmr7_presenter.c index 406c9ead52a..c244c86236a 100644 --- a/dlls/quartz/vmr7_presenter.c +++ b/dlls/quartz/vmr7_presenter.c @@ -35,6 +35,8 @@ struct vmr7_presenter IDirectDrawSurface7 *frontbuffer; IDirectDrawSurface7 *primary; HWND window; + + SIZE native_size, aspect_ratio; }; static struct vmr7_presenter *impl_from_IVMRImagePresenter(IVMRImagePresenter *iface) @@ -213,6 +215,10 @@ static HRESULT WINAPI surface_allocator_AllocateSurface(IVMRSurfaceAllocator *if } *surface = presenter->frontbuffer; ++*count; + + presenter->native_size = info->szNativeSize; + presenter->aspect_ratio = info->szAspectRatio; + return S_OK; } @@ -286,9 +292,24 @@ static ULONG WINAPI windowless_control_Release(IVMRWindowlessControl *iface) static HRESULT WINAPI windowless_control_GetNativeVideoSize(IVMRWindowlessControl *iface, LONG *width, LONG *height, LONG *aspect_width, LONG *aspect_height) { - FIXME("iface %p, width %p, height %p, aspect_width %p, aspect_height %p.\n", + struct vmr7_presenter *presenter = impl_from_IVMRWindowlessControl(iface); + + TRACE("iface %p, width %p, height %p, aspect_width %p, aspect_height %p.\n", iface, width, height, aspect_width, aspect_height); - return E_NOTIMPL; + + if (width) + *width = presenter->native_size.cx; + if (height) + *height = presenter->native_size.cy; + if (aspect_width) + *aspect_width = presenter->aspect_ratio.cx; + if (aspect_height) + *aspect_height = presenter->aspect_ratio.cy; + + TRACE("Returning size (%ld, %ld), aspect ratio (%ld, %ld).\n", + presenter->native_size.cx, presenter->native_size.cy, + presenter->aspect_ratio.cx, presenter->aspect_ratio.cy); + return S_OK; } static HRESULT WINAPI windowless_control_GetMinIdealVideoSize(

1 0

Elizabeth Figura : ntdll: Move set_async_direct_result() to file.c.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 0c4743e9c151731b6461619f82f8533624324608 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c4743e9c151731b6461619f82f853… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Jun 13 23:14:48 2024 -0500 ntdll: Move set_async_direct_result() to file.c. Similar helpers are in file.c, and sync.c has nothing to do with file I/O otherwise. --- dlls/ntdll/unix/file.c | 31 +++++++++++++++++++++++++++++++ dlls/ntdll/unix/sync.c | 34 ---------------------------------- 2 files changed, 31 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index b8fb4f19e13..2ce38b34158 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5484,6 +5484,37 @@ static void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULO SERVER_END_REQ; } +/* notify direct completion of async and close the wait handle if it is no longer needed */ +void set_async_direct_result( HANDLE *async_handle, IO_STATUS_BLOCK *io, + NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) +{ + unsigned int ret; + + /* if we got STATUS_ALERTED, we must have a valid async handle */ + assert( *async_handle ); + + if (!NT_ERROR(status) && status != STATUS_PENDING) + { + io->Status = status; + io->Information = information; + } + + SERVER_START_REQ( set_async_direct_result ) + { + req->handle = wine_server_obj_handle( *async_handle ); + req->status = status; + req->information = information; + req->mark_pending = mark_pending; + ret = wine_server_call( req ); + if (ret == STATUS_SUCCESS) + *async_handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + + if (ret != STATUS_SUCCESS) + ERR( "cannot report I/O result back to server: %#x\n", ret ); +} + /* complete async file I/O, signaling completion in all ways necessary */ void file_complete_async( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, NTSTATUS status, ULONG_PTR information ) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 326e6e7734e..1d66f0d974f 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2667,40 +2667,6 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG #endif -/* Notify direct completion of async and close the wait handle if it is no longer needed. - */ -void set_async_direct_result( HANDLE *async_handle, IO_STATUS_BLOCK *io, - NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) -{ - unsigned int ret; - - /* if we got STATUS_ALERTED, we must have a valid async handle */ - assert( *async_handle ); - - if (!NT_ERROR(status) && status != STATUS_PENDING) - { - io->Status = status; - io->Information = information; - } - - SERVER_START_REQ( set_async_direct_result ) - { - req->handle = wine_server_obj_handle( *async_handle ); - req->status = status; - req->information = information; - req->mark_pending = mark_pending; - ret = wine_server_call( req ); - if (ret == STATUS_SUCCESS) - *async_handle = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; - - if (ret != STATUS_SUCCESS) - ERR( "cannot report I/O result back to server: %08x\n", ret ); - - return; -} - /*********************************************************************** * NtCreateTransaction (NTDLL.@) */

1 0

Brendan Shanks : winemac.drv: Fix warning in [WineWindow grabDockIconSnapshotFromWindow:force:].
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 1620d8f7cabd9e3f6f67dc65fb0f7eed88f65375 URL: https://gitlab.winehq.org/wine/wine/-/commit/1620d8f7cabd9e3f6f67dc65fb0f7e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 24 15:32:31 2024 -0700 winemac.drv: Fix warning in [WineWindow grabDockIconSnapshotFromWindow:force:]. --- dlls/winemac.drv/cocoa_window.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 61a6ab2cd4e..1a73deedc2c 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -2338,7 +2338,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi return; } - const void* windowID = (const void*)(CGWindowID)window.windowNumber; + const void* windowID = (const void*)(uintptr_t)(CGWindowID)window.windowNumber; CFArrayRef windowIDs = CFArrayCreate(NULL, &windowID, 1, NULL); CGImageRef windowImage = CGWindowListCreateImageFromArray(CGRectNull, windowIDs, kCGWindowImageBoundsIgnoreFraming); CFRelease(windowIDs);

1 0

Brendan Shanks : winemac.drv: Fix warning in [WineContentView viewWillDraw].
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 3fac8334d251e2ad2110017fbd818d71519b53df URL: https://gitlab.winehq.org/wine/wine/-/commit/3fac8334d251e2ad2110017fbd818d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 24 15:45:07 2024 -0700 winemac.drv: Fix warning in [WineContentView viewWillDraw]. --- dlls/winemac.drv/cocoa_window.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 1a73deedc2c..f4a6dce89b6 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -564,7 +564,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi clearedGlSurface = TRUE; } context.needsUpdate = TRUE; - macdrv_update_opengl_context(context); + macdrv_update_opengl_context((macdrv_opengl_context)context); } [glContexts addObjectsFromArray:pendingGlContexts]; [pendingGlContexts removeAllObjects];

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 69e3c712dca9cc697830c74725e07daa46d23bdf URL: https://gitlab.winehq.org/wine/wine/-/commit/69e3c712dca9cc697830c74725e07d… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Jun 25 00:24:31 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 18c43029b88..0ba83619a34 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-04-03 22:59+0300\n" +"PO-Revision-Date: 2024-06-25 00:23+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" @@ -14582,10 +14582,8 @@ msgstr "" " šešioliktainis (0x34) arba aštuntainis (056).\n" #: programs/cmd/cmd.rc:411 -#, fuzzy -#| msgid "Syntax error\n" msgid "Syntax error: unexpected %1\n" -msgstr "Sintaksės klaida\n" +msgstr "Sintaksės klaida: netikėtas %1\n" #: programs/conhost/conhost.rc:54 msgid "Cursor size"

1 0

Alexandre Julliard : tools: Add helper functions to get the standard directories.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 6311297c158d91459fad2b4269d9a070fabc5a5b URL: https://gitlab.winehq.org/wine/wine/-/commit/6311297c158d91459fad2b4269d9a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 11:33:46 2024 +0200 tools: Add helper functions to get the standard directories. --- tools/tools.h | 82 ++++++++++++++++++++++++++++++++++++++++++++++- tools/widl/Makefile.in | 6 +--- tools/widl/widl.c | 24 ++++++-------- tools/winegcc/Makefile.in | 3 +- tools/winegcc/winegcc.c | 11 ++----- tools/wmc/Makefile.in | 4 +-- tools/wmc/wmc.c | 15 +++------ tools/wrc/Makefile.in | 6 +--- tools/wrc/wrc.c | 17 +++------- 9 files changed, 106 insertions(+), 62 deletions(-)

1 0

Alexandre Julliard : ntdll: Build relative paths at run-time instead of depending on makedep.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 8c700a4e8316a1c1c2fb23a8ae61178102d5922d URL: https://gitlab.winehq.org/wine/wine/-/commit/8c700a4e8316a1c1c2fb23a8ae6117… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 11:58:25 2024 +0200 ntdll: Build relative paths at run-time instead of depending on makedep. --- dlls/ntdll/Makefile.in | 6 +++--- dlls/ntdll/unix/loader.c | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index e17e3f72b92..37bd6c86e31 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -75,6 +75,6 @@ EXTRA_OBJS = unix/version.o unix_loader_EXTRADEFS = \ -DBINDIR=\"${bindir}\" \ - -DSYSTEMDLLPATH=\"${system_dllpath}\" \ - -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${libdir}/wine ${bindir}`\" \ - -DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\" + -DLIBDIR=\"${libdir}\" \ + -DDATADIR=\"${datadir}\" \ + -DSYSTEMDLLPATH=\"${system_dllpath}\" diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index f8420dd9e62..19fbfb2b68c 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -302,6 +302,42 @@ static char *build_path( const char *dir, const char *name ) return ret; } +/* build a path with the relative dir from 'from' to 'dest' appended to base */ +static char *build_relative_path( const char *base, const char *from, const char *dest ) +{ + const char *start; + char *ret; + unsigned int dotdots = 0; + + for (;;) + { + while (*from == '/') from++; + while (*dest == '/') dest++; + start = dest; /* save start of next path element */ + if (!*from) break; + + while (*from && *from != '/' && *from == *dest) { from++; dest++; } + if ((!*from || *from == '/') && (!*dest || *dest == '/')) continue; + + do /* count remaining elements in 'from' */ + { + dotdots++; + while (*from && *from != '/') from++; + while (*from == '/') from++; + } + while (*from); + break; + } + + ret = malloc( strlen(base) + 3 * dotdots + strlen(start) + 2 ); + strcpy( ret, base ); + while (dotdots--) strcat( ret, "/.." ); + + if (!start[0]) return ret; + strcat( ret, "/" ); + strcat( ret, start ); + return ret; +} /* build a path to a binary and exec it */ static int build_path_and_exec( pid_t *pid, const char *dir, const char *name, char **argv ) @@ -444,8 +480,8 @@ static void init_paths( char *argv[] ) free( path ); } #endif - if (!bin_dir) bin_dir = build_path( dll_dir, DLL_TO_BINDIR ); - data_dir = build_path( bin_dir, BIN_TO_DATADIR ); + if (!bin_dir) bin_dir = build_relative_path( dll_dir, LIBDIR "/wine", BINDIR ); + data_dir = build_relative_path( bin_dir, BINDIR, DATADIR "/wine" ); wineloader = build_path( bin_dir, basename ); } else

1 0