wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against bd332f53f2d7b618e313572159cd7e70e4efb0fc.

Browse Source 
[ieframe-ITargetFrame2]
Removed patch to fix implementation of impl_from_ITargetFrame2 (accepted
upstream).

[setupapi-Fix_Parser]
Removed patch to fix parsing of inf files containing garbage at the beginning
(accepted upstream).

[wined3d-MESA_GPU_Info]
Disabled patchset, a similar idea was integrated into the development branch.
This commit is contained in:
Sebastian Lackner 2016-03-20 05:53:45 +01:00
parent 17ee57bb51
commit 15c75d5194
7 changed files with 27 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
patches/ieframe-ITargetFrame2/0001-ieframe-Fix-implementation-of-impl_from_ITargetFrame.patch
View File

@ -1,25 +0,0 @@
From 1b110d47948ea020afbfebda288d8362837b8f43 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 16 Mar 2016 01:18:05 +0100
Subject: ieframe: Fix implementation of impl_from_ITargetFrame2.
---
dlls/ieframe/navigate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c
index 1027313eb..88bc7e6 100644
--- a/dlls/ieframe/navigate.c
+++ b/dlls/ieframe/navigate.c
@@ -1243,7 +1243,7 @@ static const IHlinkFrameVtbl HlinkFrameVtbl = {
static inline HlinkFrame *impl_from_ITargetFrame2(ITargetFrame2 *iface)
{
- return CONTAINING_RECORD(iface, HlinkFrame, IHlinkFrame_iface);
+ return CONTAINING_RECORD(iface, HlinkFrame, ITargetFrame2_iface);
}
static HRESULT WINAPI TargetFrame2_QueryInterface(ITargetFrame2 *iface, REFIID riid, void **ppv)
--
2.7.1

22
patches/opengl32-glDebugMessageCallback/0002-opengl32-Add-wrappers-for-glDebugMessageCallback-to-.patch
View File

@ -1,4 +1,4 @@
From 8e64df5a5161db39c7e1828b138e72f4bbcc7693 Mon Sep 17 00:00:00 2001
From ea32c5954fa372ee12c8566724897e5aba6ca886 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 12 Feb 2016 02:39:07 +0100
Subject: opengl32: Add wrappers for glDebugMessageCallback to handle calling
@ -13,10 +13,10 @@ Subject: opengl32: Add wrappers for glDebugMessageCallback to handle calling
5 files changed, 110 insertions(+), 18 deletions(-)
diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl
index 2b15f58..9a95fa77 100755
index 45e3f72..c799347 100755
--- a/dlls/opengl32/make_opengl
+++ b/dlls/opengl32/make_opengl
@@ -238,6 +238,11 @@ sub GenerateThunk($$$$)
@@ -239,6 +239,11 @@ sub GenerateThunk($$$$)
return "" if $name eq "glDebugEntry";
return "" if $name eq "glGetIntegerv";
return "" if $name eq "glGetString";
@ -29,10 +29,10 @@ index 2b15f58..9a95fa77 100755
# If for opengl_norm.c, generate a nice heading otherwise Patrik won't be happy :-)
diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c
index e1aeec5..d707f9a 100644
index 2a3b435..e216ec4 100644
--- a/dlls/opengl32/opengl_ext.c
+++ b/dlls/opengl32/opengl_ext.c
@@ -1942,24 +1942,6 @@ static void WINAPI glCurrentPaletteMatrixARB( GLint index ) {
@@ -1954,24 +1954,6 @@ static void WINAPI glCurrentPaletteMatrixARB( GLint index ) {
funcs->ext.p_glCurrentPaletteMatrixARB( index );
}
@ -58,12 +58,12 @@ index e1aeec5..d707f9a 100644
const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;
TRACE("(%d, %d, %d, %d, %p, %d)\n", source, type, severity, count, ids, enabled );
diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h
index 2e49d4a..a538434 100644
index 4f1791a..8bffba0 100644
--- a/dlls/opengl32/opengl_ext.h
+++ b/dlls/opengl32/opengl_ext.h
@@ -33,4 +33,8 @@ extern const int extension_registry_size DECLSPEC_HIDDEN;
extern BOOL WINAPI wglSetPixelFormatWINE( HDC hdc, int format ) DECLSPEC_HIDDEN;
@@ -38,4 +38,8 @@ extern BOOL WINAPI wglQueryRendererIntegerWINE( HDC dc, GLint renderer,
GLenum attribute, GLuint *value ) DECLSPEC_HIDDEN;
extern const GLchar * WINAPI wglQueryRendererStringWINE( HDC dc, GLint renderer, GLenum attribute ) DECLSPEC_HIDDEN;
+extern void WINAPI glDebugMessageCallback( void *callback, const void *userParam ) DECLSPEC_HIDDEN;
+extern void WINAPI glDebugMessageCallbackAMD( void *callback, void *userParam ) DECLSPEC_HIDDEN;
@ -147,7 +147,7 @@ index 3f203ab..59b92ea 100644
test_destroy(hdc);
test_sharelists(hdc);
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index f3f78ef..e5f9a6f 100644
index 932b217..64ebda2 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -62,6 +62,9 @@ struct opengl_context
@ -160,7 +160,7 @@ index f3f78ef..e5f9a6f 100644
GLubyte *extensions; /* extension string */
GLuint *disabled_exts; /* indices of disabled extensions */
struct wgl_context *drv_ctx; /* driver context */
@@ -1919,6 +1922,60 @@ const GLubyte * WINAPI glGetString( GLenum name )
@@ -1975,6 +1978,60 @@ const GLubyte * WINAPI glGetString( GLenum name )
return ret;
}

60
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "03ee99b43c2a01ce0e6f77fc0bbc71570a695336"
echo "bd332f53f2d7b618e313572159cd7e70e4efb0fc"
}
# Show version information
@ -154,7 +154,6 @@ patch_enable_all ()
enable_hal_KeQueryPerformanceCounter="$1"
enable_hid_HidP_TranslateUsagesToI8042ScanCodes="$1"
enable_hnetcfg_INetFwAuthorizedApplication="$1"
enable_ieframe_ITargetFrame2="$1"
enable_ieframe_IViewObject_Draw="$1"
enable_iexplore_Revert_ProductVersion="$1"
enable_imagehlp_BindImageEx="$1"
@ -289,7 +288,6 @@ patch_enable_all ()
enable_setupapi_DelReg="$1"
enable_setupapi_DiskSpaceList="$1"
enable_setupapi_Display_Device="$1"
enable_setupapi_Fix_Parser="$1"
enable_setupapi_HSPFILEQ_Check_Type="$1"
enable_setupapi_SetupDiSetDeviceInstallParamsW="$1"
enable_setupapi_SetupPromptForDisk="$1"
@ -359,7 +357,6 @@ patch_enable_all ()
enable_wined3d_CSMT_Helper="$1"
enable_wined3d_DXTn="$1"
enable_wined3d_Geforce_425M="$1"
enable_wined3d_MESA_GPU_Info="$1"
enable_wined3d_Revert_PixelFormat="$1"
enable_wined3d_Silence_FIXMEs="$1"
enable_wined3d_resource_map="$1"
@ -633,9 +630,6 @@ patch_enable ()
hnetcfg-INetFwAuthorizedApplication)
enable_hnetcfg_INetFwAuthorizedApplication="$2"
;;
ieframe-ITargetFrame2)
enable_ieframe_ITargetFrame2="$2"
;;
ieframe-IViewObject-Draw)
enable_ieframe_IViewObject_Draw="$2"
;;
@ -1038,9 +1032,6 @@ patch_enable ()
setupapi-Display_Device)
enable_setupapi_Display_Device="$2"
;;
setupapi-Fix_Parser)
enable_setupapi_Fix_Parser="$2"
;;
setupapi-HSPFILEQ_Check_Type)
enable_setupapi_HSPFILEQ_Check_Type="$2"
;;
@ -1248,9 +1239,6 @@ patch_enable ()
wined3d-Geforce_425M)
enable_wined3d_Geforce_425M="$2"
;;
wined3d-MESA_GPU_Info)
enable_wined3d_MESA_GPU_Info="$2"
;;
wined3d-Revert_PixelFormat)
enable_wined3d_Revert_PixelFormat="$2"
;;
@ -1987,13 +1975,6 @@ if test "$enable_wpcap_Dynamic_Linking" -eq 1; then
enable_wpcap_Several_Fixes=1
fi
if test "$enable_wined3d_MESA_GPU_Info" -eq 1; then
if test "$enable_wined3d_Accounting" -gt 1; then
abort "Patchset wined3d-Accounting disabled, but wined3d-MESA_GPU_Info depends on that."
fi
enable_wined3d_Accounting=1
fi
if test "$enable_wined3d_CSMT_Helper" -eq 1; then
if test "$enable_makedep_PARENTSPEC" -gt 1; then
abort "Patchset makedep-PARENTSPEC disabled, but wined3d-CSMT_Helper depends on that."
@ -3854,18 +3835,6 @@ if test "$enable_hnetcfg_INetFwAuthorizedApplication" -eq 1; then
) >> "$patchlist"
fi
# Patchset ieframe-ITargetFrame2
# |
# | Modified files:
# | * dlls/ieframe/navigate.c
# |
if test "$enable_ieframe_ITargetFrame2" -eq 1; then
patch_apply ieframe-ITargetFrame2/0001-ieframe-Fix-implementation-of-impl_from_ITargetFrame.patch
(
echo '+ { "Sebastian Lackner", "ieframe: Fix implementation of impl_from_ITargetFrame2.", 1 },';
) >> "$patchlist"
fi
# Patchset ieframe-IViewObject-Draw
# |
# | This patchset fixes the following Wine bugs:
@ -6047,18 +6016,6 @@ if test "$enable_setupapi_Display_Device" -eq 1; then
) >> "$patchlist"
fi
# Patchset setupapi-Fix_Parser
# |
# | Modified files:
# | * dlls/setupapi/parser.c, dlls/setupapi/tests/parser.c
# |
if test "$enable_setupapi_Fix_Parser" -eq 1; then
patch_apply setupapi-Fix_Parser/0001-setupapi-Fix-parsing-of-inf-files-containing-garbage.patch
(
echo '+ { "Sebastian Lackner", "setupapi: Fix parsing of inf files containing garbage at the beginning.", 1 },';
) >> "$patchlist"
fi
# Patchset setupapi-HSPFILEQ_Check_Type
# |
# | This patchset fixes the following Wine bugs:
@ -7117,21 +7074,6 @@ if test "$enable_wined3d_Geforce_425M" -eq 1; then
) >> "$patchlist"
fi
# Patchset wined3d-MESA_GPU_Info
# |
# | This patchset has the following (direct or indirect) dependencies:
# | * wined3d-Accounting
# |
# | Modified files:
# | * dlls/wined3d/directx.c, dlls/wined3d/wined3d_gl.h, dlls/winex11.drv/opengl.c, include/wine/wgl_driver.h
# |
if test "$enable_wined3d_MESA_GPU_Info" -eq 1; then
patch_apply wined3d-MESA_GPU_Info/0001-wined3d-Use-pci-and-memory-information-from-MESA-if-.patch
(
echo '+ { "Michael Müller", "wined3d: Use pci and memory information from MESA if possible.", 2 },';
) >> "$patchlist"
fi
# Patchset wined3d-Revert_PixelFormat
# |
# | Modified files:

