wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Jacek Caban : winecrt0: Add _fltused symbol.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 053f07f602e2ead81d3764ec8cb4279614285e0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=053f07f602e2ead81d3764ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:29:06 2020 +0200 winecrt0: Add _fltused symbol. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/crt_fltused.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index bcbd4e3b55..18a116e578 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -2,6 +2,7 @@ MODULE = libwinecrt0.a C_SRCS = \ crt_dllmain.c \ + crt_fltused.c \ debug.c \ delay_load.c \ dll_main.c \ diff --git a/dlls/winecrt0/crt_fltused.c b/dlls/winecrt0/crt_fltused.c new file mode 100644 index 0000000000..f65fc2d96c --- /dev/null +++ b/dlls/winecrt0/crt_fltused.c @@ -0,0 +1,24 @@ +/* + * Copyright 2020 Jacek Caban 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 + */ + +#ifdef _WIN32 + +/* referenced by MSVC to pull crt support for floating points. we don't use it. */ +int _fltused = 0; + +#endif

1 0

Jacek Caban : winecrt0: Build exception functions on clang msvc target.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 9666ed9c466d803eec868e5db1d63c10b614d4c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9666ed9c466d803eec868e5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:28:56 2020 +0200 winecrt0: Build exception functions on clang msvc target. We may potentially use compiler __try/__except support in this case, but there is no reason not to support both. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/exception.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index 3a0ecfef68..137ee2d6ee 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -23,7 +23,9 @@ #include "wine/exception.h" #include "wine/asm.h" -#if defined(__GNUC__) && defined(__i386__) +#if defined(__GNUC__) || defined(__clang__) + +#if defined(__i386__) __ASM_GLOBAL_FUNC( __wine_setjmpex, "movl 4(%esp),%ecx\n\t" /* jmp_buf */ @@ -62,7 +64,7 @@ __ASM_GLOBAL_FUNC( __wine_rtl_unwind, "call " __ASM_STDCALL("RtlUnwind",16) "\n\t" "call *16(%ebp)" ) -#elif defined(__GNUC__) && defined(__x86_64__) +#elif defined(__x86_64__) __ASM_GLOBAL_FUNC( __wine_setjmpex, "movq %rdx,(%rcx)\n\t" /* jmp_buf->Frame */ @@ -134,7 +136,7 @@ __ASM_GLOBAL_FUNC( __wine_rtl_unwind, /* we need an extra call to make sure the stack is correctly aligned */ "callq *%rax" ) -#elif defined(__GNUC__) && defined(__arm__) +#elif defined(__arm__) __ASM_GLOBAL_FUNC( __wine_setjmpex, "str r1, [r0]\n\t" /* jmp_buf->Frame */ @@ -196,7 +198,7 @@ void __cdecl __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_ for (;;) target(); } -#elif defined(__GNUC__) && defined(__aarch64__) +#elif defined(__aarch64__) __ASM_GLOBAL_FUNC( __wine_setjmpex, "str x1, [x0]\n\t" /* jmp_buf->Frame */ @@ -383,3 +385,5 @@ DWORD __cdecl __wine_finally_ctx_handler( EXCEPTION_RECORD *record, } return ExceptionContinueSearch; } + +#endif /* __GNUC__ || __clang__ */

1 0

Jacek Caban : ntoskrnl.exe: Export _chkstk from importlib.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 92e40853d8b7915187a419633c0e996fafb1bdf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92e40853d8b7915187a41963… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:28:49 2020 +0200 ntoskrnl.exe: Export _chkstk from importlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3013fe7eb9..7ebce5709d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3741,7 +3741,7 @@ __ASM_GLOBAL_FUNC( __chkstk, "ret" ); /************************************************************************** * _chkstk (NTOSKRNL.@) */ -__ASM_STDCALL_FUNC( _chkstk, 0, +__ASM_GLOBAL_FUNC( _chkstk, "negl %eax\n\t" "addl %esp,%eax\n\t" "xchgl %esp,%eax\n\t" diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8e3b127b16..76c4afb281 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1500,7 +1500,7 @@ @ stdcall ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private ZwYieldExecution() NtYieldExecution @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) -@ stdcall -private -arch=arm,x86_64 -norelay __chkstk() +@ cdecl -arch=arm,x86_64 -norelay __chkstk() @ cdecl -private -arch=i386 _CIcos() @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() @@ -1516,7 +1516,7 @@ @ stdcall -arch=i386 -norelay _aulldvrm(int64 int64) @ stdcall -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) -@ stdcall -arch=i386 -norelay _chkstk() +@ cdecl -arch=i386 -norelay _chkstk() @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) @ cdecl _finite(double)

1 0

