September 2022 - Wine-Commits

Alexandre Julliard : gitlab: Always reset the git tree after a build.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: 97302f7c9ea68e2cb28b31c6718a8459bdd0875d URL: https://gitlab.winehq.org/wine/wine/-/commit/97302f7c9ea68e2cb28b31c6718a84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 12:36:00 2022 +0200 gitlab: Always reset the git tree after a build. --- tools/gitlab/build-linux | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/gitlab/build-linux b/tools/gitlab/build-linux index 6170a66e792..659ff0a0c17 100755 --- a/tools/gitlab/build-linux +++ b/tools/gitlab/build-linux @@ -19,10 +19,10 @@ cd build32 make -s -j$(nproc) cd .. -if test -s .git/rebase-merge/git-rebase-todo +if ! test -s .git/rebase-merge/git-rebase-todo then - git reset --hard -else make -s -j$(nproc) -C build32 install-lib install-test DESTDIR=$BASEDIR make -s -j$(nproc) -C build64 install-lib install-test DESTDIR=$BASEDIR fi + +git reset --hard

1 0

Alexandre Julliard : gitlab: Fetch the full git tree with all tags.
by Alexandre Julliard Sept. 12, 2022

Sept. 12, 2022

Module: wine Branch: master Commit: 30ec834cfec7f10692d0739565c9ffdb1e08be89 URL: https://gitlab.winehq.org/wine/wine/-/commit/30ec834cfec7f10692d0739565c9ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 12:36:53 2022 +0200 gitlab: Fetch the full git tree with all tags. --- tools/gitlab/build.yml | 4 ++++ tools/gitlab/test.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 9b7edcbb912..ba654485488 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -4,6 +4,8 @@ stage: build image: $CI_REGISTRY/wine/wine:debian-bullseye interruptible: true + variables: + GIT_DEPTH: 0 cache: - paths: - ccache/ @@ -67,6 +69,8 @@ build-winetest: - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH needs: - job: build-daily-linux + variables: + GIT_STRATEGY: none artifacts: name: winetest paths: diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index c64ddb449d3..c500a6602d4 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -5,6 +5,7 @@ image: $CI_REGISTRY/wine/wine:debian-bullseye interruptible: true variables: + GIT_STRATEGY: none GECKO_VER: 2.47.3 MONO_VER: 7.3.0 cache:

1 0

Alexandre Julliard : winetest: Report success if the report has been submitted successfully.
by Alexandre Julliard Sept. 8, 2022

Sept. 8, 2022

Module: wine Branch: master Commit: 0f9628808034d979937cb4954dde930aec6c68b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f9628808034d979937cb4954dde93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 8 18:44:56 2022 +0200 winetest: Report success if the report has been submitted successfully. --- programs/winetest/main.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 38f44d2e717..59965526e02 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1525,10 +1525,18 @@ int __cdecl main( int argc, char *argv[] ) if (build_id[0] && nr_of_skips <= SKIP_LIMIT && failures <= FAILURES_LIMIT && !nr_native_dlls && !is_win9x && report (R_ASK, MB_YESNO, "Do you want to submit the test results?") == IDYES) + { if (!send_file (submiturl, logname) && !DeleteFileA(logname)) report (R_WARNING, "Can't remove logfile: %u", GetLastError()); - } else run_tests (logname, outdir); - report (R_STATUS, "Finished - %u failures", failures); + else + failures = 0; /* return success */ + } + } + else + { + run_tests (logname, outdir); + report (R_STATUS, "Finished - %u failures", failures); + } if (prev_crash_dialog) restore_crash_dialog( prev_crash_dialog ); } if (poweroff)

1 0

Alexandre Julliard : gitlab: Run tests on Debian after the daily commit round.
by Alexandre Julliard Sept. 8, 2022

Sept. 8, 2022

