January 2021 - Wine-Commits

Nikolay Sivov : dwrite/arabic: Mark some features for fallback.
by Alexandre Julliard Jan. 22, 2021

Jan. 22, 2021

Module: wine Branch: master Commit: f064acbdd9fac8a417067a244d008e4177e265f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f064acbdd9fac8a417067a24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 22 15:25:17 2021 +0300 dwrite/arabic: Mark some features for fallback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 3 +++ dlls/dwrite/opentype.c | 2 +- dlls/dwrite/shape.c | 3 ++- dlls/dwrite/shapers/arabic.c | 25 +++++++++++++++++++++++-- 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 76d49ae5104..4a4229e1dc0 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -543,6 +543,7 @@ enum shaping_feature_flags FEATURE_MANUAL_ZWNJ = 0x4, FEATURE_MANUAL_ZWJ = 0x8, FEATURE_MANUAL_JOINERS = FEATURE_MANUAL_ZWNJ | FEATURE_MANUAL_ZWJ, + FEATURE_HAS_FALLBACK = 0x10, }; struct shaping_feature @@ -575,6 +576,8 @@ 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_add_feature_full(struct shaping_features *features, unsigned int tag, unsigned int flags, + unsigned int value) DECLSPEC_HIDDEN; extern void shape_start_next_stage(struct shaping_features *features) DECLSPEC_HIDDEN; struct scriptshaping_context diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 20534460d09..256218663fb 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4553,7 +4553,7 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex } } - if (!found) + if (!found && !(features->features[i].flags & FEATURE_HAS_FALLBACK)) continue; if (feature->flags & FEATURE_GLOBAL && feature->max_value == 1) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 53b392c88e2..2dbea825216 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -115,7 +115,7 @@ static DWORD shape_select_language(const struct scriptshaping_cache *cache, DWOR return 0; } -static void shape_add_feature_full(struct shaping_features *features, unsigned int tag, unsigned int flags, unsigned int value) +void shape_add_feature_full(struct shaping_features *features, unsigned int tag, unsigned int flags, unsigned int value) { unsigned int i = features->count; @@ -193,6 +193,7 @@ static void shape_merge_features(struct scriptshaping_context *context, struct s features->features[j].flags ^= FEATURE_GLOBAL; features->features[j].max_value = max(features->features[j].max_value, features->features[i].max_value); } + features->features[j].flags |= features->features[i].flags & FEATURE_HAS_FALLBACK; features->features[j].stage = min(features->features[j].stage, features->features[i].stage); } } diff --git a/dlls/dwrite/shapers/arabic.c b/dlls/dwrite/shapers/arabic.c index d8c6c9495c0..32588b9c796 100644 --- a/dlls/dwrite/shapers/arabic.c +++ b/dlls/dwrite/shapers/arabic.c @@ -18,6 +18,7 @@ */ #include "dwrite_private.h" +#include "scripts.h" static const unsigned int arabic_features[] = { @@ -30,6 +31,24 @@ static const unsigned int arabic_features[] = DWRITE_MAKE_OPENTYPE_TAG('i','n','i','t'), }; +enum arabic_shaping_action +{ + ISOL, + FINA, + FIN2, + FIN3, + MEDI, + MED2, + INIT, + NONE, +}; + +static BOOL feature_is_syriac(unsigned int tag) +{ + return tag == arabic_features[FIN2] || tag == arabic_features[FIN3] || + tag == arabic_features[MED2]; +} + static void arabic_collect_features(struct scriptshaping_context *context, struct shaping_features *features) { @@ -41,11 +60,13 @@ static void arabic_collect_features(struct scriptshaping_context *context, for (i = 0; i < ARRAY_SIZE(arabic_features); ++i) { - shape_enable_feature(features, arabic_features[i], 0); + unsigned int flags = context->script == Script_Arabic && !feature_is_syriac(arabic_features[i]) ? + FEATURE_HAS_FALLBACK : 0; + shape_add_feature_full(features, arabic_features[i], flags, 1); 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','l','i','g'), FEATURE_MANUAL_ZWJ | FEATURE_HAS_FALLBACK); 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);

1 0

Henri Verbeet : d3d12: Implement D3D12CreateVersionedRootSignatureDeserializer().
by Alexandre Julliard Jan. 22, 2021

Jan. 22, 2021

