January 2021 - wine-commits

Akihiro Sagawa : winmm: Get rid of TIME_SMPTE format support in waveOutGetPosition().
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 158a9e738421cd16f2e8296f11baa724c64c8ca7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=158a9e738421cd16f2e8296f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jan 20 22:23:46 2021 +0900 winmm: Get rid of TIME_SMPTE format support in waveOutGetPosition(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 2 +- dlls/winmm/waveform.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 786e724c0f0..8afb32d5c73 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -527,7 +527,7 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR, "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); - todo_wine ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n", + ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n", dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); ok(returned == bytes, "waveOutGetPosition(%s): SMPTE test failed\n", diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 876b9d3d91d..37dfc919174 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2038,16 +2038,6 @@ static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames, case TIME_SAMPLES: time->u.sample = played_frames; return MMSYSERR_NOERROR; - case TIME_SMPTE: - time->u.smpte.fps = 30; - played_frames += sample_rate / time->u.smpte.fps - 1; /* round up */ - time->u.smpte.frame = (played_frames % sample_rate) * time->u.smpte.fps / sample_rate; - played_frames /= sample_rate; /* yields seconds */ - time->u.smpte.sec = played_frames % 60; - played_frames /= 60; - time->u.smpte.min = played_frames % 60; - time->u.smpte.hour= played_frames / 60; - return MMSYSERR_NOERROR; default: time->wType = TIME_BYTES; /* fall through */

1 0

Akihiro Sagawa : winmm/tests: Strictly test returned time format of waveOutGetPostion().
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 43158a173dddf2485760cfc12060d6f3553a3fdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=43158a173dddf2485760cfc1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jan 20 22:23:44 2021 +0900 winmm/tests: Strictly test returned time format of waveOutGetPostion(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index cb18f3e0fa4..786e724c0f0 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -495,9 +495,8 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime) + 1); ok(rc==MMSYSERR_NOERROR, "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); - if (mmtime.wType != TIME_BYTES && winetest_debug > 1) - trace("waveOutGetPosition(%s): TIME_BYTES not supported, returned %s\n", - dev_name(device),wave_time_format(mmtime.wType)); + ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n", + dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); ok(returned == bytes, "waveOutGetPosition(%s): returned %d bytes, " "should be %d\n", dev_name(device), returned, bytes); @@ -506,9 +505,8 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR, "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); - if (mmtime.wType != TIME_SAMPLES && winetest_debug > 1) - trace("waveOutGetPosition(%s): TIME_SAMPLES not supported, " - "returned %s\n",dev_name(device),wave_time_format(mmtime.wType)); + ok(mmtime.wType == TIME_SAMPLES, "(waveOutGetPosition(%s): returned %s\n", + dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); ok(returned == bytes, "waveOutGetPosition(%s): returned %d samples " "(%d bytes), should be %d (%d bytes)\n", dev_name(device), @@ -529,9 +527,8 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR, "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); - if (mmtime.wType != TIME_SMPTE && winetest_debug > 1) - trace("waveOutGetPosition(%s): TIME_SMPTE not supported, returned %s\n", - dev_name(device),wave_time_format(mmtime.wType)); + todo_wine ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n", + dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); ok(returned == bytes, "waveOutGetPosition(%s): SMPTE test failed\n", dev_name(device)); @@ -540,9 +537,8 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR, "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); - if (mmtime.wType != TIME_MIDI && winetest_debug > 1) - trace("waveOutGetPosition(%s): TIME_MIDI not supported, returned %s\n", - dev_name(device),wave_time_format(mmtime.wType)); + ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n", + dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); ok(returned == bytes, "waveOutGetPosition(%s): MIDI test failed\n", dev_name(device)); @@ -551,9 +547,8 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR, "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); - if (mmtime.wType != TIME_TICKS && winetest_debug > 1) - trace("waveOutGetPosition(%s): TIME_TICKS not supported, returned %s\n", - dev_name(device),wave_time_format(mmtime.wType)); + ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n", + dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); ok(returned == bytes, "waveOutGetPosition(%s): TICKS test failed\n", dev_name(device));

1 0

Akihiro Sagawa : winmm: Get rid of TIME_MS format support in waveOutGetPosition().
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 37f3a078314423da4e291ccc8b09c6aab8aeb99f URL: https://source.winehq.org/git/wine.git/?a=commit;h=37f3a078314423da4e291ccc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jan 20 22:23:42 2021 +0900 winmm: Get rid of TIME_MS format support in waveOutGetPosition(). SofTalk (Japanese text-to-speech software) depends on this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50515 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 2 +- dlls/winmm/waveform.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 079a497dd0b..cb18f3e0fa4 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -519,7 +519,7 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR, "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); - todo_wine ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n", + ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n", dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); ok(returned == bytes, "waveOutGetPosition(%s): TIME_MS test failed\n", diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 9d58b78c779..876b9d3d91d 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2038,9 +2038,6 @@ static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames, case TIME_SAMPLES: time->u.sample = played_frames; return MMSYSERR_NOERROR; - case TIME_MS: - time->u.ms = (UINT64)played_frames * 1000 / sample_rate; - return MMSYSERR_NOERROR; case TIME_SMPTE: time->u.smpte.fps = 30; played_frames += sample_rate / time->u.smpte.fps - 1; /* round up */

1 0

Akihiro Sagawa : winmm/tests: Expect TIME_BYTES format for TIME_MS request.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: aa56ee08f6c436cb5d0cbebf6b2213d06570ac8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa56ee08f6c436cb5d0cbebf… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jan 20 22:23:40 2021 +0900 winmm/tests: Expect TIME_BYTES format for TIME_MS request. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 819489e5566..079a497dd0b 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -519,14 +519,11 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR, "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); - if (mmtime.wType != TIME_MS && winetest_debug > 1) - trace("waveOutGetPosition(%s): TIME_MS not supported, returned %s\n", - dev_name(device), wave_time_format(mmtime.wType)); + todo_wine ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n", + dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); - ok(returned == bytes, "waveOutGetPosition(%s): returned %d ms, " - "(%d bytes), should be %d (%d bytes)\n", dev_name(device), - bytes_to_ms(returned, pwfx), returned, - bytes_to_ms(bytes, pwfx), bytes); + ok(returned == bytes, "waveOutGetPosition(%s): TIME_MS test failed\n", + dev_name(device)); mmtime.wType = TIME_SMPTE; rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime));

1 0

Nikolay Sivov : dwrite: Add a stub Arabic shaper.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: e03febf2a2809cc37c90dd17d00e3abd53b78dad URL: https://source.winehq.org/git/wine.git/?a=commit;h=e03febf2a2809cc37c90dd17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 21 16:36:54 2021 +0300 dwrite: Add a stub Arabic shaper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/Makefile.in | 3 +- dlls/dwrite/dwrite_private.h | 71 ++++++++++++++++++++++++++------------------ dlls/dwrite/opentype.c | 3 +- dlls/dwrite/shape.c | 42 +++++++++++++++++++++++--- dlls/dwrite/shapers/arabic.c | 66 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 150 insertions(+), 35 deletions(-) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index c91ad0bd167..feac36f3cb2 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -17,4 +17,5 @@ C_SRCS = \ mirror.c \ opentype.c \ scripts.c \ - shape.c + shape.c \ + shapers/arabic.c diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 485fcdb1f16..76d49ae5104 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -536,9 +536,51 @@ struct scriptshaping_context; typedef void (*p_apply_context_lookup)(struct scriptshaping_context *context, unsigned int lookup_index); +enum shaping_feature_flags +{ + FEATURE_GLOBAL = 0x1, + FEATURE_GLOBAL_SEARCH = 0x2, + FEATURE_MANUAL_ZWNJ = 0x4, + FEATURE_MANUAL_ZWJ = 0x8, + FEATURE_MANUAL_JOINERS = FEATURE_MANUAL_ZWNJ | FEATURE_MANUAL_ZWJ, +}; + +struct shaping_feature +{ + unsigned int tag; + unsigned int index; + unsigned int flags; + unsigned int max_value; + unsigned int default_value; + unsigned int mask; + unsigned int shift; + unsigned int stage; +}; + +struct shaping_features +{ + struct shaping_feature *features; + size_t count; + size_t capacity; + unsigned int stage; +}; + +struct shaper +{ + void (*collect_features)(struct scriptshaping_context *context, struct shaping_features *features); + void (*setup_masks)(struct scriptshaping_context *context, const struct shaping_features *features); +}; + +extern const struct shaper arabic_shaper DECLSPEC_HIDDEN; + +extern void shape_enable_feature(struct shaping_features *features, unsigned int tag, + unsigned int flags) DECLSPEC_HIDDEN; +extern void shape_start_next_stage(struct shaping_features *features) DECLSPEC_HIDDEN; + struct scriptshaping_context { struct scriptshaping_cache *cache; + const struct shaper *shaper; unsigned int script; UINT32 language_tag; @@ -615,35 +657,6 @@ extern struct scriptshaping_cache *create_scriptshaping_cache(void *context, extern void release_scriptshaping_cache(struct scriptshaping_cache*) DECLSPEC_HIDDEN; extern struct scriptshaping_cache *fontface_get_shaping_cache(struct dwrite_fontface *fontface) DECLSPEC_HIDDEN; -enum shaping_feature_flags -{ - FEATURE_GLOBAL = 0x1, - FEATURE_GLOBAL_SEARCH = 0x2, - FEATURE_MANUAL_ZWNJ = 0x4, - FEATURE_MANUAL_ZWJ = 0x8, - FEATURE_MANUAL_JOINERS = FEATURE_MANUAL_ZWNJ | FEATURE_MANUAL_ZWJ, -}; - -struct shaping_feature -{ - unsigned int tag; - unsigned int index; - unsigned int flags; - unsigned int max_value; - unsigned int default_value; - unsigned int mask; - unsigned int shift; - unsigned int stage; -}; - -struct shaping_features -{ - struct shaping_feature *features; - size_t count; - size_t capacity; - unsigned int stage; -}; - extern void opentype_layout_scriptshaping_cache_init(struct scriptshaping_cache *cache) DECLSPEC_HIDDEN; extern DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache, DWORD kind, DWORD tag, unsigned int *script_index) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index a025227dfda..20534460d09 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4647,7 +4647,8 @@ static void opentype_layout_set_glyph_masks(struct scriptshaping_context *contex for (g = 0; g < context->glyph_count; ++g) context->glyph_infos[g].mask = context->global_mask; - /* FIXME: set shaper masks */ + if (context->shaper->setup_masks) + context->shaper->setup_masks(context, features); for (r = 0, start_char = 0; r < context->user_features.range_count; ++r) { diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 567ec5fa54f..53b392c88e2 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -27,6 +27,7 @@ #define COBJMACROS #include "dwrite_private.h" +#include "scripts.h" #include "winternl.h" #include "wine/debug.h" @@ -135,6 +136,17 @@ static void shape_add_feature(struct shaping_features *features, unsigned int ta shape_add_feature_full(features, tag, FEATURE_GLOBAL, 1); } +void shape_enable_feature(struct shaping_features *features, unsigned int tag, + unsigned int flags) +{ + shape_add_feature_full(features, tag, FEATURE_GLOBAL | flags, 1); +} + +void shape_start_next_stage(struct shaping_features *features) +{ + features->stage++; +} + static int features_sorting_compare(const void *a, const void *b) { const struct shaping_feature *left = a, *right = b; @@ -187,6 +199,21 @@ static void shape_merge_features(struct scriptshaping_context *context, struct s features->count = j + 1; } +static const struct shaper null_shaper; + +static void shape_set_shaper(struct scriptshaping_context *context) +{ + switch (context->script) + { + case Script_Arabic: + case Script_Syriac: + context->shaper = &arabic_shaper; + break; + default: + context->shaper = &null_shaper; + } +} + HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigned int *scripts) { static const struct shaping_feature common_features[] = @@ -206,6 +233,8 @@ HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigne unsigned int script_index, language_index, script, i; struct shaping_features features = { 0 }; + shape_set_shaper(context); + for (i = 0; i < ARRAY_SIZE(common_features); ++i) shape_add_feature_full(&features, common_features[i].tag, FEATURE_GLOBAL | common_features[i].flags, 1); @@ -279,20 +308,25 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i struct shaping_features features = { 0 }; unsigned int i; + shape_set_shaper(context); + if (!context->is_sideways) { if (context->is_rtl) { - shape_add_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('r','t','l','a')); + shape_enable_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('r','t','l','a'), 0); shape_add_feature_full(&features, DWRITE_MAKE_OPENTYPE_TAG('r','t','l','m'), 0, 1); } else { - shape_add_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('l','t','r','a')); - shape_add_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('l','t','r','m')); + shape_enable_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('l','t','r','a'), 0); + shape_enable_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('l','t','r','m'), 0); } } + if (context->shaper->collect_features) + context->shaper->collect_features(context, &features); + for (i = 0; i < ARRAY_SIZE(common_features); ++i) shape_add_feature(&features, common_features[i]); @@ -303,7 +337,7 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i shape_add_feature(&features, horizontal_features[i]); } else - shape_add_feature_full(&features, DWRITE_MAKE_OPENTYPE_TAG('v','e','r','t'), FEATURE_GLOBAL | FEATURE_GLOBAL_SEARCH, 1); + shape_enable_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('v','e','r','t'), FEATURE_GLOBAL_SEARCH); shape_merge_features(context, &features); diff --git a/dlls/dwrite/shapers/arabic.c b/dlls/dwrite/shapers/arabic.c new file mode 100644 index 00000000000..d8c6c9495c0 --- /dev/null +++ b/dlls/dwrite/shapers/arabic.c @@ -0,0 +1,66 @@ +/* + * Copyright HarfBuzz Project authors + * Copyright 2020 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "dwrite_private.h" + +static const unsigned int arabic_features[] = +{ + DWRITE_MAKE_OPENTYPE_TAG('i','s','o','l'), + DWRITE_MAKE_OPENTYPE_TAG('f','i','n','a'), + DWRITE_MAKE_OPENTYPE_TAG('f','i','n','2'), + DWRITE_MAKE_OPENTYPE_TAG('f','i','n','3'), + DWRITE_MAKE_OPENTYPE_TAG('m','e','d','i'), + DWRITE_MAKE_OPENTYPE_TAG('m','e','d','2'), + DWRITE_MAKE_OPENTYPE_TAG('i','n','i','t'), +}; + +static void arabic_collect_features(struct scriptshaping_context *context, + struct shaping_features *features) +{ + unsigned int i; + + shape_enable_feature(features, DWRITE_MAKE_OPENTYPE_TAG('c','c','m','p'), 0); + shape_enable_feature(features, DWRITE_MAKE_OPENTYPE_TAG('l','o','c','l'), 0); + shape_start_next_stage(features); + + for (i = 0; i < ARRAY_SIZE(arabic_features); ++i) + { + shape_enable_feature(features, arabic_features[i], 0); + shape_start_next_stage(features); + } + + shape_enable_feature(features, DWRITE_MAKE_OPENTYPE_TAG('r','l','i','g'), FEATURE_MANUAL_ZWJ); + + shape_enable_feature(features, DWRITE_MAKE_OPENTYPE_TAG('r','c','l','t'), FEATURE_MANUAL_ZWJ); + shape_enable_feature(features, DWRITE_MAKE_OPENTYPE_TAG('c','a','l','t'), FEATURE_MANUAL_ZWJ); + shape_start_next_stage(features); + + shape_enable_feature(features, DWRITE_MAKE_OPENTYPE_TAG('m','s','e','t'), 0); +} + +static void arabic_setup_masks(struct scriptshaping_context *context, + const struct shaping_features *features) +{ +} + +const struct shaper arabic_shaper = +{ + arabic_collect_features, + arabic_setup_masks, +};

1 0