Module: wine Branch: master Commit: 1d0f66a3c6c6cf77ab49c834ba0d05f5232f637d URL: https://gitlab.winehq.org/wine/wine/-/commit/1d0f66a3c6c6cf77ab49c834ba0d05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 8 19:03:22 2022 +0200 gitlab: Run tests on Debian after the daily commit round. --- .gitlab-ci.yml | 2 ++ tools/gitlab/build-linux | 12 +++++++--- tools/gitlab/build.yml | 26 ++++++++++++-------- tools/gitlab/image.docker | 6 ++++- tools/gitlab/test.yml | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 92 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 67830facbc6..4f5ed6b68df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,9 +3,11 @@ stages: - image - build + - test - deploy include: - local: "/tools/gitlab/image.yml" - local: "/tools/gitlab/build.yml" + - local: "/tools/gitlab/test.yml" - local: "/tools/gitlab/release.yml" diff --git a/tools/gitlab/build-linux b/tools/gitlab/build-linux index 351e100b4f8..6170a66e792 100755 --- a/tools/gitlab/build-linux +++ b/tools/gitlab/build-linux @@ -10,13 +10,19 @@ set -Eeuxo pipefail autoreconf cd build64 -../configure -C --enable-win64 --enable-werror --with-mingw +../configure -q -C --enable-win64 --enable-werror --with-mingw make -s -j$(nproc) cd .. cd build32 -../configure -C --enable-werror --with-mingw +../configure -q -C --enable-werror --with-mingw make -s -j$(nproc) cd .. -git reset --hard +if test -s .git/rebase-merge/git-rebase-todo +then + git reset --hard +else + make -s -j$(nproc) -C build32 install-lib install-test DESTDIR=$BASEDIR + make -s -j$(nproc) -C build64 install-lib install-test DESTDIR=$BASEDIR +fi diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 08e63db0ecd..9b7edcbb912 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -20,6 +20,7 @@ - export CCACHE_COMPILERCHECK=content - export PATH="/usr/lib/ccache:$PATH" - mkdir -p build32 build64 + - rm -fr .git/rebase-merge # in case a previous CI run failed in git rebase build-linux: extends: .wine-build @@ -31,7 +32,6 @@ build-linux: - build64/config.log - build32/config.log script: - - rm -fr .git/rebase-merge # in case a previous CI run failed in git rebase - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-linux build-mac: @@ -46,26 +46,32 @@ build-mac: - build64/config.log - build32/config.log script: - - rm -fr .git/rebase-merge - export PATH="/usr/local/opt/ccache/libexec:$PATH" - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-mac -build-winetest: +build-daily-linux: extends: .wine-build rules: - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + artifacts: + expire_in: 1 day + paths: + - usr/local/ + script: + - ./tools/gitlab/build-linux + +build-winetest: + stage: build + image: $CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX/debian:bullseye + rules: + - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + needs: + - job: build-daily-linux artifacts: name: winetest paths: - winetest.exe - winetest64.exe script: - - cd build64 - - ../configure -q -C --enable-win64 --with-mingw - - make -s -j$(nproc) install-test DESTDIR=$BASEDIR - - cd ../build32 - - ../configure -q -C --with-mingw - - make -s -j$(nproc) install-test DESTDIR=$BASEDIR - - cd .. - mv usr/local/lib/wine/i386-windows/winetest.exe winetest.exe - mv usr/local/lib/wine/x86_64-windows/winetest.exe winetest64.exe diff --git a/tools/gitlab/image.docker b/tools/gitlab/image.docker index c30e8f0de26..0d23a75483b 100644 --- a/tools/gitlab/image.docker +++ b/tools/gitlab/image.docker @@ -51,7 +51,11 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ samba-dev:amd64 \ unixodbc-dev:amd64 unixodbc-dev:i386 \ x11proto-dev && \ - apt-get install -y ccache && \ + apt-get install -y ccache netbase curl ca-certificates xserver-xorg-video-dummy xserver-xorg xfonts-base xinit fvwm \ + winbind fonts-liberation2 fonts-noto-core fonts-noto-cjk pulseaudio libasound2-plugins:amd64 libasound2-plugins:i386 \ + libmjpegutils-2.1-0:amd64 libmjpegutils-2.1-0:i386 gstreamer1.0-libav:amd64 gstreamer1.0-libav:i386 \ + gstreamer1.0-plugins-base:amd64 gstreamer1.0-plugins-good:amd64 gstreamer1.0-plugins-bad:amd64 gstreamer1.0-plugins-ugly:amd64 \ + gstreamer1.0-plugins-base:i386 gstreamer1.0-plugins-good:i386 gstreamer1.0-plugins-bad:i386 gstreamer1.0-plugins-ugly:i386 && \ apt-get clean && \ useradd -m gitlab diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml new file mode 100644 index 00000000000..c64ddb449d3 --- /dev/null +++ b/tools/gitlab/test.yml @@ -0,0 +1,60 @@ +# CI script for testing Wine + +.wine-test: + stage: test + image: $CI_REGISTRY/wine/wine:debian-bullseye + interruptible: true + variables: + GECKO_VER: 2.47.3 + MONO_VER: 7.3.0 + cache: + - key: wine-gecko-$GECKO_VER + paths: + - wine-gecko-$GECKO_VER-x86.msi + - wine-gecko-$GECKO_VER-x86_64.msi + - key: wine-mono-$MONO_VER + paths: + - wine-mono-$MONO_VER-x86.msi + before_script: + - export BASEDIR=$PWD + - export PATH=$BASEDIR/usr/local/bin:$PATH + - export DISPLAY=:0 + - export LC_ALL=C.UTF-8 + - export WINEDEBUG=err-all,fixme-all + - | + cat >$HOME/xorg.conf << EOF + Section "Device" + Identifier "dummy" + Driver "dummy" + VideoRam 32768 + EndSection + EOF + - echo 'exec /usr/bin/fvwm -f config -c "Style * MwmDecor" 2>/dev/null' >$HOME/.xinitrc + - startx -- -config $HOME/xorg.conf $DISPLAY & + - test -f wine-gecko-$GECKO_VER-x86.msi || curl -o wine-gecko-$GECKO_VER-x86.msi https://dl.winehq.org/wine/wine-gecko/$GECKO_VER/wine-gecko-$GECKO_VER-x86.… + - test -f wine-gecko-$GECKO_VER-x86_64.msi || curl -o wine-gecko-$GECKO_VER-x86_64.msi https://dl.winehq.org/wine/wine-gecko/$GECKO_VER/wine-gecko-$GECKO_VER-x86_… + - test -f wine-mono-$MONO_VER-x86.msi || curl -o wine-mono-$MONO_VER-x86.msi https://dl.winehq.org/wine/wine-mono/$MONO_VER/wine-mono-$MONO_VER-x86.msi + - mkdir -p $HOME/Documents $HOME/Desktop usr/local/share/wine/gecko usr/local/share/wine/mono + - ln -sf $BASEDIR/wine-gecko-$GECKO_VER-x86.msi $BASEDIR/wine-gecko-$GECKO_VER-x86_64.msi usr/local/share/wine/gecko + - ln -sf $BASEDIR/wine-mono-$MONO_VER-x86.msi usr/local/share/wine/mono + - pulseaudio --start --exit-idle-time=-1 + - wine wineboot.exe -u + - wineserver -w + +debian-32: + extends: .wine-test + rules: + - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + needs: + - job: build-daily-linux + script: + - wine usr/local/lib/wine/i386-windows/winetest.exe -q -t gitlab-$CI_JOB_NAME -m $CI_JOB_URL + +debian-64: + extends: .wine-test + rules: + - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + needs: + - job: build-daily-linux + script: + - wine usr/local/lib/wine/x86_64-windows/winetest.exe -q -t gitlab-$CI_JOB_NAME -m $CI_JOB_URL

1 0

Alexandre Julliard : urlmon/tests: Fix race condition in abort test.
by Alexandre Julliard Sept. 8, 2022

Sept. 8, 2022

Module: wine Branch: master Commit: 44a81794dfc4e293f94654f2ef4dbfa0c5e81e95 URL: https://gitlab.winehq.org/wine/wine/-/commit/44a81794dfc4e293f94654f2ef4dbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 8 17:48:59 2022 +0200 urlmon/tests: Fix race condition in abort test. The result can arrive before we have time to abort. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53268 --- dlls/urlmon/tests/protocol.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index dcb5c852a92..f3e39f42b5f 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1193,8 +1193,8 @@ static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HR if(tested_protocol == FTP_TEST) ok(hrResult == E_PENDING || hrResult == S_OK, "hrResult = %08lx, expected E_PENDING or S_OK\n", hrResult); else - ok(hrResult == expect_hrResult, "hrResult = %08lx, expected: %08lx\n", - hrResult, expect_hrResult); + ok(hrResult == expect_hrResult || (test_abort && hrResult == S_OK), /* result can come in before the abort */ + "hrResult = %08lx, expected: %08lx\n", hrResult, expect_hrResult); if(SUCCEEDED(hrResult) || tested_protocol == FTP_TEST || test_abort || hrResult == INET_E_REDIRECT_FAILED) ok(dwError == ERROR_SUCCESS, "dwError = %ld, expected ERROR_SUCCESS\n", dwError); else @@ -3331,7 +3331,8 @@ static void test_protocol_terminate(IInternetProtocol *protocol) ok(hres == S_OK, "LockRequest failed: %08lx\n", hres); hres = IInternetProtocol_Read(protocol, buf, 1, &cb); - ok(hres == (test_abort ? S_OK : S_FALSE), "Read failed: %08lx\n", hres); + ok(hres == S_FALSE || (test_abort && hres == S_OK), /* result can come in before the abort */ + "Read failed: %08lx\n", hres); hres = IInternetProtocol_Terminate(protocol, 0); ok(hres == S_OK, "Terminate failed: %08lx\n", hres); @@ -3421,7 +3422,7 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym return; } - if(!direct_read && !test_abort && !bind_from_cache) + if(!direct_read && !bind_from_cache) SET_EXPECT(ReportResult); if(flags & TEST_DISABLEAUTOREDIRECT)

1 0

Brendan Shanks : wow64: Don't re-enter cpu_simulate() from exception filter.
by Alexandre Julliard Sept. 8, 2022

Sept. 8, 2022

