wine-commits

wine-commits@winehq.org

1 participants
185791 discussions

Eric Pouech : cmd: Set success/failure return code for COLOR command.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 9e7f3dd4018af6bbfb720659defd481e4987b004 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e7f3dd4018af6bbfb720659defd48… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sun Jun 30 10:58:37 2024 +0200 cmd: Set success/failure return code for COLOR command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 33 ++++++++++++++------------------ programs/cmd/tests/test_builtins.cmd | 1 + programs/cmd/tests/test_builtins.cmd.exp | 2 +- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8cbe9673b33..e5cc69c1461 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4054,27 +4054,24 @@ RETURN_CODE WCMD_assoc(const WCHAR *args, BOOL assoc) * Colors the terminal screen. */ -void WCMD_color (void) { - +RETURN_CODE WCMD_color(void) +{ + RETURN_CODE return_code = ERROR_INVALID_FUNCTION; CONSOLE_SCREEN_BUFFER_INFO consoleInfo; HANDLE hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); - if (param1[0] != 0x00 && lstrlenW(param1) > 2) { + if (param1[0] != 0x00 && lstrlenW(param1) > 2) + { WCMD_output_stderr(WCMD_LoadMessage(WCMD_ARGERR)); - return; } - - if (GetConsoleScreenBufferInfo(hStdOut, &consoleInfo)) + else if (GetConsoleScreenBufferInfo(hStdOut, &consoleInfo)) { - COORD topLeft; + COORD topLeft = {0, 0}; DWORD screenSize; - DWORD color = 0; + DWORD color; screenSize = consoleInfo.dwSize.X * (consoleInfo.dwSize.Y + 1); - topLeft.X = 0; - topLeft.Y = 0; - /* Convert the color hex digits */ if (param1[0] == 0x00) { color = defaultColor; @@ -4083,16 +4080,14 @@ void WCMD_color (void) { } /* Fail if fg == bg color */ - if (((color & 0xF0) >> 4) == (color & 0x0F)) { - errorlevel = ERROR_INVALID_FUNCTION; - return; + if (((color & 0xF0) >> 4) != (color & 0x0F)) + { + FillConsoleOutputAttribute(hStdOut, color, screenSize, topLeft, &screenSize); + SetConsoleTextAttribute(hStdOut, color); + return_code = NO_ERROR; } - - /* Set the current screen contents and ensure all future writes - remain this color */ - FillConsoleOutputAttribute(hStdOut, color, screenSize, topLeft, &screenSize); - SetConsoleTextAttribute(hStdOut, color); } + return errorlevel = return_code; } /**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index b43848575fc..d9757751bd1 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -693,6 +693,7 @@ call :setError 666 & (echo foo | more &&echo SUCCESS !errorlevel!||echo FAILURE echo --- success/failure for PAUSE command call :setError 666 & (pause < NUL > NUL 2>&1 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) rem TODO: pause is harder to test when fd 1 is a console handle as we don't control output + echo --- setlocal DisableDelayedExpansion echo ------------ Testing 'set' ------------ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0ca3459f8e0..86e9d22b0ce 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -603,7 +603,7 @@ SUCCESS 0 @todo_wine@@formfeed@SUCCESS 666 FAILURE 1 --- success/failure for COLOR command -@todo_wine@FAILURE 1 +FAILURE 1 --- success/failure for TITLE command SUCCESS 666 SUCCESS 666 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index e43a9f4a127..e1d4d2bc431 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -167,7 +167,7 @@ RETURN_CODE WCMD_call(WCHAR *command); void WCMD_change_tty (void); void WCMD_choice (const WCHAR *); RETURN_CODE WCMD_clear_screen(void); -void WCMD_color (void); +RETURN_CODE WCMD_color(void); RETURN_CODE WCMD_copy(WCHAR *); RETURN_CODE WCMD_create_dir(WCHAR *); RETURN_CODE WCMD_delete(WCHAR *); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 90747ad8207..1411f0f193e 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1920,7 +1920,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_assoc(parms_start, TRUE); break; case WCMD_COLOR: - WCMD_color(); + return_code = WCMD_color(); break; case WCMD_FTYPE: return_code = WCMD_assoc(parms_start, FALSE);

1 0

Eric Pouech : cmd: Set success/failure return code for CLS command.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 074051c61035fa4484ccd7207e25a311c9976c96 URL: https://gitlab.winehq.org/wine/wine/-/commit/074051c61035fa4484ccd7207e25a3… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sun Jun 30 10:40:47 2024 +0200 cmd: Set success/failure return code for CLS command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 7 +++++-- programs/cmd/tests/test_builtins.cmd.exp | 2 +- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index c8c4dfbaa0b..8cbe9673b33 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -249,13 +249,15 @@ static BOOL WCMD_ask_confirm (const WCHAR *message, BOOL showSureText, * Clear the terminal screen. */ -void WCMD_clear_screen (void) { - +RETURN_CODE WCMD_clear_screen(void) +{ /* Emulate by filling the screen from the top left to bottom right with spaces, then moving the cursor to the top left afterwards */ CONSOLE_SCREEN_BUFFER_INFO consoleInfo; HANDLE hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); + if (*quals) + return errorlevel = ERROR_INVALID_FUNCTION; if (GetConsoleScreenBufferInfo(hStdOut, &consoleInfo)) { COORD topLeft; @@ -269,6 +271,7 @@ void WCMD_clear_screen (void) { FillConsoleOutputAttribute(hStdOut, consoleInfo.wAttributes, screenSize, topLeft, &written); SetConsoleCursorPosition(hStdOut, topLeft); } + return NO_ERROR; } /**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 3daf9f1b3db..0ca3459f8e0 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -601,7 +601,7 @@ SUCCESS 0 --- success/failure for CLS command @todo_wine@@formfeed@SUCCESS 666 @todo_wine@@formfeed@SUCCESS 666 -@todo_wine@FAILURE 1 +FAILURE 1 --- success/failure for COLOR command @todo_wine@FAILURE 1 --- success/failure for TITLE command diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index f225ad0b9ff..e43a9f4a127 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -166,7 +166,7 @@ RETURN_CODE WCMD_batch(const WCHAR *, WCHAR *, const WCHAR *, HANDLE); RETURN_CODE WCMD_call(WCHAR *command); void WCMD_change_tty (void); void WCMD_choice (const WCHAR *); -void WCMD_clear_screen (void); +RETURN_CODE WCMD_clear_screen(void); void WCMD_color (void); RETURN_CODE WCMD_copy(WCHAR *); RETURN_CODE WCMD_create_dir(WCHAR *); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index ed520a05ed6..90747ad8207 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1820,7 +1820,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_setshow_default(parms_start); break; case WCMD_CLS: - WCMD_clear_screen (); + return_code = WCMD_clear_screen(); break; case WCMD_COPY: return_code = WCMD_copy(parms_start);

1 0

Eric Pouech : cmd: Add tests for screen/interactive builtin commands.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 66948479d40dcff68817375b6cc3fb3f3b3c5d1b URL: https://gitlab.winehq.org/wine/wine/-/commit/66948479d40dcff68817375b6cc3fb… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 4 13:41:02 2024 +0200 cmd: Add tests for screen/interactive builtin commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/batch.c | 10 ++++++++++ programs/cmd/tests/test_builtins.cmd | 24 ++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 22 ++++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index ade6587be81..d44d2d33dec 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -167,6 +167,7 @@ static const char *compare_line(const char *out_line, const char *out_end, const static const char space_cmd[] = {'@','s','p','a','c','e','@'}; static const char spaces_cmd[] = {'@','s','p','a','c','e','s','@'}; static const char tab_cmd[] = {'@','t','a','b','@'}; + static const char formfeed_cmd[] = {'@','f','o','r','m', 'f', 'e', 'e', 'd', '@'}; static const char or_broken_cmd[] = {'@','o','r','_','b','r','o','k','e','n','@'}; while(exp_ptr < exp_end) { @@ -242,6 +243,15 @@ static const char *compare_line(const char *out_line, const char *out_end, const } else { err = out_end; } + }else if(exp_ptr+sizeof(formfeed_cmd) <= exp_end + && !memcmp(exp_ptr, formfeed_cmd, sizeof(formfeed_cmd))) { + exp_ptr += sizeof(formfeed_cmd); + if(out_ptr < out_end && *out_ptr == '\f') { + out_ptr++; + continue; + } else { + err = out_end; + } }else if(exp_ptr+sizeof(or_broken_cmd) <= exp_end && !memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) { if(out_ptr == out_end) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 2bda4ad68ff..b43848575fc 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -669,6 +669,30 @@ call :setError 666 & help ACommandThatLikelyDoesntExist >NUL &&echo SUCCESS !err echo --- success/failure for PROMPT command call :setError 666 & prompt >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel! rem doesn't seem to set errors either on invalid $ escapes, nor qualifiers + +echo --- success/failure for CLS command +call :setError 666 & (cls &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (cls foobar &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (cls /X &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +echo --- success/failure for COLOR command +call :setError 666 & (color fc < NUL > NUL 2>&1 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +rem TODO: color is also hard to test: it requires fd 1 to be bound to a console, so we can't redirect its output +echo --- success/failure for TITLE command +call :setError 666 & (title a new title &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (title &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +echo --- success/failure for CHOICE command +call :setError 666 & (choice <NUL >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (choice /c <NUL >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & ((echo A | choice /C:BA) >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (choice /C:BA <NUL >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +rem syntax errors in command return INVALID_FUNCTION, need to find a test for returning 255 +echo --- success/failure for MORE command +call :setError 666 & (more NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (more I\dont\exist.txt > NUL 2>&1 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (echo foo | more &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +echo --- success/failure for PAUSE command +call :setError 666 & (pause < NUL > NUL 2>&1 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +rem TODO: pause is harder to test when fd 1 is a console handle as we don't control output echo --- setlocal DisableDelayedExpansion echo ------------ Testing 'set' ------------ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index de82728369a..3daf9f1b3db 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -598,6 +598,28 @@ FAILURE 1 SUCCESS 0 --- success/failure for PROMPT command SUCCESS 0 +--- success/failure for CLS command +@todo_wine@@formfeed@SUCCESS 666 +@todo_wine@@formfeed@SUCCESS 666 +@todo_wine@FAILURE 1 +--- success/failure for COLOR command +@todo_wine@FAILURE 1 +--- success/failure for TITLE command +SUCCESS 666 +SUCCESS 666 +--- success/failure for CHOICE command +@todo_wine@FAILURE 1 +@todo_wine@FAILURE 1 +@todo_wine@FAILURE 2 +@todo_wine@FAILURE 1 +@todo_wine@--- success/failure for MORE command +SUCCESS 0 +@todo_wine@SUCCESS 0 +foo@space@ +@todo_wine@ +@todo_wine@SUCCESS 0 +@todo_wine@--- success/failure for PAUSE command +@todo_wine@FAILURE 1 --- ------------ Testing 'set' ------------ 1

1 0

Nikolay Sivov : winhttp: Fix error handling when returning string options.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 89325c2a4a95abca1c08f01dccae27c87284c372 URL: https://gitlab.winehq.org/wine/wine/-/commit/89325c2a4a95abca1c08f01dccae27… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 8 23:38:27 2024 +0200 winhttp: Fix error handling when returning string options. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winhttp/session.c | 32 ++++++++++++++++++-------------- dlls/winhttp/tests/winhttp.c | 28 ---------------------------- 2 files changed, 18 insertions(+), 42 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 74c8d973f35..a473451b9a6 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -681,16 +681,24 @@ static void request_destroy( struct object_header *hdr ) free( request ); } -static void str_to_buffer( WCHAR *buffer, const WCHAR *str, LPDWORD buflen ) +static BOOL return_string_option( WCHAR *buffer, const WCHAR *str, LPDWORD buflen ) { - int len = 0; - if (str) len = lstrlenW( str ); + int len = sizeof(WCHAR); + if (str) len += lstrlenW( str ) * sizeof(WCHAR); if (buffer && *buflen > len) { - if (str) memcpy( buffer, str, len * sizeof(WCHAR) ); - buffer[len] = 0; + if (str) memcpy( buffer, str, len ); + len -= sizeof(WCHAR); + buffer[len / sizeof(WCHAR)] = 0; + *buflen = len; + return TRUE; + } + else + { + *buflen = len; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; } - *buflen = len * sizeof(WCHAR); } static WCHAR *blob_to_str( DWORD encoding, CERT_NAME_BLOB *blob ) @@ -868,20 +876,16 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void return TRUE; case WINHTTP_OPTION_USERNAME: - str_to_buffer( buffer, request->connect->username, buflen ); - return TRUE; + return return_string_option( buffer, request->connect->username, buflen ); case WINHTTP_OPTION_PASSWORD: - str_to_buffer( buffer, request->connect->password, buflen ); - return TRUE; + return return_string_option( buffer, request->connect->password, buflen ); case WINHTTP_OPTION_PROXY_USERNAME: - str_to_buffer( buffer, request->connect->session->proxy_username, buflen ); - return TRUE; + return return_string_option( buffer, request->connect->session->proxy_username, buflen ); case WINHTTP_OPTION_PROXY_PASSWORD: - str_to_buffer( buffer, request->connect->session->proxy_password, buflen ); - return TRUE; + return return_string_option( buffer, request->connect->session->proxy_password, buflen ); case WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS: if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 4ca307301ef..03b1c067fb5 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4372,9 +4372,7 @@ static void test_credentials(void) size = 4; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, NULL, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); - todo_wine ok(size == 2, "Unexpected size %lu\n", size); size = ARRAY_SIZE(buffer); @@ -4386,9 +4384,7 @@ static void test_credentials(void) size = 4; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, NULL, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); - todo_wine ok(size == 2, "Unexpected size %lu\n", size); ret = WinHttpSetOption(req, WINHTTP_OPTION_PROXY_USERNAME, proxy_userW, lstrlenW(proxy_userW)); @@ -4403,19 +4399,14 @@ static void test_credentials(void) buffer[0] = 0x1; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, &buffer, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); - todo_wine ok(*buffer == 0x1, "unexpected result %s\n", wine_dbgstr_w(buffer)); - todo_wine ok(size == (lstrlenW(proxy_userW) + 1) * sizeof(WCHAR), "unexpected result %lu\n", size); size = 0; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, NULL, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); - todo_wine ok(size == (lstrlenW(proxy_userW) + 1) * sizeof(WCHAR), "Unexpected size %lu\n", size); size = ARRAY_SIZE(buffer); @@ -4427,9 +4418,7 @@ static void test_credentials(void) size = 4; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, NULL, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); - todo_wine ok(size == 2, "Unexpected size %lu\n", size); size = ARRAY_SIZE(buffer); @@ -4441,9 +4430,7 @@ static void test_credentials(void) size = 4; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, NULL, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); - todo_wine ok(size == 2, "Unexpected size %lu\n", size); ret = WinHttpSetOption(req, WINHTTP_OPTION_PROXY_PASSWORD, proxy_passW, lstrlenW(proxy_passW)); @@ -4458,19 +4445,14 @@ static void test_credentials(void) buffer[0] = 0x1; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, &buffer, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); - todo_wine ok(*buffer == 0x1, "unexpected result %s\n", wine_dbgstr_w(buffer)); - todo_wine ok(size == (lstrlenW(proxy_passW) + 1) * sizeof(WCHAR), "unexpected result %lu\n", size); size = 0; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, NULL, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); - todo_wine ok(size == (lstrlenW(proxy_passW) + 1) * sizeof(WCHAR), "Unexpected size %lu\n", size); ret = WinHttpSetOption(req, WINHTTP_OPTION_USERNAME, userW, lstrlenW(userW)); @@ -4485,19 +4467,14 @@ static void test_credentials(void) buffer[0] = 0x1; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); - todo_wine ok(*buffer == 0x1, "unexpected result %s\n", wine_dbgstr_w(buffer)); - todo_wine ok(size == (lstrlenW(userW) + 1) * sizeof(WCHAR), "unexpected result %lu\n", size); size = 0; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, NULL, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); - todo_wine ok(size == (lstrlenW(userW) + 1) * sizeof(WCHAR), "Unexpected size %lu\n", size); ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, passW, lstrlenW(passW)); @@ -4512,19 +4489,14 @@ static void test_credentials(void) buffer[0] = 0x1; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); - todo_wine ok(*buffer == 0x1, "unexpected result %s\n", wine_dbgstr_w(buffer)); - todo_wine ok(size == (lstrlenW(passW) + 1) * sizeof(WCHAR), "unexpected result %lu\n", size); size = 0; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, NULL, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); - todo_wine ok(size == (lstrlenW(passW) + 1) * sizeof(WCHAR), "Unexpected size %lu\n", size); WinHttpCloseHandle(req);

1 0

Nikolay Sivov : winhttp/tests: Add some tests for querying string options with NULL buffer.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 6ea59e9d2e85cd690cc01c0564a9099131efb400 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ea59e9d2e85cd690cc01c0564a909… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 8 13:51:34 2024 +0200 winhttp/tests: Add some tests for querying string options with NULL buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 104 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2252551f32c..4ca307301ef 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4369,12 +4369,28 @@ static void test_credentials(void) ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(!size, "expected 0, got %lu\n", size); + size = 4; + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, NULL, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); + todo_wine + ok(size == 2, "Unexpected size %lu\n", size); + size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, &buffer, &size); ok(ret, "failed to query proxy password %lu\n", GetLastError()); ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(!size, "expected 0, got %lu\n", size); + size = 4; + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, NULL, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); + todo_wine + ok(size == 2, "Unexpected size %lu\n", size); + ret = WinHttpSetOption(req, WINHTTP_OPTION_PROXY_USERNAME, proxy_userW, lstrlenW(proxy_userW)); ok(ret, "failed to set username %lu\n", GetLastError()); @@ -4384,18 +4400,52 @@ static void test_credentials(void) ok(!wcscmp(buffer, proxy_userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(proxy_userW) * sizeof(WCHAR), "unexpected result %lu\n", size); + buffer[0] = 0x1; + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, &buffer, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); + todo_wine + ok(*buffer == 0x1, "unexpected result %s\n", wine_dbgstr_w(buffer)); + todo_wine + ok(size == (lstrlenW(proxy_userW) + 1) * sizeof(WCHAR), "unexpected result %lu\n", size); + + size = 0; + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, NULL, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); + todo_wine + ok(size == (lstrlenW(proxy_userW) + 1) * sizeof(WCHAR), "Unexpected size %lu\n", size); + size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); ok(ret, "failed to query username %lu\n", GetLastError()); ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(!size, "expected 0, got %lu\n", size); + size = 4; + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, NULL, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); + todo_wine + ok(size == 2, "Unexpected size %lu\n", size); + size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size); ok(ret, "failed to query password %lu\n", GetLastError()); ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(!size, "expected 0, got %lu\n", size); + size = 4; + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, NULL, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); + todo_wine + ok(size == 2, "Unexpected size %lu\n", size); + ret = WinHttpSetOption(req, WINHTTP_OPTION_PROXY_PASSWORD, proxy_passW, lstrlenW(proxy_passW)); ok(ret, "failed to set proxy password %lu\n", GetLastError()); @@ -4405,6 +4455,24 @@ static void test_credentials(void) ok(!wcscmp(buffer, proxy_passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(proxy_passW) * sizeof(WCHAR), "unexpected result %lu\n", size); + buffer[0] = 0x1; + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, &buffer, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); + todo_wine + ok(*buffer == 0x1, "unexpected result %s\n", wine_dbgstr_w(buffer)); + todo_wine + ok(size == (lstrlenW(proxy_passW) + 1) * sizeof(WCHAR), "unexpected result %lu\n", size); + + size = 0; + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, NULL, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); + todo_wine + ok(size == (lstrlenW(proxy_passW) + 1) * sizeof(WCHAR), "Unexpected size %lu\n", size); + ret = WinHttpSetOption(req, WINHTTP_OPTION_USERNAME, userW, lstrlenW(userW)); ok(ret, "failed to set username %lu\n", GetLastError()); @@ -4414,6 +4482,24 @@ static void test_credentials(void) ok(!wcscmp(buffer, userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(userW) * sizeof(WCHAR), "unexpected result %lu\n", size); + buffer[0] = 0x1; + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); + todo_wine + ok(*buffer == 0x1, "unexpected result %s\n", wine_dbgstr_w(buffer)); + todo_wine + ok(size == (lstrlenW(userW) + 1) * sizeof(WCHAR), "unexpected result %lu\n", size); + + size = 0; + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, NULL, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); + todo_wine + ok(size == (lstrlenW(userW) + 1) * sizeof(WCHAR), "Unexpected size %lu\n", size); + ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, passW, lstrlenW(passW)); ok(ret, "failed to set password %lu\n", GetLastError()); @@ -4423,6 +4509,24 @@ static void test_credentials(void) ok(!wcscmp(buffer, passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(passW) * sizeof(WCHAR), "unexpected result %lu\n", size); + buffer[0] = 0x1; + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); + todo_wine + ok(*buffer == 0x1, "unexpected result %s\n", wine_dbgstr_w(buffer)); + todo_wine + ok(size == (lstrlenW(passW) + 1) * sizeof(WCHAR), "unexpected result %lu\n", size); + + size = 0; + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, NULL, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected error %lu\n", GetLastError()); + todo_wine + ok(size == (lstrlenW(passW) + 1) * sizeof(WCHAR), "Unexpected size %lu\n", size); + WinHttpCloseHandle(req); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0);

1 0

Alexandre Julliard : ntdll: Support the ARM64EC work list in RtlOpenCrossProcessEmulatorWorkConnection.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 6928a14d9800fd8dce35ab9ff5873617713558b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/6928a14d9800fd8dce35ab9ff58736… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 9 12:20:05 2024 +0200 ntdll: Support the ARM64EC work list in RtlOpenCrossProcessEmulatorWorkConnection. --- dlls/ntdll/process.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 16bc445b7f9..8906e254cc0 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -314,17 +314,30 @@ void WINAPI RtlOpenCrossProcessEmulatorWorkConnection( HANDLE process, HANDLE *s { WOW64INFO wow64info; BOOLEAN is_wow64; + HANDLE handle = 0; SIZE_T size = 0; *addr = NULL; *section = 0; + if (RtlIsCurrentProcess( process )) return; if (RtlWow64GetSharedInfoProcess( process, &is_wow64, &wow64info )) return; - if (!is_wow64) return; - if (!wow64info.SectionHandle) return; - if (NtDuplicateObject( process, (HANDLE)(ULONG_PTR)wow64info.SectionHandle, - GetCurrentProcess(), section, 0, 0, DUPLICATE_SAME_ACCESS )) + if (is_wow64) handle = (HANDLE)(ULONG_PTR)wow64info.SectionHandle; +#if defined __aarch64__ || defined __arm64ec__ + else + { + PROCESS_BASIC_INFORMATION basic; + struct arm64ec_shared_info info; + + if (!NtQueryInformationProcess( process, ProcessBasicInformation, &basic, sizeof(basic), NULL ) && + !NtReadVirtualMemory( process, (PEB *)basic.PebBaseAddress + 1, &info, sizeof(info), NULL )) + handle = info.SectionHandle; + } +#endif + + if (!handle) return; + if (NtDuplicateObject( process, handle, GetCurrentProcess(), section, 0, 0, DUPLICATE_SAME_ACCESS )) return; if (!NtMapViewOfSection( *section, GetCurrentProcess(), addr, 0, 0, NULL,

1 0

Alexandre Julliard : ntdll: Create the cross-process work list at startup on ARM64EC.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: e6fa673ad5e981d1114bb31235bd7f970c6bd78d URL: https://gitlab.winehq.org/wine/wine/-/commit/e6fa673ad5e981d1114bb31235bd7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 9 12:19:55 2024 +0200 ntdll: Create the cross-process work list at startup on ARM64EC. Copied from the corresponding code in wow64.dll. --- dlls/ntdll/ntdll_misc.h | 13 +++++++++++++ dlls/ntdll/signal_arm64ec.c | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index bda4dd61d25..52875efa6b5 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -122,6 +122,19 @@ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) extern TEB_FLS_DATA *fls_alloc_data(void); extern void heap_thread_detach(void); +#if defined __aarch64__ || defined __arm64ec__ +/* equivalent of WOW64INFO, stored after the 64-bit PEB */ +struct arm64ec_shared_info +{ + ULONG Wow64ExecuteFlags; + USHORT NativeMachineType; + USHORT EmulatedMachineType; + HANDLE SectionHandle; + CROSS_PROCESS_WORK_LIST *CrossProcessWorkList; + void *unknown; +}; +#endif + /* register context */ #ifdef __i386__ diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 3fbdb63cb83..b48255678de 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -57,6 +57,40 @@ static inline BOOL is_valid_arm64ec_frame( ULONG_PTR frame ) } +/********************************************************************** + * create_cross_process_work_list + */ +static NTSTATUS create_cross_process_work_list( struct arm64ec_shared_info *info ) +{ + SIZE_T map_size = 0x4000; + LARGE_INTEGER size; + NTSTATUS status; + HANDLE section; + CROSS_PROCESS_WORK_LIST *list = NULL; + CROSS_PROCESS_WORK_ENTRY *end; + UINT i; + + size.QuadPart = map_size; + status = NtCreateSection( &section, SECTION_ALL_ACCESS, NULL, &size, PAGE_READWRITE, SEC_COMMIT, 0 ); + if (status) return status; + status = NtMapViewOfSection( section, GetCurrentProcess(), (void **)&list, 0, 0, NULL, + &map_size, ViewShare, MEM_TOP_DOWN, PAGE_READWRITE ); + if (status) + { + NtClose( section ); + return status; + } + + end = (CROSS_PROCESS_WORK_ENTRY *)((char *)list + map_size); + for (i = 0; list->entries + i + 1 <= end; i++) + RtlWow64PushCrossProcessWorkOntoFreeList( &list->free_list, &list->entries[i] ); + + info->SectionHandle = section; + info->CrossProcessWorkList = list; + return STATUS_SUCCESS; +} + + /********************************************************************** * send_cross_process_notification */ @@ -97,6 +131,7 @@ static BOOL send_cross_process_notification( HANDLE process, UINT id, const void NTSTATUS arm64ec_process_init( HMODULE module ) { NTSTATUS status = STATUS_SUCCESS; + struct arm64ec_shared_info *info = (struct arm64ec_shared_info *)(RtlGetCurrentPeb() + 1); __os_arm64x_dispatch_call_no_redirect = RtlFindExportedRoutineByName( module, "ExitToX64" ); __os_arm64x_dispatch_fptr = RtlFindExportedRoutineByName( module, "DispatchJump" ); @@ -108,7 +143,7 @@ NTSTATUS arm64ec_process_init( HMODULE module ) #undef GET_PTR if (pProcessInit) status = pProcessInit(); - + if (!status) status = create_cross_process_work_list( info ); if (!status) status = arm64ec_thread_init(); return status; }

1 0

Alexandre Julliard : ntdll/tests: Add some tests for xtajit64.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 955c76f7d0bf93a5d6457a7911d20d769db7c28f URL: https://gitlab.winehq.org/wine/wine/-/commit/955c76f7d0bf93a5d6457a7911d20d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 8 13:17:46 2024 +0200 ntdll/tests: Add some tests for xtajit64. --- dlls/ntdll/tests/wow64.c | 73 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 67 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index bae012fec0c..0ed151a3200 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -2041,18 +2041,78 @@ static void test_exception_dispatcher(void) #endif } -static void test_memory_notifications(void) +static void test_xtajit64(void) { +#ifdef __arm64ec__ HMODULE module = GetModuleHandleA( "xtajit64.dll" ); - struct arm64ec_shared_info *info; - DWORD i; + BOOLEAN (WINAPI *pBTCpu64IsProcessorFeaturePresent)( UINT feature ); + void (WINAPI *pUpdateProcessorInformation)( SYSTEM_CPU_INFORMATION *info ); + UINT i; - if (current_machine == IMAGE_FILE_MACHINE_ARM64) return; - if (!(module = GetModuleHandleA( "xtajit64.dll" ))) + if (!module) { - skip( "xtaji64.dll not loaded\n" ); + win_skip( "xtaji64.dll not loaded\n" ); return; } +#define GET_PROC(func) p##func = pRtlFindExportedRoutineByName( module, #func ) + GET_PROC( BTCpu64IsProcessorFeaturePresent ); + GET_PROC( UpdateProcessorInformation ); +#undef GET_PROC + + if (pBTCpu64IsProcessorFeaturePresent) + { + static const ULONGLONG expect_features = + (1ull << PF_COMPARE_EXCHANGE_DOUBLE) | + (1ull << PF_MMX_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_XMMI_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_RDTSC_INSTRUCTION_AVAILABLE) | + (1ull << PF_XMMI64_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_NX_ENABLED) | + (1ull << PF_SSE3_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_COMPARE_EXCHANGE128) | + (1ull << PF_FASTFAIL_AVAILABLE) | + (1ull << PF_RDTSCP_INSTRUCTION_AVAILABLE) | + (1ull << PF_SSSE3_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_SSE4_1_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_SSE4_2_INSTRUCTIONS_AVAILABLE); + + for (i = 0; i < 64; i++) + { + BOOLEAN ret = pBTCpu64IsProcessorFeaturePresent( i ); + if (expect_features & (1ull << i)) ok( ret, "missing feature %u\n", i ); + else if (ret) trace( "extra feature %u supported\n", i ); + } + } + else win_skip( "BTCpu64IsProcessorFeaturePresent missing\n" ); + + if (pUpdateProcessorInformation) + { + SYSTEM_CPU_INFORMATION info; + + memset( &info, 0xcc, sizeof(info) ); + info.ProcessorArchitecture = PROCESSOR_ARCHITECTURE_ARM64; + pUpdateProcessorInformation( &info ); + + ok( info.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64, + "wrong architecture %u\n", info.ProcessorArchitecture ); + ok( info.ProcessorLevel == 21, "wrong level %u\n", info.ProcessorLevel ); + ok( info.ProcessorRevision == 1, "wrong revision %u\n", info.ProcessorRevision ); + ok( info.MaximumProcessors == 0xcccc, "wrong max proc %u\n", info.MaximumProcessors ); + ok( info.ProcessorFeatureBits == 0xcccccccc, "wrong features %lx\n", info.ProcessorFeatureBits ); + } + else win_skip( "UpdateProcessorInformation missing\n" ); +#endif +} + + +static void test_memory_notifications(void) +{ + HMODULE module; + struct arm64ec_shared_info *info; + DWORD i; + + if (current_machine == IMAGE_FILE_MACHINE_ARM64) return; + if (!(module = GetModuleHandleA( "xtajit64.dll" ))) return; for (i = 0x600; i < 0xc00; i += sizeof(ULONG)) { info = (struct arm64ec_shared_info *)((char *)NtCurrentTeb()->Peb + i); @@ -2983,6 +3043,7 @@ START_TEST(wow64) test_selectors(); test_image_mappings(); #ifdef _WIN64 + test_xtajit64(); test_cross_process_work_list(); #else test_nt_wow64();

1 0

Alexandre Julliard : ntdll: Load xtajit64.dll on ARM64EC.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 3cf8d501f8d9975cd9d88c6cd01578271a0b4447 URL: https://gitlab.winehq.org/wine/wine/-/commit/3cf8d501f8d9975cd9d88c6cd01578… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 8 13:14:21 2024 +0200 ntdll: Load xtajit64.dll on ARM64EC. --- dlls/ntdll/loader.c | 53 ++++++++++++++++++++++++++++++++++++++++++--- dlls/ntdll/ntdll_misc.h | 3 +++ dlls/ntdll/signal_arm64ec.c | 38 ++++++++++++++++++++++++++++++++ loader/wine.inf.in | 1 + 4 files changed, 92 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e7b724471e7..bad1492e138 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4144,6 +4144,44 @@ static void elevate_token(void) NtClose( linked.LinkedToken ); } +#ifdef __arm64ec__ + +static void load_arm64ec_module(void) +{ + ULONG buffer[16]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + UNICODE_STRING nameW = RTL_CONSTANT_STRING( L"\\Registry\\Machine\\Software\\Microsoft\\Wow64\\amd64" ); + WCHAR module[64] = L"C:\\windows\\system32\\xtajit64.dll"; + OBJECT_ATTRIBUTES attr; + WINE_MODREF *wm; + NTSTATUS status; + HANDLE key; + + InitializeObjectAttributes( &attr, &nameW, OBJ_CASE_INSENSITIVE, 0, NULL ); + if (!NtOpenKey( &key, KEY_READ | KEY_WOW64_64KEY, &attr )) + { + UNICODE_STRING valueW = RTL_CONSTANT_STRING( L"" ); + ULONG dirlen = wcslen( L"C:\\windows\\system32\\" ); + ULONG size = sizeof(buffer); + + if (!NtQueryValueKey( key, &valueW, KeyValuePartialInformation, buffer, size, &size ) && info->Type == REG_SZ) + { + size = sizeof(module) - (dirlen + 1) * sizeof(WCHAR); + memcpy( module + dirlen, info->Data, min( info->DataLength, size )); + } + NtClose( key ); + } + + if ((status = load_dll( NULL, module, 0, &wm, FALSE )) || + (status = arm64ec_process_init( wm->ldr.DllBase ))) + { + ERR( "could not load %s, status %lx\n", debugstr_w(module), status ); + NtTerminateProcess( GetCurrentProcess(), status ); + } +} + +#endif + #ifdef _WIN64 static void build_wow64_main_module(void) @@ -4316,6 +4354,10 @@ void loader_init( CONTEXT *context, void **entry ) wm = build_main_module(); build_ntdll_module(); +#ifdef __arm64ec__ + load_arm64ec_module(); + update_load_config( wm->ldr.DllBase ); +#endif if ((status = load_dll( NULL, L"kernel32.dll", 0, &kernel32, FALSE )) != STATUS_SUCCESS) { @@ -4344,11 +4386,16 @@ void loader_init( CONTEXT *context, void **entry ) } imports_fixup_done = TRUE; } - else wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); - + else + { #ifdef _WIN64 - if (NtCurrentTeb()->WowTebOffset) init_wow64( context ); + if (NtCurrentTeb()->WowTebOffset) init_wow64( context ); #endif +#ifdef __arm64ec__ + arm64ec_thread_init(); +#endif + wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); + } RtlAcquirePebLock(); InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index cc467d44966..bda4dd61d25 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -162,6 +162,9 @@ extern void heap_thread_detach(void); #ifdef __arm64ec__ +extern NTSTATUS arm64ec_process_init( HMODULE module ); +extern NTSTATUS arm64ec_thread_init(void); + extern void *__os_arm64x_check_call; extern void *__os_arm64x_check_icall; extern void *__os_arm64x_check_icall_cfg; diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 393d5f7e697..3fbdb63cb83 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -39,6 +39,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); +/* xtajit64.dll functions */ +static NTSTATUS (WINAPI *pProcessInit)(void); +static NTSTATUS (WINAPI *pThreadInit)(void); static inline CHPE_V2_CPU_AREA_INFO *get_arm64ec_cpu_area(void) { @@ -88,6 +91,41 @@ static BOOL send_cross_process_notification( HANDLE process, UINT id, const void } +/******************************************************************* + * arm64ec_process_init + */ +NTSTATUS arm64ec_process_init( HMODULE module ) +{ + NTSTATUS status = STATUS_SUCCESS; + + __os_arm64x_dispatch_call_no_redirect = RtlFindExportedRoutineByName( module, "ExitToX64" ); + __os_arm64x_dispatch_fptr = RtlFindExportedRoutineByName( module, "DispatchJump" ); + __os_arm64x_dispatch_ret = RtlFindExportedRoutineByName( module, "RetToEntryThunk" ); + +#define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) + GET_PTR( ProcessInit ); + GET_PTR( ThreadInit ); +#undef GET_PTR + + if (pProcessInit) status = pProcessInit(); + + if (!status) status = arm64ec_thread_init(); + return status; +} + + +/******************************************************************* + * arm64ec_thread_init + */ +NTSTATUS arm64ec_thread_init(void) +{ + NTSTATUS status = STATUS_SUCCESS; + + if (pThreadInit) status = pThreadInit(); + return status; +} + + /******************************************************************* * syscalls */ diff --git a/loader/wine.inf.in b/loader/wine.inf.in index f952ef84f43..0b4fb295093 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -431,6 +431,7 @@ HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16426%" HKLM,%CurrentVersion%,"CommonFilesDir (x86)",,"%16428%" HKLM,%CurrentVersion%,"ProgramFilesDir (Arm)",,"C:\Program Files (Arm)" HKLM,%CurrentVersion%,"CommonFilesDir (Arm)",,"C:\Program Files (Arm)\Common Files" +HKLM,Software\Microsoft\Wow64\amd64,,2,"xtajit64.dll" HKLM,Software\Microsoft\Wow64\arm,,2,"wowarmhw.dll" HKLM,Software\Microsoft\Wow64\x86,,2,"xtajit.dll"

1 0

Alexandre Julliard : xtajit64: Add stub dll.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 9149093655417b66dca3cee22e206eb86bc3e7be URL: https://gitlab.winehq.org/wine/wine/-/commit/9149093655417b66dca3cee22e206e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 8 12:53:11 2024 +0200 xtajit64: Add stub dll. --- configure | 4 + configure.ac | 3 + dlls/xtajit64/Makefile.in | 8 ++ dlls/xtajit64/cpu.c | 223 ++++++++++++++++++++++++++++++++++++++++++++ dlls/xtajit64/xtajit64.spec | 20 ++++ 5 files changed, 258 insertions(+)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits