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

Jeff Smith : d3drm: Fix components of palette when loading texture from 8-bit BMP file.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 3c914dc2ae22295e17d319564225c2727d3c602e URL: https://gitlab.winehq.org/wine/wine/-/commit/3c914dc2ae22295e17d319564225c2… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Fri Jul 22 07:39:28 2022 -0500 d3drm: Fix components of palette when loading texture from 8-bit BMP file. --- dlls/d3drm/tests/d3drm.c | 9 +++++---- dlls/d3drm/texture.c | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 3153f7191f4..2166c8eaf2a 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6189,9 +6189,9 @@ static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized) { for (i = 0; i < 256; ++i) { - info->bmiColors[i].rgbBlue = i; - info->bmiColors[i].rgbGreen = i; - info->bmiColors[i].rgbRed = i; + info->bmiColors[i].rgbBlue = i % MOD_B; + info->bmiColors[i].rgbGreen = i % MOD_G; + info->bmiColors[i].rgbRed = i % MOD_R; } } ret = WriteFile(file, info, size, &written, NULL); @@ -6317,7 +6317,8 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img, ok(img->palette_size == 256, "Test %u: Got unexpected palette size %u.\n", test_idx, img->palette_size); for (i = 0; i < 256; ++i) { - ok(img->palette[i].red == i && img->palette[i].green == i && img->palette[i].blue == i, + ok(img->palette[i].red == i % MOD_R + && img->palette[i].green == i % MOD_G && img->palette[i].blue == i % MOD_B, "Test %u: Got unexpected palette entry (%u) color 0x%02x%02x%02x.\n", test_idx, i, img->palette[i].red, img->palette[i].green, img->palette[i].blue); ok(img->palette[i].flags == D3DRMPALETTE_READONLY, diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 29e304d8598..08cc69410cb 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -219,9 +219,11 @@ static HRESULT d3drm_image_load_8(D3DRMIMAGE *image, const RGBQUAD *palette, return D3DRMERR_BADALLOC; } - memcpy(image->palette, palette, 256 * sizeof(*image->palette)); for (i = 0; i < 256; ++i) { + image->palette[i].red = palette[i].rgbRed; + image->palette[i].green = palette[i].rgbGreen; + image->palette[i].blue = palette[i].rgbBlue; image->palette[i].flags = D3DRMPALETTE_READONLY; }

1 0