Module: wine Branch: master Commit: 30336441275f052a2baf61f63c5227fd0202a96b URL: https://gitlab.winehq.org/wine/wine/-/commit/30336441275f052a2baf61f63c5227… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Sep 7 13:49:19 2022 -0700 wow64: Don't re-enter cpu_simulate() from exception filter. Avoids an eventual stack overflow in exception-heavy applications. --- dlls/wow64/syscall.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index eb48f066b92..6709a575afa 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -721,15 +721,12 @@ NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) } -static void cpu_simulate(void); - /********************************************************************** * simulate_filter */ static LONG CALLBACK simulate_filter( EXCEPTION_POINTERS *ptrs ) { Wow64PassExceptionToGuest( ptrs ); - cpu_simulate(); /* re-enter simulation to run the exception dispatcher */ return EXCEPTION_EXECUTE_HANDLER; }

1 0

Santino Mazza : advapi32/tests: Add tests for RegLoadAppKey.
by Alexandre Julliard Sept. 8, 2022

Sept. 8, 2022

Module: wine Branch: master Commit: 25dce6137dc1eff386c3cc2438f8434f6b801938 URL: https://gitlab.winehq.org/wine/wine/-/commit/25dce6137dc1eff386c3cc2438f843… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Tue Aug 16 21:25:40 2022 -0300 advapi32/tests: Add tests for RegLoadAppKey. Signed-off-by: Santino Mazza <smazza(a)codeweavers.com> --- dlls/advapi32/tests/registry.c | 78 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index df56b0968ee..55a8074f1b7 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1600,7 +1600,82 @@ static void test_reg_unload_key(void) DeleteFileA("saved_key.LOG"); } -/* tests that show that RegConnectRegistry and +/* Helper function to wait for a file blocked by the registry to be available */ +static void wait_file_available(char *path) +{ + int attempts = 0; + HANDLE file = NULL; + + while (((file = CreateFileA(path, GENERIC_READ, 0, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) == INVALID_HANDLE_VALUE) + && attempts++ < 10) + { + Sleep(200); + } + ok(file != INVALID_HANDLE_VALUE, "couldn't open file %s after 10 attempts error %ld.\n", path, GetLastError()); + CloseHandle(file); +} + +static void test_reg_load_app_key(void) +{ + DWORD ret, size; + char temppath[MAX_PATH], hivefilepath[MAX_PATH]; + const BYTE test_data[] = "Hello World"; + BYTE output[sizeof(test_data)]; + HKEY appkey = NULL; + + GetTempPathA(sizeof(temppath), temppath); + GetTempFileNameA(temppath, "key", 0, hivefilepath); + DeleteFileA(hivefilepath); + + if (!set_privileges(SE_BACKUP_NAME, TRUE) || + !set_privileges(SE_RESTORE_NAME, FALSE)) + { + win_skip("Failed to set SE_BACKUP_NAME privileges, skipping tests\n"); + return; + } + + ret = RegSaveKeyA(hkey_main, hivefilepath, NULL); + if (ret != ERROR_SUCCESS) + { + win_skip("Failed to save test key 0x%lx\n", ret); + return; + } + + set_privileges(SE_BACKUP_NAME, FALSE); + set_privileges(SE_RESTORE_NAME, FALSE); + + /* Test simple key load */ + /* Check if the changes are saved */ + ret = RegLoadAppKeyA(hivefilepath, &appkey, KEY_READ | KEY_WRITE, 0, 0); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); + ok(appkey != NULL, "got a null key\n"); + + ret = RegSetValueExA(appkey, "testkey", 0, REG_BINARY, test_data, sizeof(test_data)); + todo_wine ok(ret == ERROR_SUCCESS, "couldn't set key value %lx\n", ret); + RegCloseKey(appkey); + + wait_file_available(hivefilepath); + + appkey = NULL; + ret = RegLoadAppKeyA(hivefilepath, &appkey, KEY_READ, 0, 0); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); + ok(appkey != NULL, "got a null key\n"); + + size = sizeof(test_data); + memset(output, 0xff, sizeof(output)); + ret = RegGetValueA(appkey, NULL, "testkey", RRF_RT_REG_BINARY, NULL, output, &size); + todo_wine ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); + ok(size == sizeof(test_data), "size doesn't match %ld != %ld\n", size, (DWORD)sizeof(test_data)); + todo_wine ok(!memcmp(test_data, output, sizeof(test_data)), "output is not what expected\n"); + + RegCloseKey(appkey); + + wait_file_available(hivefilepath); + ok(DeleteFileA(hivefilepath), "couldn't delete hive file %ld\n", GetLastError()); +} + +/* tests that show that RegConnectRegistry and OpenSCManager accept computer names without the \\ prefix (what MSDN says). */ static void test_regconnectregistry( void) @@ -4486,6 +4561,7 @@ START_TEST(registry) test_reg_save_key(); test_reg_load_key(); test_reg_unload_key(); + test_reg_load_app_key(); test_reg_copy_tree(); test_reg_delete_tree(); test_rw_order();

1 0

Nikolay Sivov : dwrite/tests: Add some tests for glyph justification values.
by Alexandre Julliard Sept. 8, 2022

Sept. 8, 2022