Module: wine Branch: master Commit: 8c412417de4c9a4625ad43d506f9904b76063f38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c412417de4c9a4625ad43d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 22 10:45:24 2021 +0100 d3d12: Implement D3D12CreateVersionedRootSignatureDeserializer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/d3d12.spec | 2 +- dlls/d3d12/d3d12_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec index 7c2ae988067..21231d39558 100644 --- a/dlls/d3d12/d3d12.spec +++ b/dlls/d3d12/d3d12.spec @@ -5,7 +5,7 @@ @ stub D3D12CoreGetLayeredDeviceSize @ stub D3D12CoreRegisterLayers @ stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) -#@ stub D3D12CreateVersionedRootSignatureDeserializer +@ stdcall D3D12CreateVersionedRootSignatureDeserializer(ptr long ptr ptr) @ stdcall D3D12EnableExperimentalFeatures(long ptr ptr ptr) @ stdcall D3D12SerializeRootSignature(ptr long ptr ptr) @ stdcall D3D12SerializeVersionedRootSignature(ptr ptr ptr) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 9f0fa12ee82..b8810848cd3 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -406,6 +406,15 @@ HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T dat return vkd3d_create_root_signature_deserializer(data, data_size, iid, deserializer); } +HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, SIZE_T data_size, + REFIID iid, void **deserializer) +{ + TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", + data, data_size, debugstr_guid(iid), deserializer); + + return vkd3d_create_versioned_root_signature_deserializer(data, data_size, iid, deserializer); +} + HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob) {

1 0

Alexandre Julliard : winegcc: Pass the same winebuild args to all winebuild invocations.
by Alexandre Julliard Jan. 22, 2021

Jan. 22, 2021

