April 2021 - Wine-commits - list.winehq.org

Anton Baskanov : winegstreamer: Add missing RGB16 format to wg_video_format_from_gst.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: d57d8bbc3558870a8f52c379c3de2b05ccd7dd82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d57d8bbc3558870a8f52c379… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Apr 11 18:08:31 2021 +0700 winegstreamer: Add missing RGB16 format to wg_video_format_from_gst. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index e0eff9ee309..5529321490e 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -192,6 +192,8 @@ static enum wg_video_format wg_video_format_from_gst(GstVideoFormat format) return WG_VIDEO_FORMAT_BGR; case GST_VIDEO_FORMAT_RGB15: return WG_VIDEO_FORMAT_RGB15; + case GST_VIDEO_FORMAT_RGB16: + return WG_VIDEO_FORMAT_RGB16; case GST_VIDEO_FORMAT_AYUV: return WG_VIDEO_FORMAT_AYUV; case GST_VIDEO_FORMAT_I420:

1 0

Gijs Vermeulen : jscript: Remove unreachable statement in disp_call_value().
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 9268407bc69c10278ab515fcce4eec9e10c60b93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9268407bc69c10278ab515fc… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Apr 12 00:35:24 2021 +0200 jscript: Remove unreachable statement in disp_call_value(). Spotted by Rafał Mikrut. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49277 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 188de659c4a..67b7cfad005 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2094,8 +2094,6 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W jsdisp = iface_to_jsdisp(disp); if(jsdisp && jsdisp->ctx == ctx) { - if(ctx != jsdisp->ctx) - flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; hres = jsdisp_call_value(jsdisp, jsthis, flags, argc, argv, r); jsdisp_release(jsdisp); return hres;

1 0

Nikolay Sivov : comctl32/tests: Enable some ComboEx tests on version 6.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 302c891eeec046935db6657f20ba81f2c075db3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=302c891eeec046935db6657f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 12:17:04 2021 +0300 comctl32/tests: Enable some ComboEx tests on version 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/combo.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 63470a50ff7..4102191e2f6 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1391,6 +1391,11 @@ START_TEST(combo) return; } + test_comboex(); + test_comboex_CB_GETLBTEXT(); + test_comboex_WM_WINDOWPOSCHANGING(); + test_comboex_get_set_item(); + /* ComboBox control tests. */ test_combo_WS_VSCROLL(); test_combo_setfont(CBS_DROPDOWN);

1 0