92
patches/setupapi-Fix_Parser/0001-setupapi-Fix-parsing-of-inf-files-containing-garbage.patch
View File

@ -1,92 +0,0 @@
From 4e1994ca2f169d84b2c879d3d792d177f66086e7 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 2 Mar 2016 21:50:40 +0100
Subject: setupapi: Fix parsing of inf files containing garbage at the
beginning.
---
dlls/setupapi/parser.c | 23 ++++++++++++++++++++---
dlls/setupapi/tests/parser.c | 12 ++++++++++++
2 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c
index e8c8fd3..1bbeac3 100644
--- a/dlls/setupapi/parser.c
+++ b/dlls/setupapi/parser.c
@@ -114,6 +114,7 @@ struct parser
int cur_section; /* index of section being parsed*/
struct line *line; /* current line */
unsigned int line_pos; /* current line position in file */
+ unsigned int garbage_line; /* first line containing garbage (if any) */
unsigned int error; /* error code */
unsigned int token_len; /* current token len */
WCHAR token[MAX_FIELD_LEN+1]; /* current token */
@@ -602,9 +603,17 @@ static const WCHAR *line_start_state( struct parser *parser, const WCHAR *pos )
default:
if (!isspaceW(*p))
{
- parser->start = p;
- set_state( parser, KEY_NAME );
- return p;
+ if (parser->cur_section != -1)
+ {
+ parser->start = p;
+ set_state( parser, KEY_NAME );
+ return p;
+ }
+ else if (!parser->garbage_line)
+ {
+ /* remember line, and check later */
+ parser->garbage_line = parser->line_pos;
+ }
}
break;
}
@@ -886,6 +895,7 @@ static DWORD parse_buffer( struct inf_file *file, const WCHAR *buffer, const WCH
parser.stack_pos = 0;
parser.cur_section = -1;
parser.line_pos = 1;
+ parser.garbage_line = 0;
parser.error = 0;
parser.token_len = 0;
@@ -916,6 +926,13 @@ static DWORD parse_buffer( struct inf_file *file, const WCHAR *buffer, const WCH
/* find the [strings] section */
file->strings_section = find_section( file, Strings );
+
+ if (file->strings_section == -1 && parser.garbage_line)
+ {
+ if (error_line) *error_line = parser.garbage_line;
+ return ERROR_EXPECTED_SECTION_NAME;
+ }
+
return 0;
}
diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c
index f929f01..67c9887 100644
--- a/dlls/setupapi/tests/parser.c
+++ b/dlls/setupapi/tests/parser.c
@@ -133,6 +133,18 @@ static const struct
{ STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE },
{ STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE },
{ STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE },
+ { "garbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 1, FALSE },
+ { "garbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE },
+ { ";comment\ngarbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 2, FALSE },
+ { ";comment\ngarbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE },
+ { " \t\ngarbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 2, FALSE },
+ { " \t\ngarbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE },
+ { "garbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 1, FALSE },
+ { "garbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE },
+ { ";comment\ngarbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 2, FALSE },
+ { ";comment\ngarbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE },
+ { " \t\ngarbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 2, FALSE },
+ { " \t\ngarbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE },
};
static void test_invalid_files(void)
--
2.7.1

1
patches/setupapi-Fix_Parser/definition
View File

@ -1 +0,0 @@
Fixes: Fix parsing of inf files containing garbage at the beginning of file

48
patches/wined3d-Accounting/0001-wined3d-Use-real-values-for-memory-accounting-on-NVI.patch
View File

@ -1,16 +1,16 @@
From c89131518dc8b8fd1995628ccf2832c6fd0e106a Mon Sep 17 00:00:00 2001
From cc05161339b7fab594d8e7d68c4f52cb63b1ab17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 6 Jun 2015 06:53:34 +0200
Subject: wined3d: Use real values for memory accounting on NVIDIA cards.
---
dlls/wined3d/device.c | 23 +++++++++++++++++++++++
dlls/wined3d/directx.c | 16 ++++++++++++++--
dlls/wined3d/directx.c | 10 ++++++++++
dlls/wined3d/wined3d_gl.h | 1 +
3 files changed, 38 insertions(+), 2 deletions(-)
3 files changed, 34 insertions(+)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index c410a47..cb80e0b 100644
index 37d9ee9..0437c81 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1244,8 +1244,31 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device)
@ -46,7 +46,7 @@ index c410a47..cb80e0b 100644
wine_dbgstr_longlong(device->adapter->vram_bytes),
wine_dbgstr_longlong(device->adapter->vram_bytes_used),
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 1aea568..999c7b3 100644
index da66aac..36432af 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -225,6 +225,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
@ -57,44 +57,24 @@ index 1aea568..999c7b3 100644
/* SGI */
{"GL_SGIS_generate_mipmap", SGIS_GENERATE_MIPMAP },
@@ -1401,7 +1402,8 @@ static const struct gpu_description *get_gpu_description(enum wined3d_pci_vendor
return NULL;
}
-static void init_driver_info(struct wined3d_driver_info *driver_info,
+/* Context activation is done by the caller. */
+static void init_driver_info(struct wined3d_gl_info *gl_info, struct wined3d_driver_info *driver_info,
enum wined3d_pci_vendor vendor, enum wined3d_pci_device device)
{
OSVERSIONINFOW os_version;
@@ -1522,6 +1524,16 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
driver_info->vram_bytes = LONG_MAX;
@@ -1422,6 +1423,15 @@ static const struct gpu_description *query_gpu_description(const struct wined3d_
TRACE("Card reports vendor PCI ID 0x%04x, device PCI ID 0x%04x, 0x%s bytes of video memory.\n",
vendor, device, wine_dbgstr_longlong(*vram_bytes));
}
+ if (gl_info->supported[NVX_GPU_MEMORY_INFO])
+ else if (gl_info->supported[NVX_GPU_MEMORY_INFO])
+ {
+ GLint vram_kb;
+ gl_info->gl_ops.gl.p_glGetIntegerv(GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX, &vram_kb);
+
+ driver_info->vram_bytes = (UINT64)vram_kb * 1024;
+ *vram_bytes = (UINT64)vram_kb * 1024;
+ TRACE("Got 0x%s as video memory from NVX_GPU_MEMORY_INFO extension.\n",
+ wine_dbgstr_longlong(driver_info->vram_bytes));
+ wine_dbgstr_longlong(*vram_bytes));
+ }
+
if (wined3d_settings.emulated_textureram)
{
TRACE("Overriding amount of video memory with 0x%s bytes.\n",
@@ -3848,7 +3860,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD
}
fixup_extensions(gl_info, gl_renderer_str, gl_vendor, card_vendor, device);
- init_driver_info(driver_info, card_vendor, device);
+ init_driver_info(gl_info, driver_info, card_vendor, device);
gl_ext_emul_mask = adapter->vertex_pipe->vp_get_emul_mask(gl_info)
| adapter->fragment_pipe->get_emul_mask(gl_info);
if (gl_ext_emul_mask & GL_EXT_EMUL_ARB_MULTITEXTURE)
if (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE)
{
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index 51053c5..87eca96 100644
index e344ff1..3b982f4 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -158,6 +158,7 @@ enum wined3d_gl_extension

1
patches/wined3d-MESA_GPU_Info/definition
View File

@ -1,2 +1,3 @@
Fixes: Use GLX_MESA_query_renderer extension to get more exact GPU infos
Depends: wined3d-Accounting
Disabled: true