Removed several patches (accepted upstream).

This commit is contained in:
Sebastian Lackner
2014-12-15 22:50:30 +01:00
parent 346417b032
commit 8765c50218
10 changed files with 14 additions and 961 deletions

View File

@@ -1,4 +1,4 @@
From bd8ddd1f8297c0216db8f027652c35cbfdfdcb54 Mon Sep 17 00:00:00 2001
From 3e8d16b07793f5794702e31dc08a55a71f46fa1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 7 Aug 2014 01:41:25 +0200
Subject: comctl32: Implement LoadIconMetric function.
@@ -24,7 +24,7 @@ index e63f0ac..af49017 100644
ipaddress.c \
listview.c \
diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec
index 0dff369..1343fca 100644
index 0bd8b13..2b96891 100644
--- a/dlls/comctl32/comctl32.spec
+++ b/dlls/comctl32/comctl32.spec
@@ -88,6 +88,7 @@
@@ -32,9 +32,9 @@ index 0dff369..1343fca 100644
376 stdcall -noname -private IntlStrEqWorkerA(long str str long)
377 stdcall -noname -private IntlStrEqWorkerW(long wstr wstr long)
+380 stdcall LoadIconMetric(ptr wstr long ptr)
381 stdcall -ordinal LoadIconWithScaleDown(ptr wstr long long ptr)
382 stdcall -noname SmoothScrollWindow(ptr)
383 stub -noname DoReaderMode
384 stdcall -noname SetPathWordBreakProc(ptr long)
diff --git a/dlls/comctl32/icon.c b/dlls/comctl32/icon.c
new file mode 100644
index 0000000..a664e2c
@@ -110,10 +110,10 @@ index 0000000..a664e2c
+ return HRESULT_FROM_WIN32(GetLastError());
+}
diff --git a/include/commctrl.h b/include/commctrl.h
index 9993ec7..0cc401e 100644
index 0bcaeb6..525f356 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -1373,6 +1373,12 @@ typedef struct tagTBADDBITMAP {
@@ -1374,6 +1374,12 @@ typedef struct tagTBADDBITMAP {
#define HIST_ADDTOFAVORITES 3
#define HIST_VIEWTREE 4
@@ -127,5 +127,5 @@ index 9993ec7..0cc401e 100644
HKEY hkr;
LPCSTR pszSubKey;
--
1.8.3.2
2.1.3