Nikolay Sivov : comctl32/tests: Add some tests for ComboEx callback functionality.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 0bb8ddfd413587f515cf55c9213ab5bf53aa0a25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bb8ddfd413587f515cf55c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 12:17:05 2021 +0300 comctl32/tests: Add some tests for ComboEx callback functionality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/combo.c | 159 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 155 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 4102191e2f6..69232a3d4bd 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -27,8 +27,12 @@ #include "v6util.h" #include "msg.h" -#define EDITBOX_SEQ_INDEX 0 -#define NUM_MSG_SEQUENCES 1 +enum message_seq_index +{ + EDITBOX_SEQ_INDEX = 0, + PARENT_SEQ_INDEX, + NUM_MSG_SEQUENCES, +}; #define EDITBOX_ID 0 #define COMBO_ID 1995 @@ -442,10 +446,29 @@ static void test_comboex_WM_WINDOWPOSCHANGING(void) ok(ret, "DestroyWindow failed\n"); } -static LRESULT ComboExTestOnNotify(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +struct di_context { + unsigned int mask; + BOOL set_CBEIF_DI_SETITEM; +}; + +static struct di_context di_context; + +static LRESULT ComboExTestOnNotify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct message msg; NMHDR *hdr = (NMHDR*)lParam; - switch(hdr->code){ + + msg.message = message; + msg.flags = sent|wparam|lparam; + msg.wParam = wParam; + msg.lParam = lParam; + if (hdr) msg.id = hdr->code; + + add_message(sequences, PARENT_SEQ_INDEX, &msg); + + switch (hdr->code) + { case CBEN_ENDEDITA: { NMCBEENDEDITA *edit_info = (NMCBEENDEDITA*)hdr; @@ -462,6 +485,42 @@ static LRESULT ComboExTestOnNotify(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lP } break; } + case CBEN_GETDISPINFOA: + case CBEN_GETDISPINFOW: + { + NMCOMBOBOXEXA *item = (NMCOMBOBOXEXA *)hdr; + + di_context.mask = item->ceItem.mask; + + if (item->ceItem.mask & CBEIF_IMAGE) + { + ok(item->ceItem.iImage == I_IMAGECALLBACK, "Unexpected iImage %d.\n", item->ceItem.iImage); + item->ceItem.iImage = 123; + } + + if (item->ceItem.mask & CBEIF_TEXT) + { + ok(item->ceItem.pszText && item->ceItem.pszText != LPSTR_TEXTCALLBACKA, + "Unexpected pszText %p.\n", item->ceItem.pszText); + ok(item->ceItem.cchTextMax == 0, "Unexpected cchTextMax %d.\n", item->ceItem.cchTextMax); + } + + if (item->ceItem.mask & CBEIF_SELECTEDIMAGE) + ok(item->ceItem.iSelectedImage == I_IMAGECALLBACK, "Unexpected iSelectedImage %d.\n", + item->ceItem.iSelectedImage); + + if (item->ceItem.mask & CBEIF_OVERLAY) + ok(item->ceItem.iOverlay == I_IMAGECALLBACK, "Unexpected iOverlay %d.\n", + item->ceItem.iOverlay); + + if (item->ceItem.mask & CBEIF_INDENT) + ok(item->ceItem.iIndent == 0, "Unexpected iIndent %d.\n", item->ceItem.iIndent); + + if (di_context.set_CBEIF_DI_SETITEM) + item->ceItem.mask |= CBEIF_DI_SETITEM; + + break; + } } return 0; } @@ -1365,6 +1424,96 @@ static void test_combo_ctlcolor(void) DestroyWindow(combo); } +static const struct message getdisp_parent_seq[] = +{ + { WM_NOTIFY, sent|id, 0, 0, CBEN_GETDISPINFOA }, + { 0 } +}; + +static const struct message empty_seq[] = +{ + { 0 } +}; + +static void test_comboex_CBEN_GETDISPINFO(void) +{ + static const unsigned int test_masks[] = + { + CBEIF_TEXT, + CBEIF_IMAGE, + CBEIF_INDENT, + CBEIF_OVERLAY, + CBEIF_SELECTEDIMAGE, + CBEIF_IMAGE | CBEIF_INDENT, + }; + COMBOBOXEXITEMA item; + unsigned int i; + HWND combo; + DWORD res; + + combo = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); + ok(!!combo, "Failed to create control window.\n"); + + /* All possible callback fields. */ + memset(&item, 0, sizeof(item)); + item.mask = CBEIF_TEXT | CBEIF_IMAGE | CBEIF_INDENT | CBEIF_OVERLAY | CBEIF_SELECTEDIMAGE; + item.pszText = LPSTR_TEXTCALLBACKA; + item.iImage = I_IMAGECALLBACK; + item.iSelectedImage = I_IMAGECALLBACK; + item.iOverlay = I_IMAGECALLBACK; + item.iIndent = I_INDENTCALLBACK; + + res = SendMessageA(combo, CBEM_INSERTITEMA, 0, (LPARAM)&item); + ok(!res, "Unexpected return value %u.\n", res); + + for (i = 0; i < ARRAY_SIZE(test_masks); ++i) + { + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&item, 0, sizeof(item)); + item.mask = test_masks[i]; + res = SendMessageA(combo, CBEM_GETITEMA, 0, (LPARAM)&item); + ok(res == 1, "Unexpected return value %u.\n", res); + + ok_sequence(sequences, PARENT_SEQ_INDEX, getdisp_parent_seq, "Get disp mask seq", TRUE); + } + + di_context.set_CBEIF_DI_SETITEM = TRUE; + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&item, 0, sizeof(item)); + item.mask = CBEIF_IMAGE; + di_context.mask = 0; + res = SendMessageA(combo, CBEM_GETITEMA, 0, (LPARAM)&item); + ok(res == 1, "Unexpected return value %u.\n", res); +todo_wine + ok(di_context.mask == CBEIF_IMAGE, "Unexpected mask %#x.\n", di_context.mask); + + ok_sequence(sequences, PARENT_SEQ_INDEX, getdisp_parent_seq, "Get disp DI_SETITEM seq", TRUE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&item, 0, sizeof(item)); + item.mask = CBEIF_IMAGE; + res = SendMessageA(combo, CBEM_GETITEMA, 0, (LPARAM)&item); + ok(res == 1, "Unexpected return value %u.\n", res); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "Get disp after DI_SETITEM seq", FALSE); + + /* Request two fields, one was set. */ + memset(&item, 0, sizeof(item)); + item.mask = CBEIF_IMAGE | CBEIF_INDENT; + di_context.mask = 0; + res = SendMessageA(combo, CBEM_GETITEMA, 0, (LPARAM)&item); + ok(res == 1, "Unexpected return value %u.\n", res); +todo_wine + ok(di_context.mask == CBEIF_INDENT, "Unexpected mask %#x.\n", di_context.mask); + + di_context.set_CBEIF_DI_SETITEM = FALSE; + + DestroyWindow(combo); +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1384,6 +1533,7 @@ START_TEST(combo) test_comboex_WM_WINDOWPOSCHANGING(); test_comboex_subclass(); test_comboex_get_set_item(); + test_comboex_CBEN_GETDISPINFO(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -1395,6 +1545,7 @@ START_TEST(combo) test_comboex_CB_GETLBTEXT(); test_comboex_WM_WINDOWPOSCHANGING(); test_comboex_get_set_item(); + test_comboex_CBEN_GETDISPINFO(); /* ComboBox control tests. */ test_combo_WS_VSCROLL();