Alexandre Julliard : gitlab: Initial version of the Gitlab CI scripts.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 889fe64d9f2e1a0d9a3660bbb94e0a9b74155827 URL: https://gitlab.winehq.org/wine/wine/-/commit/889fe64d9f2e1a0d9a3660bbb94e0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 25 12:25:20 2022 +0200 gitlab: Initial version of the Gitlab CI scripts. Derived in part from the freedesktop.org config. --- .gitlab-ci.yml | 9 +++++++ tools/gitlab/build.yml | 62 +++++++++++++++++++++++++++++++++++++++++++++++ tools/gitlab/image.docker | 55 +++++++++++++++++++++++++++++++++++++++++ tools/gitlab/image.yml | 21 ++++++++++++++++ 4 files changed, 147 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000000..413745f6758 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,9 @@ +# main Gitlab CI script + +stages: + - image + - build + +include: + - local: "/tools/gitlab/image.yml" + - local: "/tools/gitlab/build.yml" diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml new file mode 100644 index 00000000000..4f1ff0eddc5 --- /dev/null +++ b/tools/gitlab/build.yml @@ -0,0 +1,62 @@ +# CI script for building Wine + +.wine-build: + stage: build + image: $CI_REGISTRY/wine/wine:debian-bullseye + interruptible: true + cache: + - paths: + - ccache/ + - key: + files: + - configure.ac + paths: + - build32/config.cache + - build64/config.cache + before_script: + - export CCACHE_BASEDIR="$PWD" + - export CCACHE_DIR="$PWD/ccache" + - export CCACHE_COMPILERCHECK=content + - export PATH="/usr/lib/ccache:$PATH" + - mkdir -p build32 build64 + +build-all: + extends: .wine-build + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + artifacts: + when: on_failure + paths: + - build64/config.log + - build32/config.log + script: + - ./tools/make_requests + - ./tools/make_makefiles + - autoreconf + - cd build64 + - ../configure -C --enable-win64 --enable-werror --with-mingw + - make -s -j$(nproc) + - cd ../build32 + - ../configure -C --enable-werror --with-mingw + - make -s -j$(nproc) + +build-winetest: + extends: .wine-build + rules: + - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + artifacts: + name: winetest + paths: + - winetest.exe + - winetest64.exe + script: + - cd build64 + - ../configure -C --enable-win64 --with-mingw + - make -s -j$(nproc) programs/winetest/winetest.exe + - cd ../build32 + - ../configure -C --with-mingw + - make -s -j$(nproc) programs/winetest/winetest.exe + - cd .. + - mv build32/programs/winetest/winetest.exe winetest.exe + - mv build64/programs/winetest/winetest.exe winetest64.exe + - chmod 644 winetest.exe winetest64.exe diff --git a/tools/gitlab/image.docker b/tools/gitlab/image.docker new file mode 100644 index 00000000000..b1835d6dd55 --- /dev/null +++ b/tools/gitlab/image.docker @@ -0,0 +1,55 @@ +# FROM line will be added dynamically + +WORKDIR /tmp + +RUN export DEBIAN_FRONTEND=noninteractive; \ + echo 'path-exclude=/usr/share/doc/*' > /etc/dpkg/dpkg.cfg.d/99-exclude-cruft && \ + echo 'path-exclude=/usr/share/locale/*' >> /etc/dpkg/dpkg.cfg.d/99-exclude-cruft && \ + echo 'path-exclude=/usr/share/man/*' >> /etc/dpkg/dpkg.cfg.d/99-exclude-cruft && \ + echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf && \ + echo '#!/bin/sh' > /usr/sbin/policy-rc.d && \ + echo 'exit 101' >> /usr/sbin/policy-rc.d && \ + chmod +x /usr/sbin/policy-rc.d && \ + dpkg --add-architecture i386 && \ + apt-get update && \ + apt-get install -y gcc gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 gcc-multilib \ + git autoconf flex bison perl gettext \ + libasound2-dev:amd64 libasound2-dev:i386 \ + libcapi20-dev:amd64 libcapi20-dev:i386 \ + libcups2-dev:amd64 libcups2-dev:i386 \ + libdbus-1-dev:amd64 libdbus-1-dev:i386 \ + libfontconfig-dev:amd64 libfontconfig-dev:i386 \ + libfreetype6-dev:amd64 libfreetype6-dev:i386 \ + libgl1-mesa-dev:amd64 libgl1-mesa-dev:i386 \ + libgnutls28-dev:amd64 libgnutls28-dev:i386 \ + libgphoto2-dev:amd64 libgphoto2-dev:i386 \ + libgstreamer-plugins-base1.0-dev:amd64 libgstreamer-plugins-base1.0-dev:i386 \ + libice-dev:amd64 libice-dev:i386 \ + libkrb5-dev:amd64 libkrb5-dev:i386 \ + libldap-dev:amd64 libldap-dev:i386 \ + libopenal-dev:amd64 libopenal-dev:i386 \ + libosmesa6-dev:amd64 libosmesa6-dev:i386 \ + libpcap-dev:amd64 libpcap-dev:i386 \ + libpulse-dev:amd64 libpulse-dev:i386 \ + libsane-dev:amd64 libsane-dev:i386 \ + libsdl2-dev:amd64 libsdl2-dev:i386 \ + libudev-dev:amd64 libudev-dev:i386 \ + libusb-1.0-0-dev:amd64 libusb-1.0-0-dev:i386 \ + libv4l-dev:amd64 libv4l-dev:i386 \ + libvulkan-dev:amd64 libvulkan-dev:i386 \ + libx11-dev:amd64 libx11-dev:i386 \ + libxcomposite-dev:amd64 libxcomposite-dev:i386 \ + libxcursor-dev:amd64 libxcursor-dev:i386 \ + libxext-dev:amd64 libxext-dev:i386 \ + libxi-dev:amd64 libxi-dev:i386 \ + libxinerama-dev:amd64 libxinerama-dev:i386 \ + libxrandr-dev:amd64 libxrandr-dev:i386 \ + libxrender-dev:amd64 libxrender-dev:i386 \ + libxxf86vm-dev:amd64 libxxf86vm-dev:i386 \ + linux-libc-dev:amd64 linux-libc-dev:i386 \ + ocl-icd-opencl-dev:amd64 ocl-icd-opencl-dev:i386 \ + samba-dev:amd64 \ + unixodbc-dev:amd64 unixodbc-dev:i386 \ + x11proto-dev && \ + apt-get install -y ccache && \ + apt-get clean diff --git a/tools/gitlab/image.yml b/tools/gitlab/image.yml new file mode 100644 index 00000000000..2108f5c85cc --- /dev/null +++ b/tools/gitlab/image.yml @@ -0,0 +1,21 @@ +# CI script for creating the docker image used for Wine builds + +build-image: + stage: image + rules: + - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + changes: + - tools/gitlab/image.yml + - tools/gitlab/image.docker + image: + name: gcr.io/kaniko-project/executor:debug + entrypoint: [""] + variables: + IMAGE_SOURCE: "$CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX/debian:bullseye" + IMAGE_LOCAL: "$CI_REGISTRY_IMAGE:debian-bullseye" + DOCKER_FILE: "$CI_PROJECT_DIR/tools/gitlab/image.docker" + script: + - mkdir -p /kaniko/.docker + - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"},\"$CI_DEPENDENCY_PROXY_SERVER\":{\"auth\":\"$(printf "%s:%s" "$CI_DEPENDENCY_PROXY_USER" "$CI_DEPENDENCY_PROXY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json + - sed -i "1iFROM $IMAGE_SOURCE" "$DOCKER_FILE" + - /kaniko/executor --context "$CI_PROJECT_DIR" --dockerfile "$DOCKER_FILE" --destination "$IMAGE_LOCAL"

