June 2020 - Wine-commits - list.winehq.org

Michael Cronenworth : winebus: Global variable compatibility update for gcc 10.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: df434090e3d36468629832a9f200cd1670dc2e73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df434090e3d36468629832a9… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:29 2020 -0600 winebus: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 388348ddbf7d138fed3a6fe48bf6666a95ef3528) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/bus.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 041a37ad04..22a4b46a51 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -54,5 +54,5 @@ DEVICE_OBJECT* bus_enumerate_hid_devices(const platform_vtbl *vtbl, enum_func fu DWORD check_bus_option(const UNICODE_STRING *option, DWORD default_value) DECLSPEC_HIDDEN; BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; -HANDLE driver_key DECLSPEC_HIDDEN; -DEVICE_OBJECT *bus_pdo DECLSPEC_HIDDEN; +extern HANDLE driver_key DECLSPEC_HIDDEN; +extern DEVICE_OBJECT *bus_pdo DECLSPEC_HIDDEN;

1 0

Michael Cronenworth : wbemprox: Global variable compatibility update for gcc 10.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 5f11f35ad0dbce8ac996db6af7f84c02e42ccb47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f11f35ad0dbce8ac996db6a… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:27 2020 -0600 wbemprox: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit da21c305164c3e585e29e20242afc5a31f91989f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/main.c | 2 ++ dlls/wbemprox/wbemprox_private.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index d90f4f8cc6..0908441498 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -35,6 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); static HINSTANCE instance; +struct list *table_list; + typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj ); typedef struct diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 9d39a7c92b..9096b392e3 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -20,8 +20,8 @@ #include "wine/heap.h" #include "wine/list.h" -IClientSecurity client_security DECLSPEC_HIDDEN; -struct list *table_list DECLSPEC_HIDDEN; +extern IClientSecurity client_security DECLSPEC_HIDDEN; +extern struct list *table_list DECLSPEC_HIDDEN; enum param_direction {

1 0

