mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Rebase against d050343c502202e1abdabdb37668684031d5367d.
This commit is contained in:
Sebastian Lackner
parent
6b720c8cd2
commit
3307e90080
12
README.md
12
README.md
@ -104,7 +104,7 @@ for more details.*
|
||||
* Avseq crashes when multisampling is enabled ([Wine Bug #31998](https://bugs.winehq.org/show_bug.cgi?id=31998))
|
||||
* Basic handling of write watches triggered while we're on the signal stack.
|
||||
* Basic support for CUDA
|
||||
* BitBlt and StretchDIBits should be marked as hotpatchable
|
||||
* ~~BitBlt and StretchDIBits should be marked as hotpatchable~~
|
||||
* Black & White needs DXTn software decoding support ([Wine Bug #14939](https://bugs.winehq.org/show_bug.cgi?id=14939))
|
||||
* CPU-Z fails to start because GetLogicalProcessorInformationEx returns FALSE
|
||||
* Calculate msvcrt exponential math operations with higher precision ([Wine Bug #37149](https://bugs.winehq.org/show_bug.cgi?id=37149))
|
||||
@ -206,7 +206,7 @@ for more details.*
|
||||
* Implement stub for ntoskrnl.KeDelayExecutionThread.
|
||||
* Implement stubs for ntoskrnl.Ex{Acquire,Release}FastMutexUnsafe
|
||||
* Implement stubs for ntoskrnl.ObReferenceObjectByPointer and ntoskrnl.ObDereferenceObject
|
||||
* Implement ws2_32.InetPtonA/W functions
|
||||
* ~~Implement ws2_32.InetPtonA/W functions~~
|
||||
* Improve ReadDataAvailable handling in FilePipeLocalInformation class
|
||||
* Improve startup performance by delaying font initialization
|
||||
* Improve stub for AEV_GetVolumeRange ([Wine Bug #35658](https://bugs.winehq.org/show_bug.cgi?id=35658))
|
||||
@ -229,7 +229,7 @@ for more details.*
|
||||
* Need for Speed 3 installer requires devices in HKEY_DYN_DATA ([Wine Bug #7115](https://bugs.winehq.org/show_bug.cgi?id=7115))
|
||||
* Only set SFGAO_HASSUBFOLDER when there are really subfolders ([Wine Bug #24851](https://bugs.winehq.org/show_bug.cgi?id=24851))
|
||||
* Other Pipelight-specific enhancements
|
||||
* Pass cookie by reference to msvcrt_local_unwind4 in _seh_longjmp_unwind4 ([Wine Bug #39356](https://bugs.winehq.org/show_bug.cgi?id=39356))
|
||||
* ~~Pass cookie by reference to msvcrt_local_unwind4 in _seh_longjmp_unwind4~~ ([Wine Bug #39356](https://bugs.winehq.org/show_bug.cgi?id=39356))
|
||||
* Port Royale doesn't display ocean correctly ([Wine Bug #17913](https://bugs.winehq.org/show_bug.cgi?id=17913))
|
||||
* Prevent window managers from grouping all wine programs together ([Wine Bug #32699](https://bugs.winehq.org/show_bug.cgi?id=32699))
|
||||
* Process APC calls before starting process
|
||||
@ -241,7 +241,7 @@ for more details.*
|
||||
* Protect TVM_GETITEM from invalid item pointers ([Wine Bug #33001](https://bugs.winehq.org/show_bug.cgi?id=33001))
|
||||
* Reduced SetTimer minimum value from 10 ms to 5 ms (improves Silverlight framerates)
|
||||
* Refresh MDI menus when DefMDIChildProc(WM_SETTEXT) is called ([Wine Bug #21855](https://bugs.winehq.org/show_bug.cgi?id=21855))
|
||||
* RegOpenKeyExA, RegCloseKey and RegQueryValueExA should be hotpatchable
|
||||
* ~~RegOpenKeyExA, RegCloseKey and RegQueryValueExA should be hotpatchable~~
|
||||
* Report correct ObjectName for NamedPipe wineserver objects
|
||||
* Return STATUS_INVALID_DEVICE_REQUEST when trying to call NtReadFile on directory
|
||||
* Return a dummy BIOS name in Win32_BIOS record
|
||||
@ -280,7 +280,7 @@ for more details.*
|
||||
* Support for ID3DXSkinInfoImpl_UpdateSkinnedMesh ([Wine Bug #32572](https://bugs.winehq.org/show_bug.cgi?id=32572))
|
||||
* Support for Junction Points ([Wine Bug #12401](https://bugs.winehq.org/show_bug.cgi?id=12401))
|
||||
* Support for KF_FLAG_DEFAULT_PATH in SHGetKnownFolderPath ([Wine Bug #30385](https://bugs.winehq.org/show_bug.cgi?id=30385))
|
||||
* Support for LoadIconMetric ([Wine Bug #35375](https://bugs.winehq.org/show_bug.cgi?id=35375))
|
||||
* ~~Support for LoadIconMetric~~ ([Wine Bug #35375](https://bugs.winehq.org/show_bug.cgi?id=35375))
|
||||
* Support for MPEG2 DXVA2 GPU video decoding through vaapi
|
||||
* Support for NVIDIA video encoder library (nvencodeapi)
|
||||
* Support for NtQuerySection ([Wine Bug #37338](https://bugs.winehq.org/show_bug.cgi?id=37338))
|
||||
@ -311,7 +311,7 @@ for more details.*
|
||||
* Voobly expects correct handling of WRITECOPY memory protection ([Wine Bug #29384](https://bugs.winehq.org/show_bug.cgi?id=29384))
|
||||
* Wine ignores IDF_CHECKFIRST flag in SetupPromptForDisk ([Wine Bug #20465](https://bugs.winehq.org/show_bug.cgi?id=20465))
|
||||
* Workaround for shlwapi URLs with relative paths
|
||||
* WritePrivateProfileStringA should be hotpatchable
|
||||
* ~~WritePrivateProfileStringA should be hotpatchable~~
|
||||
* XEMBED support for embedding Wine windows inside Linux applications
|
||||
* eRacer Demo doesn't correctly display text ([Wine Bug #29598](https://bugs.winehq.org/show_bug.cgi?id=29598))
|
||||
* ntdll is missing WinSqm[Start|End]Session implementation ([Wine Bug #31971](https://bugs.winehq.org/show_bug.cgi?id=31971))
|
||||
|
||||
10
debian/changelog
vendored
10
debian/changelog
vendored
@ -1,5 +1,15 @@
|
||||
wine-staging (1.7.53) UNRELEASED; urgency=low
|
||||
* Added patch to implement support for msiexec /passive command line option.
|
||||
* Removed patch to mark RegOpenKeyExA, RegCloseKey and RegQueryValueExA as
|
||||
hotpatchable (accepted upstream).
|
||||
* Removed patch to mark BitBlt and StretchDIBits as hotpatchable (accepted
|
||||
upstream).
|
||||
* Removed patch to mark WritePrivateProfileStringA as hotpatchable (accepted
|
||||
upstream).
|
||||
* Removed patch to implement ws2_32.InetPtonW function (accepted upstream).
|
||||
* Removed patch to pass cookie by reference to msvcrt_local_unwind4 in
|
||||
_seh_longjmp_unwind4 (accepted upstream).
|
||||
* Removed patch to implement LoadIconMetric (accepted upstream).
|
||||
-- Sebastian Lackner <sebastian@fds-team.de> Sun, 04 Oct 2015 23:56:05 +0200
|
||||
|
||||
wine-staging (1.7.52) unstable; urgency=low
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
From bca490fc6eff140415ea68354a1458635be8522b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Fri, 2 Oct 2015 17:25:56 +0200
|
||||
Subject: advapi32: Mark some functions as hotpatchable.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Michael Müller <michael@fds-team.de>
|
||||
---
|
||||
dlls/advapi32/registry.c | 10 ++++++----
|
||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
|
||||
index 2482b85..f988c0e 100644
|
||||
--- a/dlls/advapi32/registry.c
|
||||
+++ b/dlls/advapi32/registry.c
|
||||
@@ -23,6 +23,8 @@
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
@@ -522,7 +524,7 @@ LSTATUS WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD options, REGSAM acc
|
||||
* Unlike RegCreateKeyExA(), this function will not create the key if it
|
||||
* does not exist.
|
||||
*/
|
||||
-LSTATUS WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD options, REGSAM access, PHKEY retkey )
|
||||
+LSTATUS WINAPI DECLSPEC_HOTPATCH RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD options, REGSAM access, PHKEY retkey )
|
||||
{
|
||||
OBJECT_ATTRIBUTES attr;
|
||||
STRING nameA;
|
||||
@@ -1107,7 +1109,7 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW
|
||||
* Success: ERROR_SUCCESS
|
||||
* Failure: Error code
|
||||
*/
|
||||
-LSTATUS WINAPI RegCloseKey( HKEY hkey )
|
||||
+LSTATUS WINAPI DECLSPEC_HOTPATCH RegCloseKey( HKEY hkey )
|
||||
{
|
||||
if (!hkey) return ERROR_INVALID_HANDLE;
|
||||
if (hkey >= (HKEY)0x80000000) return ERROR_SUCCESS;
|
||||
@@ -1477,8 +1479,8 @@ LSTATUS WINAPI RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDWORD reserved, LPDW
|
||||
* MSDN states that if data is too small it is partially filled. In reality
|
||||
* it remains untouched.
|
||||
*/
|
||||
-LSTATUS WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWORD type,
|
||||
- LPBYTE data, LPDWORD count )
|
||||
+LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved,
|
||||
+ LPDWORD type, LPBYTE data, LPDWORD count )
|
||||
{
|
||||
NTSTATUS status;
|
||||
ANSI_STRING nameA;
|
||||
--
|
||||
2.5.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: RegOpenKeyExA, RegCloseKey and RegQueryValueExA should be hotpatchable
|
||||
@ -1,65 +0,0 @@
|
||||
From a8bbc313edc840beb43636d634354f8d281ddd0f 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: Add semi-stub implementation for LoadIconWithScaleDown.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Michael Müller <michael@fds-team.de>
|
||||
---
|
||||
dlls/comctl32/commctrl.c | 18 +++++++++++++++---
|
||||
include/commctrl.h | 2 +-
|
||||
2 files changed, 16 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
|
||||
index e18c27d..97656a5 100644
|
||||
--- a/dlls/comctl32/commctrl.c
|
||||
+++ b/dlls/comctl32/commctrl.c
|
||||
@@ -3,6 +3,7 @@
|
||||
*
|
||||
* Copyright 1997 Dimitrie O. Paun
|
||||
* Copyright 1998,2000 Eric Kohl
|
||||
+ * Copyright 2014-2015 Michael Müller
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
@@ -1641,8 +1642,19 @@ HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *pTaskConfig, int *pnBu
|
||||
/***********************************************************************
|
||||
* LoadIconWithScaleDown [COMCTL32.@]
|
||||
*/
|
||||
-HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE hinst, PCWSTR name, int cx, int cy, HICON *icon)
|
||||
+HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE hinst, const WCHAR *name, int cx, int cy, HICON *icon)
|
||||
{
|
||||
- FIXME("stub: %p %s %d %d %p\n", hinst, wine_dbgstr_w(name), cx, cy, icon);
|
||||
- return E_NOTIMPL;
|
||||
+ TRACE("(%p, %s, %d, %d, %p)\n", hinst, debugstr_w(name), cx, cy, icon);
|
||||
+
|
||||
+ *icon = NULL;
|
||||
+
|
||||
+ if (!name)
|
||||
+ return E_INVALIDARG;
|
||||
+
|
||||
+ *icon = LoadImageW(hinst, name, IMAGE_ICON, cx, cy,
|
||||
+ (hinst || IS_INTRESOURCE(name)) ? 0 : LR_LOADFROMFILE);
|
||||
+ if (!*icon)
|
||||
+ return HRESULT_FROM_WIN32(GetLastError());
|
||||
+
|
||||
+ return S_OK;
|
||||
}
|
||||
diff --git a/include/commctrl.h b/include/commctrl.h
|
||||
index 0bcaeb6..0ed0997 100644
|
||||
--- a/include/commctrl.h
|
||||
+++ b/include/commctrl.h
|
||||
@@ -42,7 +42,7 @@ BOOL WINAPI InitCommonControlsEx (const INITCOMMONCONTROLSEX*);
|
||||
LANGID WINAPI GetMUILanguage (VOID);
|
||||
VOID WINAPI InitMUILanguage (LANGID uiLang);
|
||||
|
||||
-HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, PCWSTR, int, int, HICON *);
|
||||
+HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *);
|
||||
|
||||
#define COMCTL32_VERSION 5 /* dll version */
|
||||
|
||||
--
|
||||
2.5.1
|
||||
|
||||
@ -1,85 +0,0 @@
|
||||
From 3e453d9acebccfdcd209dbc57130bdfcaeb154ce Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 1 Oct 2015 22:52:22 +0200
|
||||
Subject: comctl32: Add implementation for LoadIconMetric.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Michael Müller <michael@fds-team.de>
|
||||
---
|
||||
dlls/comctl32/comctl32.spec | 1 +
|
||||
dlls/comctl32/commctrl.c | 28 ++++++++++++++++++++++++++++
|
||||
include/commctrl.h | 7 +++++++
|
||||
3 files changed, 36 insertions(+)
|
||||
|
||||
diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec
|
||||
index 1e92e5f..1a5ab57 100644
|
||||
--- a/dlls/comctl32/comctl32.spec
|
||||
+++ b/dlls/comctl32/comctl32.spec
|
||||
@@ -88,6 +88,7 @@
|
||||
375 stdcall -noname -private StrCSpnIW(wstr wstr)
|
||||
376 stdcall -noname -private IntlStrEqWorkerA(long str str long)
|
||||
377 stdcall -noname -private IntlStrEqWorkerW(long wstr wstr long)
|
||||
+380 stdcall -ordinal LoadIconMetric(ptr wstr long ptr)
|
||||
381 stdcall -ordinal LoadIconWithScaleDown(ptr wstr long long ptr)
|
||||
382 stdcall -noname SmoothScrollWindow(ptr)
|
||||
383 stub -noname DoReaderMode
|
||||
diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
|
||||
index 97656a5..6d6b5e4 100644
|
||||
--- a/dlls/comctl32/commctrl.c
|
||||
+++ b/dlls/comctl32/commctrl.c
|
||||
@@ -1658,3 +1658,31 @@ HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE hinst, const WCHAR *name, int cx,
|
||||
|
||||
return S_OK;
|
||||
}
|
||||
+
|
||||
+/***********************************************************************
|
||||
+ * LoadIconMetric [COMCTL32.@]
|
||||
+ */
|
||||
+HRESULT WINAPI LoadIconMetric(HINSTANCE hinst, const WCHAR *name, int size, HICON *icon)
|
||||
+{
|
||||
+ int cx, cy;
|
||||
+
|
||||
+ TRACE("(%p, %s, %d, %p)\n", hinst, debugstr_w(name), size, icon);
|
||||
+
|
||||
+ if (size == LIM_SMALL)
|
||||
+ {
|
||||
+ cx = GetSystemMetrics(SM_CXSMICON);
|
||||
+ cy = GetSystemMetrics(SM_CYSMICON);
|
||||
+ }
|
||||
+ else if (size == LIM_LARGE)
|
||||
+ {
|
||||
+ cx = GetSystemMetrics(SM_CXICON);
|
||||
+ cy = GetSystemMetrics(SM_CYICON);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ *icon = NULL;
|
||||
+ return E_INVALIDARG;
|
||||
+ }
|
||||
+
|
||||
+ return LoadIconWithScaleDown(hinst, name, cx, cy, icon);
|
||||
+}
|
||||
diff --git a/include/commctrl.h b/include/commctrl.h
|
||||
index 0ed0997..5029e77 100644
|
||||
--- a/include/commctrl.h
|
||||
+++ b/include/commctrl.h
|
||||
@@ -42,7 +42,14 @@ BOOL WINAPI InitCommonControlsEx (const INITCOMMONCONTROLSEX*);
|
||||
LANGID WINAPI GetMUILanguage (VOID);
|
||||
VOID WINAPI InitMUILanguage (LANGID uiLang);
|
||||
|
||||
+enum _LI_METRIC
|
||||
+{
|
||||
+ LIM_SMALL,
|
||||
+ LIM_LARGE
|
||||
+};
|
||||
+
|
||||
HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *);
|
||||
+HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *);
|
||||
|
||||
#define COMCTL32_VERSION 5 /* dll version */
|
||||
|
||||
--
|
||||
2.5.1
|
||||
|
||||
@ -1,201 +0,0 @@
|
||||
From 21c232611559de13e52d933ffd5f940230bbad86 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:54:28 +0200
|
||||
Subject: comctl32/tests: Add tests for LoadIconMetric function.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Michael Müller <michael@fds-team.de>
|
||||
---
|
||||
dlls/comctl32/tests/misc.c | 153 +++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 153 insertions(+)
|
||||
|
||||
diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c
|
||||
index 280b46c..ffd0dca 100644
|
||||
--- a/dlls/comctl32/tests/misc.c
|
||||
+++ b/dlls/comctl32/tests/misc.c
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <windows.h>
|
||||
+#include <commctrl.h>
|
||||
|
||||
#include "wine/test.h"
|
||||
#include "v6util.h"
|
||||
@@ -36,6 +37,18 @@ static BOOL (WINAPI * pStr_SetPtrW)(LPWSTR, LPCWSTR);
|
||||
|
||||
static HMODULE hComctl32 = 0;
|
||||
|
||||
+static char testicon_data[] =
|
||||
+{
|
||||
+ 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x00,
|
||||
+ 0x20, 0x00, 0x40, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x28, 0x00,
|
||||
+ 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00,
|
||||
+ 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x12, 0x0b,
|
||||
+ 0x00, 0x00, 0x12, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
+ 0x00, 0x00, 0xde, 0xde, 0xde, 0xff, 0xde, 0xde, 0xde, 0xff, 0xde, 0xde,
|
||||
+ 0xde, 0xff, 0xde, 0xde, 0xde, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
+ 0x00, 0x00
|
||||
+};
|
||||
+
|
||||
#define COMCTL32_GET_PROC(ordinal, func) \
|
||||
p ## func = (void*)GetProcAddress(hComctl32, (LPSTR)ordinal); \
|
||||
if(!p ## func) { \
|
||||
@@ -205,6 +218,145 @@ static void test_TaskDialogIndirect(void)
|
||||
ok(ptr == ptr2, "got wrong pointer for ordinal 345, %p expected %p\n", ptr2, ptr);
|
||||
}
|
||||
|
||||
+static void test_LoadIconWithScaleDown(void)
|
||||
+{
|
||||
+ static const WCHAR nonexisting_fileW[] = {'n','o','n','e','x','i','s','t','i','n','g','.','i','c','o',0};
|
||||
+ static const WCHAR nonexisting_resourceW[] = {'N','o','n','e','x','i','s','t','i','n','g',0};
|
||||
+ static const WCHAR prefixW[] = {'I','C','O',0};
|
||||
+ HRESULT (WINAPI *pLoadIconMetric)(HINSTANCE, const WCHAR *, int, HICON *);
|
||||
+ HRESULT (WINAPI *pLoadIconWithScaleDown)(HINSTANCE, const WCHAR *, int, int, HICON *);
|
||||
+ WCHAR tmp_path[MAX_PATH], icon_path[MAX_PATH];
|
||||
+ ICONINFO info;
|
||||
+ HMODULE hinst;
|
||||
+ HANDLE handle;
|
||||
+ DWORD written;
|
||||
+ HRESULT hr;
|
||||
+ BITMAP bmp;
|
||||
+ HICON icon;
|
||||
+ void *ptr;
|
||||
+ int bytes;
|
||||
+ BOOL res;
|
||||
+
|
||||
+ hinst = LoadLibraryA("comctl32.dll");
|
||||
+ pLoadIconMetric = (void *)GetProcAddress(hinst, "LoadIconMetric");
|
||||
+ pLoadIconWithScaleDown = (void *)GetProcAddress(hinst, "LoadIconWithScaleDown");
|
||||
+ if (!pLoadIconMetric || !pLoadIconWithScaleDown)
|
||||
+ {
|
||||
+ win_skip("LoadIconMetric or pLoadIconWithScaleDown not exported by name\n");
|
||||
+ FreeLibrary(hinst);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ GetTempPathW(MAX_PATH, tmp_path);
|
||||
+ GetTempFileNameW(tmp_path, prefixW, 0, icon_path);
|
||||
+ handle = CreateFileW(icon_path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
|
||||
+ FILE_ATTRIBUTE_NORMAL, NULL);
|
||||
+ ok(handle != INVALID_HANDLE_VALUE, "CreateFileW failed with error %u\n", GetLastError());
|
||||
+ res = WriteFile(handle, testicon_data, sizeof(testicon_data), &written, NULL);
|
||||
+ ok(res && written == sizeof(testicon_data), "Failed to write icon file\n");
|
||||
+ CloseHandle(handle);
|
||||
+
|
||||
+ /* test ordinals */
|
||||
+ ptr = GetProcAddress(hinst, (const char *)380);
|
||||
+ ok(ptr == pLoadIconMetric,
|
||||
+ "got wrong pointer for ordinal 380, %p expected %p\n", ptr, pLoadIconMetric);
|
||||
+
|
||||
+ ptr = GetProcAddress(hinst, (const char *)381);
|
||||
+ ok(ptr == pLoadIconWithScaleDown,
|
||||
+ "got wrong pointer for ordinal 381, %p expected %p\n", ptr, pLoadIconWithScaleDown);
|
||||
+
|
||||
+ /* invalid arguments */
|
||||
+ icon = (HICON)0x1234;
|
||||
+ hr = pLoadIconMetric(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), 0x100, &icon);
|
||||
+ ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", hr);
|
||||
+ ok(icon == NULL, "Expected NULL, got %p\n", icon);
|
||||
+
|
||||
+ icon = (HICON)0x1234;
|
||||
+ hr = pLoadIconMetric(NULL, NULL, LIM_LARGE, &icon);
|
||||
+ ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", hr);
|
||||
+ ok(icon == NULL, "Expected NULL, got %p\n", icon);
|
||||
+
|
||||
+ icon = (HICON)0x1234;
|
||||
+ hr = pLoadIconWithScaleDown(NULL, NULL, 32, 32, &icon);
|
||||
+ ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", hr);
|
||||
+ ok(icon == NULL, "Expected NULL, got %p\n", icon);
|
||||
+
|
||||
+ /* non-existing filename */
|
||||
+ hr = pLoadIconMetric(NULL, nonexisting_fileW, LIM_LARGE, &icon);
|
||||
+ todo_wine
|
||||
+ ok(hr == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND),
|
||||
+ "Expected HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), got %x\n", hr);
|
||||
+
|
||||
+ hr = pLoadIconWithScaleDown(NULL, nonexisting_fileW, 32, 32, &icon);
|
||||
+ todo_wine
|
||||
+ ok(hr == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND),
|
||||
+ "Expected HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), got %x\n", hr);
|
||||
+
|
||||
+ /* non-existing resource name */
|
||||
+ hr = pLoadIconMetric(hinst, nonexisting_resourceW, LIM_LARGE, &icon);
|
||||
+ ok(hr == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND),
|
||||
+ "Expected HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), got %x\n", hr);
|
||||
+
|
||||
+ hr = pLoadIconWithScaleDown(hinst, nonexisting_resourceW, 32, 32, &icon);
|
||||
+ ok(hr == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND),
|
||||
+ "Expected HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), got %x\n", hr);
|
||||
+
|
||||
+ /* load icon using predefined identifier */
|
||||
+ hr = pLoadIconMetric(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), LIM_SMALL, &icon);
|
||||
+ ok(hr == S_OK, "Expected S_OK, got %x\n", hr);
|
||||
+ res = GetIconInfo(icon, &info);
|
||||
+ ok(res, "Failed to get icon info, error %u\n", GetLastError());
|
||||
+ bytes = GetObjectA(info.hbmColor, sizeof(bmp), &bmp);
|
||||
+ ok(bytes > 0, "Failed to get bitmap info for icon\n");
|
||||
+ ok(bmp.bmWidth == GetSystemMetrics(SM_CXSMICON), "Wrong icon width %d\n", bmp.bmWidth);
|
||||
+ ok(bmp.bmHeight == GetSystemMetrics(SM_CYSMICON), "Wrong icon height %d\n", bmp.bmHeight);
|
||||
+ DestroyIcon(icon);
|
||||
+
|
||||
+ hr = pLoadIconMetric(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), LIM_LARGE, &icon);
|
||||
+ ok(hr == S_OK, "Expected S_OK, got %x\n", hr);
|
||||
+ res = GetIconInfo(icon, &info);
|
||||
+ ok(res, "Failed to get icon info, error %u\n", GetLastError());
|
||||
+ bytes = GetObjectA(info.hbmColor, sizeof(bmp), &bmp);
|
||||
+ ok(bytes > 0, "Failed to get bitmap info for icon\n");
|
||||
+ ok(bmp.bmWidth == GetSystemMetrics(SM_CXICON), "Wrong icon width %d\n", bmp.bmWidth);
|
||||
+ ok(bmp.bmHeight == GetSystemMetrics(SM_CYICON), "Wrong icon height %d\n", bmp.bmHeight);
|
||||
+ DestroyIcon(icon);
|
||||
+
|
||||
+ hr = pLoadIconWithScaleDown(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), 42, 42, &icon);
|
||||
+ ok(hr == S_OK, "Expected S_OK, got %x\n", hr);
|
||||
+ res = GetIconInfo(icon, &info);
|
||||
+ ok(res, "Failed to get icon info, error %u\n", GetLastError());
|
||||
+ bytes = GetObjectA(info.hbmColor, sizeof(bmp), &bmp);
|
||||
+ ok(bytes > 0, "Failed to get bitmap info for icon\n");
|
||||
+ ok(bmp.bmWidth == 42, "Wrong icon width %d\n", bmp.bmWidth);
|
||||
+ ok(bmp.bmHeight == 42, "Wrong icon height %d\n", bmp.bmHeight);
|
||||
+ DestroyIcon(icon);
|
||||
+
|
||||
+ /* load icon from file */
|
||||
+ hr = pLoadIconMetric(NULL, icon_path, LIM_SMALL, &icon);
|
||||
+ ok(hr == S_OK, "Expected S_OK, got %x\n", hr);
|
||||
+ res = GetIconInfo(icon, &info);
|
||||
+ ok(res, "Failed to get icon info, error %u\n", GetLastError());
|
||||
+ bytes = GetObjectA(info.hbmColor, sizeof(bmp), &bmp);
|
||||
+ ok(bytes > 0, "Failed to get bitmap info for icon\n");
|
||||
+ ok(bmp.bmWidth == GetSystemMetrics(SM_CXSMICON), "Wrong icon width %d\n", bmp.bmWidth);
|
||||
+ ok(bmp.bmHeight == GetSystemMetrics(SM_CYSMICON), "Wrong icon height %d\n", bmp.bmHeight);
|
||||
+ DestroyIcon(icon);
|
||||
+
|
||||
+ hr = pLoadIconWithScaleDown(NULL, icon_path, 42, 42, &icon);
|
||||
+ ok(hr == S_OK, "Expected S_OK, got %x\n", hr);
|
||||
+ res = GetIconInfo(icon, &info);
|
||||
+ ok(res, "Failed to get icon info, error %u\n", GetLastError());
|
||||
+ bytes = GetObjectA(info.hbmColor, sizeof(bmp), &bmp);
|
||||
+ ok(bytes > 0, "Failed to get bitmap info for icon\n");
|
||||
+ ok(bmp.bmWidth == 42, "Wrong icon width %d\n", bmp.bmWidth);
|
||||
+ ok(bmp.bmHeight == 42, "Wrong icon height %d\n", bmp.bmHeight);
|
||||
+ DestroyIcon(icon);
|
||||
+
|
||||
+ DeleteFileW(icon_path);
|
||||
+ FreeLibrary(hinst);
|
||||
+}
|
||||
+
|
||||
START_TEST(misc)
|
||||
{
|
||||
ULONG_PTR ctx_cookie;
|
||||
@@ -220,6 +372,7 @@ START_TEST(misc)
|
||||
return;
|
||||
|
||||
test_TaskDialogIndirect();
|
||||
+ test_LoadIconWithScaleDown();
|
||||
|
||||
unload_v6_module(ctx_cookie, hCtx);
|
||||
}
|
||||
--
|
||||
2.5.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [35375] Support for LoadIconMetric
|
||||
@ -1,59 +0,0 @@
|
||||
From 3a9c4ea762e13dcd7df42008f9a55eeeac702056 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Fri, 2 Oct 2015 17:26:58 +0200
|
||||
Subject: gdi32: Mark some functions as hotpatchable.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Michael Müller <michael@fds-team.de>
|
||||
---
|
||||
dlls/gdi32/bitblt.c | 4 ++--
|
||||
dlls/gdi32/dib.c | 9 ++++++---
|
||||
2 files changed, 8 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c
|
||||
index 08ebfd9..d427070 100644
|
||||
--- a/dlls/gdi32/bitblt.c
|
||||
+++ b/dlls/gdi32/bitblt.c
|
||||
@@ -559,8 +559,8 @@ BOOL WINAPI PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop
|
||||
/***********************************************************************
|
||||
* BitBlt (GDI32.@)
|
||||
*/
|
||||
-BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width,
|
||||
- INT height, HDC hdcSrc, INT xSrc, INT ySrc, DWORD rop )
|
||||
+BOOL WINAPI DECLSPEC_HOTPATCH BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width,
|
||||
+ INT height, HDC hdcSrc, INT xSrc, INT ySrc, DWORD rop )
|
||||
{
|
||||
if (!rop_uses_src( rop )) return PatBlt( hdcDst, xDst, yDst, width, height, rop );
|
||||
else return StretchBlt( hdcDst, xDst, yDst, width, height,
|
||||
diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c
|
||||
index 708a9a8..2817ede 100644
|
||||
--- a/dlls/gdi32/dib.c
|
||||
+++ b/dlls/gdi32/dib.c
|
||||
@@ -59,6 +59,8 @@
|
||||
Search for "Bitmap Structures" in MSDN
|
||||
*/
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -602,9 +604,10 @@ done:
|
||||
/***********************************************************************
|
||||
* StretchDIBits (GDI32.@)
|
||||
*/
|
||||
-INT WINAPI StretchDIBits(HDC hdc, INT xDst, INT yDst, INT widthDst, INT heightDst,
|
||||
- INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, const void *bits,
|
||||
- const BITMAPINFO *bmi, UINT coloruse, DWORD rop )
|
||||
+INT WINAPI DECLSPEC_HOTPATCH StretchDIBits( HDC hdc, INT xDst, INT yDst, INT widthDst, INT heightDst,
|
||||
+ INT xSrc, INT ySrc, INT widthSrc, INT heightSrc,
|
||||
+ const void *bits, const BITMAPINFO *bmi, UINT coloruse,
|
||||
+ DWORD rop )
|
||||
{
|
||||
char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )];
|
||||
BITMAPINFO *info = (BITMAPINFO *)buffer;
|
||||
--
|
||||
2.5.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: BitBlt and StretchDIBits should be marked as hotpatchable
|
||||
@ -1,31 +0,0 @@
|
||||
From a4e1225137261af63dcfafbbbe7df4aaadae62e5 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Fri, 2 Oct 2015 17:28:15 +0200
|
||||
Subject: kernel32: Mark WritePrivateProfileStringA as hotpatchable.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Michael Müller <michael@fds-team.de>
|
||||
---
|
||||
dlls/kernel32/profile.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c
|
||||
index a9a11b1..aad3ba3 100644
|
||||
--- a/dlls/kernel32/profile.c
|
||||
+++ b/dlls/kernel32/profile.c
|
||||
@@ -1402,8 +1402,8 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry,
|
||||
/***********************************************************************
|
||||
* WritePrivateProfileStringA (KERNEL32.@)
|
||||
*/
|
||||
-BOOL WINAPI WritePrivateProfileStringA( LPCSTR section, LPCSTR entry,
|
||||
- LPCSTR string, LPCSTR filename )
|
||||
+BOOL WINAPI DECLSPEC_HOTPATCH WritePrivateProfileStringA( LPCSTR section, LPCSTR entry,
|
||||
+ LPCSTR string, LPCSTR filename )
|
||||
{
|
||||
UNICODE_STRING sectionW, entryW, stringW, filenameW;
|
||||
BOOL ret;
|
||||
--
|
||||
2.5.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: WritePrivateProfileStringA should be hotpatchable
|
||||
@ -1,26 +0,0 @@
|
||||
From 3c3b2cc8ce0cf1acbaa409dce17315f851374bcb Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Fri, 2 Oct 2015 01:41:20 +0200
|
||||
Subject: msvcrt: Pass cookie reference to msvcrt_local_unwind4 instead of
|
||||
value.
|
||||
|
||||
---
|
||||
dlls/msvcrt/except_i386.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c
|
||||
index 6cbb758..1625854 100644
|
||||
--- a/dlls/msvcrt/except_i386.c
|
||||
+++ b/dlls/msvcrt/except_i386.c
|
||||
@@ -1127,7 +1127,7 @@ void __stdcall _seh_longjmp_unwind(struct MSVCRT___JUMP_BUFFER *jmp)
|
||||
*/
|
||||
void __stdcall _seh_longjmp_unwind4(struct MSVCRT___JUMP_BUFFER *jmp)
|
||||
{
|
||||
- msvcrt_local_unwind4( (void *)jmp->Cookie, (MSVCRT_EXCEPTION_FRAME *)jmp->Registration,
|
||||
+ msvcrt_local_unwind4( (ULONG *)&jmp->Cookie, (MSVCRT_EXCEPTION_FRAME *)jmp->Registration,
|
||||
jmp->TryLevel, (void *)jmp->Ebp );
|
||||
}
|
||||
|
||||
--
|
||||
2.5.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [39356] Pass cookie by reference to msvcrt_local_unwind4 in _seh_longjmp_unwind4
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "9bd963065b1fb7b445d010897d5f84967eadf75b"
|
||||
echo "d050343c502202e1abdabdb37668684031d5367d"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -86,7 +86,6 @@ patch_enable_all ()
|
||||
enable_Exagear="$1"
|
||||
enable_Pipelight="$1"
|
||||
enable_Staging="$1"
|
||||
enable_advapi32_Hotpatching="$1"
|
||||
enable_advapi32_LsaLookupSids="$1"
|
||||
enable_advpack_LaunchINFSection="$1"
|
||||
enable_amstream_GetMultiMediaStream="$1"
|
||||
@ -95,7 +94,6 @@ patch_enable_all ()
|
||||
enable_browseui_Progress_Dialog="$1"
|
||||
enable_combase_String="$1"
|
||||
enable_comctl32_Button_Theming="$1"
|
||||
enable_comctl32_LoadIconMetric="$1"
|
||||
enable_comctl32_TVM_GETITEM="$1"
|
||||
enable_configure_Absolute_RPATH="$1"
|
||||
enable_crypt32_CMS_Certificates="$1"
|
||||
@ -140,7 +138,6 @@ patch_enable_all ()
|
||||
enable_fltmgr_Stub_SYS="$1"
|
||||
enable_fonts_Missing_Fonts="$1"
|
||||
enable_gdi32_Default_Palette="$1"
|
||||
enable_gdi32_Hotpatching="$1"
|
||||
enable_gdi32_Lazy_Font_Initialization="$1"
|
||||
enable_gdi32_MaxPixelFormats="$1"
|
||||
enable_gdi32_MultiMonitor="$1"
|
||||
@ -160,7 +157,6 @@ patch_enable_all ()
|
||||
enable_kernel32_Cwd_Startup_Info="$1"
|
||||
enable_kernel32_GetFinalPathNameByHandle="$1"
|
||||
enable_kernel32_GetLogicalProcessorInformationEx="$1"
|
||||
enable_kernel32_Hotpatching="$1"
|
||||
enable_kernel32_LocaleNameToLCID="$1"
|
||||
enable_kernel32_Named_Pipe="$1"
|
||||
enable_kernel32_NeedCurrentDirectoryForExePath="$1"
|
||||
@ -184,7 +180,6 @@ patch_enable_all ()
|
||||
enable_msvcp90_basic_string_dtor="$1"
|
||||
enable_msvcrt_Math_Precision="$1"
|
||||
enable_msvcrt_StdHandle_RefCount="$1"
|
||||
enable_msvcrt__seh_longjmp_unwind4="$1"
|
||||
enable_msvfw32_Image_Size="$1"
|
||||
enable_ntdll_APC_Performance="$1"
|
||||
enable_ntdll_APC_Start_Process="$1"
|
||||
@ -331,7 +326,6 @@ patch_enable_all ()
|
||||
enable_wpcap_Dynamic_Linking="$1"
|
||||
enable_ws2_32_APC_Performance="$1"
|
||||
enable_ws2_32_Connect_Time="$1"
|
||||
enable_ws2_32_InetPtonW="$1"
|
||||
enable_ws2_32_TransmitFile="$1"
|
||||
enable_ws2_32_WSACleanup="$1"
|
||||
enable_ws2_32_WSAPoll="$1"
|
||||
@ -361,9 +355,6 @@ patch_enable ()
|
||||
Staging)
|
||||
enable_Staging="$2"
|
||||
;;
|
||||
advapi32-Hotpatching)
|
||||
enable_advapi32_Hotpatching="$2"
|
||||
;;
|
||||
advapi32-LsaLookupSids)
|
||||
enable_advapi32_LsaLookupSids="$2"
|
||||
;;
|
||||
@ -391,9 +382,6 @@ patch_enable ()
|
||||
comctl32-Button_Theming)
|
||||
enable_comctl32_Button_Theming="$2"
|
||||
;;
|
||||
comctl32-LoadIconMetric)
|
||||
enable_comctl32_LoadIconMetric="$2"
|
||||
;;
|
||||
comctl32-TVM_GETITEM)
|
||||
enable_comctl32_TVM_GETITEM="$2"
|
||||
;;
|
||||
@ -526,9 +514,6 @@ patch_enable ()
|
||||
gdi32-Default_Palette)
|
||||
enable_gdi32_Default_Palette="$2"
|
||||
;;
|
||||
gdi32-Hotpatching)
|
||||
enable_gdi32_Hotpatching="$2"
|
||||
;;
|
||||
gdi32-Lazy_Font_Initialization)
|
||||
enable_gdi32_Lazy_Font_Initialization="$2"
|
||||
;;
|
||||
@ -586,9 +571,6 @@ patch_enable ()
|
||||
kernel32-GetLogicalProcessorInformationEx)
|
||||
enable_kernel32_GetLogicalProcessorInformationEx="$2"
|
||||
;;
|
||||
kernel32-Hotpatching)
|
||||
enable_kernel32_Hotpatching="$2"
|
||||
;;
|
||||
kernel32-LocaleNameToLCID)
|
||||
enable_kernel32_LocaleNameToLCID="$2"
|
||||
;;
|
||||
@ -658,9 +640,6 @@ patch_enable ()
|
||||
msvcrt-StdHandle_RefCount)
|
||||
enable_msvcrt_StdHandle_RefCount="$2"
|
||||
;;
|
||||
msvcrt-_seh_longjmp_unwind4)
|
||||
enable_msvcrt__seh_longjmp_unwind4="$2"
|
||||
;;
|
||||
msvfw32-Image_Size)
|
||||
enable_msvfw32_Image_Size="$2"
|
||||
;;
|
||||
@ -1099,9 +1078,6 @@ patch_enable ()
|
||||
ws2_32-Connect_Time)
|
||||
enable_ws2_32_Connect_Time="$2"
|
||||
;;
|
||||
ws2_32-InetPtonW)
|
||||
enable_ws2_32_InetPtonW="$2"
|
||||
;;
|
||||
ws2_32-TransmitFile)
|
||||
enable_ws2_32_TransmitFile="$2"
|
||||
;;
|
||||
@ -2209,18 +2185,6 @@ if test "$enable_Staging" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset advapi32-Hotpatching
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/advapi32/registry.c
|
||||
# |
|
||||
if test "$enable_advapi32_Hotpatching" -eq 1; then
|
||||
patch_apply advapi32-Hotpatching/0001-advapi32-Mark-some-functions-as-hotpatchable.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "advapi32: Mark some functions as hotpatchable.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-CreateProcess_ACLs
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -2384,25 +2348,6 @@ if test "$enable_comctl32_Button_Theming" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset comctl32-LoadIconMetric
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#35375] Support for LoadIconMetric
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/comctl32/comctl32.spec, dlls/comctl32/commctrl.c, dlls/comctl32/tests/misc.c, include/commctrl.h
|
||||
# |
|
||||
if test "$enable_comctl32_LoadIconMetric" -eq 1; then
|
||||
patch_apply comctl32-LoadIconMetric/0001-comctl32-Add-semi-stub-implementation-for-LoadIconWi.patch
|
||||
patch_apply comctl32-LoadIconMetric/0002-comctl32-Add-implementation-for-LoadIconMetric.patch
|
||||
patch_apply comctl32-LoadIconMetric/0003-comctl32-tests-Add-tests-for-LoadIconMetric-function.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "comctl32: Add semi-stub implementation for LoadIconWithScaleDown.", 1 },';
|
||||
echo '+ { "Michael Müller", "comctl32: Add implementation for LoadIconMetric.", 1 },';
|
||||
echo '+ { "Michael Müller", "comctl32/tests: Add tests for LoadIconMetric function.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset comctl32-TVM_GETITEM
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -3185,18 +3130,6 @@ if test "$enable_gdi32_Default_Palette" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset gdi32-Hotpatching
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/gdi32/bitblt.c, dlls/gdi32/dib.c
|
||||
# |
|
||||
if test "$enable_gdi32_Hotpatching" -eq 1; then
|
||||
patch_apply gdi32-Hotpatching/0001-gdi32-Mark-some-functions-as-hotpatchable.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "gdi32: Mark some functions as hotpatchable.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset gdi32-Lazy_Font_Initialization
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -3533,18 +3466,6 @@ if test "$enable_kernel32_GetLogicalProcessorInformationEx" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-Hotpatching
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/kernel32/profile.c
|
||||
# |
|
||||
if test "$enable_kernel32_Hotpatching" -eq 1; then
|
||||
patch_apply kernel32-Hotpatching/0001-kernel32-Mark-WritePrivateProfileStringA-as-hotpatch.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "kernel32: Mark WritePrivateProfileStringA as hotpatchable.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-LocaleNameToLCID
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -3966,21 +3887,6 @@ if test "$enable_msvcrt_StdHandle_RefCount" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset msvcrt-_seh_longjmp_unwind4
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#39356] Pass cookie by reference to msvcrt_local_unwind4 in _seh_longjmp_unwind4
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/msvcrt/except_i386.c
|
||||
# |
|
||||
if test "$enable_msvcrt__seh_longjmp_unwind4" -eq 1; then
|
||||
patch_apply msvcrt-_seh_longjmp_unwind4/0001-msvcrt-Pass-cookie-reference-to-msvcrt_local_unwind4.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "msvcrt: Pass cookie reference to msvcrt_local_unwind4 instead of value.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset msvfw32-Image_Size
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -6628,18 +6534,6 @@ if test "$enable_ws2_32_Connect_Time" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ws2_32-InetPtonW
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ws2_32/socket.c, dlls/ws2_32/ws2_32.spec
|
||||
# |
|
||||
if test "$enable_ws2_32_InetPtonW" -eq 1; then
|
||||
patch_apply ws2_32-InetPtonW/0001-ws2_32-Implement-InetPtonA-W.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "ws2_32: Implement InetPtonA/W.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ws2_32-TransmitFile
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From a605e2c29345026b85ef529bb72bb83422423d14 Mon Sep 17 00:00:00 2001
|
||||
From ffb226d59c82df5c438b47a1a3d7ae29dc98f861 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
|
||||
Date: Thu, 20 Dec 2012 14:19:52 +0100
|
||||
Subject: wined3d: Get rid of state access in shader_generate_glsl_declarations
|
||||
@ -8,10 +8,10 @@ Subject: wined3d: Get rid of state access in shader_generate_glsl_declarations
|
||||
1 file changed, 6 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
|
||||
index 76d2c35..5b0b174 100644
|
||||
index eddabee..edc8ce4 100644
|
||||
--- a/dlls/wined3d/glsl_shader.c
|
||||
+++ b/dlls/wined3d/glsl_shader.c
|
||||
@@ -1497,11 +1497,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont
|
||||
@@ -1592,11 +1592,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont
|
||||
const struct wined3d_shader_reg_maps *reg_maps, const struct shader_glsl_ctx_priv *ctx_priv)
|
||||
{
|
||||
const struct wined3d_shader_version *version = ®_maps->shader_version;
|
||||
@ -23,16 +23,16 @@ index 76d2c35..5b0b174 100644
|
||||
unsigned int i, extra_constants_needed = 0;
|
||||
const struct wined3d_shader_lconst *lconst;
|
||||
const char *prefix;
|
||||
@@ -1751,7 +1749,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont
|
||||
@@ -1870,7 +1868,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont
|
||||
{
|
||||
UINT in_count = min(vec4_varyings(version->major, gl_info), shader->limits->packed_input);
|
||||
|
||||
- if (use_vs(state))
|
||||
+ if (ps_args->vp_mode == vertexshader)
|
||||
shader_addline(buffer, "varying vec4 %s_link[%u];\n", prefix, in_count);
|
||||
declare_in_varying(gl_info, buffer, FALSE, "vec4 %s_link[%u];\n", prefix, in_count);
|
||||
shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count);
|
||||
}
|
||||
@@ -1792,21 +1790,14 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont
|
||||
@@ -1911,21 +1909,14 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -60,5 +60,5 @@ index 76d2c35..5b0b174 100644
|
||||
shader_addline(buffer, "vec4 vpos;\n");
|
||||
}
|
||||
--
|
||||
2.4.2
|
||||
2.6.0
|
||||
|
||||
|
||||
@ -4637,7 +4637,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
|
||||
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
|
||||
--- a/dlls/wined3d/glsl_shader.c
|
||||
+++ b/dlls/wined3d/glsl_shader.c
|
||||
@@ -1547,9 +1547,17 @@
|
||||
@@ -1592,9 +1592,17 @@
|
||||
const struct wined3d_shader_reg_maps *reg_maps, const struct shader_glsl_ctx_priv *ctx_priv)
|
||||
{
|
||||
const struct wined3d_shader_version *version = ®_maps->shader_version;
|
||||
@ -4655,7 +4655,7 @@ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
|
||||
unsigned int i, extra_constants_needed = 0;
|
||||
const struct wined3d_shader_lconst *lconst;
|
||||
const char *prefix;
|
||||
@@ -1809,7 +1817,11 @@
|
||||
@@ -1868,7 +1876,11 @@
|
||||
{
|
||||
UINT in_count = min(vec4_varyings(version->major, gl_info), shader->limits->packed_input);
|
||||
|
||||
@ -4664,10 +4664,10 @@ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
|
||||
+#else /* STAGING_CSMT */
|
||||
+ if (use_vs(state))
|
||||
+#endif /* STAGING_CSMT */
|
||||
shader_addline(buffer, "varying vec4 %s_link[%u];\n", prefix, in_count);
|
||||
declare_in_varying(gl_info, buffer, FALSE, "vec4 %s_link[%u];\n", prefix, in_count);
|
||||
shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count);
|
||||
}
|
||||
@@ -1850,6 +1862,7 @@
|
||||
@@ -1909,6 +1921,7 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -4675,7 +4675,7 @@ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
|
||||
/* This happens because we do not have proper tracking of the
|
||||
* constant registers that are actually used, only the max
|
||||
* limit of the shader version.
|
||||
@@ -1858,6 +1871,23 @@
|
||||
@@ -1917,6 +1930,23 @@
|
||||
* it and just create the uniform.
|
||||
*/
|
||||
FIXME("Cannot find a free uniform for vpos correction params\n");
|
||||
|
||||
@ -1,77 +0,0 @@
|
||||
From 2147c0778c3a31e9f2e16facdf49dedbf7257cf6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 3 Oct 2015 00:38:08 +0200
|
||||
Subject: ws2_32: Implement InetPtonA/W.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Michael Müller <michael@fds-team.de>
|
||||
---
|
||||
dlls/ws2_32/socket.c | 30 ++++++++++++++++++++++++++++++
|
||||
dlls/ws2_32/ws2_32.spec | 4 +++-
|
||||
2 files changed, 33 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
|
||||
index 5cf3e0f..4c2428d 100644
|
||||
--- a/dlls/ws2_32/socket.c
|
||||
+++ b/dlls/ws2_32/socket.c
|
||||
@@ -7456,6 +7456,36 @@ INT WINAPI WS_inet_pton( INT family, PCSTR addr, PVOID buffer)
|
||||
#endif
|
||||
}
|
||||
|
||||
+/***********************************************************************
|
||||
+* InetPtonW (WS2_32.@)
|
||||
+*/
|
||||
+INT WINAPI InetPtonW(INT family, PCWSTR addr, PVOID buffer)
|
||||
+{
|
||||
+ char *addrA;
|
||||
+ int len;
|
||||
+ INT ret;
|
||||
+
|
||||
+ TRACE("family %d, addr '%s', buffer (%p)\n", family, addr ? debugstr_w(addr) : "(null)", buffer);
|
||||
+
|
||||
+ if (!addr)
|
||||
+ {
|
||||
+ SetLastError(WSAEFAULT);
|
||||
+ return SOCKET_ERROR;
|
||||
+ }
|
||||
+
|
||||
+ len = WideCharToMultiByte(CP_ACP, 0, addr, -1, NULL, 0, NULL, NULL);
|
||||
+ if (!(addrA = HeapAlloc(GetProcessHeap(), 0, len)))
|
||||
+ {
|
||||
+ SetLastError(WSA_NOT_ENOUGH_MEMORY);
|
||||
+ return SOCKET_ERROR;
|
||||
+ }
|
||||
+ WideCharToMultiByte(CP_ACP, 0, addr, -1, addrA, len, NULL, NULL);
|
||||
+
|
||||
+ ret = WS_inet_pton(family, addrA, buffer);
|
||||
+
|
||||
+ HeapFree(GetProcessHeap(), 0, addrA);
|
||||
+ return ret;
|
||||
+}
|
||||
|
||||
/***********************************************************************
|
||||
* WSAStringToAddressA (WS2_32.80)
|
||||
diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec
|
||||
index f7c6c2d..95c7da1 100644
|
||||
--- a/dlls/ws2_32/ws2_32.spec
|
||||
+++ b/dlls/ws2_32/ws2_32.spec
|
||||
@@ -53,6 +53,8 @@
|
||||
@ stdcall FreeAddrInfoW(ptr)
|
||||
@ stdcall GetAddrInfoW(wstr wstr ptr ptr)
|
||||
@ stdcall GetNameInfoW(ptr long ptr long ptr long long)
|
||||
+@ stdcall InetPtonA(long str ptr) WS_inet_pton
|
||||
+@ stdcall InetPtonW(long wstr ptr)
|
||||
@ stdcall WSApSetPostRoutine(ptr)
|
||||
@ stdcall WPUCompleteOverlappedRequest(long ptr long long ptr)
|
||||
@ stdcall WSAAccept(long ptr ptr ptr long)
|
||||
@@ -121,4 +123,4 @@
|
||||
@ stdcall getaddrinfo(str str ptr ptr) WS_getaddrinfo
|
||||
@ stdcall getnameinfo(ptr long ptr long ptr long long) WS_getnameinfo
|
||||
@ stdcall inet_ntop(long ptr ptr long) WS_inet_ntop
|
||||
-@ stdcall inet_pton(long ptr ptr) WS_inet_pton
|
||||
+@ stdcall inet_pton(long str ptr) WS_inet_pton
|
||||
--
|
||||
2.5.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: Implement ws2_32.InetPtonA/W functions
|
||||
Loading…
Reference in New Issue
Block a user