mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Rebase against 59987bc9ecdd0dbafd768a95c21a14884bc77c07
This commit is contained in:
Alistair Leslie-Hughes
parent
8d4d0a840e
commit
029c249e78
@ -1,4 +1,4 @@
|
||||
From f9ae11dca3f89a8b56315f759d1c6b1ec60bd71f Mon Sep 17 00:00:00 2001
|
||||
From cafe4ce8b7c5d0d3c9df47277e6cd53bb8e71b32 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 15 Aug 2015 07:41:17 +0200
|
||||
Subject: [PATCH] gdi32: Perform lazy initialization of fonts to improve
|
||||
@ -29,10 +29,10 @@ index c24b96e2750..ecc095dffec 100644
|
||||
}
|
||||
|
||||
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
|
||||
index 1162ea790d5..6a7f2d13c0d 100644
|
||||
index 31ad56706ac..91cd6327431 100644
|
||||
--- a/dlls/gdi32/freetype.c
|
||||
+++ b/dlls/gdi32/freetype.c
|
||||
@@ -109,6 +109,9 @@
|
||||
@@ -108,6 +108,9 @@
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(font);
|
||||
|
||||
@ -42,15 +42,15 @@ index 1162ea790d5..6a7f2d13c0d 100644
|
||||
#ifdef HAVE_FREETYPE
|
||||
|
||||
#ifndef HAVE_FT_TRUETYPEENGINETYPE
|
||||
@@ -3263,6 +3266,7 @@ INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv)
|
||||
{
|
||||
@@ -3291,6 +3294,7 @@ INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv)
|
||||
WCHAR path[MAX_PATH];
|
||||
INT ret = 0;
|
||||
|
||||
+ RtlRunOnceExecuteOnce( &init_once, freetype_lazy_init, NULL, NULL );
|
||||
GDI_CheckNotLock();
|
||||
|
||||
if (ft_handle) /* do it only if we have freetype up and running */
|
||||
@@ -3305,6 +3309,7 @@ INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv)
|
||||
@@ -3325,6 +3329,7 @@ INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv)
|
||||
*/
|
||||
HANDLE WineEngAddFontMemResourceEx(PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD *pcFonts)
|
||||
{
|
||||
@ -58,15 +58,15 @@ index 1162ea790d5..6a7f2d13c0d 100644
|
||||
GDI_CheckNotLock();
|
||||
|
||||
if (ft_handle) /* do it only if we have freetype up and running */
|
||||
@@ -3343,6 +3348,7 @@ BOOL WineEngRemoveFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv)
|
||||
{
|
||||
@@ -3364,6 +3369,7 @@ BOOL WineEngRemoveFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv)
|
||||
WCHAR path[MAX_PATH];
|
||||
INT ret = 0;
|
||||
|
||||
+ RtlRunOnceExecuteOnce( &init_once, freetype_lazy_init, NULL, NULL );
|
||||
GDI_CheckNotLock();
|
||||
|
||||
if (ft_handle) /* do it only if we have freetype up and running */
|
||||
@@ -3664,10 +3670,13 @@ static BOOL create_fot( const WCHAR *resource, const WCHAR *font_file, const str
|
||||
@@ -3677,10 +3683,13 @@ static BOOL create_fot( const WCHAR *resource, const WCHAR *font_file, const str
|
||||
BOOL WineEngCreateScalableFontResource( DWORD hidden, LPCWSTR resource,
|
||||
LPCWSTR font_file, LPCWSTR font_path )
|
||||
{
|
||||
@ -81,7 +81,7 @@ index 1162ea790d5..6a7f2d13c0d 100644
|
||||
if (!unix_name || !get_fontdir( unix_name, &fontdir ))
|
||||
SetLastError( ERROR_INVALID_PARAMETER );
|
||||
else
|
||||
@@ -4181,8 +4190,6 @@ static BOOL init_freetype(void)
|
||||
@@ -4194,8 +4203,6 @@ static BOOL init_freetype(void)
|
||||
FT_UInt interpreter_version = 35;
|
||||
pFT_Property_Set( library, "truetype", "interpreter-version", &interpreter_version );
|
||||
}
|
||||
@ -90,7 +90,7 @@ index 1162ea790d5..6a7f2d13c0d 100644
|
||||
return TRUE;
|
||||
|
||||
sym_not_found:
|
||||
@@ -4368,21 +4375,13 @@ static void reorder_font_list(void)
|
||||
@@ -4366,21 +4373,13 @@ static void reorder_font_list(void)
|
||||
default_sans = set_default( default_sans_list );
|
||||
}
|
||||
|
||||
@ -114,7 +114,7 @@ index 1162ea790d5..6a7f2d13c0d 100644
|
||||
|
||||
#ifdef SONAME_LIBFONTCONFIG
|
||||
init_fontconfig();
|
||||
@@ -4408,7 +4407,7 @@ BOOL WineEngInit(void)
|
||||
@@ -4406,7 +4405,7 @@ BOOL WineEngInit(void)
|
||||
if((font_mutex = CreateMutexW(NULL, FALSE, font_mutex_nameW)) == NULL)
|
||||
{
|
||||
ERR("Failed to create font mutex\n");
|
||||
@ -123,7 +123,7 @@ index 1162ea790d5..6a7f2d13c0d 100644
|
||||
}
|
||||
WaitForSingleObject(font_mutex, INFINITE);
|
||||
|
||||
@@ -4435,6 +4434,21 @@ BOOL WineEngInit(void)
|
||||
@@ -4433,6 +4432,21 @@ BOOL WineEngInit(void)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@ -145,7 +145,7 @@ index 1162ea790d5..6a7f2d13c0d 100644
|
||||
/* Some fonts have large usWinDescent values, as a result of storing signed short
|
||||
in unsigned field. That's probably caused by sTypoDescent vs usWinDescent confusion in
|
||||
some font generation tools. */
|
||||
@@ -5177,8 +5191,12 @@ static BOOL select_charmap(FT_Face ft_face, FT_Encoding encoding)
|
||||
@@ -5175,8 +5189,12 @@ static BOOL select_charmap(FT_Face ft_face, FT_Encoding encoding)
|
||||
static BOOL CDECL freetype_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device,
|
||||
LPCWSTR output, const DEVMODEW *devmode )
|
||||
{
|
||||
@ -159,7 +159,7 @@ index 1162ea790d5..6a7f2d13c0d 100644
|
||||
if (!physdev) return FALSE;
|
||||
push_dc_driver( dev, &physdev->dev, &freetype_funcs );
|
||||
return TRUE;
|
||||
@@ -8749,6 +8767,7 @@ static BOOL CDECL freetype_FontIsLinked( PHYSDEV dev )
|
||||
@@ -8753,6 +8771,7 @@ static BOOL CDECL freetype_FontIsLinked( PHYSDEV dev )
|
||||
*/
|
||||
BOOL WINAPI GetRasterizerCaps( LPRASTERIZER_STATUS lprs, UINT cbNumBytes)
|
||||
{
|
||||
@ -168,5 +168,5 @@ index 1162ea790d5..6a7f2d13c0d 100644
|
||||
lprs->wFlags = TT_AVAILABLE | TT_ENABLED;
|
||||
lprs->nLanguageID = 0;
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 96702e031b7b541dab331e1cdaa965e0c8eb0cfe Mon Sep 17 00:00:00 2001
|
||||
From 5f8071c1a278c96b1fd0a83b4b9924ed69520e5e Mon Sep 17 00:00:00 2001
|
||||
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
|
||||
Date: Tue, 19 Aug 2014 22:10:49 -0600
|
||||
Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
|
||||
@ -14,10 +14,10 @@ Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
|
||||
create mode 100644 libs/port/xattr.c
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 670056a86..437fe32af 100644
|
||||
index af9175dfaad..4cbd823f5e0 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -86,6 +86,7 @@ AC_ARG_WITH(unwind, AS_HELP_STRING([--without-unwind],[do not use the libunwi
|
||||
@@ -89,6 +89,7 @@ AC_ARG_WITH(usb, AS_HELP_STRING([--without-usb],[do not use the libusb lib
|
||||
AC_ARG_WITH(v4l2, AS_HELP_STRING([--without-v4l2],[do not use v4l2 (video capture)]))
|
||||
AC_ARG_WITH(vkd3d, AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)]))
|
||||
AC_ARG_WITH(vulkan, AS_HELP_STRING([--without-vulkan],[do not use Vulkan]))
|
||||
@ -25,7 +25,7 @@ index 670056a86..437fe32af 100644
|
||||
AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
|
||||
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
|
||||
AC_ARG_WITH(xcursor, AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]),
|
||||
@@ -686,6 +687,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
|
||||
@@ -699,6 +700,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
|
||||
#include <sys/socket.h>
|
||||
#endif])
|
||||
|
||||
@ -44,10 +44,10 @@ index 670056a86..437fe32af 100644
|
||||
|
||||
AC_SUBST(DLLFLAGS,"-D_REENTRANT")
|
||||
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
|
||||
index 6900b9c85..bdf7faedb 100644
|
||||
index 583da3a236e..f8227f10163 100644
|
||||
--- a/dlls/ntdll/file.c
|
||||
+++ b/dlls/ntdll/file.c
|
||||
@@ -127,6 +127,22 @@ static const WCHAR ntfsW[] = {'N','T','F','S'};
|
||||
@@ -126,6 +126,22 @@ mode_t FILE_umask = 0;
|
||||
NTSTATUS FILE_DecodeSymlink(const char *unix_src, char *unix_dest, USHORT *unix_dest_len,
|
||||
DWORD *tag, ULONG *flags, BOOL *is_dir);
|
||||
|
||||
@ -71,10 +71,10 @@ index 6900b9c85..bdf7faedb 100644
|
||||
static inline ULONG get_file_attributes( const struct stat *st )
|
||||
{
|
||||
diff --git a/include/wine/port.h b/include/wine/port.h
|
||||
index a7ddd4a05..62d8112a9 100644
|
||||
index 5a805c11993..c0efa12fbde 100644
|
||||
--- a/include/wine/port.h
|
||||
+++ b/include/wine/port.h
|
||||
@@ -356,6 +356,14 @@ int usleep (unsigned int useconds);
|
||||
@@ -361,6 +361,14 @@ int usleep (unsigned int useconds);
|
||||
|
||||
extern int mkstemps(char *template, int suffix_len);
|
||||
|
||||
@ -90,11 +90,11 @@ index a7ddd4a05..62d8112a9 100644
|
||||
|
||||
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
|
||||
diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
|
||||
index f6fbc2c26..40006a690 100644
|
||||
index 695938ae434..9796bc40537 100644
|
||||
--- a/libs/port/Makefile.in
|
||||
+++ b/libs/port/Makefile.in
|
||||
@@ -26,4 +26,5 @@ C_SRCS = \
|
||||
stubs.c \
|
||||
@@ -23,4 +23,5 @@ C_SRCS = \
|
||||
strnlen.c \
|
||||
symlink.c \
|
||||
usleep.c \
|
||||
- wctype.c
|
||||
@ -102,7 +102,7 @@ index f6fbc2c26..40006a690 100644
|
||||
+ xattr.c
|
||||
diff --git a/libs/port/xattr.c b/libs/port/xattr.c
|
||||
new file mode 100644
|
||||
index 000000000..94b77132b
|
||||
index 00000000000..94b77132bbf
|
||||
--- /dev/null
|
||||
+++ b/libs/port/xattr.c
|
||||
@@ -0,0 +1,39 @@
|
||||
@ -146,5 +146,5 @@ index 000000000..94b77132b
|
||||
+#endif
|
||||
+}
|
||||
--
|
||||
2.25.0
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,142 +0,0 @@
|
||||
From dd07559a20c219c50b2225c84f0b96a05a85e043 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 2 Sep 2017 04:20:21 +0200
|
||||
Subject: opengl32: Treat invalid pixel types as PFD_TYPE_RGBA in
|
||||
wglChoosePixelFormat.
|
||||
|
||||
---
|
||||
dlls/opengl32/tests/opengl.c | 59 ++++++++++++++++++++++++++++----------------
|
||||
dlls/opengl32/wgl.c | 2 +-
|
||||
2 files changed, 39 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c
|
||||
index db5ad76e96b..346b89d45ae 100644
|
||||
--- a/dlls/opengl32/tests/opengl.c
|
||||
+++ b/dlls/opengl32/tests/opengl.c
|
||||
@@ -242,7 +242,7 @@ static void test_pbuffers(HDC hdc)
|
||||
else skip("Pbuffer test for offscreen pixelformat skipped as no offscreen-only format with pbuffer capabilities has been found\n");
|
||||
}
|
||||
|
||||
-static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd)
|
||||
+static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd, PIXELFORMATDESCRIPTOR *fmt)
|
||||
{
|
||||
int pf;
|
||||
HDC hdc;
|
||||
@@ -255,6 +255,12 @@ static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd)
|
||||
|
||||
hdc = GetDC( hwnd );
|
||||
pf = ChoosePixelFormat( hdc, pfd );
|
||||
+ if (pf && fmt)
|
||||
+ {
|
||||
+ memset(fmt, 0, sizeof(*fmt));
|
||||
+ ok(DescribePixelFormat( hdc, pf, sizeof(*fmt), fmt ),
|
||||
+ "DescribePixelFormat failed with error: %u\n", GetLastError());
|
||||
+ }
|
||||
ReleaseDC( hwnd, hdc );
|
||||
DestroyWindow( hwnd );
|
||||
|
||||
@@ -282,57 +288,68 @@ static void test_choosepixelformat(void)
|
||||
0, /* reserved */
|
||||
0, 0, 0 /* layer masks */
|
||||
};
|
||||
+ PIXELFORMATDESCRIPTOR ret_fmt;
|
||||
|
||||
- ok( test_pfd(&pfd), "Simple pfd failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" );
|
||||
pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE;
|
||||
- ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" );
|
||||
pfd.dwFlags |= PFD_STEREO_DONTCARE;
|
||||
- ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" );
|
||||
pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE;
|
||||
- ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" );
|
||||
pfd.dwFlags &= ~PFD_STEREO_DONTCARE;
|
||||
+ pfd.iPixelType = 32;
|
||||
+ ok( test_pfd(&pfd, &ret_fmt), "Invalid pixel format 32 failed\n" );
|
||||
+ ok( ret_fmt.iPixelType == PFD_TYPE_RGBA, "Expected pixel type PFD_TYPE_RGBA, got %d\n", ret_fmt.iPixelType );
|
||||
+ pfd.iPixelType = 33;
|
||||
+ ok( test_pfd(&pfd, &ret_fmt), "Invalid pixel format 33 failed\n" );
|
||||
+ ok( ret_fmt.iPixelType == PFD_TYPE_RGBA, "Expected pixel type PFD_TYPE_RGBA, got %d\n", ret_fmt.iPixelType );
|
||||
+ pfd.iPixelType = 15;
|
||||
+ ok( test_pfd(&pfd, &ret_fmt), "Invalid pixel format 15 failed\n" );
|
||||
+ ok( ret_fmt.iPixelType == PFD_TYPE_RGBA, "Expected pixel type PFD_TYPE_RGBA, got %d\n", ret_fmt.iPixelType );
|
||||
+ pfd.iPixelType = PFD_TYPE_RGBA;
|
||||
|
||||
pfd.cColorBits = 32;
|
||||
- ok( test_pfd(&pfd), "Simple pfd failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" );
|
||||
pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE;
|
||||
- ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" );
|
||||
pfd.dwFlags |= PFD_STEREO_DONTCARE;
|
||||
- ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" );
|
||||
pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE;
|
||||
- ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" );
|
||||
pfd.dwFlags &= ~PFD_STEREO_DONTCARE;
|
||||
pfd.cColorBits = 0;
|
||||
|
||||
pfd.cAlphaBits = 8;
|
||||
- ok( test_pfd(&pfd), "Simple pfd failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" );
|
||||
pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE;
|
||||
- ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" );
|
||||
pfd.dwFlags |= PFD_STEREO_DONTCARE;
|
||||
- ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" );
|
||||
pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE;
|
||||
- ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" );
|
||||
pfd.dwFlags &= ~PFD_STEREO_DONTCARE;
|
||||
pfd.cAlphaBits = 0;
|
||||
|
||||
pfd.cStencilBits = 8;
|
||||
- ok( test_pfd(&pfd), "Simple pfd failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" );
|
||||
pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE;
|
||||
- ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" );
|
||||
pfd.dwFlags |= PFD_STEREO_DONTCARE;
|
||||
- ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" );
|
||||
pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE;
|
||||
- ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" );
|
||||
pfd.dwFlags &= ~PFD_STEREO_DONTCARE;
|
||||
pfd.cStencilBits = 0;
|
||||
|
||||
pfd.cAuxBuffers = 1;
|
||||
- ok( test_pfd(&pfd), "Simple pfd failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" );
|
||||
pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE;
|
||||
- ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" );
|
||||
pfd.dwFlags |= PFD_STEREO_DONTCARE;
|
||||
- ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" );
|
||||
pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE;
|
||||
- ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" );
|
||||
+ ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" );
|
||||
pfd.dwFlags &= ~PFD_STEREO_DONTCARE;
|
||||
pfd.cAuxBuffers = 0;
|
||||
}
|
||||
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
|
||||
index ae230bfcb0f..25920b6b119 100644
|
||||
--- a/dlls/opengl32/wgl.c
|
||||
+++ b/dlls/opengl32/wgl.c
|
||||
@@ -480,7 +480,7 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd)
|
||||
{
|
||||
if (!wglDescribePixelFormat( hdc, i, sizeof(format), &format )) continue;
|
||||
|
||||
- if (ppfd->iPixelType != format.iPixelType)
|
||||
+ if ((ppfd->iPixelType == PFD_TYPE_COLORINDEX) != (format.iPixelType == PFD_TYPE_COLORINDEX))
|
||||
{
|
||||
TRACE( "pixel type mismatch for iPixelFormat=%d\n", i );
|
||||
continue;
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [43638] Treat invalid pixel types as PFD_TYPE_RGBA in wglChoosePixelFormat
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "c18152630362c1bff1813fe8ad5c75ffb8dbb7cf"
|
||||
echo "59987bc9ecdd0dbafd768a95c21a14884bc77c07"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -229,7 +229,6 @@ patch_enable_all ()
|
||||
enable_oleaut32_OleLoadPicture="$1"
|
||||
enable_oleaut32_OleLoadPictureFile="$1"
|
||||
enable_opencl_version_1_2="$1"
|
||||
enable_opengl32_wglChoosePixelFormat="$1"
|
||||
enable_packager_DllMain="$1"
|
||||
enable_pdh_PdhLookupPerfNameByIndex_processor="$1"
|
||||
enable_quartz_MediaSeeking_Positions="$1"
|
||||
@ -306,7 +305,6 @@ patch_enable_all ()
|
||||
enable_winebuild_Fake_Dlls="$1"
|
||||
enable_winecfg_Libraries="$1"
|
||||
enable_winecfg_Staging="$1"
|
||||
enable_winecfg_Unmounted_Devices="$1"
|
||||
enable_wined3d_Accounting="$1"
|
||||
enable_wined3d_CSMT_Main="$1"
|
||||
enable_wined3d_Indexed_Vertex_Blending="$1"
|
||||
@ -797,9 +795,6 @@ patch_enable ()
|
||||
opencl-version_1_2)
|
||||
enable_opencl_version_1_2="$2"
|
||||
;;
|
||||
opengl32-wglChoosePixelFormat)
|
||||
enable_opengl32_wglChoosePixelFormat="$2"
|
||||
;;
|
||||
packager-DllMain)
|
||||
enable_packager_DllMain="$2"
|
||||
;;
|
||||
@ -1028,9 +1023,6 @@ patch_enable ()
|
||||
winecfg-Staging)
|
||||
enable_winecfg_Staging="$2"
|
||||
;;
|
||||
winecfg-Unmounted_Devices)
|
||||
enable_winecfg_Unmounted_Devices="$2"
|
||||
;;
|
||||
wined3d-Accounting)
|
||||
enable_wined3d_Accounting="$2"
|
||||
;;
|
||||
@ -5271,21 +5263,6 @@ if test "$enable_opencl_version_1_2" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset opengl32-wglChoosePixelFormat
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#43638] Treat invalid pixel types as PFD_TYPE_RGBA in wglChoosePixelFormat
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/opengl32/tests/opengl.c, dlls/opengl32/wgl.c
|
||||
# |
|
||||
if test "$enable_opengl32_wglChoosePixelFormat" -eq 1; then
|
||||
patch_apply opengl32-wglChoosePixelFormat/0001-opengl32-Treat-invalid-pixel-types-as-PFD_TYPE_RGBA-.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Michael Müller", "opengl32: Treat invalid pixel types as PFD_TYPE_RGBA in wglChoosePixelFormat.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset packager-DllMain
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -6519,18 +6496,6 @@ if test "$enable_winecfg_Staging" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset winecfg-Unmounted_Devices
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * programs/winecfg/drive.c, programs/winecfg/drivedetect.c, programs/winecfg/driveui.c
|
||||
# |
|
||||
if test "$enable_winecfg_Unmounted_Devices" -eq 1; then
|
||||
patch_apply winecfg-Unmounted_Devices/0001-winecfg-Show-unmounted-devices-and-allow-changing-th.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Michael Müller", "winecfg: Show unmounted devices and allow changing the device value.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-Accounting
|
||||
# |
|
||||
# | Modified files:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From c4de4777e66d9fbe7a21e8e68c2839ef8db07bee Mon Sep 17 00:00:00 2001
|
||||
From bf564ac0eee8525ab28e78552dd54e633607230f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sun, 14 Dec 2014 20:42:45 +0100
|
||||
Subject: [PATCH] winecfg: Add staging tab for CSMT.
|
||||
@ -14,10 +14,10 @@ Subject: [PATCH] winecfg: Add staging tab for CSMT.
|
||||
create mode 100644 programs/winecfg/staging.c
|
||||
|
||||
diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
|
||||
index 4e66e04e31a..1cf70310d57 100644
|
||||
index a2746f7d4ac..2172dac2169 100644
|
||||
--- a/programs/winecfg/Makefile.in
|
||||
+++ b/programs/winecfg/Makefile.in
|
||||
@@ -11,6 +11,7 @@ C_SRCS = \
|
||||
@@ -10,6 +10,7 @@ C_SRCS = \
|
||||
driveui.c \
|
||||
libraries.c \
|
||||
main.c \
|
||||
@ -26,7 +26,7 @@ index 4e66e04e31a..1cf70310d57 100644
|
||||
winecfg.c \
|
||||
x11drvdlg.c
|
||||
diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c
|
||||
index b8a85fe7175..de209a925cc 100644
|
||||
index 735ac02299f..3d7d740883f 100644
|
||||
--- a/programs/winecfg/main.c
|
||||
+++ b/programs/winecfg/main.c
|
||||
@@ -58,7 +58,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam)
|
||||
@ -56,7 +56,7 @@ index b8a85fe7175..de209a925cc 100644
|
||||
* Fill out the (General) PROPSHEETPAGE data structure
|
||||
* for the property sheet
|
||||
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
|
||||
index 2760e92c000..fe98287e241 100644
|
||||
index dd46bc71b40..582c5c967e4 100644
|
||||
--- a/programs/winecfg/resource.h
|
||||
+++ b/programs/winecfg/resource.h
|
||||
@@ -45,6 +45,7 @@
|
||||
@ -75,7 +75,7 @@ index 2760e92c000..fe98287e241 100644
|
||||
#define IDC_WINVER 1012
|
||||
#define IDC_DESKTOP_WIDTH 1023
|
||||
#define IDC_DESKTOP_HEIGHT 1024
|
||||
@@ -211,6 +213,9 @@
|
||||
@@ -210,6 +212,9 @@
|
||||
#define IDC_SYSPARAMS_MENU_HIGHLIGHT 8430
|
||||
#define IDC_SYSPARAMS_MENUBAR 8431
|
||||
|
||||
@ -177,7 +177,7 @@ index 00000000000..f5ab2594a22
|
||||
+ return FALSE;
|
||||
+}
|
||||
diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h
|
||||
index 110856a5365..a94947439c3 100644
|
||||
index 9dd39c51c3f..9279d42ea98 100644
|
||||
--- a/programs/winecfg/winecfg.h
|
||||
+++ b/programs/winecfg/winecfg.h
|
||||
@@ -87,6 +87,7 @@ INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
@ -187,9 +187,9 @@ index 110856a5365..a94947439c3 100644
|
||||
+INT_PTR CALLBACK StagingDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||
INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||
|
||||
/* Drive management */
|
||||
/* Windows version management */
|
||||
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
|
||||
index f2f795f5278..ecf6fa432c2 100644
|
||||
index 1faa0a60b55..895f68c1237 100644
|
||||
--- a/programs/winecfg/winecfg.rc
|
||||
+++ b/programs/winecfg/winecfg.rc
|
||||
@@ -38,6 +38,7 @@ BEGIN
|
||||
@ -200,7 +200,7 @@ index f2f795f5278..ecf6fa432c2 100644
|
||||
IDS_TAB_ABOUT "About"
|
||||
IDS_WINECFG_TITLE "Wine configuration"
|
||||
IDS_WINECFG_TITLE_APP "Wine configuration for %s"
|
||||
@@ -311,6 +312,15 @@ BEGIN
|
||||
@@ -310,6 +311,15 @@ BEGIN
|
||||
PUSHBUTTON "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED
|
||||
END
|
||||
|
||||
@ -217,5 +217,5 @@ index f2f795f5278..ecf6fa432c2 100644
|
||||
|
||||
/* @makedep: winecfg.ico */
|
||||
--
|
||||
2.26.0
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1 +1,2 @@
|
||||
Fixes: Show unmounted devices in winecfg and allow changing the unix path
|
||||
Disabled: True
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 65db555c42f4f114cba9f22fbec969f971e853ef Mon Sep 17 00:00:00 2001
|
||||
From 5e065400b86307a3ff59324fe4760f2812c3ba6d Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Wed, 24 Sep 2014 21:13:59 +0200
|
||||
Subject: [PATCH] winemenubuilder: Create desktop shortcuts with absolute wine
|
||||
@ -11,11 +11,11 @@ behaviour on Linux, because some other distros are a bit special (FreeBSD requir
|
||||
wine, and so on ...).
|
||||
---
|
||||
programs/winemenubuilder/Makefile.in | 1 +
|
||||
programs/winemenubuilder/winemenubuilder.c | 15 ++++++++++++---
|
||||
2 files changed, 13 insertions(+), 3 deletions(-)
|
||||
programs/winemenubuilder/winemenubuilder.c | 21 +++++++++++++++------
|
||||
2 files changed, 16 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in
|
||||
index 07e2702843..a4e28adc4b 100644
|
||||
index 07e2702843b..a4e28adc4b4 100644
|
||||
--- a/programs/winemenubuilder/Makefile.in
|
||||
+++ b/programs/winemenubuilder/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
@ -27,10 +27,10 @@ index 07e2702843..a4e28adc4b 100644
|
||||
C_SRCS = \
|
||||
winemenubuilder.c
|
||||
diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
|
||||
index 26710e9e92..c0834e54af 100644
|
||||
index d6fc9e29234..88824fc8c46 100644
|
||||
--- a/programs/winemenubuilder/winemenubuilder.c
|
||||
+++ b/programs/winemenubuilder/winemenubuilder.c
|
||||
@@ -107,6 +107,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(menubuilder);
|
||||
@@ -106,6 +106,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(menubuilder);
|
||||
#define IS_OPTION_TRUE(ch) \
|
||||
((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1')
|
||||
|
||||
@ -45,27 +45,37 @@ index 26710e9e92..c0834e54af 100644
|
||||
/* link file formats */
|
||||
|
||||
#include "pshpack1.h"
|
||||
@@ -1464,8 +1472,8 @@ static BOOL write_desktop_entry(const char *unix_link, const char *location, con
|
||||
|
||||
@@ -1466,11 +1474,12 @@ static BOOL write_desktop_entry(const char *unix_link, const char *location, con
|
||||
fprintf(file, "[Desktop Entry]\n");
|
||||
fprintf(file, "Name=%s\n", linkname);
|
||||
- fprintf(file, "Exec=env WINEPREFIX=\"%s\" wine %s %s\n",
|
||||
- wine_get_config_dir(), path, args);
|
||||
+ fprintf(file, "Exec=env WINEPREFIX=\"%s\" %s %s %s\n",
|
||||
+ wine_get_config_dir(), wine_path, path, args);
|
||||
if (prefix)
|
||||
- fprintf(file, "Exec=env WINEPREFIX=\"%s\" wine %s %s\n", prefix, path, args);
|
||||
+ fprintf(file, "Exec=env WINEPREFIX=\"%s\" wine %s %s\n", prefix, wine_path, args);
|
||||
else if (home)
|
||||
- fprintf(file, "Exec=env WINEPREFIX=\"%s/.wine\" wine %s %s\n", home, path, args);
|
||||
+ fprintf(file, "Exec=env WINEPREFIX=\"%s/.wine\" wine %s %s\n", home, wine_path, args);
|
||||
else
|
||||
- fprintf(file, "Exec=wine %s %s\n", path, args);
|
||||
+ fprintf(file, "Exec=wine %s %s\n", wine_path, args);
|
||||
+
|
||||
fprintf(file, "Type=Application\n");
|
||||
fprintf(file, "StartupNotify=true\n");
|
||||
if (descr && *descr)
|
||||
@@ -2505,7 +2513,8 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c
|
||||
fprintf(desktop, "Type=Application\n");
|
||||
@@ -2513,11 +2522,11 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c
|
||||
fprintf(desktop, "Name=%s\n", friendlyAppName);
|
||||
fprintf(desktop, "MimeType=%s;\n", mimeType);
|
||||
- fprintf(desktop, "Exec=env WINEPREFIX=\"%s\" wine start /ProgIDOpen %s %%f\n", wine_get_config_dir(), progId);
|
||||
+ fprintf(desktop, "Exec=env WINEPREFIX=\"%s\" %s start /ProgIDOpen %s %%f\n",
|
||||
+ wine_get_config_dir(), wine_path, progId);
|
||||
if (prefix)
|
||||
- fprintf(desktop, "Exec=env WINEPREFIX=\"%s\" wine start /ProgIDOpen %s %%f\n", prefix, progId);
|
||||
+ fprintf(desktop, "Exec=env WINEPREFIX=\"%s\" %s start /ProgIDOpen %s %%f\n", prefix, wine_path, progId);
|
||||
else if (home)
|
||||
- fprintf(desktop, "Exec=env WINEPREFIX=\"%s/.wine\" wine start /ProgIDOpen %s %%f\n", home, progId);
|
||||
+ fprintf(desktop, "Exec=env WINEPREFIX=\"%s/.wine\" %s start /ProgIDOpen %s %%f\n", home, wine_path, progId);
|
||||
else
|
||||
- fprintf(desktop, "Exec=wine start /ProgIDOpen %s %%f\n", progId);
|
||||
+ fprintf(desktop, "Exec=%s start /ProgIDOpen %s %%f\n", wine_path, progId);
|
||||
fprintf(desktop, "NoDisplay=true\n");
|
||||
fprintf(desktop, "StartupNotify=true\n");
|
||||
if (openWithIcon)
|
||||
--
|
||||
2.19.1
|
||||
2.25.1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user