Jacek Caban : ntdll: Export _chkstk from importlib.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 93d1eecb6aa4f911e4bf4ea2b32969b21588292c URL: https://source.winehq.org/git/wine.git/?a=commit;h=93d1eecb6aa4f911e4bf4ea2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:28:42 2020 +0200 ntdll: Export _chkstk from importlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/signal_i386.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5d083b0142..0dd3813987 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1640,7 +1640,7 @@ @ stdcall WriteTapemark(ptr long long long) @ stdcall -import ZombifyActCtx(ptr) @ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler -@ stdcall -arch=arm,x86_64 -private -norelay __chkstk() ntdll.__chkstk +@ cdecl -arch=arm,x86_64 -norelay __chkstk() ntdll.__chkstk @ stub _DebugOut @ stub _DebugPrintf @ stdcall _hread(long ptr long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e9a93e551d..e73682af0f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1736,7 +1736,7 @@ # @ stub _GetMUIStringFromCache # @ stub _OpenMuiStringCache @ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler -@ stdcall -arch=arm,x86_64 -private -norelay __chkstk() ntdll.__chkstk +@ cdecl -arch=arm,x86_64 -norelay __chkstk() ntdll.__chkstk # @ stub __dllonexit3 @ stub __misaligned_access # @ stub __wgetmainargs diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b2e467c70c..b19b334bb4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1413,7 +1413,7 @@ @ cdecl -private -arch=i386 _CIsin() NTDLL__CIsin @ cdecl -private -arch=i386 _CIsqrt() NTDLL__CIsqrt @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) -@ stdcall -private -arch=arm,x86_64 -norelay __chkstk() +@ cdecl -arch=arm,x86_64 -norelay __chkstk() @ cdecl __isascii(long) NTDLL___isascii @ cdecl __iscsym(long) NTDLL___iscsym @ cdecl __iscsymf(long) NTDLL___iscsymf @@ -1430,7 +1430,7 @@ @ stdcall -arch=i386 -norelay _aulldvrm(int64 int64) @ stdcall -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) -@ stdcall -private -arch=i386 -norelay _chkstk() +@ cdecl -arch=i386 -norelay _chkstk() @ stub _fltused @ cdecl -arch=i386 -ret64 _ftol() NTDLL__ftol @ cdecl _i64toa(int64 ptr long) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index e905ed0af1..5396037502 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -3050,7 +3050,7 @@ __ASM_STDCALL_FUNC( NtCurrentTeb, 0, ".byte 0x64\n\tmovl 0x18,%eax\n\tret" ) /************************************************************************** * _chkstk (NTDLL.@) */ -__ASM_STDCALL_FUNC( _chkstk, 0, +__ASM_GLOBAL_FUNC( _chkstk, "negl %eax\n\t" "addl %esp,%eax\n\t" "xchgl %esp,%eax\n\t" @@ -3061,7 +3061,7 @@ __ASM_STDCALL_FUNC( _chkstk, 0, /************************************************************************** * _alloca_probe (NTDLL.@) */ -__ASM_STDCALL_FUNC( _alloca_probe, 0, +__ASM_GLOBAL_FUNC( _alloca_probe, "negl %eax\n\t" "addl %esp,%eax\n\t" "xchgl %esp,%eax\n\t"

1 0

