wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 42bba70a024060fbd698aadec20fbb6f61ad9e16.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-10-21 16:15:04 +11:00
parent be9c96813a
commit 5b5a6de9b8
5 changed files with 21 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/uxtheme-CloseThemeClass/0001-uxtheme-Protect-CloseThemeData-from-invalid-input.patch
View File

@@ -1,4 +1,4 @@
From f97de7500c086aa283e4b299f3f103a83438fd01 Mon Sep 17 00:00:00 2001
From 21abf2eb3cab9a3dea048171eccd775949cfd548 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Fri, 18 Nov 2016 22:31:29 +0800
Subject: [PATCH] uxtheme: Protect CloseThemeData() from invalid input.
@@ -14,7 +14,7 @@ Testcase by Michael Müller <michael@fds-team.de>.
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c
index cee5aaf054e..5030e52a597 100644
index cd7677e5783..a0ec290eb40 100644
--- a/dlls/uxtheme/msstyles.c
+++ b/dlls/uxtheme/msstyles.c
@@ -32,6 +32,7 @@
@@ -25,16 +25,16 @@ index cee5aaf054e..5030e52a597 100644
#include "wine/debug.h"
#include "wine/heap.h"
@@ -54,6 +55,8 @@ static const WCHAR szThemesIniResource[] = {
't','h','e','m','e','s','_','i','n','i','\0'
};
@@ -50,6 +51,8 @@ extern int alphaBlendMode;
#define MSSTYLES_VERSION 0x0003
+#define THEME_CLASS_SIGNATURE (('T' << 24) | ('H' << 16) | ('E' << 8) | 'M')
+
static PTHEME_FILE tfActiveTheme;
/***********************************************************************/
@@ -218,6 +221,7 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf)
@@ -205,6 +208,7 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf)
pcls->partstate = ps->next;
heap_free(ps);
}
@@ -42,7 +42,7 @@ index cee5aaf054e..5030e52a597 100644
heap_free(pcls);
}
}
@@ -449,6 +453,7 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST
@@ -433,6 +437,7 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST
if(cur) return cur;
cur = heap_alloc(sizeof(*cur));
@@ -50,7 +50,7 @@ index cee5aaf054e..5030e52a597 100644
cur->hTheme = tf->hTheme;
lstrcpyW(cur->szAppName, pszAppName);
lstrcpyW(cur->szClassName, pszClassName);
@@ -1042,6 +1047,23 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList)
@@ -1024,6 +1029,23 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList)
*/
HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc)
{
@@ -96,7 +96,7 @@ index 0b7e1ab35cc..ba10ac82b82 100644
} THEME_IMAGE, *PTHEME_IMAGE;
diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c
index b3a861eaa6b..1cfafb30e2a 100644
index 5b6c91dc481..83b8f2ba040 100644
--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -189,6 +189,10 @@ static void test_OpenThemeData(void)
@@ -111,5 +111,5 @@ index b3a861eaa6b..1cfafb30e2a 100644
{
SetLastError(0xdeadbeef);
--
2.20.1
2.28.0