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

Eric Pouech : cmd: Add success/failure tests for file related commands.
by Alexandre Julliard 02 Jul '24

02 Jul '24

Module: wine Branch: master Commit: a132d9c37ebc5638244dd9223edf39e7665bad86 URL: https://gitlab.winehq.org/wine/wine/-/commit/a132d9c37ebc5638244dd9223edf39… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri May 24 11:06:03 2024 +0200 cmd: Add success/failure tests for file related commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 58 ++++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 34 ++++++++++++++++++- 2 files changed, 91 insertions(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index d31cb3ef72a..ccdddd289bd 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -466,6 +466,64 @@ call :setError 666 & ((for %%i in () do echo "") &&echo SUCCESS !errorlevel!||ec call :setError 666 & ((for %%i in () do call :setError 33) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & ((for %%i in (a) do call :setError 0) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & ((for %%i in (a) do call :setError 33) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) + +echo --- success/failure for TYPE command +mkdir foo & cd foo +echo a > fileA +echo b > fileB +call :setError 666 & (type &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (type NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (type i\dont\exist\at\all.txt &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (type file* i\dont\exist\at\all.txt &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +echo --- +call :setError 666 & (type i\dont\exist\at\all.txt file* &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + +echo --- success/failure for COPY command +mkdir foo & cd foo +echo a > fileA +echo b > fileB +call :setError 666 & (copy fileA >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (copy fileA fileZ >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (copy fileA fileZ /-Y >NUL <NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (copy fileA+fileD fileZ /-Y >NUL <NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (copy fileD+fileA fileZ /-Y >NUL <NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +if exist fileD echo Unexpected fileD +cd .. && rd /q /s foo + +echo --- success/failure for MOVE command +mkdir foo & cd foo +echo a > fileA +echo b > fileB +call :setError 666 & (move >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (move fileA fileC >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (move fileC nowhere\fileC >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (move fileD fileE >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (move fileC fileB /-Y >NUL <NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + +echo --- success/failure for RENAME command +mkdir foo & cd foo +echo a > fileA +echo b > fileB +call :setError 666 & (rename fileB >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (rename fileB fileA >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (rename fileB nowhere\fileB >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (rename fileD fileC >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (rename fileB fileC >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + +echo --- success/failure for ERASE command +mkdir foo & cd foo +echo a > fileA +echo b > fileB +echo e > fileE +call :setError 666 & (erase &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (erase fileE &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (erase i\dont\exist\at\all.txt &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (erase file* i\dont\exist\at\all.txt &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + 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 c2dba03b740..58e115642b2 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -464,7 +464,39 @@ SUCCESS 666 SUCCESS 666 SUCCESS 0 FAILURE 33 ---- +--- success/failure for TYPE command +(a)todo_wine@FAILURE 1 +SUCCESS 0 +(a)todo_wine@FAILURE 1 +(a)todo_wine@a(a)space@ +(a)todo_wine@b(a)space@ +(a)todo_wine@FAILURE 1 +(a)todo_wine@--- +(a)todo_wine@FAILURE 1 +--- success/failure for COPY command +(a)todo_wine@FAILURE 1 +SUCCESS 0 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +--- success/failure for MOVE command +(a)todo_wine@FAILURE 1 +(a)todo_wine@SUCCESS 0 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +--- success/failure for RENAME command +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +SUCCESS 0 +--- success/failure for ERASE command +(a)todo_wine@FAILURE 1 +SUCCESS 0 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@--- ------------ Testing 'set' ------------ 1 0

1 0

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

02 Jul '24