1 0

Arkadiusz Hiler : dinput: Use GUID_Slider type for dials.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 6719e6b2d3cfbe4b59d04105de18ee66aa8f8316 URL: https://gitlab.winehq.org/wine/wine/-/commit/6719e6b2d3cfbe4b59d04105de18ee… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Fri Jul 22 14:55:35 2022 +0300 dinput: Use GUID_Slider type for dials. --- dlls/dinput/joystick_hid.c | 1 + dlls/dinput/tests/joystick8.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 7370982d4c9..ebebbee6eb2 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -276,6 +276,7 @@ static const GUID *object_usage_to_guid( USAGE usage_page, USAGE usage ) case HID_USAGE_GENERIC_RY: return &GUID_RyAxis; case HID_USAGE_GENERIC_RZ: return &GUID_RzAxis; case HID_USAGE_GENERIC_SLIDER: return &GUID_Slider; + case HID_USAGE_GENERIC_DIAL: return &GUID_Slider; case HID_USAGE_GENERIC_HATSWITCH: return &GUID_POV; } break; diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 811db94cab5..5eebcf87d44 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -2960,7 +2960,7 @@ static void test_many_axes_joystick(void) {0}, {0}, {0}, - {.guid = TRUE}, + {0}, {.flags = TRUE}, {.flags = TRUE}, {.flags = TRUE},

1 0