Nikolay Sivov : dwrite: Set script id in shaping context.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 142c06e55ed0341fe009c544df7480e165b5001d URL: https://source.winehq.org/git/wine.git/?a=commit;h=142c06e55ed0341fe009c544… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 21 16:36:53 2021 +0300 dwrite: Set script id in shaping context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 19 ++++++++----------- dlls/dwrite/dwrite_private.h | 1 + 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 7ee8e18eff7..7446665674a 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1154,7 +1154,6 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, struct scriptshaping_context context = { 0 }; struct dwrite_fontface *font_obj; WCHAR digits[NATIVE_DIGITS_LEN]; - unsigned int script; HRESULT hr; TRACE("(%s:%u %p %d %d %s %s %p %p %p %u %u %p %p %p %p %p)\n", debugstr_wn(text, length), @@ -1172,6 +1171,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, font_obj = unsafe_impl_from_IDWriteFontFace(fontface); context.cache = fontface_get_shaping_cache(font_obj); + context.script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; context.text = text; context.length = length; context.is_rtl = is_rtl; @@ -1190,8 +1190,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * max_glyph_count); context.table = &context.cache->gsub; - script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; - scriptprops = &dwritescripts_properties[script]; + scriptprops = &dwritescripts_properties[context.script]; hr = shape_get_glyphs(&context, scriptprops->scripttags); if (SUCCEEDED(hr)) { @@ -1217,7 +1216,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 const struct dwritescript_properties *scriptprops; struct scriptshaping_context context; struct dwrite_fontface *font_obj; - unsigned int i, script; + unsigned int i; HRESULT hr; TRACE("%s, %p, %p, %u, %p, %p, %u, %p, %.2f, %d, %d, %s, %s, %p, %p, %u, %p, %p.\n", debugstr_wn(text, text_len), @@ -1243,10 +1242,8 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 offsets[i].ascenderOffset = 0.0f; } - script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; - scriptprops = &dwritescripts_properties[script]; - context.cache = fontface_get_shaping_cache(font_obj); + context.script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; context.text = text; context.length = text_len; context.is_rtl = is_rtl; @@ -1267,6 +1264,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * glyph_count); context.table = &context.cache->gpos; + scriptprops = &dwritescripts_properties[context.script]; hr = shape_get_positions(&context, scriptprops->scripttags); heap_free(context.glyph_infos); @@ -1286,7 +1284,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite struct scriptshaping_context context; DWRITE_MEASURING_MODE measuring_mode; struct dwrite_fontface *font_obj; - unsigned int i, script; + unsigned int i; HRESULT hr; TRACE("%s, %p, %p, %u, %p, %p, %u, %p, %.2f, %.2f, %p, %d, %d, %d, %s, %s, %p, %p, %u, %p, %p.\n", @@ -1314,10 +1312,8 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite offsets[i].ascenderOffset = 0.0f; } - script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; - scriptprops = &dwritescripts_properties[script]; - context.cache = fontface_get_shaping_cache(font_obj); + context.script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; context.text = text; context.length = text_len; context.is_rtl = is_rtl; @@ -1338,6 +1334,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * glyph_count); context.table = &context.cache->gpos; + scriptprops = &dwritescripts_properties[context.script]; hr = shape_get_positions(&context, scriptprops->scripttags); heap_free(context.glyph_infos); diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 9fd9e0bc68f..485fcdb1f16 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -539,6 +539,7 @@ typedef void (*p_apply_context_lookup)(struct scriptshaping_context *context, un struct scriptshaping_context { struct scriptshaping_cache *cache; + unsigned int script; UINT32 language_tag; const WCHAR *text;

1 0

Nikolay Sivov : dwrite: Add font set builder stub.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: dc9f12170c2151d65da6e5b3570c5396576922ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc9f12170c2151d65da6e5b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 21 16:36:52 2021 +0300 dwrite: Add font set builder stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 146 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 12 ++-- dlls/dwrite/tests/font.c | 17 +++-- 4 files changed, 161 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index f3636876251..9fd9e0bc68f 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -346,6 +346,7 @@ extern void factory_unlock(IDWriteFactory7 *factory) DECLSPEC_HIDDEN; extern HRESULT create_inmemory_fileloader(IDWriteInMemoryFontFileLoader **loader) DECLSPEC_HIDDEN; extern HRESULT create_font_resource(IDWriteFactory7 *factory, IDWriteFontFile *file, UINT32 face_index, IDWriteFontResource **resource) DECLSPEC_HIDDEN; +extern HRESULT create_fontset_builder(IDWriteFactory7 *factory, IDWriteFontSetBuilder2 **ret) DECLSPEC_HIDDEN; struct dwrite_fontface; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 392c1dd0ee8..014240a1c8f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -250,6 +250,13 @@ struct dwrite_fontresource IDWriteFactory7 *factory; }; +struct dwrite_fontset_builder +{ + IDWriteFontSetBuilder2 IDWriteFontSetBuilder2_iface; + LONG refcount; + IDWriteFactory7 *factory; +}; + static void dwrite_grab_font_table(void *context, UINT32 table, const BYTE **data, UINT32 *size, void **data_context) { struct dwrite_fontface *fontface = context; @@ -373,6 +380,11 @@ static struct dwrite_fontresource *impl_from_IDWriteFontResource(IDWriteFontReso return CONTAINING_RECORD(iface, struct dwrite_fontresource, IDWriteFontResource_iface); } +static struct dwrite_fontset_builder *impl_from_IDWriteFontSetBuilder2(IDWriteFontSetBuilder2 *iface) +{ + return CONTAINING_RECORD(iface, struct dwrite_fontset_builder, IDWriteFontSetBuilder2_iface); +} + static HRESULT get_cached_glyph_metrics(struct dwrite_fontface *fontface, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics) { static const DWRITE_GLYPH_METRICS nil; @@ -7105,3 +7117,137 @@ HRESULT create_font_resource(IDWriteFactory7 *factory, IDWriteFontFile *file, UI return S_OK; } + +static HRESULT WINAPI dwritefontsetbuilder_QueryInterface(IDWriteFontSetBuilder2 *iface, + REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IDWriteFontSetBuilder2) || + IsEqualIID(riid, &IID_IDWriteFontSetBuilder1) || + IsEqualIID(riid, &IID_IDWriteFontSetBuilder) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IDWriteFontSetBuilder2_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dwritefontsetbuilder_AddRef(IDWriteFontSetBuilder2 *iface) +{ + struct dwrite_fontset_builder *builder = impl_from_IDWriteFontSetBuilder2(iface); + ULONG refcount = InterlockedIncrement(&builder->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI dwritefontsetbuilder_Release(IDWriteFontSetBuilder2 *iface) +{ + struct dwrite_fontset_builder *builder = impl_from_IDWriteFontSetBuilder2(iface); + ULONG refcount = InterlockedDecrement(&builder->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + IDWriteFactory7_Release(builder->factory); + heap_free(builder); + } + + return refcount; +} + +static HRESULT WINAPI dwritefontsetbuilder_AddFontFaceReference_(IDWriteFontSetBuilder2 *iface, + IDWriteFontFaceReference *ref, DWRITE_FONT_PROPERTY const *props, UINT32 prop_count) +{ + FIXME("%p, %p, %p, %u.\n", iface, ref, props, prop_count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontsetbuilder_AddFontFaceReference(IDWriteFontSetBuilder2 *iface, + IDWriteFontFaceReference *ref) +{ + FIXME("%p, %p.\n", iface, ref); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontsetbuilder_AddFontSet(IDWriteFontSetBuilder2 *iface, IDWriteFontSet *fontset) +{ + FIXME("%p, %p.\n", iface, fontset); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontsetbuilder_CreateFontSet(IDWriteFontSetBuilder2 *iface, IDWriteFontSet **fontset) +{ + FIXME("%p, %p.\n", iface, fontset); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontsetbuilder1_AddFontFile(IDWriteFontSetBuilder2 *iface, IDWriteFontFile *file) +{ + FIXME("%p, %p.\n", iface, file); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontsetbuilder2_AddFont(IDWriteFontSetBuilder2 *iface, IDWriteFontFile *file, + unsigned int face_index, DWRITE_FONT_SIMULATIONS simulations, const DWRITE_FONT_AXIS_VALUE *axis_values, + unsigned int num_values, const DWRITE_FONT_AXIS_RANGE *axis_ranges, unsigned int num_ranges, + const DWRITE_FONT_PROPERTY *props, unsigned int num_properties) +{ + FIXME("%p, %p, %u, %#x, %p, %u, %p, %u, %p, %u.\n", iface, file, face_index, simulations, axis_values, num_values, + axis_ranges, num_ranges, props, num_properties); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontsetbuilder2_AddFontFile(IDWriteFontSetBuilder2 *iface, const WCHAR *filepath) +{ + FIXME("%p, %s.\n", iface, debugstr_w(filepath)); + + return E_NOTIMPL; +} + +static const IDWriteFontSetBuilder2Vtbl fontsetbuildervtbl = +{ + dwritefontsetbuilder_QueryInterface, + dwritefontsetbuilder_AddRef, + dwritefontsetbuilder_Release, + dwritefontsetbuilder_AddFontFaceReference_, + dwritefontsetbuilder_AddFontFaceReference, + dwritefontsetbuilder_AddFontSet, + dwritefontsetbuilder_CreateFontSet, + dwritefontsetbuilder1_AddFontFile, + dwritefontsetbuilder2_AddFont, + dwritefontsetbuilder2_AddFontFile, +}; + +HRESULT create_fontset_builder(IDWriteFactory7 *factory, IDWriteFontSetBuilder2 **ret) +{ + struct dwrite_fontset_builder *builder; + + *ret = NULL; + + if (!(builder = heap_alloc_zero(sizeof(*builder)))) + return E_OUTOFMEMORY; + + builder->IDWriteFontSetBuilder2_iface.lpVtbl = &fontsetbuildervtbl; + builder->refcount = 1; + builder->factory = factory; + IDWriteFactory7_AddRef(builder->factory); + + *ret = &builder->IDWriteFontSetBuilder2_iface; + + return S_OK; +} diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index dd9bd4dc6a3..0cc0edd1ffc 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1501,9 +1501,9 @@ static HRESULT WINAPI dwritefactory3_GetSystemFontSet(IDWriteFactory7 *iface, ID static HRESULT WINAPI dwritefactory3_CreateFontSetBuilder(IDWriteFactory7 *iface, IDWriteFontSetBuilder **builder) { - FIXME("%p, %p: stub\n", iface, builder); + TRACE("%p, %p.\n", iface, builder); - return E_NOTIMPL; + return create_fontset_builder(iface, (IDWriteFontSetBuilder2 **)builder); } static HRESULT WINAPI dwritefactory3_CreateFontCollectionFromFontSet(IDWriteFactory7 *iface, IDWriteFontSet *fontset, @@ -1644,9 +1644,9 @@ static HRESULT WINAPI dwritefactory4_ComputeGlyphOrigins(IDWriteFactory7 *iface, static HRESULT WINAPI dwritefactory5_CreateFontSetBuilder(IDWriteFactory7 *iface, IDWriteFontSetBuilder1 **builder) { - FIXME("%p, %p: stub\n", iface, builder); + TRACE("%p, %p.\n", iface, builder); - return E_NOTIMPL; + return create_fontset_builder(iface, (IDWriteFontSetBuilder2 **)builder); } static HRESULT WINAPI dwritefactory5_CreateInMemoryFontFileLoader(IDWriteFactory7 *iface, @@ -1725,9 +1725,9 @@ static HRESULT WINAPI dwritefactory6_CreateFontCollectionFromFontSet(IDWriteFact static HRESULT WINAPI dwritefactory6_CreateFontSetBuilder(IDWriteFactory7 *iface, IDWriteFontSetBuilder2 **builder) { - FIXME("%p, %p.\n", iface, builder); + TRACE("%p, %p.\n", iface, builder); - return E_NOTIMPL; + return create_fontset_builder(iface, builder); } static HRESULT WINAPI dwritefactory6_CreateTextFormat(IDWriteFactory7 *iface, const WCHAR *familyname, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 193f8ed9c48..872405b1639 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9371,21 +9371,15 @@ static void test_fontsetbuilder(void) HRESULT hr; factory = create_factory_iid(&IID_IDWriteFactory3); - if (!factory) { - skip("IDWriteFontSetBuilder is not supported.\n"); + if (!factory) + { + win_skip("IDWriteFontSetBuilder is not supported.\n"); return; } EXPECT_REF(factory, 1); hr = IDWriteFactory3_CreateFontSetBuilder(factory, &builder); -todo_wine ok(hr == S_OK, "Failed to create font set builder, hr %#x.\n", hr); - - if (FAILED(hr)) { - IDWriteFactory3_Release(factory); - return; - } - EXPECT_REF(factory, 2); IDWriteFontSetBuilder_Release(builder); @@ -9419,12 +9413,16 @@ todo_wine EXPECT_REF(ref, 1); hr = IDWriteFontSetBuilder_AddFontFaceReference(builder, ref); + todo_wine ok(hr == S_OK, "Failed to add fontface reference, hr %#x.\n", hr); EXPECT_REF(ref, 1); hr = IDWriteFontSetBuilder_CreateFontSet(builder, &fontset); + todo_wine ok(hr == S_OK, "Failed to create a font set, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { setcount = IDWriteFontSet_GetFontCount(fontset); ok(setcount == 1, "Unexpected font count %u.\n", setcount); @@ -9490,6 +9488,7 @@ todo_wine } IDWriteFontSet_Release(fontset); + } IDWriteFontFaceReference_Release(ref); IDWriteFontSetBuilder_Release(builder);

1 0

Nikolay Sivov : dwrite/tests: Add some tests for text format properties.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 239530e8a8ecebfcf9a8d23f67ebec2b8522750e URL: https://source.winehq.org/git/wine.git/?a=commit;h=239530e8a8ecebfcf9a8d23f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 21 16:36:51 2021 +0300 dwrite/tests: Add some tests for text format properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 94 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 52f17820e5e..eb47997f22f 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -190,11 +190,17 @@ static IDWriteTextAnalysisSourceVtbl analysissourcevtbl = { static IDWriteTextAnalysisSource analysissource = { &analysissourcevtbl }; +static void *create_factory_iid(REFIID riid) +{ + IUnknown *factory = NULL; + DWriteCreateFactory(DWRITE_FACTORY_TYPE_ISOLATED, riid, &factory); + return factory; +} + static IDWriteFactory *create_factory(void) { - IDWriteFactory *factory; - HRESULT hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_ISOLATED, &IID_IDWriteFactory, (IUnknown**)&factory); - ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFactory *factory = create_factory_iid(&IID_IDWriteFactory); + ok(factory != NULL, "Failed to create factory.\n"); return factory; } @@ -5860,6 +5866,87 @@ static void test_automatic_font_axes(void) IDWriteFactory_Release(factory); } +static void test_text_format_axes(void) +{ + IDWriteFontCollection *collection; + IDWriteFontCollection2 *collection2; + DWRITE_FONT_AXIS_VALUE axis; + IDWriteTextFormat3 *format3; + DWRITE_FONT_STRETCH stretch; + DWRITE_FONT_WEIGHT weight; + IDWriteTextFormat *format; + IDWriteFactory6 *factory; + DWRITE_FONT_STYLE style; + DWRITE_FONT_FAMILY_MODEL model; + unsigned int count; + HRESULT hr; + + factory = create_factory_iid(&IID_IDWriteFactory6); + + if (!factory) + { + win_skip("Text format does not support variations.\n"); + return; + } + + hr = IDWriteFactory6_CreateTextFormat(factory, L"test_family", NULL, NULL, 0, 10.0f, L"en-us", &format3); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + +if (SUCCEEDED(hr)) +{ + hr = IDWriteTextFormat3_GetFontCollection(format3, &collection); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFontCollection_QueryInterface(collection, &IID_IDWriteFontCollection2, (void **)&collection2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + model = IDWriteFontCollection2_GetFontFamilyModel(collection2); + ok(model == DWRITE_FONT_FAMILY_MODEL_TYPOGRAPHIC, "Unexpected model %d.\n", model); + + IDWriteFontCollection_Release(collection); + IDWriteFontCollection2_Release(collection2); + + count = IDWriteTextFormat3_GetFontAxisValueCount(format3); + ok(!count, "Unexpected axis count %u.\n", count); + + stretch = IDWriteTextFormat3_GetFontStretch(format3); + ok(stretch == DWRITE_FONT_STRETCH_NORMAL, "Unexpected font stretch %d.\n", stretch); + + style = IDWriteTextFormat3_GetFontStyle(format3); + ok(style == DWRITE_FONT_STYLE_NORMAL, "Unexpected font style %d.\n", style); + + weight = IDWriteTextFormat3_GetFontWeight(format3); + ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "Unexpected font weight %d.\n", weight); + + /* Regular properties are not set from axis values. */ + axis.axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axis.value = 200.0f; + hr = IDWriteTextFormat3_SetFontAxisValues(format3, &axis, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + weight = IDWriteTextFormat3_GetFontWeight(format3); + ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "Unexpected font weight %d.\n", weight); + + IDWriteTextFormat3_Release(format3); +} + hr = IDWriteFactory_CreateTextFormat((IDWriteFactory *)factory, L"test_family", NULL, + DWRITE_FONT_WEIGHT_BOLD, DWRITE_FONT_STYLE_ITALIC, DWRITE_FONT_STRETCH_EXPANDED, + 10.0f, L"en-us", &format); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat3, (void **)&format3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IDWriteTextFormat3_GetFontAxisValueCount(format3); + ok(!count, "Unexpected axis count %u.\n", count); + + IDWriteTextFormat3_Release(format3); + IDWriteTextFormat_Release(format); + + IDWriteFactory6_Release(factory); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -5912,6 +5999,7 @@ START_TEST(layout) test_GetOverhangMetrics(); test_tab_stops(); test_automatic_font_axes(); + test_text_format_axes(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Zero initialize font data structure.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 612652bb9ca93dbafefc2ff47714c1906cb59d4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=612652bb9ca93dbafefc2ff4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 21 16:36:50 2021 +0300 dwrite: Zero initialize font data structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 74e6b929ecd..392c1dd0ee8 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3932,9 +3932,6 @@ static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_fo data->file = desc->files[0]; data->face_index = desc->index; data->face_type = desc->face_type; - data->simulations = DWRITE_FONT_SIMULATIONS_NONE; - data->bold_sim_tested = 0; - data->oblique_sim_tested = 0; IDWriteFontFile_AddRef(data->file); stream_desc.stream = desc->stream;

1 0

Arkadiusz Hiler : hidclass.sys: Calculate correct bitCount for vendor-specific 1 bit repeated elements.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 5a32339dc858d898ac2fa1c948306a2ec271c68b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a32339dc858d898ac2fa1c9… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Thu Jan 21 18:11:13 2021 +0200 hidclass.sys: Calculate correct bitCount for vendor-specific 1 bit repeated elements. DualSense controller's report descriptor comes with a 1 bit vendor specific (Usage Page & Usage) element repeated through 'report count'. Those were correctly interpreted as non-ranged buttons (exposed as button caps with appropriate usage values) but their size was incorrectly assumed to be 1 ignoring the 'report count'. Because of that the InputReportByteLength is miscalculated as 63 instead of 64. If the buffer passed to HidD_GetInputReport() is allocated using that value the call will fail with ERROR_INSUFFICIENT_BUFFER. This change fixes the above and cleans up the code a bit so the size for each case is calculated directly from the count and size instead of using the values that were derived from them. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 56e4da4ad10..c02988494fd 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -698,6 +698,10 @@ static void build_elements(WINE_HID_REPORT *wine_report, WINE_HID_ELEMENT *elems } wine_element->valueStartBit = wine_report->bitSize; + + wine_element->bitCount = (feature->caps.BitSize * feature->caps.ReportCount); + wine_report->bitSize += wine_element->bitCount; + if (feature->caps.BitSize == 1) { wine_element->ElementType = ButtonElement; @@ -713,8 +717,6 @@ static void build_elements(WINE_HID_REPORT *wine_report, WINE_HID_ELEMENT *elems wine_element->caps.button.IsAbsolute = feature->IsAbsolute; if (wine_element->caps.button.IsRange) { - wine_element->bitCount = (feature->caps.u.Range.UsageMax - feature->caps.u.Range.UsageMin) + 1; - wine_report->bitSize += wine_element->bitCount; wine_element->caps.button.u.Range.UsageMin = feature->caps.u.Range.UsageMin; wine_element->caps.button.u.Range.UsageMax = feature->caps.u.Range.UsageMax; wine_element->caps.button.u.Range.StringMin = feature->caps.u.Range.StringMin; @@ -727,8 +729,6 @@ static void build_elements(WINE_HID_REPORT *wine_report, WINE_HID_ELEMENT *elems } else { - wine_report->bitSize++; - wine_element->bitCount = 1; wine_element->caps.button.u.NotRange.Usage = feature->caps.u.NotRange.Usage; wine_element->caps.button.u.NotRange.Reserved1 = feature->caps.u.NotRange.Usage; wine_element->caps.button.u.NotRange.StringIndex = feature->caps.u.NotRange.StringIndex; @@ -756,8 +756,6 @@ static void build_elements(WINE_HID_REPORT *wine_report, WINE_HID_ELEMENT *elems wine_element->caps.value.HasNull = feature->HasNull; wine_element->caps.value.BitSize = feature->caps.BitSize; wine_element->caps.value.ReportCount = feature->caps.ReportCount; - wine_element->bitCount = (feature->caps.BitSize * wine_element->caps.value.ReportCount); - wine_report->bitSize += wine_element->bitCount; wine_element->caps.value.UnitsExp = feature->caps.UnitsExp; wine_element->caps.value.Units = feature->caps.Units; wine_element->caps.value.LogicalMin = feature->caps.LogicalMin;

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapter.ServiceName.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 4c5dee872be0c6a5d5df089bcf15e49edfd00d43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c5dee872be0c6a5d5df089b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 12:36:42 2021 +0100 wbemprox: Implement Win32_NetworkAdapter.ServiceName. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50256 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d33cf1d03cc..9ae34a50c0d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -206,6 +206,7 @@ static const struct column col_networkadapter[] = { L"NetConnectionStatus", CIM_UINT16 }, { L"PhysicalAdapter", CIM_BOOLEAN }, { L"PNPDeviceID", CIM_STRING }, + { L"ServiceName", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Speed", CIM_UINT64 }, }; static const struct column col_networkadapterconfig[] = @@ -613,6 +614,7 @@ struct record_networkadapter UINT16 netconnection_status; int physicaladapter; const WCHAR *pnpdevice_id; + const WCHAR *servicename; UINT64 speed; }; struct record_networkadapterconfig @@ -2718,6 +2720,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e rec->netconnection_status = get_connection_status( aa->OperStatus ); rec->physicaladapter = physical; rec->pnpdevice_id = L"PCI\\VEN_8086&DEV_100E&SUBSYS_001E8086&REV_02\\3&267A616A&1&18"; + rec->servicename = heap_strdupW( aa->FriendlyName ); rec->speed = 1000000; if (!match_row( table, row, cond, &status )) { diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 5d7559afe56..a0488f40e52 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1160,12 +1160,26 @@ static void test_Win32_NetworkAdapter( IWbemServices *services ) for (;;) { + VARIANT val; + CIMTYPE type; + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; + check_property( obj, L"Description", VT_BSTR, CIM_STRING ); check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); check_property( obj, L"Index", VT_I4, CIM_UINT32 ); check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"ServiceName", 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get service name %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || broken(V_VT( &val ) == VT_NULL) /* win2k8 */, + "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + VariantClear( &val ); + IWbemClassObject_Release( obj ); }

1 0

Hans Leidekker : wbemprox: Handle escaped backslashes in LIKE queries.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: d4032d69f6fe4290217cb21a05dc33b9add868b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4032d69f6fe4290217cb21a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 12:36:41 2021 +0100 wbemprox: Handle escaped backslashes in LIKE queries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50256 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 1 + dlls/wbemprox/tests/query.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 3d60825f24e..ec2a43c3f5f 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -93,6 +93,7 @@ static BOOL eval_like( const WCHAR *lstr, const WCHAR *rstr ) while (*p && *q) { + if (q[0] == '\\' && q[1] == '\\') q++; if (*q == '%') { while (*q == '%') q++; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 572920c7702..5d7559afe56 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1171,6 +1171,16 @@ static void test_Win32_NetworkAdapter( IWbemServices *services ) IEnumWbemClassObject_Release( result ); SysFreeString( query ); + + query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapter WHERE PNPDeviceID LIKE \"PCI\\\\%\"" ); + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( query ); + + query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapter WHERE PNPDeviceID LIKE \"PCI\\%\"" ); + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + todo_wine ok( hr == WBEM_E_INVALID_QUERY, "got %08x\n", hr ); + SysFreeString( query ); SysFreeString( wql ); }

1 0

Hans Leidekker : wbemprox/tests: Add tests for Win32_NetworkAdapter/Configuration.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: e8aa254f3425a140a955f9d250987c88042bb747 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8aa254f3425a140a955f9d2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 12:36:40 2021 +0100 wbemprox/tests: Add tests for Win32_NetworkAdapter/Configuration. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 5a59f0a8f8f..572920c7702 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -248,6 +248,9 @@ static void _check_property( ULONG line, IWbemClassObject *obj, const WCHAR *pro case VT_R4: trace( "%s: %f\n", wine_dbgstr_w(prop), V_R4(&val) ); break; + case VT_BOOL: + trace( "%s: %d\n", wine_dbgstr_w(prop), V_BOOL(&val) ); + break; default: break; } @@ -1162,6 +1165,34 @@ static void test_Win32_NetworkAdapter( IWbemServices *services ) check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); check_property( obj, L"Index", VT_I4, CIM_UINT32 ); + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + +static void test_Win32_NetworkAdapterConfiguration( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapterConfiguration" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"Description", VT_BSTR, CIM_STRING ); + check_property( obj, L"Index", VT_I4, CIM_UINT32 ); + check_property( obj, L"IPEnabled", VT_BOOL, CIM_BOOLEAN ); IWbemClassObject_Release( obj ); } @@ -1901,6 +1932,7 @@ START_TEST(query) test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); test_Win32_NetworkAdapter( services ); + test_Win32_NetworkAdapterConfiguration( services ); test_Win32_OperatingSystem( services ); test_Win32_PhysicalMemory( services ); test_Win32_PnPEntity( services );

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapter.GUID.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: ebff7de0c986f68b9c065e513c7a6bd125f3f616 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebff7de0c986f68b9c065e51… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 12:36:39 2021 +0100 wbemprox: Implement Win32_NetworkAdapter.GUID. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50256 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 27 ++++++++++++++++++++++----- dlls/wbemprox/tests/query.c | 27 +++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 39166a21171..d33cf1d03cc 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -197,6 +197,7 @@ static const struct column col_networkadapter[] = { L"AdapterTypeID", CIM_UINT16 }, { L"Description", CIM_STRING|COL_FLAG_DYNAMIC }, { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"GUID", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Index", CIM_UINT32 }, { L"InterfaceIndex", CIM_UINT32 }, { L"MACAddress", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -603,6 +604,7 @@ struct record_networkadapter UINT16 adaptertypeid; const WCHAR *description; const WCHAR *device_id; + const WCHAR *guid; UINT32 index; UINT32 interface_index; const WCHAR *mac_address; @@ -2651,6 +2653,24 @@ static const WCHAR *get_adaptertype( DWORD type, int *id, int *physical ) } } +#define GUID_SIZE 39 +static WCHAR *guid_to_str( const GUID *ptr ) +{ + WCHAR *ret; + if (!(ret = heap_alloc( GUID_SIZE * sizeof(WCHAR) ))) return NULL; + swprintf( ret, GUID_SIZE, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + ptr->Data1, ptr->Data2, ptr->Data3, ptr->Data4[0], ptr->Data4[1], ptr->Data4[2], + ptr->Data4[3], ptr->Data4[4], ptr->Data4[5], ptr->Data4[6], ptr->Data4[7] ); + return ret; +} + +static WCHAR *get_networkadapter_guid( const IF_LUID *luid ) +{ + GUID guid; + if (ConvertInterfaceLuidToGuid( luid, &guid )) return NULL; + return guid_to_str( &guid ); +} + static enum fill_status fill_networkadapter( struct table *table, const struct expr *cond ) { WCHAR device_id[11]; @@ -2689,6 +2709,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e rec->adaptertypeid = adaptertypeid; rec->description = heap_strdupW( aa->Description ); rec->device_id = heap_strdupW( device_id ); + rec->guid = get_networkadapter_guid( &aa->Luid ); rec->index = aa->u.s.IfIndex; rec->interface_index = aa->u.s.IfIndex; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); @@ -2877,13 +2898,9 @@ static struct array *get_ipsubnet( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) static WCHAR *get_settingid( UINT32 index ) { GUID guid; - WCHAR *ret, *str; memset( &guid, 0, sizeof(guid) ); guid.Data1 = index; - UuidToStringW( &guid, &str ); - ret = heap_strdupW( str ); - RpcStringFreeW( &str ); - return ret; + return guid_to_str( &guid ); } static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr *cond ) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 67c0b218ce1..5a59f0a8f8f 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1144,6 +1144,32 @@ static void test_SystemSecurity( IWbemServices *services ) SysFreeString( class ); } +static void test_Win32_NetworkAdapter( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapter" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); + check_property( obj, L"Index", VT_I4, CIM_UINT32 ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_OperatingSystem( IWbemServices *services ) { BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_OperatingSystem" ); @@ -1874,6 +1900,7 @@ START_TEST(query) test_Win32_DiskDrive( services ); test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); + test_Win32_NetworkAdapter( services ); test_Win32_OperatingSystem( services ); test_Win32_PhysicalMemory( services ); test_Win32_PnPEntity( services );

1 0

Nikolay Sivov : make_unicode: Remove unused variable.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: ea1afd6597a0868d2696864f94e9e664eb349a45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea1afd6597a0868d2696864f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 21 14:34:02 2021 +0300 make_unicode: Remove unused variable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/make_unicode b/tools/make_unicode index da4c732bc3e..5d180310b48 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1235,7 +1235,6 @@ sub dump_linebreak($) { my $filename = shift; my @break_table; - my $next_group = 0; my $INPUT = open_data_file( $UNIDATA, "LineBreak.txt" ); while (<$INPUT>)

1 0

Henri Verbeet : wined3d: Correct the argument order of a FIXME in wined3d_texture_vk_download_data().
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: f0dae1d852a371293da00104ec861787f35865f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0dae1d852a371293da00104… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:55:53 2021 +0100 wined3d: Correct the argument order of a FIXME in wined3d_texture_vk_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6f16868c5ad..5bb4de05d5c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4771,8 +4771,8 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, if (dst_format->id != src_texture->resource.format->id) { FIXME("Unhandled format conversion (%s -> %s).\n", - debug_d3dformat(dst_format->id), - debug_d3dformat(src_texture->resource.format->id)); + debug_d3dformat(src_texture->resource.format->id), + debug_d3dformat(dst_format->id)); return; }

1 0

Henri Verbeet : wined3d: Stencil test also uses the depth/stencil buffer.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: c47b28f5d4324ec77404319a1dc22584f006ed1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c47b28f5d4324ec77404319a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:55:52 2021 +0100 wined3d: Stencil test also uses the depth/stencil buffer. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e010deb1264..07ddb57333c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3709,7 +3709,8 @@ static inline bool wined3d_state_uses_depth_buffer(const struct wined3d_state *s { if (!state->depth_stencil_state) return true; - return state->depth_stencil_state->desc.depth || state->depth_stencil_state->desc.depth_write; + return state->depth_stencil_state->desc.depth || state->depth_stencil_state->desc.depth_write + || state->depth_stencil_state->desc.stencil; } struct wined3d_dummy_textures

1 0

Henri Verbeet : wined3d: Always include any depth/stencil attachment in the Vulkan framebuffer.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: a3f829bbb8894410c7e2e5f909ef37415c33deac URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3f829bbb8894410c7e2e5f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:55:51 2021 +0100 wined3d: Always include any depth/stencil attachment in the Vulkan framebuffer. Analogous to the GL backend. The alternative would be to potentially invalidate STATE_FRAMEBUFFER when changing the depth/stencil state object, which doesn't seem worth it. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 04d24ba163a..b8414155dc0 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2174,7 +2174,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont ++attachment_count; } - if (wined3d_state_uses_depth_buffer(state) && (view = state->fb.depth_stencil)) + if ((view = state->fb.depth_stencil)) { rtv_vk = wined3d_rendertarget_view_vk(view); vk_views[attachment_count] = wined3d_rendertarget_view_vk_get_image_view(rtv_vk, context_vk); @@ -2191,7 +2191,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont } if (!(context_vk->vk_render_pass = wined3d_context_vk_get_render_pass(context_vk, &state->fb, - ARRAY_SIZE(state->fb.render_targets), wined3d_state_uses_depth_buffer(state), 0))) + ARRAY_SIZE(state->fb.render_targets), !!state->fb.depth_stencil, 0))) { ERR("Failed to get render pass.\n"); return false;

1 0

Henri Verbeet : wined3d: End the current render pass in wined3d_buffer_vk_barrier().
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: c75bbc5c22b4b884a1fef2ffea1ca5cddc4d590a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c75bbc5c22b4b884a1fef2ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:55:50 2021 +0100 wined3d: End the current render pass in wined3d_buffer_vk_barrier(). As we do for image barriers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ad5a7680457..4ab26c05040 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1575,6 +1575,8 @@ void wined3d_buffer_vk_barrier(struct wined3d_buffer_vk *buffer_vk, TRACE(" %s -> %s.\n", wined3d_debug_bind_flags(buffer_vk->bind_mask), wined3d_debug_bind_flags(bind_mask)); + wined3d_context_vk_end_current_render_pass(context_vk); + vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; vk_barrier.pNext = NULL; vk_barrier.srcAccessMask = vk_access_mask_from_bind_flags(buffer_vk->bind_mask);

1 0

Henri Verbeet : wined3d: Properly convert Vulkan sample count format information.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: e796da7a5eda98f455fb02c7a1ca1e188c01faa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e796da7a5eda98f455fb02c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:55:49 2021 +0100 wined3d: Properly convert Vulkan sample count format information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4ec6e4db42d..e7e04e81557 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4133,6 +4133,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, unsigned int flags; const char *fixup; unsigned int i; + uint32_t mask; VkResult vr; for (i = 0; i < ARRAY_SIZE(vulkan_formats); ++i) @@ -4208,7 +4209,13 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, ERR("Failed to get image format properties, vr %s.\n", wined3d_debug_vkresult(vr)); return; } - format->f.multisample_types = image_properties.sampleCounts; + + mask = image_properties.sampleCounts & 0x3f; + while (mask) + { + i = (1u << wined3d_bit_scan(&mask)) - 1; + format->f.multisample_types |= 1u << i; + } } }

1 0

Byeongsik Jeon : gdi32: Preserve the GGO_UNHINTED bits until used.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: f0267395645eb8fc3b8409d7ae3b43e41929469a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0267395645eb8fc3b8409d7… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Mon Jan 11 13:18:42 2021 +0900 gdi32: Preserve the GGO_UNHINTED bits until used. Fix a regression caused by 044315c0b3890676d9fd751d8191b0b7381e0b97. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 3 +-- dlls/gdi32/freetype.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index afd41aeec31..74ca4825de4 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2955,6 +2955,7 @@ static DWORD get_glyph_outline( struct gdi_font *font, UINT glyph, UINT format, /* Windows bitmap font, e.g. Small Fonts, uses ANSI character code as glyph index. "Treasure Adventure Game" depends on this. */ font_funcs->get_glyph_index( font, &index, FALSE ); + format &= ~GGO_GLYPH_INDEX; /* TODO: Window also turns off tategaki for glyphs passed in by index if their unicode code points fall outside of the range that is rotated. */ @@ -2970,8 +2971,6 @@ static DWORD get_glyph_outline( struct gdi_font *font, UINT glyph, UINT format, } } - format &= ~(GGO_GLYPH_INDEX | GGO_UNHINTED); - if (mat && !memcmp( mat, &identity, sizeof(*mat) )) mat = NULL; if (format == GGO_METRICS && !mat && get_gdi_font_glyph_metrics( font, index, &gm, &abc )) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fffa3288503..b3fc565afe8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3515,6 +3515,8 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph font->matrix.eM11, font->matrix.eM12, font->matrix.eM21, font->matrix.eM22); + format &= ~GGO_UNHINTED; + needsTransform = get_transform_matrices( font, tategaki, lpmat, matrices ); vertical_metrics = (tategaki && FT_HAS_VERTICAL(ft_face));

1 0

Dmitry Timoshkov : msi: Also set "MsiRunningElevated" installer property.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: dac655abce0397b3c1accec64039b8cd75beb561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dac655abce0397b3c1accec6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 22 16:36:11 2020 +0300 msi: Also set "MsiRunningElevated" installer property. This property is supposed to be set starting from Windows Installer 4.0 targeting Windows Vista. This patch fixes the installer that checks this property in addition to VersionNT and ALLUSERS. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2483d99e2b5..25e22f040a4 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -737,6 +737,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) /* in a wine environment the user is always admin and privileged */ msi_set_property( package->db, L"AdminUser", L"1", -1 ); msi_set_property( package->db, L"Privileged", L"1", -1 ); + msi_set_property( package->db, L"MsiRunningElevated", L"1", -1 ); /* set the os things */ OSVersion.dwOSVersionInfoSize = sizeof(OSVersion); @@ -963,6 +964,8 @@ void msi_adjust_privilege_properties( MSIPACKAGE *package ) msi_set_property( package->db, L"ALLUSERS", L"1", -1 ); } msi_set_property( package->db, L"AdminUser", L"1", -1 ); + msi_set_property( package->db, L"Privileged", L"1", -1 ); + msi_set_property( package->db, L"MsiRunningElevated", L"1", -1 ); } MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db )

1 0

Alexandre Julliard : include: Add a couple of dll characteristics.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: e137063394deba721f3a8a8ebd78961f39679ad2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e137063394deba721f3a8a8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 20:39:11 2021 +0100 include: Add a couple of dll characteristics. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 3 +++ tools/winedump/pe.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index fba721f7f02..f5ef0c7bd52 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3135,13 +3135,16 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION 16 /* DLL Characteristics */ +#define IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA 0x0020 #define IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE 0x0040 #define IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY 0x0080 #define IMAGE_DLLCHARACTERISTICS_NX_COMPAT 0x0100 #define IMAGE_DLLCHARACTERISTICS_NO_ISOLATION 0x0200 #define IMAGE_DLLCHARACTERISTICS_NO_SEH 0x0400 #define IMAGE_DLLCHARACTERISTICS_NO_BIND 0x0800 +#define IMAGE_DLLCHARACTERISTICS_APPCONTAINER 0x1000 #define IMAGE_DLLCHARACTERISTICS_WDM_DRIVER 0x2000 +#define IMAGE_DLLCHARACTERISTICS_GUARD_CF 0x4000 #define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE 0x8000 typedef struct _IMAGE_FILE_HEADER { diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index fef95c6bb67..19ccd172da2 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -213,15 +213,18 @@ static inline void print_subsys(const char *title, WORD value) static inline void print_dllflags(const char *title, WORD value) { - printf(" %-34s 0x%X\n", title, value); + printf(" %-34s 0x%04X\n", title, value); #define X(f,s) if (value & f) printf(" %s\n", s) + X(IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA, "HIGH_ENTROPY_VA"); X(IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE, "DYNAMIC_BASE"); X(IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY, "FORCE_INTEGRITY"); X(IMAGE_DLLCHARACTERISTICS_NX_COMPAT, "NX_COMPAT"); X(IMAGE_DLLCHARACTERISTICS_NO_ISOLATION, "NO_ISOLATION"); X(IMAGE_DLLCHARACTERISTICS_NO_SEH, "NO_SEH"); X(IMAGE_DLLCHARACTERISTICS_NO_BIND, "NO_BIND"); + X(IMAGE_DLLCHARACTERISTICS_APPCONTAINER, "APPCONTAINER"); X(IMAGE_DLLCHARACTERISTICS_WDM_DRIVER, "WDM_DRIVER"); + X(IMAGE_DLLCHARACTERISTICS_GUARD_CF, "GUARD_CF"); X(IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE, "TERMINAL_SERVER_AWARE"); #undef X }

1 0

Alexandre Julliard : ntdll: Support more Dwarf pointer types.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: e0dbdaac64086b1982760a22b61a9da2794938c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0dbdaac64086b1982760a22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 10:46:26 2021 +0100 ntdll: Support more Dwarf pointer types. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 92 +++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 40 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index cccbfc2a3be..12e40853397 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -512,10 +512,14 @@ enum dwarf_operation }; #define DW_EH_PE_native 0x00 -#define DW_EH_PE_leb128 0x01 -#define DW_EH_PE_data2 0x02 -#define DW_EH_PE_data4 0x03 -#define DW_EH_PE_data8 0x04 +#define DW_EH_PE_uleb128 0x01 +#define DW_EH_PE_udata2 0x02 +#define DW_EH_PE_udata4 0x03 +#define DW_EH_PE_udata8 0x04 +#define DW_EH_PE_sleb128 0x09 +#define DW_EH_PE_sdata2 0x0a +#define DW_EH_PE_sdata4 0x0b +#define DW_EH_PE_sdata8 0x0c #define DW_EH_PE_signed 0x08 #define DW_EH_PE_abs 0x00 #define DW_EH_PE_pcrel 0x10 @@ -609,13 +613,13 @@ static LONG_PTR dwarf_get_sleb128( const unsigned char **p ) return ret; } -static ULONG_PTR dwarf_get_ptr( const unsigned char **p, unsigned char encoding ) +static ULONG_PTR dwarf_get_ptr( const unsigned char **p, unsigned char encoding, const struct dwarf_eh_bases *bases ) { ULONG_PTR base; if (encoding == DW_EH_PE_omit) return 0; - switch (encoding & 0xf0) + switch (encoding & 0x70) { case DW_EH_PE_abs: base = 0; @@ -623,6 +627,18 @@ static ULONG_PTR dwarf_get_ptr( const unsigned char **p, unsigned char encoding case DW_EH_PE_pcrel: base = (ULONG_PTR)*p; break; + case DW_EH_PE_textrel: + base = (ULONG_PTR)bases->tbase; + break; + case DW_EH_PE_datarel: + base = (ULONG_PTR)bases->dbase; + break; + case DW_EH_PE_funcrel: + base = (ULONG_PTR)bases->func; + break; + case DW_EH_PE_aligned: + base = ((ULONG_PTR)*p + 7) & ~7ul; + break; default: FIXME( "unsupported encoding %02x\n", encoding ); return 0; @@ -630,28 +646,21 @@ static ULONG_PTR dwarf_get_ptr( const unsigned char **p, unsigned char encoding switch (encoding & 0x0f) { - case DW_EH_PE_native: - return base + dwarf_get_u8( p ); - case DW_EH_PE_leb128: - return base + dwarf_get_uleb128( p ); - case DW_EH_PE_data2: - return base + dwarf_get_u2( p ); - case DW_EH_PE_data4: - return base + dwarf_get_u4( p ); - case DW_EH_PE_data8: - return base + dwarf_get_u8( p ); - case DW_EH_PE_signed|DW_EH_PE_leb128: - return base + dwarf_get_sleb128( p ); - case DW_EH_PE_signed|DW_EH_PE_data2: - return base + (signed short)dwarf_get_u2( p ); - case DW_EH_PE_signed|DW_EH_PE_data4: - return base + (signed int)dwarf_get_u4( p ); - case DW_EH_PE_signed|DW_EH_PE_data8: - return base + (LONG64)dwarf_get_u8( p ); + case DW_EH_PE_native: base += dwarf_get_u8( p ); break; + case DW_EH_PE_uleb128: base += dwarf_get_uleb128( p ); break; + case DW_EH_PE_udata2: base += dwarf_get_u2( p ); break; + case DW_EH_PE_udata4: base += dwarf_get_u4( p ); break; + case DW_EH_PE_udata8: base += dwarf_get_u8( p ); break; + case DW_EH_PE_sleb128: base += dwarf_get_sleb128( p ); break; + case DW_EH_PE_sdata2: base += (signed short)dwarf_get_u2( p ); break; + case DW_EH_PE_sdata4: base += (signed int)dwarf_get_u4( p ); break; + case DW_EH_PE_sdata8: base += (LONG64)dwarf_get_u8( p ); break; default: FIXME( "unsupported encoding %02x\n", encoding ); return 0; } + if (encoding & DW_EH_PE_indirect) base = *(ULONG_PTR *)base; + return base; } enum reg_rule @@ -706,7 +715,8 @@ static BOOL valid_reg( ULONG_PTR reg ) } static void execute_cfa_instructions( const unsigned char *ptr, const unsigned char *end, - ULONG_PTR last_ip, struct frame_info *info ) + ULONG_PTR last_ip, struct frame_info *info, + const struct dwarf_eh_bases *bases ) { while (ptr < end && info->ip < last_ip + info->signal_frame) { @@ -749,7 +759,7 @@ static void execute_cfa_instructions( const unsigned char *ptr, const unsigned c break; case DW_CFA_set_loc: { - ULONG_PTR loc = dwarf_get_ptr( &ptr, info->fde_encoding ); + ULONG_PTR loc = dwarf_get_ptr( &ptr, info->fde_encoding, bases ); TRACE( "%lx: DW_CFA_set_loc %lx\n", info->ip, loc ); info->ip = loc; break; @@ -998,7 +1008,8 @@ static void set_context_reg( CONTEXT *context, ULONG_PTR dw_reg, void *val ) } } -static ULONG_PTR eval_expression( const unsigned char *p, CONTEXT *context ) +static ULONG_PTR eval_expression( const unsigned char *p, CONTEXT *context, + const struct dwarf_eh_bases *bases ) { ULONG_PTR reg, tmp, stack[64]; int sp = -1; @@ -1059,7 +1070,7 @@ static ULONG_PTR eval_expression( const unsigned char *p, CONTEXT *context ) case DW_OP_ne: stack[sp-1] = (stack[sp-1] != stack[sp]); sp--; break; case DW_OP_skip: tmp = (short)dwarf_get_u2(&p); p += tmp; break; case DW_OP_bra: tmp = (short)dwarf_get_u2(&p); if (!stack[sp--]) p += tmp; break; - case DW_OP_GNU_encoded_addr: tmp = *p++; stack[++sp] = dwarf_get_ptr( &p, tmp ); break; + case DW_OP_GNU_encoded_addr: tmp = *p++; stack[++sp] = dwarf_get_ptr( &p, tmp, bases ); break; case DW_OP_regx: stack[++sp] = *(ULONG_PTR *)get_context_reg( context, dwarf_get_uleb128(&p) ); break; case DW_OP_bregx: reg = dwarf_get_uleb128(&p); @@ -1083,7 +1094,8 @@ static ULONG_PTR eval_expression( const unsigned char *p, CONTEXT *context ) } /* apply the computed frame info to the actual context */ -static void apply_frame_state( CONTEXT *context, struct frame_state *state ) +static void apply_frame_state( CONTEXT *context, struct frame_state *state, + const struct dwarf_eh_bases *bases ) { unsigned int i; ULONG_PTR cfa, value; @@ -1092,10 +1104,10 @@ static void apply_frame_state( CONTEXT *context, struct frame_state *state ) switch (state->cfa_rule) { case RULE_EXPRESSION: - cfa = *(ULONG_PTR *)eval_expression( (const unsigned char *)state->cfa_offset, context ); + cfa = *(ULONG_PTR *)eval_expression( (const unsigned char *)state->cfa_offset, context, bases ); break; case RULE_VAL_EXPRESSION: - cfa = eval_expression( (const unsigned char *)state->cfa_offset, context ); + cfa = eval_expression( (const unsigned char *)state->cfa_offset, context, bases ); break; default: cfa = *(ULONG_PTR *)get_context_reg( context, state->cfa_reg ) + state->cfa_offset; @@ -1118,11 +1130,11 @@ static void apply_frame_state( CONTEXT *context, struct frame_state *state ) set_context_reg( &new_context, i, get_context_reg( context, state->regs[i] )); break; case RULE_EXPRESSION: - value = eval_expression( (const unsigned char *)state->regs[i], context ); + value = eval_expression( (const unsigned char *)state->regs[i], context, bases ); set_context_reg( &new_context, i, (void *)value ); break; case RULE_VAL_EXPRESSION: - value = eval_expression( (const unsigned char *)state->regs[i], context ); + value = eval_expression( (const unsigned char *)state->regs[i], context, bases ); set_context_reg( &new_context, i, &value ); break; } @@ -1193,7 +1205,7 @@ static NTSTATUS dwarf_virtual_unwind( ULONG64 ip, ULONG64 *frame,CONTEXT *contex case 'P': { unsigned char encoding = *ptr++; - *handler = (void *)dwarf_get_ptr( &ptr, encoding ); + *handler = (void *)dwarf_get_ptr( &ptr, encoding, bases ); continue; } case 'R': @@ -1210,11 +1222,11 @@ static NTSTATUS dwarf_virtual_unwind( ULONG64 ip, ULONG64 *frame,CONTEXT *contex if (end) ptr = end; end = (const unsigned char *)(&cie->length + 1) + cie->length; - execute_cfa_instructions( ptr, end, ip, &info ); + execute_cfa_instructions( ptr, end, ip, &info, bases ); ptr = (const unsigned char *)(fde + 1); - info.ip = dwarf_get_ptr( &ptr, info.fde_encoding ); /* fde code start */ - code_end = info.ip + dwarf_get_ptr( &ptr, info.fde_encoding & 0x0f ); /* fde code length */ + info.ip = dwarf_get_ptr( &ptr, info.fde_encoding, bases ); /* fde code start */ + code_end = info.ip + dwarf_get_ptr( &ptr, info.fde_encoding & 0x0f, bases ); /* fde code length */ if (aug_z_format) /* get length of augmentation data */ { @@ -1223,15 +1235,15 @@ static NTSTATUS dwarf_virtual_unwind( ULONG64 ip, ULONG64 *frame,CONTEXT *contex } else end = NULL; - *handler_data = (void *)dwarf_get_ptr( &ptr, lsda_encoding ); + *handler_data = (void *)dwarf_get_ptr( &ptr, lsda_encoding, bases ); if (end) ptr = end; end = (const unsigned char *)(&fde->length + 1) + fde->length; TRACE( "fde %p len %x personality %p lsda %p code %lx-%lx\n", fde, fde->length, *handler, *handler_data, info.ip, code_end ); - execute_cfa_instructions( ptr, end, ip, &info ); + execute_cfa_instructions( ptr, end, ip, &info, bases ); *frame = context->Rsp; - apply_frame_state( context, &info.state ); + apply_frame_state( context, &info.state, bases ); TRACE( "next function rip=%016lx\n", context->Rip ); TRACE( " rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n",

1 0

Alexandre Julliard : ntdll: Always inline NtCurrentTeb() on ARM.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: fc7c3b51ac27b0b4f19c871d0d5e298b5cf535ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc7c3b51ac27b0b4f19c871d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 10:37:54 2021 +0100 ntdll: Always inline NtCurrentTeb() on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm.c | 8 -------- dlls/ntdll/unix/loader.c | 2 ++ dlls/ntdll/unix/signal_arm.c | 41 ++++++++--------------------------------- dlls/ntdll/unixlib.h | 4 +++- include/winnt.h | 2 +- tools/winebuild/import.c | 6 ++---- 7 files changed, 17 insertions(+), 48 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f3ec8fd9e39..9f7bfae76d3 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -189,7 +189,7 @@ @ stub NtCreateToken @ stdcall -syscall NtCreateUserProcess(ptr ptr long long ptr ptr long long ptr ptr ptr) # @ stub NtCreateWaitablePort -@ stdcall -arch=win32,arm64 NtCurrentTeb() +@ stdcall -arch=i386,arm64 NtCurrentTeb() @ stdcall -syscall NtDebugActiveProcess(long long) # @ stub NtDebugContinue @ stdcall -syscall NtDelayExecution(long ptr) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 0461183460d..b1544ba15fe 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -304,12 +304,4 @@ __ASM_STDCALL_FUNC( DbgBreakPoint, 0, "bkpt #0; bx lr; nop; nop; nop; nop" ); */ __ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "bkpt #0; bx lr; nop; nop; nop; nop" ); -/********************************************************************** - * NtCurrentTeb (NTDLL.@) - */ -TEB * WINAPI NtCurrentTeb(void) -{ - return unix_funcs->NtCurrentTeb(); -} - #endif /* __arm__ */ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 31cfb43d11f..43c769f2d2a 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1508,7 +1508,9 @@ static double CDECL ntdll_tan( double d ) { return tan( d ); } */ static struct unix_funcs unix_funcs = { +#ifdef __aarch64__ NtCurrentTeb, +#endif DbgUiIssueRemoteBreakin, RtlGetSystemTimePrecise, RtlWaitOnAddress, diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 231f23e354a..385e4807990 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -68,8 +68,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); -static pthread_key_t teb_key; - /*********************************************************************** * signal context platform-specific definitions @@ -584,23 +582,21 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) * call_user_apc_dispatcher */ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, - "mov r4, r0\n\t" /* context_ptr */ "mov r5, r1\n\t" /* ctx */ "mov r6, r2\n\t" /* arg1 */ "mov r7, r3\n\t" /* arg2 */ "ldr r8, [sp]\n\t" /* func */ "ldr r9, [sp, #4]\n\t" /* dispatcher */ - "bl " __ASM_NAME("NtCurrentTeb") "\n\t" - "add r10, r0, #0x1d8\n\t" /* arm_thread_data()->syscall_frame */ - "movs r0, r4\n\t" + "mrc p15, 0, r10, c13, c0, 2\n\t" /* NtCurrentTeb() */ + "cmp r0, #0\n\t" /* context_ptr */ "beq 1f\n\t" "ldr r0, [r0, #0x38]\n\t" /* context_ptr->Sp */ "sub r0, r0, #0x1c8\n\t" /* sizeof(CONTEXT) + offsetof(frame,r4) */ "mov ip, #0\n\t" - "str ip, [r10]\n\t" + "str ip, [r10, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ "mov sp, r0\n\t" "b 2f\n" - "1:\tldr r0, [r10]\n\t" + "1:\tldr r0, [r10, #0x1d8]\n\t" "sub r0, #0x1a0\n\t" "mov sp, r0\n\t" "mov r0, #3\n\t" @@ -613,7 +609,7 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "str r0, [sp, #4]\n\t" /* context.R0 = STATUS_USER_APC */ "mov r0, sp\n\t" "mov ip, #0\n\t" - "str ip, [r10]\n\t" + "str ip, [r10, #0x1d8]\n\t" "2:\tmov r1, r5\n\t" /* ctx */ "mov r2, r6\n\t" /* arg1 */ "mov r3, r7\n\t" /* arg2 */ @@ -634,17 +630,10 @@ __ASM_GLOBAL_FUNC( call_raise_user_exception_dispatcher, * call_user_exception_dispatcher */ __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, - "mov r4, r0\n\t" - "mov r5, r1\n\t" - "mov r6, r2\n\t" - "bl " __ASM_NAME("NtCurrentTeb") "\n\t" - "add r7, r0, #0x1d8\n\t" /* arm_thread_data()->syscall_frame */ - "mov r0, r4\n\t" - "mov r1, r5\n\t" - "mov r2, r6\n\t" - "ldr r3, [r7]\n\t" + "mrc p15, 0, r7, c13, c0, 2\n\t" /* NtCurrentTeb() */ + "ldr r3, [r7, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ "mov ip, #0\n\t" - "str ip, [r7]\n\t" + "str ip, [r7, #0x1d8]\n\t" "add r3, r3, #8\n\t" "ldm r3, {r5-r11}\n\t" "ldr r4, [r3, #32]\n\t" @@ -911,7 +900,6 @@ NTSTATUS WINAPI NtSetLdtEntries( ULONG sel1, LDT_ENTRY entry1, ULONG sel2, LDT_E */ void signal_init_threading(void) { - pthread_key_create( &teb_key, NULL ); } @@ -937,11 +925,7 @@ void signal_free_thread( TEB *teb ) */ void signal_init_thread( TEB *teb ) { -#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_8A__) - /* Win32/ARM applications expect the TEB pointer to be in the TPIDRURW register. */ __asm__ __volatile__( "mcr p15, 0, %0, c13, c0, 2" : : "r" (teb) ); -#endif - pthread_setspecific( teb_key, teb ); } @@ -1057,13 +1041,4 @@ void signal_exit_thread( int status, void (*func)(int) ) call_thread_exit_func( status, func, NtCurrentTeb() ); } - -/********************************************************************** - * NtCurrentTeb (NTDLL.@) - */ -TEB * WINAPI NtCurrentTeb(void) -{ - return pthread_getspecific( teb_key ); -} - #endif /* __arm__ */ diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 7ed3148e4c4..0847c7e07ca 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -27,12 +27,14 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 106 +#define NTDLL_UNIXLIB_VERSION 107 struct unix_funcs { /* Nt* functions */ +#ifdef __aarch64__ TEB * (WINAPI *NtCurrentTeb)(void); +#endif /* other Win32 API functions */ NTSTATUS (WINAPI *DbgUiIssueRemoteBreakin)( HANDLE process ); diff --git a/include/winnt.h b/include/winnt.h index 83f03b62ade..fba721f7f02 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2801,7 +2801,7 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB, Self)); } -#elif defined(__arm__) && defined(__MINGW32__) +#elif defined(__arm__) && defined(__GNUC__) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { struct _TEB *teb; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index f0730aa2fe7..2ff63c2265d 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1577,10 +1577,8 @@ void output_syscalls( DLLSPEC *spec ) output( "\tcmp r4, r5\n" ); output( "\tbcs 5f\n" ); output( "\tsub sp, sp, #8\n" ); - output( "\tpush {r0-r3}\n" ); - output( "\tbl %s\n", asm_name("NtCurrentTeb") ); - output( "\tadd r7, r0, #0x1d8\n" ); /* arm_thread_data()->syscall_frame */ - output( "\tpop {r0-r3}\n" ); + output( "\tmrc p15, 0, r7, c13, c0, 2\n" ); /* NtCurrentTeb() */ + output( "\tadd r7, #0x1d8\n" ); /* arm_thread_data()->syscall_frame */ output( "\tmrs ip, CPSR\n" ); output( "\tstr ip, [sp, #4]\n" ); output( "\tstr sp, [r7]\n" ); /* syscall frame */

1 0

Daniel Lehman : ntdll: Check event type on creation.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 6a971e8429a81e4fcec8ac13b28bbf75b7a06bdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a971e8429a81e4fcec8ac13… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jan 20 22:04:52 2021 -0800 ntdll: Check event type on creation. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 50 +++++++++++++++++++++++++++++++++++--------------- dlls/ntdll/unix/sync.c | 1 + 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index ff0b9c939e4..5744b88fc84 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -26,7 +26,7 @@ #include "stdlib.h" static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); -static NTSTATUS (WINAPI *pNtCreateEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, BOOLEAN, BOOLEAN); +static NTSTATUS (WINAPI *pNtCreateEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, EVENT_TYPE, BOOLEAN); static NTSTATUS (WINAPI *pNtOpenEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES); static NTSTATUS (WINAPI *pNtPulseEvent) ( HANDLE, PLONG ); static NTSTATUS (WINAPI *pNtQueryEvent) ( HANDLE, EVENT_INFORMATION_CLASS, PVOID, ULONG, PULONG ); @@ -92,12 +92,12 @@ static void test_case_sensitive (void) status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE); ok(status == STATUS_SUCCESS, "Failed to create Mutant(%08x)\n", status); - status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, FALSE, FALSE); + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, NotificationEvent, FALSE); ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* Vista+ */, "got %#x\n", status); pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\Test"); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, FALSE, FALSE); + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, NotificationEvent, FALSE); ok(status == STATUS_SUCCESS, "Failed to create Event(%08x)\n", status); pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\TEst"); @@ -113,7 +113,7 @@ static void test_case_sensitive (void) status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE); ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* Vista+ */, "got %#x\n", status); - status = pNtCreateEvent(&h, GENERIC_ALL, &attr, FALSE, FALSE); + status = pNtCreateEvent(&h, GENERIC_ALL, &attr, NotificationEvent, FALSE); ok(status == STATUS_OBJECT_NAME_COLLISION, "NtCreateEvent should have failed with STATUS_OBJECT_NAME_COLLISION got(%08x)\n", status); @@ -292,7 +292,7 @@ static void test_name_collisions(void) h = CreateEventA(NULL, FALSE, FALSE, "om.c-test"); ok(h != 0, "CreateEventA failed got ret=%p (%d)\n", h, GetLastError()); - status = pNtCreateEvent(&h1, GENERIC_ALL, &attr, FALSE, FALSE); + status = pNtCreateEvent(&h1, GENERIC_ALL, &attr, NotificationEvent, FALSE); ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL, "NtCreateEvent should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08x)\n", status); h2 = CreateEventA(NULL, FALSE, FALSE, "om.c-test"); @@ -370,7 +370,7 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr, ok( status2 == open_expect, "%u: NtOpenSemaphore failed %x\n", line, status2 ); if (!status) pNtClose( ret ); if (!status2) pNtClose( ret2 ); - status = pNtCreateEvent( &ret, GENERIC_ALL, attr, 1, 0 ); + status = pNtCreateEvent( &ret, GENERIC_ALL, attr, SynchronizationEvent, 0 ); ok( status == create_expect, "%u: NtCreateEvent failed %x\n", line, status ); status2 = pNtOpenEvent( &ret2, GENERIC_ALL, attr ); ok( status2 == open_expect, "%u: NtOpenEvent failed %x\n", line, status2 ); @@ -462,7 +462,7 @@ static void test_name_limits(void) ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenSemaphore failed %x\n", str.Length, status ); pNtClose( ret ); - status = pNtCreateEvent( &ret, GENERIC_ALL, &attr2, 1, 0 ); + status = pNtCreateEvent( &ret, GENERIC_ALL, &attr2, SynchronizationEvent, 0 ); ok( status == STATUS_SUCCESS, "%u: NtCreateEvent failed %x\n", str.Length, status ); attr3.RootDirectory = ret; status = pNtOpenEvent( &ret2, GENERIC_ALL, &attr ); @@ -581,7 +581,7 @@ static void test_name_limits(void) pNtClose( ret ); status = pNtOpenSemaphore( &ret, GENERIC_ALL, NULL ); ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenSemaphore failed %x\n", status ); - status = pNtCreateEvent( &ret, GENERIC_ALL, NULL, 1, 0 ); + status = pNtCreateEvent( &ret, GENERIC_ALL, NULL, SynchronizationEvent, 0 ); ok( status == STATUS_SUCCESS, "NULL: NtCreateEvent failed %x\n", status ); pNtClose( ret ); status = pNtOpenEvent( &ret, GENERIC_ALL, NULL ); @@ -934,7 +934,7 @@ static void test_directory(void) RtlInitUnicodeString( &str, L"om.c-event" ); InitializeObjectAttributes( &attr, &str, 0, dir1, NULL ); - status = pNtCreateEvent( &h, GENERIC_ALL, &attr, 1, 0 ); + status = pNtCreateEvent( &h, GENERIC_ALL, &attr, SynchronizationEvent, 0 ); ok( status == STATUS_SUCCESS, "NtCreateEvent failed %x\n", status ); status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); ok( status == STATUS_SUCCESS, "NtOpenEvent failed %x\n", status ); @@ -1570,7 +1570,7 @@ static void test_type_mismatch(void) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - res = pNtCreateEvent( &h, 0, &attr, 0, 0 ); + res = pNtCreateEvent( &h, 0, &attr, NotificationEvent, 0 ); ok(!res, "can't create event: %x\n", res); res = pNtReleaseSemaphore( h, 30, NULL ); @@ -1592,16 +1592,29 @@ static void test_event(void) pRtlInitUnicodeString( &str, L"\\BaseNamedObjects\\testEvent" ); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, 1, 0); + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, 2, 0); + ok( status == STATUS_INVALID_PARAMETER, "NtCreateEvent failed %08x\n", status ); + + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, NotificationEvent, 0); + ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08x\n", status ); + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( info.EventType == NotificationEvent && info.EventState == 0, + "NtQueryEvent failed, expected 0 0, got %d %d\n", info.EventType, info.EventState ); + pNtClose(Event); + + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, SynchronizationEvent, 0); ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08x\n", status ); status = pNtPulseEvent(Event, &prev_state); ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); ok( !prev_state, "prev_state = %x\n", prev_state ); + memset(&info, 0xcc, sizeof(info)); status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); - ok( info.EventType == 1 && info.EventState == 0, + ok( info.EventType == SynchronizationEvent && info.EventState == 0, "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); status = pNtOpenEvent(&Event2, GENERIC_ALL, &attr); @@ -1610,15 +1623,22 @@ static void test_event(void) pNtClose(Event); Event = Event2; + memset(&info, 0xcc, sizeof(info)); status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); - ok( info.EventType == 1 && info.EventState == 0, + ok( info.EventType == SynchronizationEvent && info.EventState == 0, "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); status = pNtSetEvent( Event, &prev_state ); ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); ok( !prev_state, "prev_state = %x\n", prev_state ); + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( info.EventType == SynchronizationEvent && info.EventState == 1, + "NtQueryEvent failed, expected 1 1, got %d %d\n", info.EventType, info.EventState ); + status = pNtSetEvent( Event, &prev_state ); ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); ok( prev_state == 1, "prev_state = %x\n", prev_state ); @@ -1824,13 +1844,13 @@ static void test_keyed_events(void) status = pNtPulseEvent( handle, NULL ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtPulseEvent %x\n", status ); - status = pNtCreateEvent( &event, GENERIC_ALL, &attr, FALSE, FALSE ); + status = pNtCreateEvent( &event, GENERIC_ALL, &attr, NotificationEvent, FALSE ); ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* 7+ */, "CreateEvent %x\n", status ); NtClose( handle ); - status = pNtCreateEvent( &event, GENERIC_ALL, &attr, FALSE, FALSE ); + status = pNtCreateEvent( &event, GENERIC_ALL, &attr, NotificationEvent, FALSE ); ok( status == 0, "CreateEvent %x\n", status ); status = pNtWaitForKeyedEvent( event, (void *)8, 0, &timeout ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtWaitForKeyedEvent %x\n", status ); diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index dcc8c5447ef..3a3080463d7 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -427,6 +427,7 @@ NTSTATUS WINAPI NtCreateEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_ data_size_t len; struct object_attributes *objattr; + if (type != NotificationEvent && type != SynchronizationEvent) return STATUS_INVALID_PARAMETER; if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; SERVER_START_REQ( create_event )

1 0

Zebediah Figura : ntoskrnl: Use YieldProcessor().
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: c0ce83371b1c45d22d584afc7407cfcf9d4063aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0ce83371b1c45d22d584afc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 22:35:49 2021 -0600 ntoskrnl: Use YieldProcessor(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 671398594e8..2aa60a0f2a0 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -540,15 +540,6 @@ void WINAPI KeInitializeSpinLock( KSPIN_LOCK *lock ) *lock = 0; } -static inline void small_pause(void) -{ -#ifdef __x86_64__ - __asm__ __volatile__( "rep;nop" : : : "memory" ); -#else - __asm__ __volatile__( "" : : : "memory" ); -#endif -} - /*********************************************************************** * KeAcquireSpinLockAtDpcLevel (NTOSKRNL.EXE.@) */ @@ -556,7 +547,7 @@ void WINAPI KeAcquireSpinLockAtDpcLevel( KSPIN_LOCK *lock ) { TRACE("lock %p.\n", lock); while (InterlockedCompareExchangePointer( (void **)lock, (void *)1, (void *)0 )) - small_pause(); + YieldProcessor(); } /*********************************************************************** @@ -592,7 +583,7 @@ void FASTCALL KeAcquireInStackQueuedSpinLockAtDpcLevel( KSPIN_LOCK *lock, KLOCK_ while (!((ULONG_PTR)InterlockedCompareExchangePointer( (void **)&queue->LockQueue.Lock, 0, 0 ) & QUEUED_SPINLOCK_OWNED)) { - small_pause(); + YieldProcessor(); } } } @@ -619,7 +610,7 @@ void FASTCALL KeReleaseInStackQueuedSpinLockFromDpcLevel( KLOCK_QUEUE_HANDLE *qu /* Otherwise, someone just queued themselves, but hasn't yet set * themselves as successor. Spin waiting for them to do so. */ while (!(next = queue->LockQueue.Next)) - small_pause(); + YieldProcessor(); } InterlockedExchangePointer( (void **)&next->Lock, (KSPIN_LOCK *)((ULONG_PTR)lock | QUEUED_SPINLOCK_OWNED) );

1 0

Zebediah Figura : wined3d: Use YieldProcessor().
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 6bdf641142c631ce22784da16cf8ff0bda4f3a70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bdf641142c631ce22784da1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 22:35:48 2021 -0600 wined3d: Use YieldProcessor(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 4 ++-- dlls/wined3d/wined3d_private.h | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0b9c5f70043..56df760145a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -646,7 +646,7 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw * ahead of the worker thread. */ while (pending >= swapchain->max_frame_latency) { - wined3d_pause(); + YieldProcessor(); pending = InterlockedCompareExchange(&cs->pending_presents, 0, 0); } } @@ -2822,7 +2822,7 @@ static void wined3d_cs_mt_finish(struct wined3d_cs *cs, enum wined3d_cs_queue_id return wined3d_cs_st_finish(cs, queue_id); while (cs->queue[queue_id].head != *(volatile LONG *)&cs->queue[queue_id].tail) - wined3d_pause(); + YieldProcessor(); } static const struct wined3d_cs_ops wined3d_cs_mt_ops = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 37fe3a314cb..e010deb1264 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -424,13 +424,6 @@ static inline unsigned int wined3d_popcount(unsigned int x) #endif } -static inline void wined3d_pause(void) -{ -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - __asm__ __volatile__( "rep;nop" : : : "memory" ); -#endif -} - #define ORM_BACKBUFFER 0 #define ORM_FBO 1 @@ -4817,7 +4810,7 @@ static inline void wined3d_resource_wait_idle(struct wined3d_resource *resource) return; while (InterlockedCompareExchange(&resource->access_count, 0, 0)) - wined3d_pause(); + YieldProcessor(); } /* TODO: Add tests and support for FLOAT16_4 POSITIONT, D3DCOLOR position, other

1 0

Zebediah Figura : include: Add YieldProcessor().
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 86fc30c10540dc5ed225e547032ca1dd2d21433f URL: https://source.winehq.org/git/wine.git/?a=commit;h=86fc30c10540dc5ed225e547… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 22:35:47 2021 -0600 include: Add YieldProcessor(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index d8abb8bde70..83f03b62ade 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -7154,6 +7154,19 @@ static FORCEINLINE void MemoryBarrier(void) #endif /* __GNUC__ */ +static FORCEINLINE void YieldProcessor(void) +{ +#ifdef __GNUC__ +#if defined(__i386__) || defined(__x86_64__) + __asm__ __volatile__( "rep; nop" : : : "memory" ); +#elif defined(__arm__) || defined(__aarch64__) + __asm__ __volatile__( "dmb ishst\n\tyield" : : : "memory" ); +#else + __asm__ __volatile__( "" : : : "memory" ); +#endif +#endif +} + #ifdef __cplusplus } #endif

1 0

Zebediah Figura : include: Add InterlockedIncrement16() and InterlockedDecrement16().
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: a3c295d4cf295860fd45c3ef828174da4e969874 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3c295d4cf295860fd45c3ef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 22:35:46 2021 -0600 include: Add InterlockedIncrement16() and InterlockedDecrement16(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index b03f7bb3646..d8abb8bde70 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6905,7 +6905,9 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #pragma intrinsic(_InterlockedExchange) #pragma intrinsic(_InterlockedExchangeAdd) #pragma intrinsic(_InterlockedIncrement) +#pragma intrinsic(_InterlockedIncrement16) #pragma intrinsic(_InterlockedDecrement) +#pragma intrinsic(_InterlockedDecrement16) #pragma intrinsic(_InterlockedOr) long _InterlockedAnd(long volatile *,long); @@ -6915,9 +6917,11 @@ long long _InterlockedCompareExchange64(long long volatile*,long long,long long) unsigned char _InterlockedCompareExchange128(volatile __int64 *, __int64, __int64, __int64 *); #endif long _InterlockedDecrement(long volatile*); +short _InterlockedDecrement16(short volatile*); long _InterlockedExchange(long volatile*,long); long _InterlockedExchangeAdd(long volatile*,long); long _InterlockedIncrement(long volatile*); +short _InterlockedIncrement16(short volatile*); long _InterlockedOr(long volatile *,long); static FORCEINLINE LONG WINAPI InterlockedAnd( LONG volatile *dest, LONG val ) @@ -6957,11 +6961,21 @@ static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) return _InterlockedIncrement( (long volatile *)dest ); } +static FORCEINLINE short WINAPI InterlockedIncrement16( short volatile *dest ) +{ + return _InterlockedIncrement16( (long volatile *)dest ); +} + static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) { return _InterlockedDecrement( (long volatile *)dest ); } +static FORCEINLINE short WINAPI InterlockedDecrement16( short volatile *dest ) +{ + return _InterlockedDecrement16( (long volatile *)dest ); +} + static FORCEINLINE LONG WINAPI InterlockedOr( LONG volatile *dest, LONG val ) { return _InterlockedOr( (long volatile *)dest, val ); @@ -7098,11 +7112,21 @@ static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) return __sync_add_and_fetch( dest, 1 ); } +static FORCEINLINE short WINAPI InterlockedIncrement16( short volatile *dest ) +{ + return __sync_add_and_fetch( dest, 1 ); +} + static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) { return __sync_add_and_fetch( dest, -1 ); } +static FORCEINLINE short WINAPI InterlockedDecrement16( short volatile *dest ) +{ + return __sync_add_and_fetch( dest, -1 ); +} + static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) { void *ret;

1 0

Zebediah Figura : include: Add InterlockedAnd().
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 0d1345ac2bf5c9c4b36e34cd2a790c10dd2bbd08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d1345ac2bf5c9c4b36e34cd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 22:35:45 2021 -0600 include: Add InterlockedAnd(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 10 ---------- include/winnt.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index c10445becda..74156aa7db3 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -1157,16 +1157,6 @@ static inline void spin_wait_for_next_rwl(rwl_queue *q) SpinWait_dtor(&sw); } -static LONG InterlockedAnd(LONG *d, LONG v) -{ - LONG l = *d, old; - while ((l & v) != l) { - if((old = InterlockedCompareExchange(d, l&v, l)) == l) break; - l = old; - } - return l; -} - /* ?lock@reader_writer_lock@Concurrency@@QAEXXZ */ /* ?lock@reader_writer_lock@Concurrency@@QEAAXXZ */ DEFINE_THISCALL_WRAPPER(reader_writer_lock_lock, 4) diff --git a/include/winnt.h b/include/winnt.h index 8834ced73e6..b03f7bb3646 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6896,6 +6896,7 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #ifdef _MSC_VER +#pragma intrinsic(_InterlockedAnd) #pragma intrinsic(_InterlockedCompareExchange) #pragma intrinsic(_InterlockedCompareExchange64) #ifdef _WIN64 @@ -6907,6 +6908,7 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #pragma intrinsic(_InterlockedDecrement) #pragma intrinsic(_InterlockedOr) +long _InterlockedAnd(long volatile *,long); long _InterlockedCompareExchange(long volatile*,long,long); long long _InterlockedCompareExchange64(long long volatile*,long long,long long); #ifdef _WIN64 @@ -6918,6 +6920,11 @@ long _InterlockedExchangeAdd(long volatile*,long); long _InterlockedIncrement(long volatile*); long _InterlockedOr(long volatile *,long); +static FORCEINLINE LONG WINAPI InterlockedAnd( LONG volatile *dest, LONG val ) +{ + return _InterlockedAnd( (long volatile *)dest, val ); +} + static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) { return _InterlockedCompareExchange( (long volatile *)dest, xchg, compare ); @@ -7030,6 +7037,11 @@ static FORCEINLINE void MemoryBarrier(void) #elif defined(__GNUC__) +static FORCEINLINE LONG WINAPI InterlockedAnd( LONG volatile *dest, LONG val ) +{ + return __sync_fetch_and_and( dest, val ); +} + static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) { return __sync_val_compare_and_swap( dest, compare, xchg );

1 0

Zebediah Figura : winegstreamer: Use the "flushing" field to unblock the streaming thread when stopping.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 275b222662e425dbd6d758c59285c6a5c0ae4edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=275b222662e425dbd6d758c5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 18:58:53 2021 -0600 winegstreamer: Use the "flushing" field to unblock the streaming thread when stopping. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6e0f727de49..da53556eb0c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1013,14 +1013,14 @@ static DWORD CALLBACK stream_thread(void *arg) TRACE("Starting streaming thread for pin %p.\n", pin); - for (;;) + while (filter->streaming) { struct parser_event event; EnterCriticalSection(&pin->flushing_cs); EnterCriticalSection(&filter->cs); - while (filter->streaming && !filter->flushing && pin->event.type == PARSER_EVENT_NONE) + while (!filter->flushing && pin->event.type == PARSER_EVENT_NONE) SleepConditionVariableCS(&pin->event_cv, &filter->cs, INFINITE); if (filter->flushing) @@ -1031,13 +1031,6 @@ static DWORD CALLBACK stream_thread(void *arg) continue; } - if (!filter->streaming) - { - LeaveCriticalSection(&filter->cs); - LeaveCriticalSection(&pin->flushing_cs); - break; - } - if (!pin->event.type) { LeaveCriticalSection(&filter->cs); @@ -1585,8 +1578,9 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) if (!filter->container) return S_OK; - EnterCriticalSection(&filter->cs); filter->streaming = true; + EnterCriticalSection(&filter->cs); + filter->flushing = false; LeaveCriticalSection(&filter->cs); /* DirectShow retains the old seek positions, but resets to them every time @@ -1624,8 +1618,9 @@ static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) if (!filter->container) return S_OK; - EnterCriticalSection(&filter->cs); filter->streaming = false; + EnterCriticalSection(&filter->cs); + filter->flushing = true; LeaveCriticalSection(&filter->cs); for (i = 0; i < filter->source_count; ++i) @@ -1869,6 +1864,7 @@ static void parser_init_common(struct parser *object) object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": parser.cs"); + object->flushing = true; } HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out)

1 0

Zebediah Figura : winegstreamer: Keep the stream in paused state for its entire lifetime.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 90107bba944a1da286e9ebd246ab3fd5dd7cb115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90107bba944a1da286e9ebd2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 18:58:52 2021 -0600 winegstreamer: Keep the stream in paused state for its entire lifetime. This noticeably improves stream startup time. The process of typefinding and negotiation takes about 70 ms for a simple test file on one machine, and this is currently done twice. This patch replaces the second instance with a simple seek, which takes less than 10 ms. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 194 +++++++----------------------------------- 1 file changed, 32 insertions(+), 162 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90107bba944a1da286e9…

1 0

Zebediah Figura : winegstreamer: Do not return GST_FLOW_NOT_LINKED if the DirectShow pin is not connected.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: 36a7dd93d713ff16b0df6ef3cdb836d6614ec0f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36a7dd93d713ff16b0df6ef3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 18:58:51 2021 -0600 winegstreamer: Do not return GST_FLOW_NOT_LINKED if the DirectShow pin is not connected. This is a fatal error condition for GStreamer, but should not cause errors for DirectShow. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 90ba02bba5d..da0121e089e 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -878,18 +878,12 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu TRACE("pad %p, pin %p, buffer %p.\n", pad, pin, buffer); - if (filter->initial) + if (filter->initial || !pin->pin.pin.peer) { gst_buffer_unref(buffer); return GST_FLOW_OK; } - if (!pin->pin.pin.peer) - { - gst_buffer_unref(buffer); - return GST_FLOW_NOT_LINKED; - } - stream_event.type = PARSER_EVENT_BUFFER; stream_event.u.buffer = buffer; /* Transfer our reference to the buffer to the thread. */

1 0

Zebediah Figura : winegstreamer: Consistently use GST_STATE_PAUSED for test-play.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: b3e2009b5edfa653f7629901c2658b70f65538b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3e2009b5edfa653f7629901… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 18:58:50 2021 -0600 winegstreamer: Consistently use GST_STATE_PAUSED for test-play. It does not matter whether we use PAUSED or PLAYING, but we should at least be consistent. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9cf2379cb2c..90ba02bba5d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1875,7 +1875,7 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) return FALSE; } - gst_element_set_state(filter->container, GST_STATE_PLAYING); + gst_element_set_state(filter->container, GST_STATE_PAUSED); ret = gst_element_get_state(filter->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { @@ -2776,7 +2776,7 @@ static BOOL avi_splitter_init_gst(struct parser *filter) return FALSE; } - gst_element_set_state(filter->container, GST_STATE_PLAYING); + gst_element_set_state(filter->container, GST_STATE_PAUSED); ret = gst_element_get_state(filter->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) {

1 0

Zebediah Figura : winegstreamer: Flush connected pins directly in SetPositions().
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: ef79e902a61e25845b3fac16bc51294b370030d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef79e902a61e25845b3fac16… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 18:58:49 2021 -0600 winegstreamer: Flush connected pins directly in SetPositions(). Instead of propagating GStreamer flush events to corresponding DirectShow pins. This is mainly to avoid more callbacks from GStreamer and further separate the Win32 and Unix code. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 130 ++++++++++++++++++++++++++++-------------- 1 file changed, 86 insertions(+), 44 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 949acd012aa..9cf2379cb2c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -65,7 +65,7 @@ struct parser /* FIXME: It would be nice to avoid duplicating these with strmbase. * However, synchronization is tricky; we need access to be protected by a * separate lock. */ - bool streaming; + bool streaming, flushing; BOOL initial, ignore_flush; GstElement *container; @@ -111,8 +111,9 @@ struct parser_source GstCaps *caps; SourceSeeking seek; - CONDITION_VARIABLE event_cv, event_empty_cv, flushing_cv, flush_stop_cv; - bool flushing, thread_blocked; + CRITICAL_SECTION flushing_cs; + CONDITION_VARIABLE event_cv, event_empty_cv; + bool flushing; struct parser_event event; HANDLE thread; }; @@ -630,8 +631,6 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) tevent = gst_event_new_flush_start(); gst_event_set_seqnum(tevent, seqnum); gst_pad_push_event(This->my_src, tevent); - if (This->reader) - IAsyncReader_BeginFlush(This->reader); if (thread) gst_pad_set_active(This->my_src, 1); } @@ -643,8 +642,6 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) tevent = gst_event_new_flush_stop(TRUE); gst_event_set_seqnum(tevent, seqnum); gst_pad_push_event(This->my_src, tevent); - if (This->reader) - IAsyncReader_EndFlush(This->reader); if (thread) gst_pad_set_active(This->my_src, 1); } @@ -659,25 +656,18 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) TRACE("filter %p, type \"%s\".\n", This, GST_EVENT_TYPE_NAME(event)); - switch (event->type) { + switch (event->type) + { case GST_EVENT_SEEK: ret = gst_base_src_perform_seek(This, event); break; + case GST_EVENT_FLUSH_START: - EnterCriticalSection(&This->filter.filter_cs); - if (This->reader) - IAsyncReader_BeginFlush(This->reader); - LeaveCriticalSection(&This->filter.filter_cs); - break; case GST_EVENT_FLUSH_STOP: - EnterCriticalSection(&This->filter.filter_cs); - if (This->reader) - IAsyncReader_EndFlush(This->reader); - LeaveCriticalSection(&This->filter.filter_cs); - break; case GST_EVENT_QOS: case GST_EVENT_RECONFIGURE: break; + default: WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); ret = FALSE; @@ -757,19 +747,11 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) } if (pin->pin.pin.peer) { - IPin_BeginFlush(pin->pin.pin.peer); - EnterCriticalSection(&filter->cs); pin->flushing = true; - WakeConditionVariable(&pin->event_cv); WakeConditionVariable(&pin->event_empty_cv); - /* Wait for the thread to pause itself, to ensure that no stale - * samples are sent. */ - while (!pin->thread_blocked) - SleepConditionVariableCS(&pin->flushing_cv, &filter->cs, INFINITE); - /* And flush out any buffered event. */ switch (pin->event.type) { case PARSER_EVENT_NONE: @@ -797,9 +779,6 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) EnterCriticalSection(&filter->cs); pin->flushing = false; LeaveCriticalSection(&filter->cs); - WakeConditionVariable(&pin->flush_stop_cv); - - IPin_EndFlush(pin->pin.pin.peer); } break; @@ -1057,32 +1036,31 @@ static DWORD CALLBACK stream_thread(void *arg) { struct parser_event event; + EnterCriticalSection(&pin->flushing_cs); EnterCriticalSection(&filter->cs); - while (filter->streaming && !pin->flushing && pin->event.type == PARSER_EVENT_NONE) + while (filter->streaming && !filter->flushing && pin->event.type == PARSER_EVENT_NONE) SleepConditionVariableCS(&pin->event_cv, &filter->cs, INFINITE); - if (pin->flushing) + if (filter->flushing) { - TRACE("Filter is flushing; pausing thread.\n"); - pin->thread_blocked = true; - WakeConditionVariable(&pin->flushing_cv); - do - SleepConditionVariableCS(&pin->flush_stop_cv, &filter->cs, INFINITE); - while (pin->flushing); - pin->thread_blocked = false; - TRACE("Filter is no longer flushing; resuming thread.\n"); + LeaveCriticalSection(&filter->cs); + LeaveCriticalSection(&pin->flushing_cs); + TRACE("Filter is flushing.\n"); + continue; } if (!filter->streaming) { LeaveCriticalSection(&filter->cs); + LeaveCriticalSection(&pin->flushing_cs); break; } if (!pin->event.type) { LeaveCriticalSection(&filter->cs); + LeaveCriticalSection(&pin->flushing_cs); continue; } @@ -1127,6 +1105,8 @@ static DWORD CALLBACK stream_thread(void *arg) case PARSER_EVENT_NONE: assert(0); } + + LeaveCriticalSection(&pin->flushing_cs); } TRACE("Streaming stopped; exiting.\n"); @@ -2153,7 +2133,10 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, { GstSeekType current_type = GST_SEEK_TYPE_SET, stop_type = GST_SEEK_TYPE_SET; struct parser_source *pin = impl_from_IMediaSeeking(iface); + struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); GstSeekFlags flags = 0; + HRESULT hr = S_OK; + int i; TRACE("pin %p, current %s, current_flags %#x, stop %s, stop_flags %#x.\n", pin, current ? debugstr_time(*current) : "<null>", current_flags, @@ -2161,9 +2144,40 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, mark_wine_thread(); - SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); if (pin->pin.pin.filter->state == State_Stopped) + { + SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); return S_OK; + } + + if (!(current_flags & AM_SEEKING_NoFlush)) + { + EnterCriticalSection(&filter->cs); + filter->flushing = true; + LeaveCriticalSection(&filter->cs); + + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i]->pin.pin.peer) + { + WakeConditionVariable(&pin->event_cv); + IPin_BeginFlush(filter->sources[i]->pin.pin.peer); + } + } + + if (filter->reader) + IAsyncReader_BeginFlush(filter->reader); + } + + /* Acquire the flushing locks. This blocks the streaming threads, and + * ensures the seek is serialized between flushes. */ + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i]->pin.pin.peer) + EnterCriticalSection(&pin->flushing_cs); + } + + SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); if (current_flags & AM_SEEKING_SeekToKeyFrame) flags |= GST_SEEK_FLAG_KEY_UNIT; @@ -2182,9 +2196,33 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, { ERR("Failed to seek (current %s, stop %s).\n", debugstr_time(pin->seek.llCurrent), debugstr_time(pin->seek.llStop)); - return E_FAIL; + hr = E_FAIL; } - return S_OK; + + if (!(current_flags & AM_SEEKING_NoFlush)) + { + EnterCriticalSection(&filter->cs); + filter->flushing = false; + LeaveCriticalSection(&filter->cs); + + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i]->pin.pin.peer) + IPin_EndFlush(filter->sources[i]->pin.pin.peer); + } + + if (filter->reader) + IAsyncReader_EndFlush(filter->reader); + } + + /* Release the flushing locks. */ + for (i = filter->source_count - 1; i >= 0; --i) + { + if (filter->sources[i]->pin.pin.peer) + LeaveCriticalSection(&pin->flushing_cs); + } + + return hr; } static const IMediaSeekingVtbl GST_Seeking_Vtbl = @@ -2397,6 +2435,9 @@ static void free_source_pin(struct parser_source *pin) CloseHandle(pin->eos_event); gst_segment_free(pin->segment); + pin->flushing_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&pin->flushing_cs); + strmbase_seeking_cleanup(&pin->seek); strmbase_source_cleanup(&pin->pin); heap_free(pin); @@ -2434,10 +2475,11 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name GST_ChangeCurrent, GST_ChangeRate); InitializeConditionVariable(&pin->event_cv); InitializeConditionVariable(&pin->event_empty_cv); - InitializeConditionVariable(&pin->flushing_cv); - InitializeConditionVariable(&pin->flush_stop_cv); BaseFilterImpl_IncrementPinVersion(&filter->filter); + InitializeCriticalSection(&pin->flushing_cs); + pin->flushing_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": pin.flushing_cs"); + sprintf(pad_name, "qz_sink_%u", filter->source_count); pin->my_sink = gst_pad_new(pad_name, GST_PAD_SINK); gst_pad_set_element_private(pin->my_sink, pin);

