Rebase against 21003538619cb22bf35d7cf68ee0ef13ff658424

This commit is contained in:
Alistair Leslie-Hughes 2020-01-09 10:21:50 +11:00
parent 93a708bf2b
commit f05f084d9a
2 changed files with 6 additions and 6 deletions

View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "6b839a0f85236aac2cc794d5d586f1ba371866b1"
echo "21003538619cb22bf35d7cf68ee0ef13ff658424"
}
# Show version information

View File

@ -1,4 +1,4 @@
From 58ef0f2b6938fbec5add8bb671afe1d81ab534fc Mon Sep 17 00:00:00 2001
From 887aef4a73c3815df3e0f218463abbea50efdf3d Mon Sep 17 00:00:00 2001
From: David Torok <dt@zeroitlab.com>
Date: Mon, 14 Oct 2019 10:37:49 +1100
Subject: [PATCH] user32: AddInternalGetWindowIcon stub.
@ -9,7 +9,7 @@ Subject: [PATCH] user32: AddInternalGetWindowIcon stub.
2 files changed, 8 insertions(+)
diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec
index f9a4ae26df..2c4d0d252a 100644
index 1aedc32de28..5499c7771f4 100644
--- a/dlls/user32/user32.spec
+++ b/dlls/user32/user32.spec
@@ -444,6 +444,7 @@
@ -17,14 +17,14 @@ index f9a4ae26df..2c4d0d252a 100644
@ stdcall InsertMenuItemW(long long long ptr)
@ stdcall InsertMenuW(long long long long ptr)
+@ stdcall InternalGetWindowIcon(long long)
@ stdcall InternalGetWindowText(long long long)
@ stdcall InternalGetWindowText(long ptr long)
@ stdcall IntersectRect(ptr ptr ptr)
@ stdcall InvalidateRect(long ptr long)
diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index 3323ed3e41..8231acc0f1 100644
index 7a9af5862c9..fbd53a76bd1 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -2887,6 +2887,13 @@ INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount )
@@ -2895,6 +2895,13 @@ INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount )
return strlen(lpString);
}