Module: wine Branch: master Commit: a23b1dbf397f7bf0b0f9b2280b7308641aa005d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a23b1dbf397f7bf0b0f9b2280b7308… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 8 15:28:39 2022 +0300 dwrite/tests: Add some tests for glyph justification values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/analyzer.c | 111 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 0363293197e..0bcfffa281b 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -29,6 +29,7 @@ #include "windows.h" #include "winternl.h" #include "dwrite_3.h" +#include "usp10.h" #include "wine/test.h" @@ -2829,6 +2830,115 @@ static void test_AnalyzeBidi(void) IDWriteTextAnalyzer_Release(analyzer); } +enum script_id +{ + Script_Unknown = 0, + Script_Arabic = 3, + Script_Latin = 49, +}; + +static void test_glyph_justification_property(void) +{ + static const struct + { + enum script_id script; + const WCHAR *text; + unsigned short justification[10]; + } tests[] = + { + { + Script_Latin, + L"a b\tc", + { + SCRIPT_JUSTIFY_CHARACTER, + SCRIPT_JUSTIFY_BLANK, + SCRIPT_JUSTIFY_CHARACTER, + SCRIPT_JUSTIFY_BLANK, + SCRIPT_JUSTIFY_CHARACTER, + }, + }, + { + Script_Latin, + L" a b", + { + SCRIPT_JUSTIFY_BLANK, + SCRIPT_JUSTIFY_CHARACTER, + SCRIPT_JUSTIFY_BLANK, + SCRIPT_JUSTIFY_CHARACTER, + }, + }, + { + Script_Arabic, + L" a b", + { + SCRIPT_JUSTIFY_ARABIC_BLANK, + SCRIPT_JUSTIFY_NONE, + SCRIPT_JUSTIFY_ARABIC_BLANK, + SCRIPT_JUSTIFY_NONE, + }, + }, + { Script_Unknown, L"a", { SCRIPT_JUSTIFY_CHARACTER } }, + { Script_Latin, L"\x640", { SCRIPT_JUSTIFY_CHARACTER } }, + { Script_Arabic, L"\x640", { SCRIPT_JUSTIFY_ARABIC_KASHIDA } }, + + { Script_Arabic, L"\x633\x627", { SCRIPT_JUSTIFY_ARABIC_SEEN, SCRIPT_JUSTIFY_ARABIC_ALEF } }, + { Script_Arabic, L"\x633\x625", { SCRIPT_JUSTIFY_ARABIC_SEEN, SCRIPT_JUSTIFY_ARABIC_ALEF } }, + { Script_Arabic, L"\x633\x623", { SCRIPT_JUSTIFY_ARABIC_SEEN, SCRIPT_JUSTIFY_ARABIC_ALEF } }, + { Script_Arabic, L"\x633\x622", { SCRIPT_JUSTIFY_ARABIC_SEEN, SCRIPT_JUSTIFY_ARABIC_ALEF } }, + + { Script_Arabic, L"\x644\x647", { SCRIPT_JUSTIFY_NONE, SCRIPT_JUSTIFY_ARABIC_HA } }, + + { Script_Arabic, L"\x628\x631", { SCRIPT_JUSTIFY_NONE, SCRIPT_JUSTIFY_ARABIC_BARA } }, + { Script_Arabic, L"\x645\x631", { SCRIPT_JUSTIFY_NONE, SCRIPT_JUSTIFY_ARABIC_BARA } }, + { Script_Arabic, L"\x645\x632", { SCRIPT_JUSTIFY_NONE, SCRIPT_JUSTIFY_ARABIC_BARA } }, + + { Script_Arabic, L"\x644\x633\x645", { SCRIPT_JUSTIFY_NONE, SCRIPT_JUSTIFY_ARABIC_SEEN_M, SCRIPT_JUSTIFY_ARABIC_NORMAL } }, + }; + DWRITE_SHAPING_GLYPH_PROPERTIES glyph_props[16]; + DWRITE_SHAPING_TEXT_PROPERTIES text_props[16]; + UINT16 clustermap[16], glyphs[16]; + IDWriteTextAnalyzer *analyzer; + DWRITE_SCRIPT_ANALYSIS sa; + IDWriteFontFace *fontface; + UINT32 glyph_count; + unsigned int i, j; + HRESULT hr; + + if (!strcmp(winetest_platform, "wine")) + return; + + analyzer = create_text_analyzer(&IID_IDWriteTextAnalyzer); + ok(!!analyzer, "Failed to create analyzer instance.\n"); + + fontface = create_fontface(); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("Test %s", debugstr_w(tests[i].text)); + + sa.script = tests[i].script; + sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT; + + /* Use RTL for Arabic, it affects returned justification classes. */ + hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, tests[i].text, wcslen(tests[i].text), fontface, + FALSE, sa.script == Script_Arabic, &sa, L"en-US", NULL, NULL, NULL, 0, ARRAY_SIZE(glyphs), clustermap, + text_props, glyphs, glyph_props, &glyph_count); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + for (j = 0; j < glyph_count; ++j) + { + winetest_push_context("Glyph %u", j); + ok(glyph_props[j].justification == tests[i].justification[j], "Unexpected justification value %u.\n", + glyph_props[j].justification); + winetest_pop_context(); + } + + winetest_pop_context(); + } + + IDWriteFontFace_Release(fontface); +} + START_TEST(analyzer) { HRESULT hr; @@ -2857,6 +2967,7 @@ START_TEST(analyzer) test_GetGlyphOrientationTransform(); test_GetBaseline(); test_GetGdiCompatibleGlyphPlacements(); + test_glyph_justification_property(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dssenh: Use CRT allocation functions.
by Alexandre Julliard Sept. 8, 2022