1 0

Nikolay Sivov : comctl32/tests: Remove unnecessary macro.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: b6b98933ece4dbe0d5c04fa0fe751dfdb0cf55e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6b98933ece4dbe0d5c04fa0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 12:17:06 2021 +0300 comctl32/tests: Remove unnecessary macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/combo.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 69232a3d4bd..69cc7680827 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -37,8 +37,6 @@ enum message_seq_index #define EDITBOX_ID 0 #define COMBO_ID 1995 -#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) - #define expect_rect(r, _left, _top, _right, _bottom) ok(r.left == _left && r.top == _top && \ r.bottom == _bottom && r.right == _right, "Invalid rect %s vs (%d,%d)-(%d,%d)\n", \ wine_dbgstr_rect(&r), _left, _top, _right, _bottom); @@ -631,7 +629,7 @@ static void test_comboex_get_set_item(void) char textA[] = "test"; HWND hComboEx; COMBOBOXEXITEMA item; - BOOL ret; + DWORD ret; hComboEx = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); @@ -644,7 +642,7 @@ static void test_comboex_get_set_item(void) item.pszText = textA; item.iItem = -1; ret = SendMessageA(hComboEx, CBEM_SETITEMA, 0, (LPARAM)&item); - expect(TRUE, ret); + ok(ret == 1, "Unexpected return value %d.\n", ret); ok_sequence(sequences, EDITBOX_SEQ_INDEX, test_setitem_edit_seq, "set item data for edit", FALSE); @@ -653,16 +651,16 @@ static void test_comboex_get_set_item(void) item.iItem = -1; item.lParam = 0xdeadbeef; ret = SendMessageA(hComboEx, CBEM_GETITEMA, 0, (LPARAM)&item); - expect(TRUE, ret); + ok(ret == 1, "Unexpected return value %d.\n", ret); ok(item.lParam == 0, "Expected zero, got %lx\n", item.lParam); item.lParam = 0x1abe11ed; ret = SendMessageA(hComboEx, CBEM_SETITEMA, 0, (LPARAM)&item); - expect(TRUE, ret); + ok(ret == 1, "Unexpected return value %d.\n", ret); item.lParam = 0; ret = SendMessageA(hComboEx, CBEM_GETITEMA, 0, (LPARAM)&item); - expect(TRUE, ret); + ok(ret == 1, "Unexpected return value %d.\n", ret); ok(item.lParam == 0x1abe11ed, "Expected 0x1abe11ed, got %lx\n", item.lParam); DestroyWindow(hComboEx);

