October 2015 - Wine-Commits

Andrew Eikum : xaudio2_6: Forward to xaudio2_7.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: 7d7b1176dae9aff25db1882ca29bfc298ab2a2fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d7b1176dae9aff25db1882ca… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 2 08:49:54 2015 -0500 xaudio2_6: Forward to xaudio2_7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/xaudio2_6/Makefile.in | 7 ++++++ dlls/xaudio2_6/xaudio2_6.spec | 4 +++ dlls/xaudio2_6/xaudio_classes.idl | 28 +++++++++++++++++++++ dlls/xaudio2_6/xaudio_dll.c | 52 +++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 2 ++ include/xaudio2.idl | 7 ++++++ 8 files changed, 103 insertions(+) diff --git a/configure b/configure index 8af7bc8..cf5dc78 100755 --- a/configure +++ b/configure @@ -1377,6 +1377,7 @@ enable_xapofx1_5 enable_xaudio2_3 enable_xaudio2_4 enable_xaudio2_5 +enable_xaudio2_6 enable_xaudio2_7 enable_xaudio2_8 enable_xinput1_1 @@ -17917,6 +17918,7 @@ wine_fn_config_dll xapofx1_5 enable_xapofx1_5 wine_fn_config_dll xaudio2_3 enable_xaudio2_3 clean wine_fn_config_dll xaudio2_4 enable_xaudio2_4 clean wine_fn_config_dll xaudio2_5 enable_xaudio2_5 clean +wine_fn_config_dll xaudio2_6 enable_xaudio2_6 clean wine_fn_config_dll xaudio2_7 enable_xaudio2_7 clean wine_fn_config_test dlls/xaudio2_7/tests xaudio2_7_test wine_fn_config_dll xaudio2_8 enable_xaudio2_8 diff --git a/configure.ac b/configure.ac index e420df7..bd98b6c 100644 --- a/configure.ac +++ b/configure.ac @@ -3463,6 +3463,7 @@ WINE_CONFIG_DLL(xapofx1_5) WINE_CONFIG_DLL(xaudio2_3,,[clean]) WINE_CONFIG_DLL(xaudio2_4,,[clean]) WINE_CONFIG_DLL(xaudio2_5,,[clean]) +WINE_CONFIG_DLL(xaudio2_6,,[clean]) WINE_CONFIG_DLL(xaudio2_7,,[clean]) WINE_CONFIG_TEST(dlls/xaudio2_7/tests) WINE_CONFIG_DLL(xaudio2_8) diff --git a/dlls/xaudio2_6/Makefile.in b/dlls/xaudio2_6/Makefile.in new file mode 100644 index 0000000..c56b079 --- /dev/null +++ b/dlls/xaudio2_6/Makefile.in @@ -0,0 +1,7 @@ +MODULE = xaudio2_6.dll +IMPORTS = ole32 + +C_SRCS = \ + xaudio_dll.c + +IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_6/xaudio2_6.spec b/dlls/xaudio2_6/xaudio2_6.spec new file mode 100644 index 0000000..cb263d4 --- /dev/null +++ b/dlls/xaudio2_6/xaudio2_6.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) xaudio2_7.DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xaudio2_6/xaudio_classes.idl b/dlls/xaudio2_6/xaudio_classes.idl new file mode 100644 index 0000000..e54eed7 --- /dev/null +++ b/dlls/xaudio2_6/xaudio_classes.idl @@ -0,0 +1,28 @@ +/* + * COM Classes for xaudio + * + * Copyright 2015 Andrew Eikum for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +[ + helpstring("XAudio2.6 Class"), + threading(both), + uuid(3eda9b49-2085-498b-9bb2-39a6778493de) +] +coclass XAudio26 { interface IXAudio27; } diff --git a/dlls/xaudio2_6/xaudio_dll.c b/dlls/xaudio2_6/xaudio_dll.c new file mode 100644 index 0000000..7c95c28 --- /dev/null +++ b/dlls/xaudio2_6/xaudio_dll.c @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2015 Andrew Eikum for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" + +static HINSTANCE instance; + +BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinstance; + DisableThreadLibraryCalls(hinstance); + break; + } + return TRUE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources(instance); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources(instance); +} diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 23e0390..5453d25 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2466,6 +2466,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) factory = make_xaudio2_factory(24); }else if(IsEqualGUID(rclsid, &CLSID_XAudio25)){ factory = make_xaudio2_factory(25); + }else if(IsEqualGUID(rclsid, &CLSID_XAudio26)){ + factory = make_xaudio2_factory(26); }else if(IsEqualGUID(rclsid, &CLSID_XAudio2)){ factory = make_xaudio2_factory(27); }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter)) { diff --git a/include/xaudio2.idl b/include/xaudio2.idl index dfef62c..5de6622 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -52,6 +52,13 @@ coclass XAudio25 { } [ + uuid(3eda9b49-2085-498b-9bb2-39a6778493de) +] +coclass XAudio26 { + interface IUnknown; +} + +[ uuid(db05ea35-0329-4d4b-a53a-6dead03d3852) ] coclass XAudio2Debug {

1 0

Jacek Caban : mshtml: Fixed comparing names in find_http_header.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: a68d5d2da350aa86cd798e0eeaecd3ffbc5eac6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a68d5d2da350aa86cd798e0ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 5 15:50:27 2015 +0200 mshtml: Fixed comparing names in find_http_header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index a661c4d..45ad55f 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -363,7 +363,7 @@ static http_header_t *find_http_header(struct list *headers, const WCHAR *name, http_header_t *iter; LIST_FOR_EACH_ENTRY(iter, headers, http_header_t, entry) { - if(!strcmpiW(iter->header, name)) + if(!strncmpiW(iter->header, name, len) && !iter->header[len]) return iter; }

1 0

Aric Stewart : gdi32/tests: Mark Hebrew stock font test as different, like Arabic.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: fc94e5dd5f9faaa36d084a8e4eeebf719cde2bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc94e5dd5f9faaa36d084a8e4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 2 09:00:11 2015 -0500 gdi32/tests: Mark Hebrew stock font test as different, like Arabic. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index c7dd6e1..fd9bda3 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5971,6 +5971,7 @@ static void test_stock_fonts(void) { { /* ANSI_FIXED_FONT */ { ANSI_CHARSET, FW_NORMAL, 12, 12, 96, "Courier", LANG_ARABIC }, + { ANSI_CHARSET, FW_NORMAL, 12, 12, 96, "Courier", LANG_HEBREW}, { DEFAULT_CHARSET, FW_NORMAL, 12, 13, 96, "Courier" }, { DEFAULT_CHARSET, FW_NORMAL, 12, 13, 120, "Courier" }, { 0 }