1 0

Zebediah Figura : vkd3d-shader: Implement inequality operators in #if directives.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: vkd3d Branch: master Commit: eecfe9c2a2d4dde32a60c7fb680c02ff74a6837d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=eecfe9c2a2d4dde32a60c7f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 19 11:18:21 2021 -0600 vkd3d-shader: Implement inequality operators in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 7 +++++-- libs/vkd3d-shader/preproc.y | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index a522b7c..6779a39 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -78,6 +78,9 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>{IDENTIFIER}/\( {return T_IDENTIFIER_PAREN;} <INITIAL>{IDENTIFIER} {return T_IDENTIFIER;} +<INITIAL>"<=" {return T_LE;} +<INITIAL>">=" {return T_GE;} + /* We have no use for floats, but shouldn't parse them as integers. */ <INITIAL>[0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;} @@ -96,7 +99,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>"--" {return T_TEXT;} <INITIAL>"<<"=? {return T_TEXT;} <INITIAL>">>"=? {return T_TEXT;} -<INITIAL>[-+*/%&|^=><!]= {return T_TEXT;} +<INITIAL>[-+*/%&|^=!]= {return T_TEXT;} <INCLUDE>\"[^"]*\" {return T_STRING;} <INCLUDE>\<[^>]*\> {return T_STRING;} @@ -157,7 +160,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* } <INITIAL>{WS}+ {} -<INITIAL>[-()\[\]{},+!*/] {return yytext[0];} +<INITIAL>[-()\[\]{},+!*/<>] {return yytext[0];} <INITIAL>. {return T_TEXT;} %% diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 61b6baf..6d88419 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -331,12 +331,16 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_UNDEF "#undef" %token T_CONCAT "##" + +%token T_LE "<=" +%token T_GE ">=" %token T_DEFINED "defined" %type <integer> primary_expr %type <integer> unary_expr %type <integer> mul_expr %type <integer> add_expr +%type <integer> ineq_expr %type <string> body_token %type <const_string> body_token_const %type <string_buffer> body_text @@ -449,10 +453,26 @@ body_token_const { $$ = "/"; } + | '<' + { + $$ = "<"; + } + | '>' + { + $$ = ">"; + } | T_CONCAT { $$ = "##"; } + | T_LE + { + $$ = "<="; + } + | T_GE + { + $$ = ">="; + } | T_DEFINED { $$ = "defined"; @@ -490,7 +510,7 @@ directive } vkd3d_free($2); } - | T_IF add_expr T_NEWLINE + | T_IF ineq_expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; @@ -505,7 +525,7 @@ directive preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); vkd3d_free($2); } - | T_ELIF add_expr T_NEWLINE + | T_ELIF ineq_expr T_NEWLINE { const struct preproc_file *file = preproc_get_top_file(ctx); @@ -668,3 +688,22 @@ add_expr { $$ = $1 - $3; } + +ineq_expr + : add_expr + | ineq_expr '<' add_expr + { + $$ = $1 < $3; + } + | ineq_expr '>' add_expr + { + $$ = $1 > $3; + } + | ineq_expr T_LE add_expr + { + $$ = $1 <= $3; + } + | ineq_expr T_GE add_expr + { + $$ = $1 >= $3; + }