Module: wine Branch: master Commit: 7c909489b4a0404d7a0f386bc11c7399ae59a84a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c909489b4a0404d7a0f386b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 13:59:48 2021 +0100 winegcc: Pass the same winebuild args to all winebuild invocations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 0a45cb7a0d5..e72f234d94b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -986,8 +986,7 @@ static strarray *get_winebuild_args(struct options *opts) for (i = 0; i < opts->prefix->size; i++) strarray_add( spec_args, strmake( "-B%s", opts->prefix->base[i] )); } - if (opts->use_msvcrt) strarray_add( spec_args, "-mno-cygwin" ); - if (opts->unix_lib) strarray_add( spec_args, "-munix" ); + strarray_addall( spec_args, opts->winebuild_args ); if (opts->unwind_tables) strarray_add( spec_args, "-fasynchronous-unwind-tables" ); else strarray_add( spec_args, "-fno-asynchronous-unwind-tables" ); return spec_args; @@ -1266,8 +1265,6 @@ static void build(struct options* opts) spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); - if(opts->unicode_app) - strarray_add(spec_args, "-municode"); strarray_add(spec_args, "-D_REENTRANT"); if (opts->pic && !is_pe) strarray_add(spec_args, "-fPIC"); strarray_add(spec_args, opts->shared ? "--dll" : "--exe"); @@ -1287,7 +1284,6 @@ static void build(struct options* opts) strarray_add(spec_args, "-E"); strarray_add(spec_args, spec_file); } - if (opts->win16_app) strarray_add(spec_args, "-m16"); if (!opts->shared) { @@ -1315,9 +1311,6 @@ static void build(struct options* opts) for ( j = 0; j < lib_dirs->size; j++ ) strarray_add(spec_args, strmake("-L%s", lib_dirs->base[j])); - for ( j = 0 ; j < opts->winebuild_args->size ; j++ ) - strarray_add(spec_args, opts->winebuild_args->base[j]); - if (!is_pe) { for (j = 0; j < opts->delayimports->size; j++) @@ -1485,7 +1478,6 @@ static void build(struct options* opts) strarray_add(implib_args, opts->out_implib); strarray_add(implib_args, "--export"); strarray_add(implib_args, spec_file); - strarray_addall(implib_args, opts->winebuild_args); spawn(opts->prefix, implib_args, 0); strarray_free (implib_args); @@ -1636,7 +1628,7 @@ static int is_option( struct options *opts, int i, const char *option, const cha int main(int argc, char **argv) { int i, c, next_is_arg = 0, linking = 1; - int raw_compiler_arg, raw_linker_arg; + int raw_compiler_arg, raw_linker_arg, raw_winebuild_arg; const char* option_arg; struct options opts; char* lang = 0; @@ -1782,6 +1774,7 @@ int main(int argc, char **argv) /* determine what options go 'as is' to the linker & the compiler */ raw_linker_arg = is_linker_arg(opts.args->base[i]); raw_compiler_arg = !raw_linker_arg; + raw_winebuild_arg = 0; /* do a bit of semantic analysis */ switch (opts.args->base[i][1]) @@ -1840,7 +1833,7 @@ int main(int argc, char **argv) { opts.use_msvcrt = 1; raw_compiler_arg = 0; - strarray_add( opts.winebuild_args, opts.args->base[i] ); + raw_winebuild_arg = 1; } else if (strcmp("-mwindows", opts.args->base[i]) == 0) { @@ -1856,6 +1849,7 @@ int main(int argc, char **argv) { opts.unicode_app = 1; raw_compiler_arg = 0; + raw_winebuild_arg = 1; } else if (strcmp("-mthreads", opts.args->base[i]) == 0) { @@ -1865,11 +1859,13 @@ int main(int argc, char **argv) { opts.unix_lib = 1; raw_compiler_arg = 0; + raw_winebuild_arg = 1; } else if (strcmp("-m16", opts.args->base[i]) == 0) { opts.win16_app = 1; raw_compiler_arg = 0; + raw_winebuild_arg = 1; } else if (strcmp("-m32", opts.args->base[i]) == 0) { @@ -1891,14 +1887,14 @@ int main(int argc, char **argv) } else if (!strcmp("-marm", opts.args->base[i] ) || !strcmp("-mthumb", opts.args->base[i] )) { - strarray_add(opts.winebuild_args, opts.args->base[i]); raw_linker_arg = 1; + raw_winebuild_arg = 1; } else if (!strncmp("-mcpu=", opts.args->base[i], 6) || !strncmp("-mfpu=", opts.args->base[i], 6) || !strncmp("-march=", opts.args->base[i], 7) || !strncmp("-mfloat-abi=", opts.args->base[i], 12)) - strarray_add(opts.winebuild_args, opts.args->base[i]); + raw_winebuild_arg = 1; break; case 'n': if (strcmp("-nostdinc", opts.args->base[i]) == 0) @@ -2073,6 +2069,12 @@ int main(int argc, char **argv) if (next_is_arg && (i + 1 < opts.args->size)) strarray_add( opts.compiler_args, opts.args->base[i + 1] ); } + if (raw_winebuild_arg) + { + strarray_add( opts.winebuild_args, opts.args->base[i] ); + if (next_is_arg && (i + 1 < opts.args->size)) + strarray_add( opts.winebuild_args, opts.args->base[i + 1] ); + } /* skip the next token if it's an argument */ if (next_is_arg) i++;

1 0

Alexandre Julliard : d3dx9: Fix some spec file discrepancies.
by Alexandre Julliard Jan. 22, 2021

Jan. 22, 2021

Module: wine Branch: master Commit: 16c03e479774aa211beb35e4a2cb5a336490b688 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16c03e479774aa211beb35e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 11:47:43 2021 +0100 d3dx9: Fix some spec file discrepancies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec index fe8140d1b49..d617d766f85 100644 --- a/dlls/d3dx9_24/d3dx9_24.spec +++ b/dlls/d3dx9_24/d3dx9_24.spec @@ -26,7 +26,7 @@ @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) -@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec index cb40277ea04..f13923dcb3a 100644 --- a/dlls/d3dx9_25/d3dx9_25.spec +++ b/dlls/d3dx9_25/d3dx9_25.spec @@ -26,7 +26,7 @@ @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) -@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec index bfad690a15a..286a9a094a0 100644 --- a/dlls/d3dx9_26/d3dx9_26.spec +++ b/dlls/d3dx9_26/d3dx9_26.spec @@ -30,7 +30,7 @@ @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) -@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec index bfad690a15a..286a9a094a0 100644 --- a/dlls/d3dx9_27/d3dx9_27.spec +++ b/dlls/d3dx9_27/d3dx9_27.spec @@ -30,7 +30,7 @@ @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) -@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec index 60228541015..06ced20df61 100644 --- a/dlls/d3dx9_28/d3dx9_28.spec +++ b/dlls/d3dx9_28/d3dx9_28.spec @@ -30,7 +30,7 @@ @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) -@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec index 60228541015..06ced20df61 100644 --- a/dlls/d3dx9_29/d3dx9_29.spec +++ b/dlls/d3dx9_29/d3dx9_29.spec @@ -30,7 +30,7 @@ @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) -@ stdcall D3DXCpuOptimizations(long) d3dx9_30.D3DXCpuOptimizations +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr)

1 0

Alexandre Julliard : ntdll: Add some more section information data.
by Alexandre Julliard Jan. 22, 2021

Jan. 22, 2021