Arkadiusz Hiler : dinput/tests: Assert that we can't get info about the third slider with c_dfDIJoystick2.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 101bf6c8bd869462072c2bc5621ce5d61de11cc7 URL: https://gitlab.winehq.org/wine/wine/-/commit/101bf6c8bd869462072c2bc5621ce5… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Fri Jul 22 14:56:08 2022 +0300 dinput/tests: Assert that we can't get info about the third slider with c_dfDIJoystick2. --- dlls/dinput/tests/joystick8.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 5eebcf87d44..cedf362d23e 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -3054,6 +3054,10 @@ static void test_many_axes_joystick(void) ok( hr == DI_OK, "GetObjectInfo returned: %#lx\n", hr ); check_object( &objinst, &expect_objects[8], NULL ); + /* c_dfDIJoystick2 is broken when it comes to more than two sliders */ + hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, offsetof(DIJOYSTATE2, rglVSlider[0]), DIPH_BYOFFSET ); + ok( hr == DIERR_NOTFOUND, "GetObjectInfo returned: %#lx\n", hr ); + hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, offsetof(DIJOYSTATE2, lVX), DIPH_BYOFFSET ); ok( hr == DI_OK, "GetObjectInfo returned: %#lx\n", hr ); check_object( &objinst, &expect_objects[10], &todo_flags );

1 0

Arkadiusz Hiler : dinput/tests: Test GetObjectInfo() with three sliders and a proper format.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 7fd01cf7dd1033410373ae738d907e33fcc6523b URL: https://gitlab.winehq.org/wine/wine/-/commit/7fd01cf7dd1033410373ae738d907e… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Fri Jul 22 14:57:01 2022 +0300 dinput/tests: Test GetObjectInfo() with three sliders and a proper format. --- dlls/dinput/tests/joystick8.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index cedf362d23e..1c6496790e6 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -2596,6 +2596,28 @@ static BOOL test_device_types( DWORD version ) return success; } +struct three_sliders_state +{ + LONG slider[3]; +}; + +static const DIOBJECTDATAFORMAT df_three_sliders[] = +{ + {&GUID_Slider, FIELD_OFFSET(struct three_sliders_state, slider[0]), DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE, DIDOI_ASPECTPOSITION}, + {&GUID_Slider, FIELD_OFFSET(struct three_sliders_state, slider[1]), DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE, DIDOI_ASPECTPOSITION}, + {&GUID_Slider, FIELD_OFFSET(struct three_sliders_state, slider[2]), DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE, DIDOI_ASPECTPOSITION}, +}; + +static const DIDATAFORMAT c_df_three_sliders = +{ + sizeof(DIDATAFORMAT), + sizeof(DIOBJECTDATAFORMAT), + DIDF_ABSAXIS, + sizeof(struct three_sliders_state), + ARRAY_SIZE(df_three_sliders), + (DIOBJECTDATAFORMAT *)df_three_sliders, +}; + static void test_many_axes_joystick(void) { #include "psh_hid_macros.h" @@ -3070,6 +3092,22 @@ static void test_many_axes_joystick(void) ok( hr == DI_OK, "GetObjectInfo returned: %#lx\n", hr ); check_object( &objinst, &expect_objects[16], &todo_flags ); + /* make sure that we handle three sliders correctly when the format allows */ + hr = IDirectInputDevice8_SetDataFormat( device, &c_df_three_sliders ); + ok( hr == DI_OK, "SetDataFormat returned: %#lx\n", hr ); + + hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, offsetof(struct three_sliders_state, slider[0]), DIPH_BYOFFSET ); + ok( hr == DI_OK, "GetObjectInfo returned: %#lx\n", hr ); + check_object( &objinst, &expect_objects[6], NULL ); + + hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, offsetof(struct three_sliders_state, slider[1]), DIPH_BYOFFSET ); + ok( hr == DI_OK, "GetObjectInfo returned: %#lx\n", hr ); + check_object( &objinst, &expect_objects[8], NULL ); + + hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, offsetof(struct three_sliders_state, slider[2]), DIPH_BYOFFSET ); + ok( hr == DI_OK, "GetObjectInfo returned: %#lx\n", hr ); + check_object( &objinst, &expect_objects[9], NULL ); + ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "Release returned %ld\n", ref );

1 0