1 0

Zebediah Figura : vkd3d-shader: Implement addition and subtraction in #if directives.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: vkd3d Branch: master Commit: 76383b244bdff2ad99f55235fd50c073835f707d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=76383b244bdff2ad99f5523… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 19 11:18:20 2021 -0600 vkd3d-shader: Implement addition and subtraction in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.y | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index eb2036c..61b6baf 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -336,6 +336,7 @@ static void free_parse_arg_names(struct parse_arg_names *args) %type <integer> primary_expr %type <integer> unary_expr %type <integer> mul_expr +%type <integer> add_expr %type <string> body_token %type <const_string> body_token_const %type <string_buffer> body_text @@ -489,7 +490,7 @@ directive } vkd3d_free($2); } - | T_IF mul_expr T_NEWLINE + | T_IF add_expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; @@ -504,7 +505,7 @@ directive preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); vkd3d_free($2); } - | T_ELIF mul_expr T_NEWLINE + | T_ELIF add_expr T_NEWLINE { const struct preproc_file *file = preproc_get_top_file(ctx); @@ -656,3 +657,14 @@ mul_expr } $$ = $1 / $3; } + +add_expr + : mul_expr + | add_expr '+' mul_expr + { + $$ = $1 + $3; + } + | add_expr '-' mul_expr + { + $$ = $1 - $3; + }