1 0

Jacek Caban : mshtml: Use proper name for OnRedirectVerifyCallback implementation.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: a42816073e44113e7a4bad5688e11e9c1a43d0c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42816073e44113e7a4bad568… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 5 15:50:34 2015 +0200 mshtml: Use proper name for OnRedirectVerifyCallback implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/navigate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index b324160..ed61ab0 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1137,7 +1137,7 @@ static nsrefcnt NSAPI nsAsyncVerifyRedirectCallback_Release(nsIAsyncVerifyRedire return ref; } -static nsresult NSAPI nsAsyncVerifyRedirectCallback_AsyncOnChannelRedirect(nsIAsyncVerifyRedirectCallback *iface, nsresult result) +static nsresult NSAPI nsAsyncVerifyRedirectCallback_OnRedirectVerifyCallback(nsIAsyncVerifyRedirectCallback *iface, nsresult result) { nsRedirectCallback *This = impl_from_nsIAsyncVerifyRedirectCallback(iface); nsChannel *old_nschannel; @@ -1184,7 +1184,7 @@ static const nsIAsyncVerifyRedirectCallbackVtbl nsAsyncVerifyRedirectCallbackVtb nsAsyncVerifyRedirectCallback_QueryInterface, nsAsyncVerifyRedirectCallback_AddRef, nsAsyncVerifyRedirectCallback_Release, - nsAsyncVerifyRedirectCallback_AsyncOnChannelRedirect + nsAsyncVerifyRedirectCallback_OnRedirectVerifyCallback }; static HRESULT create_redirect_callback(nsChannel *nschannel, nsChannelBSC *bsc, nsRedirectCallback **ret)