Nikolay Sivov : dwrite: Use u32-reads for AnalyzeScript().
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: dcb8094a37afb7bf505d4377158a5e0ce25bcd7c URL: https://gitlab.winehq.org/wine/wine/-/commit/dcb8094a37afb7bf505d4377158a5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 25 12:34:58 2022 +0300 dwrite: Use u32-reads for AnalyzeScript(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 595d8806159..86d030b3738 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -513,22 +513,21 @@ static DWRITE_SCRIPT_ANALYSIS get_char_sa(WCHAR c) return sa; } -static HRESULT analyze_script(const WCHAR *text, UINT32 position, UINT32 length, IDWriteTextAnalysisSink *sink) +static HRESULT analyze_script(struct text_source_context *context, IDWriteTextAnalysisSink *sink) { DWRITE_SCRIPT_ANALYSIS sa; - UINT32 pos, i, seq_length; + UINT32 pos, seq_length; - if (!length) - return S_OK; + text_source_get_next_u32_char(context); - sa = get_char_sa(*text); + sa = get_char_sa(context->ch); - pos = position; + pos = context->position; seq_length = 1; - for (i = 1; i < length; i++) + while (!text_source_get_next_u32_char(context)) { - DWRITE_SCRIPT_ANALYSIS cur_sa = get_char_sa(text[i]); + DWRITE_SCRIPT_ANALYSIS cur_sa = get_char_sa(context->ch); /* Unknown type is ignored when preceded or followed by another script */ switch (sa.script) { @@ -554,7 +553,7 @@ static HRESULT analyze_script(const WCHAR *text, UINT32 position, UINT32 length, hr = IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, seq_length, &sa); if (FAILED(hr)) return hr; - pos = position + i; + pos += seq_length; seq_length = 1; sa = cur_sa; } @@ -1104,23 +1103,17 @@ static HRESULT get_text_source_ptr(IDWriteTextAnalysisSource *source, UINT32 pos static HRESULT WINAPI dwritetextanalyzer_AnalyzeScript(IDWriteTextAnalyzer2 *iface, IDWriteTextAnalysisSource* source, UINT32 position, UINT32 length, IDWriteTextAnalysisSink* sink) { - WCHAR *buff = NULL; - const WCHAR *text; + struct text_source_context context; HRESULT hr; TRACE("%p, %u, %u, %p.\n", source, position, length, sink); - if (length == 0) + if (!length) return S_OK; - hr = get_text_source_ptr(source, position, length, &text, &buff); - if (FAILED(hr)) - return hr; - - hr = analyze_script(text, position, length, sink); - free(buff); + if (FAILED(hr = text_source_context_init(&context, source, position, length))) return hr; - return hr; + return analyze_script(&context, sink); } static HRESULT WINAPI dwritetextanalyzer_AnalyzeBidi(IDWriteTextAnalyzer2 *iface,

1 0

Nikolay Sivov : dwrite: Use correct ranges to set DWRITE_SCRIPT_SHAPES_NO_VISUAL.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 5259c1a1dcbbdeec8d60548194bbb6aed9c2f671 URL: https://gitlab.winehq.org/wine/wine/-/commit/5259c1a1dcbbdeec8d60548194bbb6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 25 14:27:41 2022 +0300 dwrite: Use correct ranges to set DWRITE_SCRIPT_SHAPES_NO_VISUAL. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 86d030b3738..200ffc8da4c 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -501,15 +501,31 @@ static inline UINT16 get_char_script(WCHAR c) return script == Script_Inherited ? Script_Unknown : script; } -static DWRITE_SCRIPT_ANALYSIS get_char_sa(WCHAR c) +static DWRITE_SCRIPT_ANALYSIS get_char_sa(UINT32 c) { DWRITE_SCRIPT_ANALYSIS sa; - WORD type; - GetStringTypeW(CT_CTYPE1, &c, 1, &type); sa.script = get_char_script(c); - sa.shapes = (type & C1_CNTRL) || c == 0x2028 /* LINE SEPARATOR */ || c == 0x2029 /* PARAGRAPH SEPARATOR */ ? - DWRITE_SCRIPT_SHAPES_NO_VISUAL : DWRITE_SCRIPT_SHAPES_DEFAULT; + sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT; + if ((c >= 0x0001 && c <= 0x001f) || + (c >= 0x007f && c <= 0x009f) || + (c == 0x00ad) /* SOFT HYPHEN */ || + (c >= 0x200b && c <= 0x200f) || + (c >= 0x2028 && c <= 0x202e) || + (c >= 0x2060 && c <= 0x2064) || + (c >= 0x2066 && c <= 0x206f) || + (c == 0xfeff) || + (c == 0xfff9) || + (c == 0xfffa) || + (c == 0xfffb)) + { + sa.shapes = DWRITE_SCRIPT_SHAPES_NO_VISUAL; + } + else + { + sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT; + } + return sa; }