1 0

Zebediah Figura : vkd3d-shader: Implement multiplication and division in #if directives.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: vkd3d Branch: master Commit: be7e06cd4a4b0eefba908aab3b9b517ad7c47bb3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=be7e06cd4a4b0eefba908aa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 19 11:18:19 2021 -0600 vkd3d-shader: Implement multiplication and division in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 2 +- libs/vkd3d-shader/preproc.y | 29 +++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 011f8db..a522b7c 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -157,7 +157,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* } <INITIAL>{WS}+ {} -<INITIAL>[-()\[\]{},+!] {return yytext[0];} +<INITIAL>[-()\[\]{},+!*/] {return yytext[0];} <INITIAL>. {return T_TEXT;} %% diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 51df5d4..eb2036c 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -335,6 +335,7 @@ static void free_parse_arg_names(struct parse_arg_names *args) %type <integer> primary_expr %type <integer> unary_expr +%type <integer> mul_expr %type <string> body_token %type <const_string> body_token_const %type <string_buffer> body_text @@ -439,6 +440,14 @@ body_token_const { $$ = "!"; } + | '*' + { + $$ = "*"; + } + | '/' + { + $$ = "/"; + } | T_CONCAT { $$ = "##"; @@ -480,7 +489,7 @@ directive } vkd3d_free($2); } - | T_IF unary_expr T_NEWLINE + | T_IF mul_expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; @@ -495,7 +504,7 @@ directive preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); vkd3d_free($2); } - | T_ELIF unary_expr T_NEWLINE + | T_ELIF mul_expr T_NEWLINE { const struct preproc_file *file = preproc_get_top_file(ctx); @@ -631,3 +640,19 @@ unary_expr { $$ = !$2; } + +mul_expr + : unary_expr + | mul_expr '*' unary_expr + { + $$ = $1 * $3; + } + | mul_expr '/' unary_expr + { + if (!$3) + { + preproc_warning(ctx, &@3, VKD3D_SHADER_WARNING_PP_DIV_BY_ZERO, "Division by zero."); + $3 = 1; + } + $$ = $1 / $3; + } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 8d9821d..12edfae 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -90,6 +90,7 @@ enum vkd3d_shader_error VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE = 4303, VKD3D_SHADER_WARNING_PP_UNTERMINATED_MACRO = 4304, VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF = 4305, + VKD3D_SHADER_WARNING_PP_DIV_BY_ZERO = 4306, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER

1 0

Zebediah Figura : vkd3d-shader: Implement unary operators in #if directives.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: vkd3d Branch: master Commit: f8a89877378b8a494f7f068f297f5ff89dea4587 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f8a89877378b8a494f7f068… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 19 11:18:18 2021 -0600 vkd3d-shader: Implement unary operators in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 2 +- libs/vkd3d-shader/preproc.y | 36 ++++++++++++++++++++++++++++++++---- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 95b043e..011f8db 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -157,7 +157,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* } <INITIAL>{WS}+ {} -<INITIAL>[()\[\]{},] {return yytext[0];} +<INITIAL>[-()\[\]{},+!] {return yytext[0];} <INITIAL>. {return T_TEXT;} %% diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 008d01e..51df5d4 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -333,7 +333,8 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_CONCAT "##" %token T_DEFINED "defined" -%type <integer> expr +%type <integer> primary_expr +%type <integer> unary_expr %type <string> body_token %type <const_string> body_token_const %type <string_buffer> body_text @@ -426,6 +427,18 @@ body_token_const { $$ = ","; } + | '+' + { + $$ = "+"; + } + | '-' + { + $$ = "-"; + } + | '!' + { + $$ = "!"; + } | T_CONCAT { $$ = "##"; @@ -467,7 +480,7 @@ directive } vkd3d_free($2); } - | T_IF expr T_NEWLINE + | T_IF unary_expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; @@ -482,7 +495,7 @@ directive preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); vkd3d_free($2); } - | T_ELIF expr T_NEWLINE + | T_ELIF unary_expr T_NEWLINE { const struct preproc_file *file = preproc_get_top_file(ctx); @@ -582,7 +595,7 @@ directive vkd3d_free($2); } -expr +primary_expr : T_INTEGER { $$ = preproc_parse_integer($1); @@ -603,3 +616,18 @@ expr $$ = !!preproc_find_macro(ctx, $3); vkd3d_free($3); } + +unary_expr + : primary_expr + | '+' unary_expr + { + $$ = $2; + } + | '-' unary_expr + { + $$ = -$2; + } + | '!' unary_expr + { + $$ = !$2; + }

