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

Huw Davies : winebuild: On x86_64, save xmm0 - 3 during the delayed import lookup.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: fab84afd55d293c731ca94f2fc74379f29e33e13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fab84afd55d293c731ca94f2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 7 12:47:10 2018 +0000 winebuild: On x86_64, save xmm0 - 3 during the delayed import lookup. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 13fec030e73abe3a54e23288900f6ca528cf6cb0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winebuild/import.c | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 01a418f..5e5866c 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -943,24 +943,32 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tjmp *%%eax\n" ); break; case CPU_x86_64: - output( "\tsubq $88,%%rsp\n" ); - output_cfi( ".cfi_adjust_cfa_offset 88" ); - output( "\tmovq %%rdx,80(%%rsp)\n" ); - output( "\tmovq %%rcx,72(%%rsp)\n" ); - output( "\tmovq %%r8,64(%%rsp)\n" ); - output( "\tmovq %%r9,56(%%rsp)\n" ); - output( "\tmovq %%r10,48(%%rsp)\n" ); - output( "\tmovq %%r11,40(%%rsp)\n" ); + output( "\tsubq $0x98,%%rsp\n" ); + output_cfi( ".cfi_adjust_cfa_offset 0x98" ); + output( "\tmovq %%rdx,0x88(%%rsp)\n" ); + output( "\tmovq %%rcx,0x80(%%rsp)\n" ); + output( "\tmovq %%r8,0x78(%%rsp)\n" ); + output( "\tmovq %%r9,0x70(%%rsp)\n" ); + output( "\tmovq %%r10,0x68(%%rsp)\n" ); + output( "\tmovq %%r11,0x60(%%rsp)\n" ); + output( "\tmovups %%xmm0,0x50(%%rsp)\n" ); + output( "\tmovups %%xmm1,0x40(%%rsp)\n" ); + output( "\tmovups %%xmm2,0x30(%%rsp)\n" ); + output( "\tmovups %%xmm3,0x20(%%rsp)\n" ); output( "\tmovq %%rax,%%rcx\n" ); output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); - output( "\tmovq 40(%%rsp),%%r11\n" ); - output( "\tmovq 48(%%rsp),%%r10\n" ); - output( "\tmovq 56(%%rsp),%%r9\n" ); - output( "\tmovq 64(%%rsp),%%r8\n" ); - output( "\tmovq 72(%%rsp),%%rcx\n" ); - output( "\tmovq 80(%%rsp),%%rdx\n" ); - output( "\taddq $88,%%rsp\n" ); - output_cfi( ".cfi_adjust_cfa_offset -88" ); + output( "\tmovups 0x20(%%rsp),%%xmm3\n" ); + output( "\tmovups 0x30(%%rsp),%%xmm2\n" ); + output( "\tmovups 0x40(%%rsp),%%xmm1\n" ); + output( "\tmovups 0x50(%%rsp),%%xmm0\n" ); + output( "\tmovq 0x60(%%rsp),%%r11\n" ); + output( "\tmovq 0x68(%%rsp),%%r10\n" ); + output( "\tmovq 0x70(%%rsp),%%r9\n" ); + output( "\tmovq 0x78(%%rsp),%%r8\n" ); + output( "\tmovq 0x80(%%rsp),%%rcx\n" ); + output( "\tmovq 0x88(%%rsp),%%rdx\n" ); + output( "\taddq $0x98,%%rsp\n" ); + output_cfi( ".cfi_adjust_cfa_offset -0x98" ); output( "\tjmp *%%rax\n" ); break; case CPU_ARM:

1 0