1 0

Nikolay Sivov : mf/topology: Copy input topology attributes on Load().
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: b75301b471a77bc2aab548163880bd5ace430cd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b75301b471a77bc2aab54816… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 12:19:51 2021 +0300 mf/topology: Copy input topology attributes on Load(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 4 ++++ dlls/mf/topology.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index df286db6385..458da0cb275 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2109,9 +2109,13 @@ todo_wine { IMFTopologyNode_Release(sink_node2); + hr = IMFTopology_SetUINT32(full_topology, &IID_IMFTopology, 123); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFTopoLoader_Load(loader, full_topology, &topology2, NULL); ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); ok(full_topology != topology2, "Unexpected instance.\n"); + hr = IMFTopology_GetUINT32(topology2, &IID_IMFTopology, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFTopology_Release(topology2); IMFTopology_Release(full_topology); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 58639a67bdb..bbed2cba893 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2567,6 +2567,8 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in if (FAILED(hr = MFCreateTopology(&output_topology))) return hr; + IMFTopology_CopyAllItems(input_topology, (IMFAttributes *)output_topology); + context.input_topology = input_topology; context.output_topology = output_topology; memset(&context.key, 0xff, sizeof(context.key));

1 0

Nikolay Sivov : mf/tests: Add some SAR supported interfaces checks.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: aaf520cf5efe41f015b1cbbfad7c1cadb392fc9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf520cf5efe41f015b1cbbf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 12:19:52 2021 +0300 mf/tests: Add some SAR supported interfaces checks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 458da0cb275..20440499227 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3878,7 +3878,10 @@ if (SUCCEEDED(hr)) check_interface(sink, &IID_IMFClockStateSink, TRUE); check_interface(sink, &IID_IMFGetService, TRUE); todo_wine check_interface(sink, &IID_IMFPresentationTimeSource, TRUE); + todo_wine check_service_interface(sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); + check_service_interface(sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, FALSE); check_service_interface(sink, &MR_POLICY_VOLUME_SERVICE, &IID_IMFSimpleAudioVolume, TRUE); + check_service_interface(sink, &MR_STREAM_VOLUME_SERVICE, &IID_IMFAudioStreamVolume, TRUE); /* Clock */ hr = IMFMediaSink_QueryInterface(sink, &IID_IMFClockStateSink, (void **)&state_sink);

1 0

Alexandre Julliard : wine.inf: Also install start.exe in syswow64.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: ee13ab0f022f1b89cdc0e6f36ac55a5fb151d6fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee13ab0f022f1b89cdc0e6f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 11 12:20:16 2021 +0200 wine.inf: Also install start.exe in syswow64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50867 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 45ba4fabfa1..d699bd1e4f3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2608,6 +2608,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,ddhelp.exe 11,,dosx.exe 11,,dsound.vxd +11,,start.exe 11,,winhlp32.exe 52,win40\0,wineps16.drv,wineps16.drv16 @@ -2674,7 +2675,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,explorer.exe 11,,iexplore.exe 11,,notepad.exe -11,,start.exe 11,,winetest.exe,- ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,-

1 0

Alexandre Julliard : ntdll: Take loadorder into account also for a main exe in .so format.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: f1e614027b5bb4129976ad5fca8caceac573f549 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1e614027b5bb4129976ad5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 12 09:20:55 2021 +0200 ntdll: Take loadorder into account also for a main exe in .so format. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50956 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index cbafa0d8882..28d2be0b770 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1420,7 +1420,8 @@ found: /*********************************************************************** * open_main_image */ -static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFORMATION *info ) +static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFORMATION *info, + enum loadorder loadorder ) { static const WCHAR soW[] = {'.','s','o',0}; UNICODE_STRING nt_name; @@ -1432,6 +1433,8 @@ static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFO HANDLE mapping; WCHAR *p; + if (loadorder == LO_DISABLED) NtTerminateProcess( GetCurrentProcess(), STATUS_DLL_NOT_FOUND ); + init_unicode_string( &nt_name, image ); InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE, 0, NULL ); if (nt_to_unix_file_name( &nt_name, &unix_name, NULL, FILE_OPEN )) return STATUS_DLL_NOT_FOUND; @@ -1445,7 +1448,7 @@ static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFO if (!status) NtQuerySection( mapping, SectionImageInformation, info, sizeof(*info), NULL ); NtClose( mapping ); } - else if (status == STATUS_INVALID_IMAGE_NOT_MZ) + else if (status == STATUS_INVALID_IMAGE_NOT_MZ && loadorder != LO_NATIVE) { /* remove .so extension from Windows name */ p = image + wcslen(image); @@ -1468,6 +1471,7 @@ static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFO NTSTATUS load_main_exe( const WCHAR *dos_name, const char *unix_name, const WCHAR *curdir, WCHAR **image, void **module ) { + enum loadorder loadorder = LO_INVALID; UNICODE_STRING nt_name; WCHAR *tmp = NULL; BOOL contains_path; @@ -1480,7 +1484,8 @@ NTSTATUS load_main_exe( const WCHAR *dos_name, const char *unix_name, const WCHA if (unix_name && unix_name[0] == '/' && !stat( unix_name, &st )) { if ((status = unix_to_nt_file_name( unix_name, image ))) goto failed; - status = open_main_image( *image, module, &main_image_info ); + loadorder = get_load_order( &nt_name ); + status = open_main_image( *image, module, &main_image_info, loadorder ); if (status != STATUS_DLL_NOT_FOUND) return status; free( *image ); } @@ -1497,12 +1502,14 @@ NTSTATUS load_main_exe( const WCHAR *dos_name, const char *unix_name, const WCHA if ((status = get_full_path( dos_name, curdir, image ))) goto failed; free( tmp ); - status = open_main_image( *image, module, &main_image_info ); + init_unicode_string( &nt_name, *image ); + if (loadorder == LO_INVALID) loadorder = get_load_order( &nt_name ); + + status = open_main_image( *image, module, &main_image_info, loadorder ); if (status != STATUS_DLL_NOT_FOUND) return status; /* if path is in system dir, we can load the builtin even if the file itself doesn't exist */ - init_unicode_string( &nt_name, *image ); - if (is_builtin_path( &nt_name, &machine )) + if (loadorder != LO_NATIVE && is_builtin_path( &nt_name, &machine )) { status = find_builtin_dll( &nt_name, module, &size, &main_image_info, machine, FALSE ); if (status != STATUS_DLL_NOT_FOUND) return status;

1 0

Alexandre Julliard : ntdll: Cleanup the path with collapse_path() in unix_to_nt_file_name().
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: cdb1f3ae55f37318e99590b5f5ae8917ce826bc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdb1f3ae55f37318e99590b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 12 10:27:53 2021 +0200 ntdll: Cleanup the path with collapse_path() in unix_to_nt_file_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 116 ++++++++++++++++++++++++------------------------- 1 file changed, 57 insertions(+), 59 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 9ee5e84ee43..0ba0ee7b586 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3431,64 +3431,6 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, char *nam } -/****************************************************************** - * unix_to_nt_file_name - */ -NTSTATUS unix_to_nt_file_name( const char *name, WCHAR **nt ) -{ - static const WCHAR unix_prefixW[] = {'\\','?','?','\\','u','n','i','x',0}; - WCHAR dos_prefixW[] = {'\\','?','?','\\','A',':','\\',0}; - const WCHAR *prefix = unix_prefixW; - unsigned int lenW, lenA = strlen(name); - const char *path = name; - NTSTATUS status; - WCHAR *p, *buffer; - int drive; - - status = find_drive_rootA( &path, lenA, &drive ); - lenA -= path - name; - - if (status == STATUS_SUCCESS) - { - while (lenA && path[0] == '/') { lenA--; path++; } - dos_prefixW[4] += drive; - prefix = dos_prefixW; - } - else if (status != STATUS_OBJECT_PATH_NOT_FOUND) return status; - - lenW = wcslen( prefix ); - if (!(buffer = malloc( (lenA + lenW + 1) * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; - memcpy( buffer, prefix, lenW * sizeof(WCHAR) ); - lenW += ntdll_umbstowcs( path, lenA, buffer + lenW, lenA ); - buffer[lenW] = 0; - for (p = buffer; *p; p++) if (*p == '/') *p = '\\'; - *nt = buffer; - return STATUS_SUCCESS; -} - - -/****************************************************************** - * wine_unix_to_nt_file_name - */ -NTSTATUS CDECL wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, SIZE_T *size ) -{ - WCHAR *nt_name = NULL; - NTSTATUS status; - - if (name[0] != '/') return STATUS_INVALID_PARAMETER; /* relative paths are not supported */ - - status = unix_to_nt_file_name( name, &nt_name ); - if (nt_name) - { - if (*size > wcslen(nt_name)) wcscpy( buffer, nt_name ); - else status = STATUS_BUFFER_TOO_SMALL; - *size = wcslen(nt_name) + 1; - free( nt_name ); - } - return status; -} - - /****************************************************************** * collapse_path * @@ -3567,7 +3509,63 @@ static void collapse_path( WCHAR *path ) } -#define IS_SEPARATOR(ch) ((ch) == '\\' || (ch) == '/') +/****************************************************************** + * unix_to_nt_file_name + */ +NTSTATUS unix_to_nt_file_name( const char *name, WCHAR **nt ) +{ + static const WCHAR unix_prefixW[] = {'\\','?','?','\\','u','n','i','x',0}; + WCHAR dos_prefixW[] = {'\\','?','?','\\','A',':','\\',0}; + const WCHAR *prefix = unix_prefixW; + unsigned int lenW, lenA = strlen(name); + const char *path = name; + NTSTATUS status; + WCHAR *buffer; + int drive; + + status = find_drive_rootA( &path, lenA, &drive ); + lenA -= path - name; + + if (status == STATUS_SUCCESS) + { + while (lenA && path[0] == '/') { lenA--; path++; } + dos_prefixW[4] += drive; + prefix = dos_prefixW; + } + else if (status != STATUS_OBJECT_PATH_NOT_FOUND) return status; + + lenW = wcslen( prefix ); + if (!(buffer = malloc( (lenA + lenW + 1) * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; + memcpy( buffer, prefix, lenW * sizeof(WCHAR) ); + lenW += ntdll_umbstowcs( path, lenA, buffer + lenW, lenA ); + buffer[lenW] = 0; + collapse_path( buffer ); + *nt = buffer; + return STATUS_SUCCESS; +} + + +/****************************************************************** + * wine_unix_to_nt_file_name + */ +NTSTATUS CDECL wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, SIZE_T *size ) +{ + WCHAR *nt_name = NULL; + NTSTATUS status; + + if (name[0] != '/') return STATUS_INVALID_PARAMETER; /* relative paths are not supported */ + + status = unix_to_nt_file_name( name, &nt_name ); + if (nt_name) + { + if (*size > wcslen(nt_name)) wcscpy( buffer, nt_name ); + else status = STATUS_BUFFER_TOO_SMALL; + *size = wcslen(nt_name) + 1; + free( nt_name ); + } + return status; +} + /*********************************************************************** * get_full_path

1 0