1 0

Nikolay Sivov : dwrite: Add a few more fallback ranges.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: b32acacb4f0def1778de68f46e38a06484e29b1a URL: https://gitlab.winehq.org/wine/wine/-/commit/b32acacb4f0def1778de68f46e38a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 25 20:18:44 2022 +0300 dwrite: Add a few more fallback ranges. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 200ffc8da4c..11cf66ce13c 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -222,6 +222,28 @@ system_fallback_config[] = { "0000-007F, 0080-00FF, 0100-017F, 0180-024F, " "0250-02AF, 02B0-02FF, 0300-036F", L"Tahoma" }, + { "0590-05FF, FB1D-FB4F", L"Noto Sans Hebrew" }, + + { "0900-097F", L"Noto Sans Devanagari" }, + { "0980-09FF", L"Noto Sans Bengali" }, + { "0A00-0A7F", L"Noto Sans Gurmukhi" }, + { "0A80-0AFF", L"Noto Sans Gujarati" }, + { "0B00-0B7F", L"Noto Sans Oriya" }, + { "0B80-0BFF", L"Noto Sans Tamil" }, + { "0C00-0C7F", L"Noto Sans Telugu" }, + { "0C80-0CFF", L"Noto Sans Kannada" }, + { "0D00-0D7F", L"Noto Sans Malayalam" }, + { "0D80-0DFF", L"Noto Sans Sinhala" }, + + { "0E00-0E7F", L"Noto Sans Thai" }, + { "0E80-0EFF", L"Noto Sans Lao" }, + + { "1680-169F", L"Noto Sans Ogham" }, + + { "16A0-16FF", L"Noto Sans Runic" }, + + { "1800-18AF, 11660-1167F", L"Noto Sans Mongolian" }, + { "3000-30FF, 31F0-31FF, 4E00-9FFF", L"Meiryo" }, };

1 0