Module: wine Branch: master Commit: 0b6fc4cd1cc6ac4c0410fa99e517a23184efe488 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b6fc4cd1cc6ac4c0410fa99e517a2… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 27 17:28:53 2024 +0200 cmd: Set success/failure return code for TYPE command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 12 +++++++----- programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 708e3c6dce6..2510735f00d 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3490,21 +3490,22 @@ void WCMD_title (const WCHAR *args) { * Copy a file to standard output. */ -void WCMD_type (WCHAR *args) { - +RETURN_CODE WCMD_type(WCHAR *args) +{ + RETURN_CODE return_code; int argno = 0; WCHAR *argN = args; BOOL writeHeaders = FALSE; if (param1[0] == 0x00) { WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); - return; + return errorlevel = ERROR_INVALID_FUNCTION; } if (param2[0] != 0x00) writeHeaders = TRUE; /* Loop through all args */ - errorlevel = NO_ERROR; + return_code = NO_ERROR; while (argN) { WCHAR *thisArg = WCMD_parameter (args, argno++, &argN, FALSE, FALSE); @@ -3520,7 +3521,7 @@ void WCMD_type (WCHAR *args) { if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), thisArg); - errorlevel = ERROR_INVALID_FUNCTION; + return errorlevel = ERROR_INVALID_FUNCTION; } else { if (writeHeaders) { WCMD_output_stderr(L"\n%1\n\n\n", thisArg); @@ -3533,6 +3534,7 @@ void WCMD_type (WCHAR *args) { CloseHandle (h); } } + return errorlevel = return_code; } /**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 58e115642b2..5919bcf4f77 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -465,14 +465,14 @@ SUCCESS 666 SUCCESS 0 FAILURE 33 --- success/failure for TYPE command -(a)todo_wine@FAILURE 1 +FAILURE 1 SUCCESS 0 -(a)todo_wine@FAILURE 1 +FAILURE 1 @todo_wine(a)a@space@ @todo_wine(a)b@space@ @todo_wine(a)FAILURE 1 @todo_wine(a)--- -(a)todo_wine@FAILURE 1 +FAILURE 1 --- success/failure for COPY command @todo_wine(a)FAILURE 1 SUCCESS 0 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 9f8bdd46044..44cdd415fbe 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -202,7 +202,7 @@ void WCMD_setshow_time (void); void WCMD_shift (const WCHAR *args); void WCMD_start (WCHAR *args); void WCMD_title (const WCHAR *); -void WCMD_type (WCHAR *); +RETURN_CODE WCMD_type(WCHAR *); void WCMD_verify (const WCHAR *args); void WCMD_version (void); int WCMD_volume (BOOL set_label, const WCHAR *args); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 46ec53587e7..cd2043b02f3 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1896,7 +1896,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) WCMD_title(&whichcmd[count+1]); break; case WCMD_TYPE: - WCMD_type (parms_start); + return_code = WCMD_type(parms_start); break; case WCMD_VER: WCMD_output_asis(L"\r\n");

1 0

Eric Pouech : cmd: Set success/failure return code DELETE command.
by Alexandre Julliard 02 Jul '24

02 Jul '24

Module: wine Branch: master Commit: ca3b24733a981b456edc8f26859ce988a293a7c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca3b24733a981b456edc8f26859ce9… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 27 17:39:24 2024 +0200 cmd: Set success/failure return code DELETE command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 22 +++++++++++++--------- programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 2510735f00d..2a7e08da898 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1438,37 +1438,41 @@ static BOOL WCMD_delete_one (const WCHAR *thisArg) { * non-hidden files */ -BOOL WCMD_delete (WCHAR *args) { +RETURN_CODE WCMD_delete(WCHAR *args) +{ int argno; WCHAR *argN; BOOL argsProcessed = FALSE; - BOOL foundAny = FALSE; errorlevel = NO_ERROR; - for (argno=0; ; argno++) { - BOOL found; + for (argno = 0; ; argno++) + { WCHAR *thisArg; argN = NULL; - thisArg = WCMD_parameter (args, argno, &argN, FALSE, FALSE); + thisArg = WCMD_parameter(args, argno, &argN, FALSE, FALSE); if (!argN) break; /* no more parameters */ if (argN[0] == '/') continue; /* skip options */ argsProcessed = TRUE; - found = WCMD_delete_one(thisArg); - if (!found) + if (!WCMD_delete_one(thisArg)) + { WCMD_output_stderr(WCMD_LoadMessage(WCMD_FILENOTFOUND), thisArg); - foundAny |= found; + errorlevel = ERROR_INVALID_FUNCTION; + } } /* Handle no valid args */ if (!argsProcessed) + { WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); + errorlevel = ERROR_INVALID_FUNCTION; + } - return foundAny; + return errorlevel; } /* diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 5919bcf4f77..8d23e7efaf8 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -492,10 +492,10 @@ SUCCESS 0 @todo_wine(a)FAILURE 1 SUCCESS 0 --- success/failure for ERASE command -(a)todo_wine@FAILURE 1 +FAILURE 1 SUCCESS 0 -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 +FAILURE 1 +FAILURE 1 @todo_wine(a)--- ------------ Testing 'set' ------------ 1 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 44cdd415fbe..db63966bffe 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -168,7 +168,7 @@ void WCMD_clear_screen (void); void WCMD_color (void); void WCMD_copy (WCHAR *); void WCMD_create_dir (WCHAR *); -BOOL WCMD_delete (WCHAR *); +RETURN_CODE WCMD_delete(WCHAR *); void WCMD_directory (WCHAR *); RETURN_CODE WCMD_echo(const WCHAR *); void WCMD_endlocal (void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index cd2043b02f3..0ec3b014283 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1830,7 +1830,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) break; case WCMD_DEL: case WCMD_ERASE: - WCMD_delete (parms_start); + return_code = WCMD_delete(parms_start); break; case WCMD_DIR: WCMD_directory (parms_start);

1 0

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

02 Jul '24

Module: wine Branch: master Commit: 90d278f9326f582b8d60a86dab6eb0317d4b88df URL: https://gitlab.winehq.org/wine/wine/-/commit/90d278f9326f582b8d60a86dab6eb0… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 27 17:46:11 2024 +0200 cmd: Set success/failure return code for MOVE command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 25 +++++++++++-------------- programs/cmd/tests/test_builtins.cmd.exp | 10 +++++----- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 2a7e08da898..b14aa477380 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1928,11 +1928,10 @@ void WCMD_popd (void) { * Move a file, directory tree or wildcarded set of files. */ -void WCMD_move (void) +RETURN_CODE WCMD_move(void) { - BOOL status; WIN32_FIND_DATAW fd; - HANDLE hff; + HANDLE hff; WCHAR input[MAX_PATH]; WCHAR output[MAX_PATH]; WCHAR drive[10]; @@ -1942,7 +1941,7 @@ void WCMD_move (void) if (param1[0] == 0x00) { WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); - return; + return errorlevel = ERROR_INVALID_FUNCTION; } /* If no destination supplied, assume current directory */ @@ -1953,7 +1952,8 @@ void WCMD_move (void) /* If 2nd parm is directory, then use original filename */ /* Convert partial path to full path */ if (!WCMD_get_fullpath(param1, ARRAY_SIZE(input), input, NULL) || - !WCMD_get_fullpath(param2, ARRAY_SIZE(output), output, NULL)) return; + !WCMD_get_fullpath(param2, ARRAY_SIZE(output), output, NULL)) + return errorlevel = ERROR_INVALID_FUNCTION; WINE_TRACE("Move from '%s'('%s') to '%s'\n", wine_dbgstr_w(input), wine_dbgstr_w(param1), wine_dbgstr_w(output)); @@ -1962,8 +1962,9 @@ void WCMD_move (void) hff = FindFirstFileW(input, &fd); if (hff == INVALID_HANDLE_VALUE) - return; + return errorlevel = ERROR_INVALID_FUNCTION; + errorlevel = NO_ERROR; do { WCHAR dest[MAX_PATH]; WCHAR src[MAX_PATH]; @@ -2036,19 +2037,15 @@ void WCMD_move (void) flags |= MOVEFILE_REPLACE_EXISTING; } - if (ok) { - status = MoveFileExW(src, dest, flags); - } else { - status = TRUE; - } - - if (!status) { - WCMD_print_error (); + if (!ok || !MoveFileExW(src, dest, flags)) + { + if (!ok) WCMD_print_error(); errorlevel = ERROR_INVALID_FUNCTION; } } while (FindNextFileW(hff, &fd) != 0); FindClose(hff); + return errorlevel; } /**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8d23e7efaf8..0c6362d227a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -480,11 +480,11 @@ SUCCESS 0 @todo_wine(a)FAILURE 1 @todo_wine(a)FAILURE 1 --- success/failure for MOVE command -(a)todo_wine@FAILURE 1 -(a)todo_wine@SUCCESS 0 -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 +FAILURE 1 +SUCCESS 0 +FAILURE 1 +FAILURE 1 +FAILURE 1 --- success/failure for RENAME command @todo_wine(a)FAILURE 1 @todo_wine(a)FAILURE 1 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index db63966bffe..d2ef5b46b86 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -179,7 +179,7 @@ void WCMD_give_help (const WCHAR *args); RETURN_CODE WCMD_goto(void); void WCMD_leave_paged_mode(void); void WCMD_more (WCHAR *); -void WCMD_move (void); +RETURN_CODE WCMD_move (void); WCHAR* WINAPIV WCMD_format_string (const WCHAR *format, ...); void WINAPIV WCMD_output (const WCHAR *format, ...); void WINAPIV WCMD_output_stderr (const WCHAR *format, ...); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0ec3b014283..18315e9ce2b 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1852,7 +1852,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) WCMD_create_dir (parms_start); break; case WCMD_MOVE: - WCMD_move (); + return_code = WCMD_move(); break; case WCMD_PATH: WCMD_setshow_path (parms_start);

1 0

Fabian Maurer : mlang/tests: Add test for GetGlobalFontLinkObject allowing IID_IMultiLanguage2.
by Alexandre Julliard 02 Jul '24

02 Jul '24

Module: wine Branch: master Commit: 1ba592eec681c79ce1ccb301ff5725f666fb1dcf URL: https://gitlab.winehq.org/wine/wine/-/commit/1ba592eec681c79ce1ccb301ff5725… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jun 29 04:18:46 2024 +0200 mlang/tests: Add test for GetGlobalFontLinkObject allowing IID_IMultiLanguage2. --- dlls/mlang/tests/mlang.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 6bb973dc285..988e48ee178 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2308,6 +2308,7 @@ static void test_GetGlobalFontLinkObject(void) IMLangFontLink *IMLFL; IMLangCodePages *IMLCP; IMultiLanguage *IML; + IMultiLanguage2 *IML2; ret = GetGlobalFontLinkObject(NULL); ok(ret == E_INVALIDARG, "expected E_INVALIDARG got %#lx\n", ret); @@ -2327,6 +2328,10 @@ static void test_GetGlobalFontLinkObject(void) todo_wine ok(ret == E_NOINTERFACE, "expected E_NOINTERFACE got %#lx\n", ret); if (ret == S_OK) IMultiLanguage_Release(IML); + ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMultiLanguage2, (void**)&IML2); + todo_wine ok(ret == E_NOINTERFACE, "expected E_NOINTERFACE got %#lx\n", ret); + if (ret == S_OK) IMultiLanguage2_Release(IML2); + ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMLangFontLink, (void**)&IMLFL); ok(ret == S_OK, "expected S_OK got %#lx\n", ret); IMLangFontLink_Release(IMLFL);

1 0

Fabian Maurer : mlang/tests: Add tests showing which interface is returned by GetGlobalFontLinkObject.
by Alexandre Julliard 02 Jul '24

02 Jul '24

Module: wine Branch: master Commit: 6df749e2b83ff048d365d04e8f98a9572a1c076e URL: https://gitlab.winehq.org/wine/wine/-/commit/6df749e2b83ff048d365d04e8f98a9… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jun 29 04:36:43 2024 +0200 mlang/tests: Add tests showing which interface is returned by GetGlobalFontLinkObject. --- dlls/mlang/tests/mlang.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 988e48ee178..7d94003bc78 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2340,6 +2340,10 @@ static void test_GetGlobalFontLinkObject(void) ok(ret == S_OK, "expected S_OK got %#lx\n", ret); IMLangCodePages_Release(IMLCP); + todo_wine + ok(unknown == IMLFL, "IUnknown from GetGlobalFontLinkObject isn't IMLangFontLink\n"); + todo_wine + ok(unknown == IMLCP, "IUnknown from GetGlobalFontLinkObject isn't IMLangCodePages\n"); refcount = IUnknown_Release((IUnknown*)unknown); ok(refcount == 1, "Got refcount %ld\n", refcount);

1 0

Fabian Maurer : mlang: Return the correct interface in GetGlobalFontLinkObject.
by Alexandre Julliard 02 Jul '24

02 Jul '24

Module: wine Branch: master Commit: 279d8bf7242df03c7269f30c86db2f7c3291cf1f URL: https://gitlab.winehq.org/wine/wine/-/commit/279d8bf7242df03c7269f30c86db2f… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jun 29 04:45:03 2024 +0200 mlang: Return the correct interface in GetGlobalFontLinkObject. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56600 --- dlls/gdiplus/graphics.c | 5 +---- dlls/mlang/mlang.c | 11 ++++------- dlls/mlang/tests/mlang.c | 4 +--- include/mlang.idl | 2 +- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 265b3363ca9..1c0e6aa07d6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5354,7 +5354,6 @@ GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics *graphics, INT x, INT y, INT w /* Populates gdip_font_link_info struct based on the base_font and input string */ static void generate_font_link_info(struct gdip_format_string_info *info, DWORD length, GDIPCONST GpFont *base_font) { - IUnknown *unk; IMLangFontLink *iMLFL; GpFont *gpfont; HFONT map_hfont, hfont, old_font; @@ -5365,9 +5364,7 @@ static void generate_font_link_info(struct gdip_format_string_info *info, DWORD list_init(&info->font_link_info.sections); info->font_link_info.base_font = base_font; - GetGlobalFontLinkObject((void**)&unk); - IUnknown_QueryInterface(unk, &IID_IMLangFontLink, (void**)&iMLFL); - IUnknown_Release(unk); + GetGlobalFontLinkObject(&iMLFL); get_font_hfont(info->graphics, base_font, NULL, &hfont, NULL, NULL); IMLangFontLink_GetFontCodePages(iMLFL, info->hdc, hfont, &font_codepages); diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index c7e7f360f0b..fd78f47fdb2 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3887,11 +3887,11 @@ static BOOL WINAPI allocate_font_link_cb(PINIT_ONCE init_once, PVOID args, PVOID return SUCCEEDED(MultiLanguage_create(NULL, (void**)&font_link_global)); } -HRESULT WINAPI GetGlobalFontLinkObject(void **unknown) +HRESULT WINAPI GetGlobalFontLinkObject(IMLangFontLink **obj) { - TRACE("%p\n", unknown); + TRACE("%p\n", obj); - if (!unknown) return E_INVALIDARG; + if (!obj) return E_INVALIDARG; if (!InitOnceExecuteOnce(&font_link_global_init_once, allocate_font_link_cb, NULL, NULL)) { @@ -3899,8 +3899,5 @@ HRESULT WINAPI GetGlobalFontLinkObject(void **unknown) return E_FAIL; } - IUnknown_AddRef(font_link_global); - *unknown = font_link_global; - - return S_OK; + return IUnknown_QueryInterface(font_link_global, &IID_IMLangFontLink, (void**)obj); } diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 7d94003bc78..d104d4d5184 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2314,7 +2314,7 @@ static void test_GetGlobalFontLinkObject(void) ok(ret == E_INVALIDARG, "expected E_INVALIDARG got %#lx\n", ret); unknown = (void *)0xdeadbeef; - ret = GetGlobalFontLinkObject(&unknown); + ret = GetGlobalFontLinkObject((IMLangFontLink**)&unknown); ok(ret == S_OK, "expected S_OK got %#lx\n", ret); ok(unknown != NULL && unknown != (void *)0xdeadbeef, "GetGlobalFontLinkObject() returned %p\n", unknown); @@ -2340,9 +2340,7 @@ static void test_GetGlobalFontLinkObject(void) ok(ret == S_OK, "expected S_OK got %#lx\n", ret); IMLangCodePages_Release(IMLCP); - todo_wine ok(unknown == IMLFL, "IUnknown from GetGlobalFontLinkObject isn't IMLangFontLink\n"); - todo_wine ok(unknown == IMLCP, "IUnknown from GetGlobalFontLinkObject isn't IMLangCodePages\n"); refcount = IUnknown_Release((IUnknown*)unknown); diff --git a/include/mlang.idl b/include/mlang.idl index 7c4398feafd..c9b5912b0e3 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -762,7 +762,7 @@ cpp_quote("STDAPI Rfc1766ToLcidA(LCID *, LPCSTR);") cpp_quote("STDAPI Rfc1766ToLcidW(LCID *, LPCWSTR);") cpp_quote("#define Rfc1766ToLcid WINELIB_NAME_AW(Rfc1766ToLcid)") -cpp_quote("STDAPI GetGlobalFontLinkObject(void **unknown);") +cpp_quote("STDAPI GetGlobalFontLinkObject(IMLangFontLink **unknown);") cpp_quote("STDAPI IsConvertINetStringAvailable(DWORD, DWORD);") cpp_quote("STDAPI ConvertINetString(LPDWORD, DWORD, DWORD, LPCSTR, LPINT, LPSTR, LPINT);") cpp_quote("STDAPI ConvertINetMultiByteToUnicode(LPDWORD, DWORD, LPCSTR, LPINT, LPWSTR, LPINT);")

1 0

Rémi Bernon : win32u: Read the thread message queue masks from the shared memory.
by Alexandre Julliard 01 Jul '24

01 Jul '24

Module: wine Branch: master Commit: f41c434b88c63984082ad9d4627bef5d51434871 URL: https://gitlab.winehq.org/wine/wine/-/commit/f41c434b88c63984082ad9d4627bef… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 25 16:42:46 2024 +0200 win32u: Read the thread message queue masks from the shared memory. --- dlls/win32u/message.c | 34 +++++++++++++++++++--------------- dlls/win32u/ntuser_private.h | 2 -- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 3099f5a6660..d8cb6f395b2 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2708,8 +2708,6 @@ int peek_message( MSG *msg, const struct peek_message_filter *filter ) free( buffer ); if (res == STATUS_PENDING) { - thread_info->wake_mask = filter->mask & (QS_SENDMESSAGE | QS_SMRESULT); - thread_info->changed_mask = filter->mask; return 0; } if (res != STATUS_BUFFER_OVERFLOW) @@ -3017,6 +3015,23 @@ static DWORD wait_message( DWORD count, const HANDLE *handles, DWORD timeout, DW return ret; } +/*********************************************************************** + * check_queue_masks + */ +static BOOL check_queue_masks( UINT wake_mask, UINT changed_mask ) +{ + struct object_lock lock = OBJECT_LOCK_INIT; + const queue_shm_t *queue_shm; + BOOL skip = FALSE; + UINT status; + + while ((status = get_shared_queue( &lock, &queue_shm )) == STATUS_PENDING) + skip = queue_shm->wake_mask == wake_mask && queue_shm->changed_mask == changed_mask; + + if (status) return FALSE; + return skip; +} + /*********************************************************************** * wait_objects * @@ -3025,14 +3040,11 @@ static DWORD wait_message( DWORD count, const HANDLE *handles, DWORD timeout, DW static DWORD wait_objects( DWORD count, const HANDLE *handles, DWORD timeout, DWORD wake_mask, DWORD changed_mask, DWORD flags ) { - struct user_thread_info *thread_info = get_user_thread_info(); - DWORD ret; - assert( count ); /* we must have at least the server queue */ flush_window_surfaces( TRUE ); - if (thread_info->wake_mask != wake_mask || thread_info->changed_mask != changed_mask) + if (!check_queue_masks( wake_mask, changed_mask )) { SERVER_START_REQ( set_queue_mask ) { @@ -3042,14 +3054,9 @@ static DWORD wait_objects( DWORD count, const HANDLE *handles, DWORD timeout, wine_server_call( req ); } SERVER_END_REQ; - thread_info->wake_mask = wake_mask; - thread_info->changed_mask = changed_mask; } - ret = wait_message( count, handles, timeout, changed_mask, flags ); - - if (ret != WAIT_TIMEOUT) thread_info->wake_mask = thread_info->changed_mask = 0; - return ret; + return wait_message( count, handles, timeout, changed_mask, flags ); } static HANDLE normalize_std_handle( HANDLE handle ) @@ -3314,7 +3321,6 @@ done: */ static void wait_message_reply( UINT flags ) { - struct user_thread_info *thread_info = get_user_thread_info(); HANDLE server_queue = get_server_queue_handle(); unsigned int wake_mask = QS_SMRESULT | ((flags & SMTO_BLOCK) ? 0 : QS_SENDMESSAGE); @@ -3331,8 +3337,6 @@ static void wait_message_reply( UINT flags ) } SERVER_END_REQ; - thread_info->wake_mask = thread_info->changed_mask = 0; - if (wake_bits & QS_SMRESULT) return; /* got a result */ if (wake_bits & QS_SENDMESSAGE) { diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 44edadad8f8..e9d407efb14 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -108,8 +108,6 @@ struct user_thread_info { struct ntuser_thread_info client_info; /* Data shared with client */ HANDLE server_queue; /* Handle to server-side queue */ - DWORD wake_mask; /* Current queue wake mask */ - DWORD changed_mask; /* Current queue changed mask */ WORD message_count; /* Get/PeekMessage loop counter */ WORD hook_call_depth; /* Number of recursively called hook procs */ WORD hook_unicode; /* Is current hook unicode? */

1 0

Rémi Bernon : server: Move thread message queue bits to the shared mapping.
by Alexandre Julliard 01 Jul '24

01 Jul '24

Module: wine Branch: master Commit: 7f53ca70bad150af094e77f7dde582dc3f50ff34 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f53ca70bad150af094e77f7dde582… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 26 15:55:33 2024 +0200 server: Move thread message queue bits to the shared mapping. --- include/wine/server_protocol.h | 4 ++- server/protocol.def | 2 ++ server/queue.c | 69 ++++++++++++++++++++++++++++-------------- 3 files changed, 52 insertions(+), 23 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f6cde739a84..2598ecc1817 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -901,7 +901,9 @@ typedef volatile struct { int hooks_count[WH_MAX - WH_MIN + 2]; unsigned int wake_mask; + unsigned int wake_bits; unsigned int changed_mask; + unsigned int changed_bits; } queue_shm_t; typedef volatile union @@ -6589,7 +6591,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 820 +#define SERVER_PROTOCOL_VERSION 821 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 6b0ab8ae466..21e35204ed0 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -917,7 +917,9 @@ typedef volatile struct { int hooks_count[WH_MAX - WH_MIN + 2]; /* active hooks count */ unsigned int wake_mask; /* wakeup mask */ + unsigned int wake_bits; /* wakeup bits */ unsigned int changed_mask; /* changed wakeup mask */ + unsigned int changed_bits; /* changed wakeup bits */ } queue_shm_t; typedef volatile union diff --git a/server/queue.c b/server/queue.c index d79b4839733..4f58b795b7e 100644 --- a/server/queue.c +++ b/server/queue.c @@ -125,8 +125,6 @@ struct msg_queue { struct object obj; /* object header */ struct fd *fd; /* optional file descriptor to poll */ - unsigned int wake_bits; /* wakeup bits */ - unsigned int changed_bits; /* changed wakeup bits */ int paint_count; /* pending paint messages count */ int hotkey_count; /* pending hotkey messages count */ int quit_message; /* is there a pending quit message? */ @@ -300,8 +298,6 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ if ((queue = alloc_object( &msg_queue_ops ))) { queue->fd = NULL; - queue->wake_bits = 0; - queue->changed_bits = 0; queue->paint_count = 0; queue->hotkey_count = 0; queue->quit_message = 0; @@ -329,7 +325,9 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ { memset( (void *)shared->hooks_count, 0, sizeof(shared->hooks_count) ); shared->wake_mask = 0; + shared->wake_bits = 0; shared->changed_mask = 0; + shared->changed_bits = 0; } SHARED_WRITE_END; @@ -641,29 +639,44 @@ void add_queue_hook_count( struct thread *thread, unsigned int index, int count static inline int is_signaled( struct msg_queue *queue ) { const queue_shm_t *queue_shm = queue->shared; - return (queue->wake_bits & queue_shm->wake_mask) || - (queue->changed_bits & queue_shm->changed_mask); + return (queue_shm->wake_bits & queue_shm->wake_mask) || + (queue_shm->changed_bits & queue_shm->changed_mask); } /* set some queue bits */ static inline void set_queue_bits( struct msg_queue *queue, unsigned int bits ) { + const queue_shm_t *queue_shm = queue->shared; + if (bits & (QS_KEY | QS_MOUSEBUTTON)) { if (!queue->keystate_lock) lock_input_keystate( queue->input ); queue->keystate_lock = 1; } - queue->wake_bits |= bits; - queue->changed_bits |= bits; + + SHARED_WRITE_BEGIN( queue_shm, queue_shm_t ) + { + shared->wake_bits |= bits; + shared->changed_bits |= bits; + } + SHARED_WRITE_END; + if (is_signaled( queue )) wake_up( &queue->obj, 0 ); } /* clear some queue bits */ static inline void clear_queue_bits( struct msg_queue *queue, unsigned int bits ) { - queue->wake_bits &= ~bits; - queue->changed_bits &= ~bits; - if (!(queue->wake_bits & (QS_KEY | QS_MOUSEBUTTON))) + const queue_shm_t *queue_shm = queue->shared; + + SHARED_WRITE_BEGIN( queue_shm, queue_shm_t ) + { + shared->wake_bits &= ~bits; + shared->changed_bits &= ~bits; + } + SHARED_WRITE_END; + + if (!(queue_shm->wake_bits & (QS_KEY | QS_MOUSEBUTTON))) { if (queue->keystate_lock) unlock_input_keystate( queue->input ); queue->keystate_lock = 0; @@ -1181,7 +1194,7 @@ static void msg_queue_dump( struct object *obj, int verbose ) struct msg_queue *queue = (struct msg_queue *)obj; const queue_shm_t *queue_shm = queue->shared; fprintf( stderr, "Msg queue bits=%x mask=%x\n", - queue->wake_bits, queue_shm->wake_mask ); + queue_shm->wake_bits, queue_shm->wake_mask ); } static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entry ) @@ -2955,8 +2968,9 @@ DECL_HANDLER(set_queue_mask) } SHARED_WRITE_END; - reply->wake_bits = queue->wake_bits; - reply->changed_bits = queue->changed_bits; + reply->wake_bits = queue_shm->wake_bits; + reply->changed_bits = queue_shm->changed_bits; + if (is_signaled( queue )) { /* if skip wait is set, do what would have been done in the subsequent wait */ @@ -2981,9 +2995,16 @@ DECL_HANDLER(get_queue_status) struct msg_queue *queue = current->queue; if (queue) { - reply->wake_bits = queue->wake_bits; - reply->changed_bits = queue->changed_bits; - queue->changed_bits &= ~req->clear_bits; + const queue_shm_t *queue_shm = queue->shared; + + reply->wake_bits = queue_shm->wake_bits; + reply->changed_bits = queue_shm->changed_bits; + + SHARED_WRITE_BEGIN( queue_shm, queue_shm_t ) + { + shared->changed_bits &= ~req->clear_bits; + } + SHARED_WRITE_END; } else reply->wake_bits = reply->changed_bits = 0; } @@ -3167,13 +3188,17 @@ DECL_HANDLER(get_message) } /* clear changed bits so we can wait on them if we don't find a message */ - if (filter & QS_POSTMESSAGE) + SHARED_WRITE_BEGIN( queue_shm, queue_shm_t ) { - queue->changed_bits &= ~(QS_POSTMESSAGE | QS_HOTKEY | QS_TIMER); - if (req->get_first == 0 && req->get_last == ~0U) queue->changed_bits &= ~QS_ALLPOSTMESSAGE; + if (filter & QS_POSTMESSAGE) + { + shared->changed_bits &= ~(QS_POSTMESSAGE | QS_HOTKEY | QS_TIMER); + if (req->get_first == 0 && req->get_last == ~0U) shared->changed_bits &= ~QS_ALLPOSTMESSAGE; + } + if (filter & QS_INPUT) shared->changed_bits &= ~QS_INPUT; + if (filter & QS_PAINT) shared->changed_bits &= ~QS_PAINT; } - if (filter & QS_INPUT) queue->changed_bits &= ~QS_INPUT; - if (filter & QS_PAINT) queue->changed_bits &= ~QS_PAINT; + SHARED_WRITE_END; /* then check for posted messages */ if ((filter & QS_POSTMESSAGE) &&

1 0

Rémi Bernon : win32u: Use the thread message queue shared memory in get_input_state.
by Alexandre Julliard 01 Jul '24

01 Jul '24

Module: wine Branch: master Commit: 26e4e3581f1eed5166d476f4c3eb77198e0b279f URL: https://gitlab.winehq.org/wine/wine/-/commit/26e4e3581f1eed5166d476f4c3eb77… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 25 17:00:13 2024 +0200 win32u: Use the thread message queue shared memory in get_input_state. --- dlls/win32u/input.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index a582826d18e..999cce23715 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -841,6 +841,26 @@ SHORT WINAPI NtUserGetAsyncKeyState( INT key ) return ret; } +/*********************************************************************** + * get_shared_queue_bits + */ +static BOOL get_shared_queue_bits( UINT *wake_bits, UINT *changed_bits ) +{ + struct object_lock lock = OBJECT_LOCK_INIT; + const queue_shm_t *queue_shm; + UINT status; + + *wake_bits = *changed_bits = 0; + while ((status = get_shared_queue( &lock, &queue_shm )) == STATUS_PENDING) + { + *wake_bits = queue_shm->wake_bits; + *changed_bits = queue_shm->changed_bits; + } + + if (status) return FALSE; + return TRUE; +} + /*********************************************************************** * NtUserGetQueueStatus (win32u.@) */ @@ -871,18 +891,12 @@ DWORD WINAPI NtUserGetQueueStatus( UINT flags ) */ DWORD get_input_state(void) { - DWORD ret; + UINT wake_bits, changed_bits; check_for_events( QS_INPUT ); - SERVER_START_REQ( get_queue_status ) - { - req->clear_bits = 0; - wine_server_call( req ); - ret = reply->wake_bits & (QS_KEY | QS_MOUSEBUTTON); - } - SERVER_END_REQ; - return ret; + if (!get_shared_queue_bits( &wake_bits, &changed_bits )) return 0; + return wake_bits & (QS_KEY | QS_MOUSEBUTTON); } /***********************************************************************

1 0