Module: wine Branch: master Commit: 7250f9a95b864cd2cda5dda6ce19e370e93b82d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7250f9a95b864cd2cda5dda6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 17:21:13 2021 +0100 ntdll: Add some more section information data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 30 +++++++++++----- dlls/kernelbase/process.c | 2 +- dlls/ntdll/tests/info.c | 16 ++++++--- dlls/ntdll/unix/virtual.c | 33 +++++++++--------- include/wine/server_protocol.h | 10 +++--- include/winternl.h | 13 ++++--- server/mapping.c | 79 +++++++++++++++++++++++------------------- server/protocol.def | 8 +++-- server/trace.c | 12 ++++--- 9 files changed, 121 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7250f9a95b864cd2cda5…

1 0

Nikolay Sivov : dwrite/arabic: Set per-glyph action.
by Alexandre Julliard Jan. 22, 2021

Jan. 22, 2021

Module: wine Branch: master Commit: bea9c706eb6e818b1d8666b619e10f62a0cb1a96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bea9c706eb6e818b1d8666b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 22 15:25:21 2021 +0300 dwrite/arabic: Set per-glyph action. 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/shapers/arabic.c | 82 +++++++++++ dlls/dwrite/shapers/arabic_table.c | 275 +++++++++++++++++++++++++++++++++++++ tools/make_unicode | 54 +++++++- 4 files changed, 410 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bea9c706eb6e818b1d86…

1 0

Henri Verbeet : wined3d: Require VK_KHR_sampler_mirror_clamp_to_edge for WINED3D_TADDRESS_MIRROR_ONCE.
by Alexandre Julliard Jan. 22, 2021

Jan. 22, 2021

Module: wine Branch: master Commit: ff19c3e6fa154e4388cfc83d9a7b0603a5714533 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff19c3e6fa154e4388cfc83d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 22 10:45:21 2021 +0100 wined3d: Require VK_KHR_sampler_mirror_clamp_to_edge for WINED3D_TADDRESS_MIRROR_ONCE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 17 +++++++++++------ dlls/wined3d/wined3d_vk.h | 3 +++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 09180e7fdb6..9a226edc65a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -560,7 +560,8 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s { const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk_const(adapter); const VkPhysicalDeviceLimits *limits = &adapter_vk->device_limits; - BOOL sampler_anisotropy = limits->maxSamplerAnisotropy > 1.0f; + bool sampler_anisotropy = limits->maxSamplerAnisotropy > 1.0f; + const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; caps->ddraw_caps.dds_caps |= WINEDDSCAPS_BACKBUFFER | WINEDDSCAPS_COMPLEX @@ -615,8 +616,9 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s | WINED3DPTADDRESSCAPS_CLAMP | WINED3DPTADDRESSCAPS_WRAP; caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_BORDER - | WINED3DPTADDRESSCAPS_MIRROR - | WINED3DPTADDRESSCAPS_MIRRORONCE; + | WINED3DPTADDRESSCAPS_MIRROR; + if (vk_info->supported[WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE]) + caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; caps->MaxVolumeExtent = limits->maxImageDimension3D; @@ -643,8 +645,9 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s } caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_BORDER - | WINED3DPTADDRESSCAPS_MIRROR - | WINED3DPTADDRESSCAPS_MIRRORONCE; + | WINED3DPTADDRESSCAPS_MIRROR; + if (vk_info->supported[WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE]) + caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; caps->StencilCaps |= WINED3DSTENCILCAPS_DECR | WINED3DSTENCILCAPS_INCR @@ -2170,6 +2173,7 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, ~0u}, {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, ~0u, true}, {VK_KHR_MAINTENANCE1_EXTENSION_NAME, VK_API_VERSION_1_1, true}, + {VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME,VK_API_VERSION_1_2}, {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_API_VERSION_1_1, true}, {VK_KHR_SWAPCHAIN_EXTENSION_NAME, ~0u, true}, }; @@ -2181,7 +2185,8 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk } map[] = { - {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, WINED3D_VK_EXT_TRANSFORM_FEEDBACK}, + {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, WINED3D_VK_EXT_TRANSFORM_FEEDBACK}, + {VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME, WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE}, }; if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 0b6748ed0cf..a417a795901 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -207,7 +207,10 @@ struct vulkan_ops enum wined3d_vk_extension { WINED3D_VK_EXT_NONE, + WINED3D_VK_EXT_TRANSFORM_FEEDBACK, + WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE, + WINED3D_VK_EXT_COUNT, };

1 0

Ziqing Hui : gdiplus: Correctly handle UnitDisplay for printer DC.
by Alexandre Julliard Jan. 22, 2021

Jan. 22, 2021