Brendan Shanks : wow64: Respect the large address aware flag.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: a3de8d191b7034ec47e3ed27f91fc7b1eb61d069 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3de8d191b7034ec47e3ed27f91fc7… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 27 13:47:41 2022 -0700 wow64: Respect the large address aware flag. --- dlls/wow64/process.c | 2 +- dlls/wow64/syscall.c | 4 ++++ dlls/wow64/wow64_private.h | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 0c6726b9c6e..55cb19c6a17 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -1118,7 +1118,7 @@ NTSTATUS WINAPI wow64_NtSetInformationProcess( UINT *args ) PROCESS_STACK_ALLOCATION_INFORMATION info; info.ReserveSize = stack->ReserveSize; - info.ZeroBits = stack->ZeroBits ? stack->ZeroBits : 0x7fffffff; + info.ZeroBits = get_zero_bits( stack->ZeroBits ); if (!(status = NtSetInformationProcess( handle, class, &info, sizeof(info) ))) stack->StackBase = PtrToUlong( info.StackBase ); return status; diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 7cab0894738..80c4bf73d8b 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wow); USHORT native_machine = 0; USHORT current_machine = 0; ULONG_PTR args_alignment = 0; +ULONG_PTR default_zero_bits = 0x7fffffff; typedef NTSTATUS (WINAPI *syscall_thunk)( UINT *args ); @@ -566,10 +567,13 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex { HMODULE module; UNICODE_STRING str; + SYSTEM_BASIC_INFORMATION info; RtlWow64GetProcessMachines( GetCurrentProcess(), &current_machine, &native_machine ); if (!current_machine) current_machine = native_machine; args_alignment = (current_machine == IMAGE_FILE_MACHINE_I386) ? sizeof(ULONG) : sizeof(ULONG64); + NtQuerySystemInformation( SystemEmulationBasicInformation, &info, sizeof(info), NULL ); + default_zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; #define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index b26148023db..c089a6ec4aa 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -39,6 +39,7 @@ extern BOOL get_file_redirect( OBJECT_ATTRIBUTES *attr ) DECLSPEC_HIDDEN; extern USHORT native_machine DECLSPEC_HIDDEN; extern USHORT current_machine DECLSPEC_HIDDEN; extern ULONG_PTR args_alignment DECLSPEC_HIDDEN; +extern ULONG_PTR default_zero_bits DECLSPEC_HIDDEN; extern SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock DECLSPEC_HIDDEN; struct object_attr64 @@ -83,7 +84,7 @@ static inline ULONG64 get_ulong64( UINT **args ) static inline ULONG_PTR get_zero_bits( ULONG_PTR zero_bits ) { - return zero_bits ? zero_bits : 0x7fffffff; + return zero_bits ? zero_bits : default_zero_bits; } static inline void **addr_32to64( void **addr, ULONG *addr32 )

1 0

Paul Gofman : ntdll: Preserve rbx register when calling DLL entry point on x64.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 7527869fe868834ede7601aa40f11d28cb809f06 URL: https://gitlab.winehq.org/wine/wine/-/commit/7527869fe868834ede7601aa40f11d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 11 17:54:36 2022 -0500 ntdll: Preserve rbx register when calling DLL entry point on x64. --- dlls/ntdll/loader.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 20a96664825..043bce67ea9 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -264,7 +264,7 @@ void WINAPI RtlGetUnloadEventTraceEx(ULONG **size, ULONG **count, void **trace) * that only modifying esi leads to a crash, so use this one to backup * ebp while running the dll entry proc. */ -#ifdef __i386__ +#if defined(__i386__) extern BOOL call_dll_entry_point( DLLENTRYPROC proc, void *module, UINT reason, void *reserved ); __ASM_GLOBAL_FUNC(call_dll_entry_point, "pushl %ebp\n\t" @@ -298,13 +298,36 @@ __ASM_GLOBAL_FUNC(call_dll_entry_point, __ASM_CFI(".cfi_def_cfa %esp,4\n\t") __ASM_CFI(".cfi_same_value %ebp\n\t") "ret" ) -#else /* __i386__ */ +#elif defined(__x86_64__) +extern BOOL CDECL call_dll_entry_point( DLLENTRYPROC proc, void *module, UINT reason, void *reserved ); +/* Some apps modify rbx in TLS entry point. */ +__ASM_GLOBAL_FUNC(call_dll_entry_point, + "pushq %rbx\n\t" + __ASM_SEH(".seh_pushreg %rbx\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + __ASM_CFI(".cfi_rel_offset %rbx,0\n\t") + "subq $48,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 48\n\t") + __ASM_SEH(".seh_endprologue\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 48\n\t") + "mov %rcx,%r10\n\t" + "mov %rdx,%rcx\n\t" + "mov %r8d,%edx\n\t" + "mov %r9,%r8\n\t" + "call *%r10\n\t" + "addq $48,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -48\n\t") + "popq %rbx\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + __ASM_CFI(".cfi_same_value %rbx\n\t") + "ret" ) +#else static inline BOOL call_dll_entry_point( DLLENTRYPROC proc, void *module, UINT reason, void *reserved ) { return proc( module, reason, reserved ); } -#endif /* __i386__ */ +#endif #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)

1 0