Michael Cronenworth : xinput: Global variable compatibility update for gcc 10.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: d42cb277d0ba8918598c2d1af62e9c0d883e20c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d42cb277d0ba8918598c2d1a… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:30 2020 -0600 xinput: Global variable compatibility update for gcc 10. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 44e69405adcdc98d6b0777e6c0acb2697d776ef8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xinput1_3/xinput_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index f3456cd8e7..9a0e03c1de 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -26,8 +26,8 @@ typedef struct _xinput_controller XINPUT_VIBRATION vibration; } xinput_controller; -CRITICAL_SECTION xinput_crit; -xinput_controller controllers[XUSER_MAX_COUNT]; +extern CRITICAL_SECTION xinput_crit; +extern xinput_controller controllers[XUSER_MAX_COUNT]; void HID_find_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; void HID_destroy_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : dwrite: Add main loop variant for reverse substitution.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 3e59649c9edfd27df45fca9112ecde9cb33d1740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e59649c9edfd27df45fca91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 1 12:23:37 2020 +0300 dwrite: Add main loop variant for reverse substitution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 50 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 29f2a95a8c..58e1a3941c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -5610,6 +5610,19 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c } } +static BOOL opentype_is_gsub_lookup_reversed(const struct scriptshaping_context *context, const struct lookup *lookup) +{ + unsigned int subtable_offset, lookup_type = lookup->type; + + if (lookup->type == GSUB_LOOKUP_EXTENSION_SUBST) + { + subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup->offset, 0); + /* Assumes format 1. */ + lookup_type = table_read_be_word(&context->table->table, subtable_offset + 2); + } + return lookup_type == GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST; +} + void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, const struct shaping_features *features) { @@ -5626,19 +5639,38 @@ void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, { const struct lookup *lookup = &lookups.lookups[i]; - context->cur = 0; - while (context->cur < context->glyph_count) + if (!opentype_is_gsub_lookup_reversed(context, lookup)) { - ret = FALSE; - - if ((context->glyph_infos[context->cur].mask & lookup->mask) && - lookup_is_glyph_match(context, context->cur, lookup->flags)) + context->cur = 0; + while (context->cur < context->glyph_count) { - ret = opentype_layout_apply_gsub_lookup(context, lookup); + ret = FALSE; + + if ((context->glyph_infos[context->cur].mask & lookup->mask) && + lookup_is_glyph_match(context, context->cur, lookup->flags)) + { + ret = opentype_layout_apply_gsub_lookup(context, lookup); + } + + if (!ret) + context->cur++; } + } + else + { + context->cur = context->glyph_count - 1; - if (!ret) - context->cur++; + for (;;) + { + if ((context->glyph_infos[context->cur].mask & lookup->mask) && + lookup_is_glyph_match(context, context->cur, lookup->flags)) + { + opentype_layout_apply_gsub_lookup(context, lookup); + } + + if (context->cur == 0) break; + --context->cur; + } } }

1 0

Alexandre Julliard : ntdll: Move the threading initialization functions to the Unix library.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 3e9f8c87e5a2acaa80f8bbb1d50fa82147942143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e9f8c87e5a2acaa80f8bbb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 12:52:05 2020 +0200 ntdll: Move the threading initialization functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/selector.c | 4 +- dlls/ntdll/Makefile.in | 6 + dlls/ntdll/ntdll_misc.h | 9 - dlls/ntdll/server.c | 10 +- dlls/ntdll/signal_arm.c | 90 +------ dlls/ntdll/signal_arm64.c | 93 +------ dlls/ntdll/signal_i386.c | 380 +---------------------------- dlls/ntdll/signal_powerpc.c | 75 +----- dlls/ntdll/signal_x86_64.c | 205 +--------------- dlls/ntdll/thread.c | 51 ++-- dlls/ntdll/unix/loader.c | 10 + dlls/ntdll/unix/server.c | 12 +- dlls/ntdll/unix/signal_arm.c | 157 ++++++++++++ dlls/ntdll/unix/signal_arm64.c | 166 +++++++++++++ dlls/ntdll/unix/signal_i386.c | 508 +++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_powerpc.c | 140 +++++++++++ dlls/ntdll/unix/signal_x86_64.c | 278 +++++++++++++++++++++ dlls/ntdll/unix/thread.c | 150 ++++++++++++ dlls/ntdll/unix/unix_private.h | 19 ++ dlls/ntdll/unix/virtual.c | 22 +- dlls/ntdll/unixlib.h | 16 +- dlls/ntdll/virtual.c | 7 +- 22 files changed, 1521 insertions(+), 887 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e9f8c87e5a2acaa80f8…

1 0

Alexandre Julliard : ntdll: Use the actual zero_bits parameter in the server requests.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: b925dd78b813decf386139a15aa7bc6863ee7ae5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b925dd78b813decf386139a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 13:27:40 2020 +0200 ntdll: Use the actual zero_bits parameter in the server requests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 2 -- dlls/ntdll/server.c | 27 ++++++++++++++------------- dlls/ntdll/virtual.c | 29 +++++++---------------------- include/wine/server_protocol.h | 10 +++++----- server/protocol.def | 6 +++--- server/request.h | 8 ++++---- server/trace.c | 9 ++++----- tools/make_requests | 2 +- 8 files changed, 38 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b925dd78b813decf3861…

1 0

Alexandre Julliard : ntdll: Move server wait functions to the Unix library.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: c0319e0eabbad87a3e153c23f2461c881153b984 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0319e0eabbad87a3e153c23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 13:40:25 2020 +0200 ntdll: Move server wait functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/critsection.c | 2 +- dlls/ntdll/exception.c | 4 +- dlls/ntdll/process.c | 2 +- dlls/ntdll/server.c | 449 --------------------------------------- dlls/ntdll/sync.c | 12 +- dlls/ntdll/thread.c | 2 +- dlls/ntdll/unix/loader.c | 3 + dlls/ntdll/unix/server.c | 424 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_arm.c | 110 ++++++++++ dlls/ntdll/unix/signal_arm64.c | 98 +++++++++ dlls/ntdll/unix/signal_i386.c | 142 +++++++++++++ dlls/ntdll/unix/signal_powerpc.c | 202 ++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 134 ++++++++++++ dlls/ntdll/unix/unix_private.h | 9 + dlls/ntdll/unixlib.h | 8 +- dlls/ntdll/virtual.c | 18 +- 16 files changed, 1149 insertions(+), 470 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0319e0eabbad87a3e15…

1 0

Alexandre Julliard : ntdll: Properly reset the stack environment at thread exit on ARM64.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 87fa906a84621295a76035d73dd6305c9cd2ea4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=87fa906a84621295a76035d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 17:50:02 2020 +0200 ntdll: Properly reset the stack environment at thread exit on ARM64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49301 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 6a407c63d9..9cfb4eaa05 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -238,11 +238,13 @@ void signal_init_thread( TEB *teb ) extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), TEB *teb ); __ASM_GLOBAL_FUNC( call_thread_exit_func, + "stp x29, x30, [sp,#-16]!\n\t" "ldr x3, [x2, #0x300]\n\t" /* arm64_thread_data()->exit_frame */ "str xzr, [x2, #0x300]\n\t" "cbz x3, 1f\n\t" "mov sp, x3\n" - "1:\tblr x1" ) + "1:\tldp x29, x30, [sp], #16\n\t" + "br x1" ) /*********************************************************************** * signal_exit_thread

1 0

Vijay Kiran Kamuju : msasn1: Add stub for ASN1_Decode function.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: d2f3f3aaa831fa9c5b14dac82427283365da8f8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2f3f3aaa831fa9c5b14dac8… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun May 31 10:44:23 2020 +0200 msasn1: Add stub for ASN1_Decode function. ASN1decoding_t and ASN1encoding_t are implemented as linked lists. Current implementation does not properly emulate the linked list, as we need to identify where the next link pointers are stored. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38020 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 18 ++++++++++++++++++ dlls/msasn1/msasn1.spec | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index c96be7d07d..d151362905 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -190,3 +190,21 @@ void WINAPI ASN1_CloseDecoder(ASN1decoding_t decoder) { FIXME("(%p): Stub!\n", decoder); } + +ASN1error_e WINAPI ASN1_Decode(ASN1decoding_t decoder, void **outdata, ASN1uint32_t pdunum, + ASN1uint32_t flags, ASN1octet_t *buf, ASN1uint32_t bufsize) +{ + FIXME("(%p %p %u %08x %p %u): Stub!\n", decoder, outdata, pdunum, flags, buf, bufsize); + + if (!decoder) + return ASN1_ERR_BADARGS; + + if (!buf || !bufsize) + { + decoder->err = ASN1_ERR_BADARGS; + return ASN1_ERR_BADARGS; + } + + decoder->err = ASN1_ERR_BADPDU; + return ASN1_ERR_BADPDU; +} diff --git a/dlls/msasn1/msasn1.spec b/dlls/msasn1/msasn1.spec index f98a4a62d7..ab823b03c3 100644 --- a/dlls/msasn1/msasn1.spec +++ b/dlls/msasn1/msasn1.spec @@ -224,7 +224,7 @@ @ stub ASN1_CreateDecoderEx @ stdcall ASN1_CreateEncoder(ptr ptr ptr long ptr) @ stdcall ASN1_CreateModule(long long long long ptr ptr ptr ptr long) -@ stub ASN1_Decode +@ stdcall ASN1_Decode(ptr ptr long long ptr long) @ stub ASN1_Encode @ stub ASN1_FreeDecoded @ stub ASN1_FreeEncoded

1 0

Vijay Kiran Kamuju : include: Add missing enum, function and packing to msasn1.h.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 1b249e9055172a7a6c208a0e95335a50ae1cc56a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b249e9055172a7a6c208a0e… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Jun 1 11:10:43 2020 +0200 include: Add missing enum, function and packing to msasn1.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msasn1.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/msasn1.h b/include/msasn1.h index dd0bcb5b3d..244ed61487 100644 --- a/include/msasn1.h +++ b/include/msasn1.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 Austin English + * Copyright (C) 2020 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +19,8 @@ #ifndef __MS_ASN1_H__ #define __MS_ASN1_H__ +#include <pshpack8.h> + #ifdef __cplusplus extern "C" { #endif @@ -157,6 +160,13 @@ typedef enum tagASN1error_e ASN1_WRN_NOEOD = 1002, } ASN1error_e; +enum +{ + ASN1_CHOICE_BASE = 1, + ASN1_CHOICE_INVALID = -1, + ASN1_CHOICE_EXTENSION = 0 +}; + #define ASN1_SUCCEEDED(ret) (((int)(ret)) >= 0) #define ASN1_FAILED(ret) (((int)(ret)) < 0) @@ -301,6 +311,7 @@ void WINAPI ASN1_CloseEncoder(ASN1encoding_t); void WINAPI ASN1_CloseEncoder2(ASN1encoding_t); void WINAPI ASN1_CloseModule(ASN1module_t); ASN1error_e WINAPI ASN1_CreateDecoder(ASN1module_t, ASN1decoding_t*,ASN1octet_t*, ASN1uint32_t, ASN1decoding_t); +ASN1error_e WINAPI ASN1_CreateDecoderEx(ASN1module_t, ASN1decoding_t*,ASN1octet_t*, ASN1uint32_t, ASN1decoding_t, ASN1uint32_t); ASN1error_e WINAPI ASN1_CreateEncoder(ASN1module_t, ASN1encoding_t*, ASN1octet_t*, ASN1uint32_t, ASN1encoding_t); ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t,ASN1encodingrule_e,ASN1uint32_t,ASN1uint32_t,const ASN1GenericFun_t [],const ASN1GenericFun_t [],const ASN1FreeFun_t [],const ASN1uint32_t [],ASN1magic_t); ASN1error_e WINAPI ASN1_Decode(ASN1decoding_t, void** , ASN1uint32_t, ASN1uint32_t, ASN1octet_t*, ASN1uint32_t); @@ -352,4 +363,6 @@ void WINAPI ASN1ztcharstring_free(ASN1charstring_t*); } #endif +#include <poppack.h> + #endif /* __MS_ASN1_H__ */

1 0