Sept. 8, 2022

Module: wine Branch: master Commit: d32f9ef31636a0a46cce7ea42d3519abead26543 URL: https://gitlab.winehq.org/wine/wine/-/commit/d32f9ef31636a0a46cce7ea42d3519… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 8 12:42:00 2022 +0300 dssenh: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dssenh/main.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 51a29e0d61a..5f179a3c82b 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -31,7 +31,6 @@ #include "ntsecapi.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dssenh); @@ -88,7 +87,7 @@ static struct container *create_key_container( const char *name, DWORD flags ) { struct container *ret; - if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return NULL; + if (!(ret = calloc( 1, sizeof(*ret) ))) return NULL; ret->magic = MAGIC_CONTAINER; ret->flags = flags; if (name) strcpy( ret->name, name ); @@ -154,14 +153,14 @@ static struct key *create_key( ALG_ID algid, DWORD flags ) return NULL; } - if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return NULL; + if (!(ret = calloc( 1, sizeof(*ret) ))) return NULL; ret->magic = MAGIC_KEY; ret->algid = algid; ret->flags = flags; if (BCryptOpenAlgorithmProvider( &ret->alg_handle, alg, MS_PRIMITIVE_PROVIDER, 0 )) { - heap_free( ret ); + free( ret ); return NULL; } return ret; @@ -173,7 +172,7 @@ static void destroy_key( struct key *key ) BCryptDestroyKey( key->handle ); BCryptCloseAlgorithmProvider( key->alg_handle, 0 ); key->magic = 0; - heap_free( key ); + free( key ); } static struct key *import_key( DWORD keyspec, BYTE *data, DWORD len ) @@ -201,7 +200,7 @@ static struct key *read_key( HKEY hkey, DWORD keyspec, DWORD flags ) if (!(value = map_keyspec_to_keypair_name( keyspec ))) return NULL; if (RegQueryValueExW( hkey, value, 0, &type, NULL, &len )) return NULL; - if (!(data = heap_alloc( len ))) return NULL; + if (!(data = malloc( len ))) return NULL; if (!RegQueryValueExW( hkey, value, 0, &type, data, &len )) { @@ -214,7 +213,7 @@ static struct key *read_key( HKEY hkey, DWORD keyspec, DWORD flags ) } } - heap_free( data ); + free( data ); return ret; } @@ -224,7 +223,7 @@ static void destroy_container( struct container *container ) destroy_key( container->exch_key ); destroy_key( container->sign_key ); container->magic = 0; - heap_free( container ); + free( container ); } static struct container *read_key_container( const char *name, DWORD flags ) @@ -292,7 +291,7 @@ BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags case CRYPT_NEWKEYSET | CRYPT_MACHINE_KEYSET: if ((ret = read_key_container( name, flags ))) { - heap_free( ret ); + free( ret ); SetLastError( NTE_EXISTS ); return FALSE; } @@ -348,7 +347,7 @@ static BOOL store_key_pair( struct key *key, HKEY hkey, DWORD keyspec, DWORD fla if (!(value = map_keyspec_to_keypair_name( keyspec ))) return FALSE; if (BCryptExportKey( key->handle, NULL, LEGACY_DSA_V2_PRIVATE_BLOB, NULL, 0, &len, 0 )) return FALSE; - if (!(data = heap_alloc( len ))) return FALSE; + if (!(data = malloc( len ))) return FALSE; if (!BCryptExportKey( key->handle, NULL, LEGACY_DSA_V2_PRIVATE_BLOB, data, len, &len, 0 )) { @@ -361,7 +360,7 @@ static BOOL store_key_pair( struct key *key, HKEY hkey, DWORD keyspec, DWORD fla } } - heap_free( data ); + free( data ); return ret; } @@ -392,7 +391,7 @@ static struct key *duplicate_key( const struct key *key ) if (BCryptDuplicateKey( key->handle, &ret->handle, NULL, 0, 0 )) { - heap_free( ret ); + free( ret ); return NULL; } return ret; @@ -596,7 +595,7 @@ static BOOL import_key_dss3( struct container *container, ALG_ID algid, const BY if (!(key = create_key( CALG_DSS_SIGN, flags ))) return FALSE; size = sizeof(*blob) + (pubkey->bitlenP / 8) * 3; - if (!(blob = heap_alloc_zero( size ))) + if (!(blob = calloc( 1, size ))) { destroy_key( key ); return FALSE; @@ -630,11 +629,11 @@ static BOOL import_key_dss3( struct container *container, ALG_ID algid, const BY { WARN( "failed to import key %08lx\n", status ); destroy_key( key ); - heap_free( blob ); + free( blob ); return FALSE; } - heap_free( blob ); + free( blob ); *ret_key = (HCRYPTKEY)key; return TRUE; } @@ -792,19 +791,19 @@ static struct hash *create_hash( ALG_ID algid ) return NULL; } - if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return NULL; + if (!(ret = calloc( 1, sizeof(*ret) ))) return NULL; ret->magic = MAGIC_HASH; ret->len = len; if (BCryptOpenAlgorithmProvider( &alg_handle, alg, MS_PRIMITIVE_PROVIDER, 0 )) { - heap_free( ret ); + free( ret ); return NULL; } if (BCryptCreateHash( alg_handle, &ret->handle, NULL, 0, NULL, 0, 0 )) { BCryptCloseAlgorithmProvider( alg_handle, 0 ); - heap_free( ret ); + free( ret ); return NULL; } @@ -841,7 +840,7 @@ static void destroy_hash( struct hash *hash ) if (!hash) return; BCryptDestroyHash( hash->handle ); hash->magic = 0; - heap_free( hash ); + free( hash ); } BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) @@ -864,13 +863,13 @@ static struct hash *duplicate_hash( const struct hash *hash ) { struct hash *ret; - if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; + if (!(ret = malloc( sizeof(*ret) ))) return NULL; ret->magic = hash->magic; ret->len = hash->len; if (BCryptDuplicateHash( hash->handle, &ret->handle, NULL, 0, 0 )) { - heap_free( ret ); + free( ret ); return NULL; } memcpy( ret->value, hash->value, sizeof(hash->value) );

