wine-devel

wine-devel@winehq.org

8 participants
84486 discussions

[PATCH] shcore: Add GetScaleFactorForDevice() stub.
by Nikolay Sivov 26 Aug '20

26 Aug '20

From: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/main.c | 7 +++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index e552ba277f7..32649cccd9c 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -86,6 +86,13 @@ HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR monitor, DEVICE_SCALE_FACTOR *s return S_OK; } +DEVICE_SCALE_FACTOR WINAPI GetScaleFactorForDevice(DISPLAY_DEVICE_TYPE device_type) +{ + FIXME("%d\n", device_type); + + return SCALE_100_PERCENT; +} + HRESULT WINAPI _IStream_Read(IStream *stream, void *dest, ULONG size) { ULONG read; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index d5b7a342e31..368fab19541 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -11,7 +11,7 @@ @ stub GetDpiForShellUIComponent @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) -@ stub GetScaleFactorForDevice +@ stdcall GetScaleFactorForDevice(long) @ stdcall GetScaleFactorForMonitor(long ptr) @ stub IStream_Copy @ stdcall IStream_Read(ptr ptr long) _IStream_Read diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 82a1daaa62b..0ca0c2432af 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -36,8 +36,15 @@ typedef enum PROCESS_DPI_AWARENESS PROCESS_PER_MONITOR_DPI_AWARE } PROCESS_DPI_AWARENESS; +typedef enum +{ + DEVICE_PRIMARY = 0, + DEVICE_IMMERSIVE = 1, +} DISPLAY_DEVICE_TYPE; + HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); +DEVICE_SCALE_FACTOR WINAPI GetScaleFactoryForDevice(DISPLAY_DEVICE_TYPE device_type); HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS); -- 2.28.0

2 1

[PATCH] msvcrt: Import memmove from musl
by Fabian Maurer 26 Aug '20

26 Aug '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49663 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msvcrt/string.c | 53 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index ab6747db5c..fb2ef3ee01 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -30,6 +30,7 @@ #include <stdio.h> #include <math.h> #include <limits.h> +#include <stdint.h> #include <errno.h> #include "msvcrt.h" #include "bnum.h" @@ -2482,22 +2483,50 @@ int __cdecl MSVCRT_memcmp(const void *ptr1, const void *ptr2, MSVCRT_size_t n) /********************************************************************* * memmove (MSVCRT.@) + * Copied from musl (http://www.musl-libc.org/): src/string/memmove.c + * + * ==================================================== + * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * + * Developed at SunSoft, a Sun Microsystems, Inc. business. + * Permission to use, copy, modify, and distribute this + * software is freely granted, provided that this notice + * is preserved. + * ==================================================== */ void * __cdecl MSVCRT_memmove(void *dst, const void *src, MSVCRT_size_t n) { - volatile unsigned char *d = dst; /* avoid gcc optimizations */ - const unsigned char *s = src; - - if ((MSVCRT_size_t)dst - (MSVCRT_size_t)src >= n) - { - while (n--) *d++ = *s++; - } - else - { - d += n - 1; - s += n - 1; - while (n--) *d-- = *s--; + char *d = dst; + const char *s = src; + typedef __attribute__((__may_alias__)) size_t WT; + const int WS = sizeof(WT); + + if (d==s) return d; + + if (d<s) { +#ifdef __GNUC__ + if ((uintptr_t)s % WS == (uintptr_t)d % WS) { + while ((uintptr_t)d % WS) { + if (!n--) return dst; + *d++ = *s++; + } + for (; n>=WS; n-=WS, d+=WS, s+=WS) *(WT *)d = *(WT *)s; + } +#endif + for (; n; n--) *d++ = *s++; + } else { +#ifdef __GNUC__ + if ((uintptr_t)s % WS == (uintptr_t)d % WS) { + while ((uintptr_t)(d+n) % WS) { + if (!n--) return dst; + d[n] = s[n]; + } + while (n>=WS) n-=WS, *(WT *)(d+n) = *(WT *)(s+n); + } +#endif + while (n) n--, d[n] = s[n]; } + return dst; } -- 2.28.0

4 14

[PATCH v2 4/6] include/d3d11sdklayers.idl: Add D3D11SwitchToRef interface.
by Biswapriyo Nath 26 Aug '20

26 Aug '20

2 1

[PATCH v2 1/6] include/d3d10sdklayers.idl: Add D3D10Debug interface.
by Biswapriyo Nath 26 Aug '20

26 Aug '20

2 1

[PATCH v2 2/6] include/d3d10sdklayers.idl: Add D3D10SwitchToRef interface.
by Biswapriyo Nath 26 Aug '20

26 Aug '20

2 1