Module: wine Branch: master Commit: f40f379f050c97bf615adcff07e6b1f554dff3cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f40f379f050c97bf615adcff… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jan 20 10:24:10 2021 +0800 gdiplus: Correctly handle UnitDisplay for printer DC. For printer DC, UnitDisplay specifies that a unit is 1/100 inch, which is different from display DC. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=17848 Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 12 ++++++------ dlls/gdiplus/gdiplus.c | 22 +++++++++++++++------- dlls/gdiplus/gdiplus_private.h | 8 +++++--- dlls/gdiplus/graphics.c | 38 ++++++++++++++++++++------------------ dlls/gdiplus/image.c | 12 ++++++++---- dlls/gdiplus/metafile.c | 25 ++++++++++++++++--------- dlls/gdiplus/tests/graphics.c | 2 -- 7 files changed, 70 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f40f379f050c97bf615a…

1 0

Zebediah Figura : server: Avoid leaking "acceptsock" on allocation failure.
by Alexandre Julliard Jan. 22, 2021

Jan. 22, 2021

Module: wine Branch: master Commit: fe11ff87ac8918f5e5104cccccb5544d9c6c30c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe11ff87ac8918f5e5104ccc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 21 18:16:42 2021 -0600 server: Avoid leaking "acceptsock" on allocation failure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 5f207e7f180..8c146a0a8f8 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1473,7 +1473,11 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } - if (!(req = alloc_accept_req( acceptsock, async, params ))) return 0; + if (!(req = alloc_accept_req( acceptsock, async, params ))) + { + release_object( acceptsock ); + return 0; + } list_add_tail( &sock->accept_list, &req->entry ); acceptsock->accept_recv_req = req; release_object( acceptsock );

1 0

Zebediah Figura : winegstreamer: Store the segment parameters in the parser_event structure.
by Alexandre Julliard Jan. 22, 2021

Jan. 22, 2021

Module: wine Branch: master Commit: 2546ad81158946c98d6fcf63e3f15d84909421d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2546ad81158946c98d6fcf63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 21 17:22:52 2021 -0600 winegstreamer: Store the segment parameters in the parser_event structure. Instead of the segment event. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gstdemux.c | 49 ++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 9cd3c8adff5..b6942e5ae77 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -23,6 +23,7 @@ #include <stdarg.h> #include <stdbool.h> +#include <stdint.h> #include <stdio.h> #include <gst/gst.h> #include <gst/video/video.h> diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 903305724a4..d79622094f6 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -94,7 +94,11 @@ struct parser_event union { GstBuffer *buffer; - GstEvent *segment; + struct + { + uint64_t position, stop; + double rate; + } segment; } u; }; @@ -709,14 +713,23 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) if (pin->pin.pin.peer) { struct parser_event stream_event; + const GstSegment *segment; - stream_event.type = PARSER_EVENT_SEGMENT; - stream_event.u.segment = event; - if (queue_stream_event(pin, &stream_event) == GST_FLOW_OK) + gst_event_parse_segment(event, &segment); + + if (segment->format != GST_FORMAT_TIME) { - /* Transfer our reference to the event to the thread. */ - return TRUE; + FIXME("Unhandled format \"%s\".\n", gst_format_get_name(segment->format)); + break; } + + gst_segment_copy_into(segment, pin->segment); + + stream_event.type = PARSER_EVENT_SEGMENT; + stream_event.u.segment.position = segment->position / 100; + stream_event.u.segment.stop = segment->stop / 100; + stream_event.u.segment.rate = segment->rate * segment->applied_rate; + queue_stream_event(pin, &stream_event); } break; @@ -744,15 +757,12 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) { case PARSER_EVENT_NONE: case PARSER_EVENT_EOS: + case PARSER_EVENT_SEGMENT: break; case PARSER_EVENT_BUFFER: gst_buffer_unref(pin->event.u.buffer); break; - - case PARSER_EVENT_SEGMENT: - gst_event_unref(pin->event.u.segment); - break; } pin->event.type = PARSER_EVENT_NONE; @@ -1057,24 +1067,9 @@ static DWORD CALLBACK stream_thread(void *arg) break; case PARSER_EVENT_SEGMENT: - { - const GstSegment *segment; - - gst_event_parse_segment(event.u.segment, &segment); - - if (segment->format != GST_FORMAT_TIME) - { - FIXME("Unhandled format \"%s\".\n", gst_format_get_name(segment->format)); - break; - } - - gst_segment_copy_into(segment, pin->segment); - - IPin_NewSegment(pin->pin.pin.peer, segment->position / 100, - segment->stop / 100, segment->rate * segment->applied_rate); - gst_event_unref(event.u.segment); + IPin_NewSegment(pin->pin.pin.peer, event.u.segment.position, + event.u.segment.stop, event.u.segment.rate); break; - } case PARSER_EVENT_NONE: assert(0);

1 0