1 0

Davide Beatrici : wineoss: Switch to mmdevapi's unixlib.h.
by Alexandre Julliard Sept. 8, 2022

Sept. 8, 2022

Module: wine Branch: master Commit: 76dc764139807c602f13075af03b91d7923882c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/76dc764139807c602f13075af03b91… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Sep 8 01:26:40 2022 +0200 wineoss: Switch to mmdevapi's unixlib.h. --- dlls/wineoss.drv/oss.c | 14 ++- dlls/wineoss.drv/unixlib.h | 280 +-------------------------------------------- 2 files changed, 13 insertions(+), 281 deletions(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 62016f8fe58..221e4e2ff71 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1612,7 +1612,9 @@ static NTSTATUS oss_aux_message(void *args) unixlib_entry_t __wine_unix_call_funcs[] = { - oss_test_connect, + NULL, + NULL, + NULL, oss_get_endpoint_ids, oss_create_stream, oss_release_stream, @@ -1626,6 +1628,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = oss_release_capture_buffer, oss_is_format_supported, oss_get_mix_format, + NULL, oss_get_buffer_size, oss_get_latency, oss_get_current_padding, @@ -1634,7 +1637,9 @@ unixlib_entry_t __wine_unix_call_funcs[] = oss_get_position, oss_set_volumes, oss_set_event_handle, + oss_test_connect, oss_is_started, + NULL, oss_midi_release, oss_midi_out_message, oss_midi_in_message, @@ -2008,7 +2013,9 @@ static NTSTATUS oss_wow64_aux_message(void *args) unixlib_entry_t __wine_unix_call_wow64_funcs[] = { - oss_wow64_test_connect, + NULL, + NULL, + NULL, oss_wow64_get_endpoint_ids, oss_wow64_create_stream, oss_wow64_release_stream, @@ -2022,6 +2029,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = oss_release_capture_buffer, oss_wow64_is_format_supported, oss_wow64_get_mix_format, + NULL, oss_wow64_get_buffer_size, oss_wow64_get_latency, oss_wow64_get_current_padding, @@ -2030,7 +2038,9 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = oss_wow64_get_position, oss_wow64_set_volumes, oss_wow64_set_event_handle, + oss_wow64_test_connect, oss_is_started, + NULL, oss_midi_release, oss_wow64_midi_out_message, oss_wow64_midi_in_message, diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 2bd6e182d82..1c3ee7b93b3 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -16,285 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "mmdeviceapi.h" - -typedef UINT64 stream_handle; - -/* From <dlls/mmdevapi/mmdevapi.h> */ -enum driver_priority -{ - Priority_Unavailable = 0, /* driver won't work */ - Priority_Low, /* driver may work, but unlikely */ - Priority_Neutral, /* driver makes no judgment */ - Priority_Preferred /* driver thinks it's correct */ -}; - -struct test_connect_params -{ - const char *name; - enum driver_priority priority; -}; - -struct endpoint -{ - unsigned int name; - unsigned int device; -}; - -struct get_endpoint_ids_params -{ - EDataFlow flow; - struct endpoint *endpoints; - unsigned int size; - HRESULT result; - unsigned int num; - unsigned int default_idx; -}; - -struct create_stream_params -{ - const char *name; - const char *device; - EDataFlow flow; - AUDCLNT_SHAREMODE share; - UINT flags; - REFERENCE_TIME duration; - REFERENCE_TIME period; - const WAVEFORMATEX *fmt; - HRESULT result; - UINT32 *channel_count; - stream_handle *stream; -}; - -struct release_stream_params -{ - stream_handle stream; - HANDLE timer_thread; - HRESULT result; -}; - -struct start_params -{ - stream_handle stream; - HRESULT result; -}; - -struct stop_params -{ - stream_handle stream; - HRESULT result; -}; - -struct reset_params -{ - stream_handle stream; - HRESULT result; -}; - -struct timer_loop_params -{ - stream_handle stream; -}; - -struct get_render_buffer_params -{ - stream_handle stream; - UINT32 frames; - HRESULT result; - BYTE **data; -}; - -struct release_render_buffer_params -{ - stream_handle stream; - UINT32 written_frames; - UINT flags; - HRESULT result; -}; - -struct get_capture_buffer_params -{ - stream_handle stream; - HRESULT result; - BYTE **data; - UINT32 *frames; - UINT *flags; - UINT64 *devpos; - UINT64 *qpcpos; -}; - -struct release_capture_buffer_params -{ - stream_handle stream; - UINT32 done; - HRESULT result; -}; - -struct is_format_supported_params -{ - const char *device; - EDataFlow flow; - AUDCLNT_SHAREMODE share; - const WAVEFORMATEX *fmt_in; - WAVEFORMATEXTENSIBLE *fmt_out; - HRESULT result; -}; - -struct get_mix_format_params -{ - const char *device; - EDataFlow flow; - WAVEFORMATEXTENSIBLE *fmt; - HRESULT result; -}; - -struct get_buffer_size_params -{ - stream_handle stream; - HRESULT result; - UINT32 *size; -}; - -struct get_latency_params -{ - stream_handle stream; - HRESULT result; - REFERENCE_TIME *latency; -}; - -struct get_current_padding_params -{ - stream_handle stream; - HRESULT result; - UINT32 *padding; -}; - -struct get_next_packet_size_params -{ - stream_handle stream; - HRESULT result; - UINT32 *frames; -}; - -struct get_frequency_params -{ - stream_handle stream; - HRESULT result; - UINT64 *freq; -}; - -struct get_position_params -{ - stream_handle stream; - BOOL device; - HRESULT result; - UINT64 *pos; - UINT64 *qpctime; -}; - -struct set_volumes_params -{ - stream_handle stream; - float master_volume; - const float *volumes; - const float *session_volumes; -}; - -struct set_event_handle_params -{ - stream_handle stream; - HANDLE event; - HRESULT result; -}; - -struct is_started_params -{ - stream_handle stream; - HRESULT result; -}; - -struct notify_context -{ - BOOL send_notify; - WORD dev_id; - WORD msg; - UINT_PTR param_1; - UINT_PTR param_2; - UINT_PTR callback; - UINT flags; - HANDLE device; - UINT_PTR instance; -}; - -struct midi_out_message_params -{ - UINT dev_id; - UINT msg; - UINT_PTR user; - UINT_PTR param_1; - UINT_PTR param_2; - UINT *err; - struct notify_context *notify; -}; - -struct midi_in_message_params -{ - UINT dev_id; - UINT msg; - UINT_PTR user; - UINT_PTR param_1; - UINT_PTR param_2; - UINT *err; - struct notify_context *notify; -}; - -struct midi_notify_wait_params -{ - BOOL *quit; - struct notify_context *notify; -}; - -struct aux_message_params -{ - UINT dev_id; - UINT msg; - UINT_PTR user; - UINT_PTR param_1; - UINT_PTR param_2; - UINT *err; -}; - -enum oss_funcs -{ - test_connect, - get_endpoint_ids, - create_stream, - release_stream, - start, - stop, - reset, - timer_loop, - get_render_buffer, - release_render_buffer, - get_capture_buffer, - release_capture_buffer, - is_format_supported, - get_mix_format, - get_buffer_size, - get_latency, - get_current_padding, - get_next_packet_size, - get_frequency, - get_position, - set_volumes, - set_event_handle, - is_started, - midi_release, - midi_out_message, - midi_in_message, - midi_notify_wait, - aux_message, -}; +#include "../mmdevapi/unixlib.h" NTSTATUS oss_midi_release(void *args) DECLSPEC_HIDDEN; NTSTATUS oss_midi_out_message(void *args) DECLSPEC_HIDDEN;

1 0