.NET 5.0 and Wine
by Esme Povirk (they/them) 26 Aug '20

26 Aug '20

Microsoft has announced a feature complete preview of .NET 5.0: https://devblogs.microsoft.com/dotnet/announcing-net-5-0-preview-8/ I thought I would pre-empt the inevitable questions about what this means for Wine and Wine Mono. The answer is, not very much. Summary: Wine Mono will only replace .NET version 4.x and earlier. For .NET 5.0 and later in Wine, the official binaries from https://dotnet.microsoft.com/download/dotnet/5.0 should be used. The 2 runtimes can be installed at the same time and will function independently. .NET 5.0 does not interact with earlier versions of .NET at all, nor is it really part of the OS. It is a runtime that can be installed globally, or packaged with an individual application, similar to how the Mono runtime functions on Windows now. I have been told that it works fine in Wine. It's also (mostly) open source. Since .NET 5.0 breaks compatibility with earlier versions (winforms has removed APIs and changed the default font which breaks some application layouts), is open source, works independently from .NET 4.x and earlier, already works in Wine, and has a build system very different from the one used in Wine Mono, it does not make sense to try to replace it with Wine Mono. Should Wine require any changes that upstream does not wish to merge, we will need our own fork, otherwise we can simply use the official binaries. One reason to fork it might be to remove dependencies on proprietary components, most notably PresentationNative_cor3.dll, and Microsoft SDK build tools. Some of the work I've been doing with WPF may help with that, but it's still incomplete and would need to be forward-ported to the current version of WPF. For folks who want to use Wine to port Windows applications using .NET 5.0 winforms or wpf to other platforms, I am not aware of anything in the .NET 5.0 license that would get in the way of this use case.

1 0

[PATCH 1/5] iphlpapi: Unify conversions to interface guid.
by Isabella Bosia 26 Aug '20

26 Aug '20

Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c039086229..ddde081950 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1008,12 +1008,19 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index WCHAR *dst; DWORD buflen, type; INTERNAL_IF_OPER_STATUS status; + NET_LUID luid; + GUID guid; memset(aa, 0, sizeof(IP_ADAPTER_ADDRESSES)); aa->u.s.Length = sizeof(IP_ADAPTER_ADDRESSES); aa->u.s.IfIndex = index; - sprintf(ptr, "{%08x-0000-0000-0000-000000000000}", index); + ConvertInterfaceIndexToLuid(index, &luid); + ConvertInterfaceLuidToGuid(&luid, &guid); + sprintf(ptr, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], + guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], + guid.Data4[6], guid.Data4[7]); aa->AdapterName = ptr; ptr += 39; @@ -1786,7 +1793,7 @@ DWORD WINAPI GetIfEntry2( MIB_IF_ROW2 *row2 ) row2->InterfaceLuid.Info.NetLuidIndex = row.dwIndex; row2->InterfaceLuid.Info.IfType = row.dwType; row2->InterfaceIndex = row.dwIndex; - row2->InterfaceGuid.Data1 = row.dwIndex; + ConvertInterfaceLuidToGuid( &row2->InterfaceLuid, &row2->InterfaceGuid ); row2->Type = row.dwType; row2->Mtu = row.dwMtu; MultiByteToWideChar( CP_UNIXCP, 0, (const char *)row.bDescr, -1, row2->Description, len ); -- 2.25.1

2 7

[PATCH v2 2/6] windowscodecs/tests: Fix tests for CopyBlocks.
by Ziqing Hui 26 Aug '20

26 Aug '20

Using strncmp() to compare pixel data buffer leads to incorrect tests. Also, we should clear the pixel data buffer before editing and comparing them. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: This is a new patch in patch set. This patch fixes the test failure in previous patch. dlls/windowscodecs/tests/ddsformat.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)

2 1

[PATCH 1/4] gdiplus: Remove outdated FIXME comment about compositing mode.
by Shawn M. Chapla 26 Aug '20

26 Aug '20

Removes an outdated comment about graphics compositing mode being unused. Graphics compositing mode has been used in pixel blending since a16a4d97. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/gdiplus/graphics.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f0da41c6cbb..57022003249 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4781,7 +4781,6 @@ GpStatus WINGDIPAPI GdipGetClipBoundsI(GpGraphics *graphics, GpRect *rect) return GdipGetRegionBoundsI(graphics->clip, graphics, rect); } -/* FIXME: Compositing mode is not used anywhere except the getter/setter. */ GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics *graphics, CompositingMode *mode) { -- 2.28.0

2 7

[PATCH] vbscript: Implement case-insensitive search in Replace function
by Dmitry Kislyuk 26 Aug '20

26 Aug '20

2 1

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-devel