1 0

Zebediah Figura : vkd3d-shader: Treat undefined identifiers as equal to 0 in #if directives.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: vkd3d Branch: master Commit: d4929660c3247c2198d4f6f641813256638307a2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d4929660c3247c2198d4f6f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 19 11:18:17 2021 -0600 vkd3d-shader: Treat undefined identifiers as equal to 0 in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.y | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index f9047c9..008d01e 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -588,6 +588,11 @@ expr $$ = preproc_parse_integer($1); vkd3d_free($1); } + | T_IDENTIFIER + { + $$ = 0; + vkd3d_free($1); + } | T_DEFINED T_IDENTIFIER { $$ = !!preproc_find_macro(ctx, $2);

1 0

Francois Gouget : testbot/TestWTBS: Do not allow nested $TestInfo structures.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: tools Branch: master Commit: 0485fbcee84d679e93f9b8a671fed6ff4cfa1bc4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0485fbcee84d679e93f9b8a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 21 11:16:11 2021 +0100 testbot/TestWTBS: Do not allow nested $TestInfo structures. Enforce $TestInfo to be of the form $TestInfo->{category}->{property}. Having $TestInfo->{category}->{subcategory}->{property} would make the propagation code more complex and would require documentation regarding how the subcategory properties get merged. That means properties cannot be hashtables, except in the case of the errors-matching properties since their value is a LoadLogErrors() structure. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index e8d8f3f..5f62d63 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -330,12 +330,24 @@ sub LoadTestInfo($) my ($Src, $TaskTypes) = @$Pair; foreach my $Field (keys %{$TestInfo->{$Src}}) { + my $SrcVal = $TestInfo->{$Src}->{$Field}; + if (ref($SrcVal) eq "HASH" and $Field !~ /\.errors$/) + { + # Simply propagating hashtable references would result in changes to + # win32 to impact the parent win / test parent which is not what we + # want. So subsets of properties are not supported. + # .errors properties are the exception because their values are a + # LoadLogErrors() structure. As a result they are read-only, and are + # not merged. + fail("internal error: $Src.$Field should not be a hash in $FileName"); + next; + } foreach my $TaskType (@$TaskTypes) { my $TaskInfo = $TestInfo->{$TaskType}; if (!defined $TaskInfo->{$Field}) { - $TaskInfo->{$Field} = $TestInfo->{$Src}->{$Field}; + $TaskInfo->{$Field} = $SrcVal; } } } @@ -404,6 +416,10 @@ the test suite, then one could also issue the following check: p tests.TestFailures 2 +Finally, note that while the error directives are inherited by subcategories, +they are not merged. So if if both win and win32 have error-matching +directives, win32 will not inherit anything from the win category. + =cut sub CheckLogErrors($$$)

1 0

Francois Gouget : testbot/TestWTBS: Fix a typo in the TestUnits check.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: tools Branch: master Commit: 0fb4aa9ddb7ea476d065617eb1b6a3f4af8c090e URL: https://source.winehq.org/git/tools.git/?a=commit;h=0fb4aa9ddb7ea476d065617… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 21 11:16:22 2021 +0100 testbot/TestWTBS: Fix a typo in the TestUnits check. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index b4460b8..e8d8f3f 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -652,7 +652,7 @@ sub CheckJobTree($) { foreach my $TestUnit (split / +/, $TypeInfo->{TestUnits}) { - ok($TestUnits->{$Type}->{$TestUnit}, "Check that $TestUnit was tested by $Type VMs for job ". $Job->Id) or + ok($TestUnits->{$Type}->{$TestUnit}, "Check that $TestUnit was tested by $Type VMs for job ". $Job->Id) or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$Type}})); } }

1 0

Zebediah Figura : include: Add MemoryBarrier().
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: a952453888fb5df3c70edf357820bc924b4f3e7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a952453888fb5df3c70edf35… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 18 21:55:03 2021 -0600 include: Add MemoryBarrier(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 61368d43d3c..8834ced73e6 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6983,7 +6983,50 @@ static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *des return (void *)_InterlockedExchange( (long volatile*)dest, (long)val ); } -#endif +#endif /* __i386__ */ + +#ifdef __i386__ + +static FORCEINLINE void MemoryBarrier(void) +{ + LONG dummy; + InterlockedOr(&dummy, 0); +} + +#elif defined(__x86_64__) + +#pragma intrinsic(__faststorefence) + +void __faststorefence(void); + +static FORCEINLINE void MemoryBarrier(void) +{ + __faststorefence(); +} + +#elif defined(__arm__) + +#pragma intrinsic(__dmb) + +void __dmb(void); + +static FORCEINLINE void MemoryBarrier(void) +{ + __dmb(_ARM_BARRIER_SY); +} + +#elif defined(__aarch64__) + +#pragma intrinsic(__dmb) + +void __dmb(void); + +static FORCEINLINE void MemoryBarrier(void) +{ + __dmb(_ARM64_BARRIER_SY); +} + +#endif /* __i386__ */ #elif defined(__GNUC__) @@ -7068,6 +7111,11 @@ static FORCEINLINE LONG WINAPI InterlockedOr( LONG volatile *dest, LONG val ) return __sync_fetch_and_or( dest, val ); } +static FORCEINLINE void MemoryBarrier(void) +{ + __sync_synchronize(); +} + #endif /* __GNUC__ */ #ifdef __cplusplus

1 0

Zebediah Figura : include: Add InterlockedOr().
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: 377f721362e41a6acaa8b9b4af6ac5ff532cfaf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=377f721362e41a6acaa8b9b4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 18 21:55:02 2021 -0600 include: Add InterlockedOr(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 9 --------- include/winnt.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index b6b5d4b78db..c10445becda 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -1157,15 +1157,6 @@ static inline void spin_wait_for_next_rwl(rwl_queue *q) SpinWait_dtor(&sw); } -/* Remove when proper InterlockedOr implementation is added to wine */ -static LONG InterlockedOr(LONG *d, LONG v) -{ - LONG l; - while (~(l = *d) & v) - if (InterlockedCompareExchange(d, l|v, l) == l) break; - return l; -} - static LONG InterlockedAnd(LONG *d, LONG v) { LONG l = *d, old; diff --git a/include/winnt.h b/include/winnt.h index 8abc11a7dd5..61368d43d3c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6905,6 +6905,7 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #pragma intrinsic(_InterlockedExchangeAdd) #pragma intrinsic(_InterlockedIncrement) #pragma intrinsic(_InterlockedDecrement) +#pragma intrinsic(_InterlockedOr) long _InterlockedCompareExchange(long volatile*,long,long); long long _InterlockedCompareExchange64(long long volatile*,long long,long long); @@ -6915,6 +6916,7 @@ long _InterlockedDecrement(long volatile*); long _InterlockedExchange(long volatile*,long); long _InterlockedExchangeAdd(long volatile*,long); long _InterlockedIncrement(long volatile*); +long _InterlockedOr(long volatile *,long); static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) { @@ -6953,6 +6955,11 @@ static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) return _InterlockedDecrement( (long volatile *)dest ); } +static FORCEINLINE LONG WINAPI InterlockedOr( LONG volatile *dest, LONG val ) +{ + return _InterlockedOr( (long volatile *)dest, val ); +} + #ifndef __i386__ #pragma intrinsic(_InterlockedCompareExchangePointer) @@ -7056,6 +7063,11 @@ static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *des return ret; } +static FORCEINLINE LONG WINAPI InterlockedOr( LONG volatile *dest, LONG val ) +{ + return __sync_fetch_and_or( dest, val ); +} + #endif /* __GNUC__ */ #ifdef __cplusplus

1 0

Zebediah Figura : include: Use __atomic_exchange_n() for InterlockedExchange*() if possible.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: aabdaed10211fd5d6e7399c95b25a1a2bde3c7e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aabdaed10211fd5d6e7399c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 18 21:55:01 2021 -0600 include: Use __atomic_exchange_n() for InterlockedExchange*() if possible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index e48c884cd4c..8abc11a7dd5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -7015,7 +7015,9 @@ static FORCEINLINE unsigned char InterlockedCompareExchange128( volatile __int64 static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) { LONG ret; -#if defined(__i386__) || defined(__x86_64__) +#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) + ret = __atomic_exchange_n( dest, val, __ATOMIC_SEQ_CST ); +#elif defined(__i386__) || defined(__x86_64__) __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); #else @@ -7042,7 +7044,9 @@ static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) { void *ret; -#ifdef __x86_64__ +#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) + ret = __atomic_exchange_n( dest, val, __ATOMIC_SEQ_CST ); +#elif defined(__x86_64__) __asm__ __volatile__( "lock; xchgq %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); #elif defined(__i386__) __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" );

1 0

Hans Leidekker : ws2_32: Fix buffer size query in WSAAddressToStringW.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: dc02bbee547266ef4c55bc9105e0337ffcedda83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc02bbee547266ef4c55bc91… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 20 15:56:30 2021 +0100 ws2_32: Fix buffer size query in WSAAddressToStringW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 25 +++++-------------------- dlls/ws2_32/tests/sock.c | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 88dfc83dbc2..6e783f87ee7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -8518,30 +8518,15 @@ INT WINAPI WSAAddressToStringW( LPSOCKADDR sockaddr, DWORD len, LPWSAPROTOCOL_INFOW info, LPWSTR string, LPDWORD lenstr ) { - INT ret; - DWORD size; - WCHAR buffer[54]; /* 32 digits + 7':' + '[' + '%" + 5 digits + ']:' + 5 digits + '\0' */ - CHAR bufAddr[54]; + INT ret; + char buf[54]; /* 32 digits + 7':' + '[' + '%" + 5 digits + ']:' + 5 digits + '\0' */ TRACE( "(%p, %d, %p, %p, %p)\n", sockaddr, len, info, string, lenstr ); - size = *lenstr; - ret = WSAAddressToStringA(sockaddr, len, NULL, bufAddr, &size); - - if (ret) return ret; + if ((ret = WSAAddressToStringA(sockaddr, len, NULL, buf, lenstr))) return ret; - MultiByteToWideChar(CP_ACP, 0, bufAddr, size, buffer, ARRAY_SIZE(buffer)); - - if (*lenstr < size) - { - *lenstr = size; - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - - TRACE("=> %s,%u bytes\n", debugstr_w(buffer), size); - *lenstr = size; - lstrcpyW( string, buffer ); + MultiByteToWideChar(CP_ACP, 0, buf, *lenstr, string, *lenstr); + TRACE("=> %s,%u chars\n", debugstr_w(string), *lenstr); return 0; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 81536cb9dbe..cab25baf1d1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2923,11 +2923,29 @@ static void test_WSAAddressToString(void) sockaddr.sin_family = AF_INET; sockaddr.sin_addr.s_addr = 0; sockaddr.sin_port = 0; + WSASetLastError( 0xdeadbeef ); ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr, sizeof(sockaddr), NULL, output, &len ); ok( ret == SOCKET_ERROR, "WSAAddressToStringA() returned %d, expected SOCKET_ERROR\n", ret ); ok( WSAGetLastError() == WSAEFAULT, "WSAAddressToStringA() gave error %d, expected WSAEFAULT\n", WSAGetLastError() ); ok( len == 8, "WSAAddressToStringA() gave length %d, expected 8\n", len ); + len = 0; + sockaddr.sin_family = AF_INET; + sockaddr.sin_addr.s_addr = 0; + sockaddr.sin_port = 0; + WSASetLastError( 0xdeadbeef ); + ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr, sizeof(sockaddr), NULL, NULL, &len ); + ok( ret == SOCKET_ERROR, "got %d\n", ret ); + ok( WSAGetLastError() == WSAEFAULT, "got %08x\n", WSAGetLastError() ); + ok( len == 8, "got %u\n", len ); + + len = ARRAY_SIZE(outputW); + memset( outputW, 0, sizeof(outputW) ); + ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr, sizeof(sockaddr), NULL, outputW, &len ); + ok( !ret, "WSAAddressToStringW() returned %d\n", ret ); + ok( len == 8, "got %u\n", len ); + ok( !wcscmp(outputW, L"0.0.0.0"), "got %s\n", wine_dbgstr_w(outputW) ); + for (i = 0; i < 2; i++) { for (j = 0; j < ARRAY_SIZE(ipv4_tests); j++)

1 0

Hans Leidekker : ws2_32: Avoid returning duplicate entries from WS_getaddrinfo.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: e7dc82377b37810109910fe92c4ce8cdb516f782 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7dc82377b37810109910fe9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 20 15:56:29 2021 +0100 ws2_32: Avoid returning duplicate entries from WS_getaddrinfo. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 381c61d5e10..88dfc83dbc2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6528,6 +6528,21 @@ static char *get_fqdn(void) return ret; } +static BOOL addrinfo_in_list( const struct WS_addrinfo *list, const struct WS_addrinfo *ai ) +{ + const struct WS_addrinfo *cursor = list; + while (cursor) + { + if (ai->ai_flags == cursor->ai_flags && ai->ai_family == cursor->ai_family && + ai->ai_socktype == cursor->ai_socktype && ai->ai_protocol == cursor->ai_protocol && + ai->ai_addrlen == cursor->ai_addrlen && !memcmp(ai->ai_addr, cursor->ai_addr, ai->ai_addrlen) && + ((ai->ai_canonname && cursor->ai_canonname && !strcmp(ai->ai_canonname, cursor->ai_canonname)) + || (!ai->ai_canonname && !cursor->ai_canonname))) return TRUE; + cursor = cursor->ai_next; + } + return FALSE; +} + /*********************************************************************** * getaddrinfo (WS2_32.@) */ @@ -6654,7 +6669,6 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr if (!ai) goto outofmem; - *xai = ai;xai = &ai->ai_next; ai->ai_flags = convert_aiflag_u2w(xuai->ai_flags); ai->ai_family = convert_af_u2w(xuai->ai_family); /* copy whatever was sent in the hints */ @@ -6690,6 +6704,18 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr goto outofmem; ai->ai_addrlen = len; } while (1); + + if (addrinfo_in_list(*res, ai)) + { + HeapFree(GetProcessHeap(), 0, ai->ai_canonname); + HeapFree(GetProcessHeap(), 0, ai->ai_addr); + HeapFree(GetProcessHeap(), 0, ai); + } + else + { + *xai = ai; + xai = &ai->ai_next; + } xuai = xuai->ai_next; } freeaddrinfo(unixaires);

1 0

Nikolay Sivov : make_unicode: Make it explicit what other default joining type is.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: 9c11fc642f8c84a0d8ff1ed9c07387d7565a4994 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c11fc642f8c84a0d8ff1ed9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 15:35:16 2021 +0300 make_unicode: Make it explicit what other default joining type is. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/make_unicode b/tools/make_unicode index 27ce80432a8..da4c732bc3e 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -643,7 +643,14 @@ sub load_data() $category_table[$src] = $categories{$cat}; $direction_table[$src] = $bidi; - $joining_table[$src] = $joining_types{"T"} if $cat eq "Mn" || $cat eq "Me" || $cat eq "Cf"; + if ($cat eq "Mn" || $cat eq "Me" || $cat eq "Cf") + { + $joining_table[$src] = $joining_types{"T"}; + } + else + { + $joining_table[$src] = $joining_types{"U"}; + } if ($lower ne "") {

1 0

Nikolay Sivov : gdi32/uniscribe: Get rid of shaping group values in Arabic shaping data table.
by Alexandre Julliard 20 Jan '21

20 Jan '21

Module: wine Branch: master Commit: 016eeb5109663420e25e5ba3da019135331a893e URL: https://source.winehq.org/git/wine.git/?a=commit;h=016eeb5109663420e25e5ba3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 15:35:15 2021 +0300 gdi32/uniscribe: Get rid of shaping group values in Arabic shaping data table. It's not used right now, Syriac specific groups will be accomodated as additional joining types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/uniscribe/shaping.c | 356 ++++++++++++++++++++--------------------- tools/make_unicode | 8 +- 2 files changed, 175 insertions(+), 189 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=016eeb5109663420e25e…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2021