1 0

Sebastian Lackner : ws2_32: Fix TRACE and specfile for inet_pton.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: f8aa842deabce583c17d68292dbde8a67d77ee4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8aa842deabce583c17d68292… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Oct 5 04:57:34 2015 +0200 ws2_32: Fix TRACE and specfile for inet_pton. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/ws2_32.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5cf3e0f..535cf57 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7431,7 +7431,7 @@ INT WINAPI WS_inet_pton( INT family, PCSTR addr, PVOID buffer) #ifdef HAVE_INET_PTON int unixaf, ret; - TRACE("family %d, addr '%s', buffer (%p)\n", family, addr ? addr : "(null)", buffer); + TRACE("family %d, addr %s, buffer (%p)\n", family, debugstr_a(addr), buffer); if (!addr || !buffer) { diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index f7c6c2d..d08d59a 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -121,4 +121,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

1 0

Michael Müller : comctl32: Add semi-stub implementation for LoadIconWithScaleDown.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: c098c13ee268a542df7dd5a1069b4bb5a400197a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c098c13ee268a542df7dd5a10… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Oct 2 15:12:44 2015 +0200 comctl32: Add semi-stub implementation for LoadIconWithScaleDown. Thanks to Nikolay Sivov and Alistair Leslie-Hughes for various comments and ideas for improvements. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)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 */

1 0

Michael Müller : comctl32: Add implementation for LoadIconMetric.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: 088eb87e3b6e3b41acde6f544b1f9d41b83674bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=088eb87e3b6e3b41acde6f544… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Oct 2 15:13:05 2015 +0200 comctl32: Add implementation for LoadIconMetric. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)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 */

1 0

Michael Müller : advapi32: Mark some registry functions as hotpatchable.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: 9eb8aa1ebbc1aabc2f3e889db3663c8f7b6e7fdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb8aa1ebbc1aabc2f3e889db… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Oct 5 00:33:24 2015 +0200 advapi32: Mark some registry functions as hotpatchable. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)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;

1 0

Michael Müller : gdi32: Make BitBlt and StretchDIBits hotpatchable.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: cde2fbb08e2810572ed393afb2f7939959eb3bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde2fbb08e2810572ed393afb… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Oct 5 00:30:41 2015 +0200 gdi32: Make BitBlt and StretchDIBits hotpatchable. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)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;

1 0

Michael Müller : ws2_32: Implement InetPtonW function.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: af8c79343ce9eb24e223607ec2c04cb91ffaf782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af8c79343ce9eb24e223607ec… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Oct 5 04:57:53 2015 +0200 ws2_32: Implement InetPtonW function. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/ws2_32/socket.c | 30 ++++++++++++++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + 2 files changed, 31 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 535cf57..5098f85 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, debugstr_w(addr), 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 d08d59a..1b096b5 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -53,6 +53,7 @@ @ stdcall FreeAddrInfoW(ptr) @ stdcall GetAddrInfoW(wstr wstr ptr ptr) @ stdcall GetNameInfoW(ptr long ptr long ptr long long) +@ stdcall InetPtonW(long wstr ptr) @ stdcall WSApSetPostRoutine(ptr) @ stdcall WPUCompleteOverlappedRequest(long ptr long long ptr) @ stdcall WSAAccept(long ptr ptr ptr long)

1 0