André Hentschel : wininet: Fix negated check for drain_content result (clang).
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 0de02c6ac43c87939b06d2c5fcf2cdce918e77b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0de02c6ac43c87939b06d2c5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 28 19:50:06 2018 +0200 wininet: Fix negated check for drain_content result (clang). Introduced with 4f40039cd785c916cd25e5e9b4a0c75dab53a50a Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit be002fd92b9d72163bf130ab8ade8aa4d9cdbad0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/http.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b1c2d94..79f7df1 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5091,7 +5091,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, request->session->password, host)) { heap_free(requestString); - if(!drain_content(request, TRUE) == ERROR_SUCCESS) { + if (drain_content(request, TRUE) != ERROR_SUCCESS) + { FIXME("Could not drain content\n"); http_release_netconn(request, FALSE); } @@ -5119,7 +5120,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, NULL)) { heap_free(requestString); - if(!drain_content(request, TRUE) == ERROR_SUCCESS) { + if (drain_content(request, TRUE) != ERROR_SUCCESS) + { FIXME("Could not drain content\n"); http_release_netconn(request, FALSE); }

1 0

André Hentschel : gdiplus: Add stub for GdipSetPathGradientPath.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 00081e51780233e8da635d0b4560c8f8e273dded URL: https://source.winehq.org/git/wine.git/?a=commit;h=00081e51780233e8da635d0b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 26 20:09:37 2018 +0200 gdiplus: Add stub for GdipSetPathGradientPath. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e7b16bcb577fd38a1e13f1e0efc7f8a91a2ab240) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/brush.c | 12 ++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 26e3419..0114a51 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1686,6 +1686,18 @@ GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient *grad, return Ok; } +GpStatus WINGDIPAPI GdipSetPathGradientPath(GpPathGradient *grad, GDIPCONST GpPath *path) +{ + static int calls; + + TRACE("(%p, %p)\n", grad, path); + + if (!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient *grad, REAL focus, REAL scale) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 25b27e7..e0cf6d5 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -534,7 +534,7 @@ 534 stdcall GdipSetPathGradientFocusScales(ptr float float) 535 stdcall GdipSetPathGradientGammaCorrection(ptr long) 536 stdcall GdipSetPathGradientLinearBlend(ptr float float) -537 stub GdipSetPathGradientPath +537 stdcall GdipSetPathGradientPath(ptr ptr) 538 stdcall GdipSetPathGradientPresetBlend(ptr ptr ptr long) 539 stdcall GdipSetPathGradientSigmaBlend(ptr float float) 540 stdcall GdipSetPathGradientSurroundColorsWithCount(ptr ptr ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index f766441..628db82 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -589,6 +589,7 @@ GpStatus WINGDIPAPI GdipSetPathGradientCenterPoint(GpPathGradient*,GpPointF*); GpStatus WINGDIPAPI GdipSetPathGradientCenterPointI(GpPathGradient*,GpPoint*); GpStatus WINGDIPAPI GdipSetPathGradientFocusScales(GpPathGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient*,BOOL); +GpStatus WINGDIPAPI GdipSetPathGradientPath(GpPathGradient*,GDIPCONST GpPath*); GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient*, GDIPCONST ARGB*,INT*);

1 0

André Hentschel : progman: Fix warning in PUT_SHORT macro (clang).
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 547fb05fe697f773c6dc5c202466eee7132b67ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=547fb05fe697f773c6dc5c20… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 4 19:06:14 2018 +0200 progman: Fix warning in PUT_SHORT macro (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a6becd791f9d96b19863eb274d3da9e1756e1c07) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/progman/grpfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c index d49dde3..4a71ce5 100644 --- a/programs/progman/grpfile.c +++ b/programs/progman/grpfile.c @@ -32,7 +32,7 @@ #define GET_SHORT(buffer, i)\ (((BYTE)((buffer)[(i)]) + 0x100 * (signed char)((buffer)[(i)+1]))) #define PUT_SHORT(buffer, i, s)\ - (((buffer)[(i)] = (s) & 0xff, (buffer)[(i)+1] = ((s) >> 8) & 0xff)) + (((buffer)[(i)] = (BYTE)((s) & 0xff), (buffer)[(i)+1] = (BYTE)(((s) >> 8) & 0xff))) static BOOL GRPFILE_ReadFileToBuffer(LPCSTR, HLOCAL*, INT*); static HLOCAL GRPFILE_ScanGroup(LPCSTR, INT, LPCSTR, BOOL);

1 0

Ivan Kalvachev : kernel32: Add DECL_HOTPATCH to OutputDebugString functions.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: d57db8ae5132d02f85c97b4a7bf8ca1c2de2d0a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d57db8ae5132d02f85c97b4a… Author: Ivan Kalvachev <ikalvachev(a)gmail.com> Date: Sat Apr 7 14:02:16 2018 +0300 kernel32: Add DECL_HOTPATCH to OutputDebugString functions. Some Microsoft debuggers hotpatch this function to get the debug output directly from the code they are tracing. Having the wrong function prologue leads to a crash. Signed-off-by: Ivan Kalvachev <ikalvachev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7f359ea93e89de099ac6be15ca07a6ee16efdce5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/debugger.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index a277f93..8e5af30 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -253,7 +253,7 @@ static LONG WINAPI debug_exception_handler( EXCEPTION_POINTERS *eptr ) * * Nothing. */ -void WINAPI OutputDebugStringA( LPCSTR str ) +void WINAPI DECLSPEC_HOTPATCH OutputDebugStringA( LPCSTR str ) { static HANDLE DBWinMutex = NULL; static BOOL mutex_inited = FALSE; @@ -364,7 +364,7 @@ void WINAPI OutputDebugStringA( LPCSTR str ) * * Nothing. */ -void WINAPI OutputDebugStringW( LPCWSTR str ) +void WINAPI DECLSPEC_HOTPATCH OutputDebugStringW( LPCWSTR str ) { UNICODE_STRING strW; STRING strA;

1 0

Andrew Eikum : maintainers: Remove myself from a dmusic DLL.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 499db8c9fe12769a6042df8bc460e88dca3550ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=499db8c9fe12769a6042df8b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Mar 1 07:57:23 2018 -0600 maintainers: Remove myself from a dmusic DLL. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7600847da01b50c9c51de854eba29e790f4e286d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 6845a7a..d957e31 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -38,7 +38,6 @@ F: programs/winedbg/be_arm* Audio I/O M: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/dsound/ -F: dlls/dswave/ F: dlls/mmdevapi/ F: dlls/winealsa.drv/ F: dlls/winecoreaudio.drv/

1 0

Michael Stefaniuc : maintainers: Add a DirectMusic section.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 5ff32e7e86f8bda9391c52cf7986803672cffa82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ff32e7e86f8bda9391c52cf… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 1 19:00:03 2018 +0100 maintainers: Add a DirectMusic section. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5ed6fd9ade3f630e68eed077b7ca86dcd48a64b8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index d957e31..20b5678 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -90,6 +90,11 @@ DirectInput P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/dinput/ +DirectMusic +M: Michael Stefaniuc <mstefani(a)winehq.org> +F: dlls/dm*/ +F: dlls/dswave/ + DirectPlay M: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> F: dlls/dplayx/

1 0

Alistair Leslie-Hughes : maintainers: Update Staging branch.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 0d017614575742d7c4c476e2db4c36971e636ac1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d017614575742d7c4c476e2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 10 21:55:20 2018 +0000 maintainers: Update Staging branch. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4a6a7655e1cbc614f609ea53939e240f4f785a94) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 20b5678..7d76e51 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -324,7 +324,9 @@ M: Michael Stefaniuc <mstefani(a)winehq.org> W: https://wiki.winehq.org/StableRules Staging Branch +M: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> M: Sebastian Lackner <sebastian(a)fds-team.de> M: Michael Müller <michael(a)fds-team.de> +P: Zebediah Figura <z.figura12(a)gmail.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> W: https://wine-staging.com/

1 0

Alistair Leslie-Hughes : maintainers: Remove previous wine-staging maintainers.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: f0e19a3b2ed4686aacd02154304c4da7531879dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0e19a3b2ed4686aacd02154… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 30 01:13:28 2018 +0000 maintainers: Remove previous wine-staging maintainers. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a8d4b1097594b3d16d76550b5e8fe8ad37104da3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- MAINTAINERS | 2 -- 1 file changed, 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 7d76e51..e72a9e8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -325,8 +325,6 @@ W: https://wiki.winehq.org/StableRules Staging Branch M: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -M: Sebastian Lackner <sebastian(a)fds-team.de> -M: Michael Müller <michael(a)fds-team.de> P: Zebediah Figura <z.figura12(a)gmail.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> W: https://wine-staging.com/

1 0

Michael Stefaniuc : Release 3.0.2.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: b0192430380888bbd961c81c8b9baa32386337bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0192430380888bbd961c81c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jun 10 23:48:56 2018 +0200 Release 3.0.2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 389 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 5 + VERSION | 2 +- configure | 18 +-- 4 files changed, 193 insertions(+), 221 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0192430380888bbd961…

1 0