Nikolay Sivov : dwrite: Use feature tags directly instead of SDK symbols.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: eadd97cbcea105cade5981503b3bb8eceaa3a127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eadd97cbcea105cade598150… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 5 13:45:55 2020 +0300 dwrite: Use feature tags directly instead of SDK symbols. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/shape.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index a5a1a232e7..e7693b58ae 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -285,15 +285,15 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i { static const unsigned int common_features[] = { - DWRITE_FONT_FEATURE_TAG_GLYPH_COMPOSITION_DECOMPOSITION, - DWRITE_FONT_FEATURE_TAG_LOCALIZED_FORMS, - DWRITE_FONT_FEATURE_TAG_REQUIRED_LIGATURES, + DWRITE_MAKE_OPENTYPE_TAG('c','c','m','p'), + DWRITE_MAKE_OPENTYPE_TAG('l','o','c','l'), + DWRITE_MAKE_OPENTYPE_TAG('r','l','i','g'), }; static const unsigned int horizontal_features[] = { - DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_ALTERNATES, - DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_LIGATURES, - DWRITE_FONT_FEATURE_TAG_STANDARD_LIGATURES, + DWRITE_MAKE_OPENTYPE_TAG('c','a','l','t'), + DWRITE_MAKE_OPENTYPE_TAG('c','l','i','g'), + DWRITE_MAKE_OPENTYPE_TAG('l','i','g','a'), DWRITE_MAKE_OPENTYPE_TAG('r','c','l','t'), }; struct scriptshaping_cache *cache = context->cache;

1 0

Nikolay Sivov : dwrite: Enable common positional features for all scripts.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 33ec962e271d2d7a88a1ec66940d52b708ec040c URL: https://source.winehq.org/git/wine.git/?a=commit;h=33ec962e271d2d7a88a1ec66… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 5 13:45:54 2020 +0300 dwrite: Enable common positional features for all scripts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 78 ++++++++++++++++--------------------- dlls/dwrite/dwrite_private.h | 4 +- dlls/dwrite/shape.c | 92 +++++++++++++++++++------------------------- 3 files changed, 74 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33ec962e271d2d7a88a1…

1 0

Hans Leidekker : msxml6: Update version resource.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: dd41471f0711aa1e0999fa91f4de970bd1b42e99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd41471f0711aa1e0999fa91… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 1 09:44:48 2020 +0200 msxml6: Update version resource. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml6/rsrc.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml6/rsrc.rc b/dlls/msxml6/rsrc.rc index 9c6e55c551..d803f67962 100644 --- a/dlls/msxml6/rsrc.rc +++ b/dlls/msxml6/rsrc.rc @@ -18,10 +18,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine MSXML 6.0" #define WINE_FILENAME_STR "msxml6.dll" -#define WINE_FILEVERSION 6,10,1129,0 -#define WINE_FILEVERSION_STR "6.10.1129.0" -#define WINE_PRODUCTVERSION 6,10,1129,0 -#define WINE_PRODUCTVERSION_STR "6.10.1129.0" +#define WINE_FILEVERSION 6,30,7601,24498 +#define WINE_FILEVERSION_STR "6.30.7601.24498" +#define WINE_PRODUCTVERSION 6,30,7601,24498 +#define WINE_PRODUCTVERSION_STR "6.30.7601.24498" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc"

1 0

Hans Leidekker : msxml3: Update version resource.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 608a7f94e8fb9182b70f0b8d550e961e724f7d88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=608a7f94e8fb9182b70f0b8d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 1 09:44:47 2020 +0200 msxml3: Update version resource. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/version.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/version.rc b/dlls/msxml3/version.rc index 127ecee884..51da3e809e 100644 --- a/dlls/msxml3/version.rc +++ b/dlls/msxml3/version.rc @@ -16,10 +16,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine MSXML 3.0" #define WINE_FILENAME_STR "msxml3.dll" -#define WINE_FILEVERSION 8,90,1101,0 -#define WINE_FILEVERSION_STR "8.90.1101.0" -#define WINE_PRODUCTVERSION 8,90,1101,0 -#define WINE_PRODUCTVERSION_STR "8.90.1101.0" +#define WINE_FILEVERSION 8,110,7601,24402 +#define WINE_FILEVERSION_STR "8.110.7601.24402" +#define WINE_PRODUCTVERSION 8,110,7601,24402 +#define WINE_PRODUCTVERSION_STR "8.110.7601.24402" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc"

1 0

Alexandre Julliard : kernelbase: Add CopyMemoryNonTemporal export.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 9c0a205ff4c4b1ea62febca41213255b3b0f2452 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c0a205ff4c4b1ea62febca4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 19:05:28 2020 +0200 kernelbase: Add CopyMemoryNonTemporal export. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7b60ee3eef..e9a93e551d 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -168,7 +168,7 @@ # @ stub CopyFile2 @ stdcall CopyFileExW(wstr wstr ptr ptr ptr long) @ stdcall CopyFileW(wstr wstr long) -# @ stub -arch=x86_64 CopyMemoryNonTemporal +@ stdcall -arch=x86_64 CopyMemoryNonTemporal(ptr ptr long) ntdll.RtlCopyMemoryNonTemporal @ stdcall CopySid(long ptr ptr) # @ stub CouldMultiUserAppsBehaviorBePossibleForPackage @ stdcall CreateActCtxW(ptr)

1 0

Alexandre Julliard : kernel32: Move some stub functions to kernelbase.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 0c90da7f7ed77c6ad067319ada66377c641c82d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c90da7f7ed77c6ad067319a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 20:15:08 2020 +0200 kernel32: Move some stub functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 23 --------------------- dlls/kernel32/kernel32.spec | 26 ++++++++++++------------ dlls/kernel32/locale.c | 28 ------------------------- dlls/kernel32/process.c | 33 ------------------------------ dlls/kernel32/time.c | 24 ---------------------- dlls/kernel32/version.c | 36 --------------------------------- dlls/kernelbase/file.c | 22 ++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 26 ++++++++++++------------ dlls/kernelbase/locale.c | 27 +++++++++++++++++++++++++ dlls/kernelbase/process.c | 45 +++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/thread.c | 12 +++++++++++ dlls/kernelbase/version.c | 40 ++++++++++++++++++++++++++++++++++++ 12 files changed, 172 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c90da7f7ed77c6ad067…

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
75
Older →

Jump to page:

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 May 2020