June 2017 - Wine-commits - list.winehq.org

Owen Rudge : include: Add definitions for IWSDUdpAddress, IWSDTransportAddress.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: bcbe4ae756f44109f858475e1e5dc1e465c515cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcbe4ae756f44109f858475e1… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 30 23:06:06 2017 +0100 include: Add definitions for IWSDUdpAddress, IWSDTransportAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wsdbase.idl | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/include/wsdbase.idl b/include/wsdbase.idl index c93262d..099dc87 100644 --- a/include/wsdbase.idl +++ b/include/wsdbase.idl @@ -22,8 +22,21 @@ cpp_quote("#define WSDAPI_ADDRESSFAMILY_IPV4 1") cpp_quote("#define WSDAPI_ADDRESSFAMILY_IPV6 2") interface IWSDAddress; +interface IWSDUdpAddress; interface IWSDMessageParameters; +cpp_quote("HRESULT WINAPI WSDCreateUdpAddress(IWSDUdpAddress **ppAddress);") + +#ifndef SOCKADDR_STORAGE +cpp_quote("#if 1") +cpp_quote("#ifndef __CSADDR_DEFINED__") +cpp_quote("typedef struct SOCKADDR_STORAGE SOCKADDR_STORAGE;") +cpp_quote("#endif") +cpp_quote("#else") +typedef void SOCKADDR_STORAGE; +cpp_quote("#endif") +#endif + [ uuid(b9574c6c-12a6-4f74-93a1-3318ff605759), object, @@ -36,6 +49,45 @@ interface IWSDAddress : IUnknown } [ +uuid(70d23498-4ee6-4340-a3df-d845d2235467), +object, +local +] +interface IWSDTransportAddress : IWSDAddress +{ + HRESULT GetPort([out] WORD *pwPort); + HRESULT SetPort([in] WORD wPort); + HRESULT GetTransportAddress([out] LPCWSTR *ppszAddress); + HRESULT GetTransportAddressEx([in] BOOL fSafe, [out] LPCWSTR *ppszAddress); + HRESULT SetTransportAddress([in] LPCWSTR pszAddress); +} + +typedef enum _WSDUdpMessageType +{ + ONE_WAY, + TWO_WAY +} WSDUdpMessageType; + +[ +uuid(74d6124a-a441-4f78-a1eb-97a8d1996893), +object, +local +] +interface IWSDUdpAddress : IWSDTransportAddress +{ + HRESULT SetSockaddr([in] const SOCKADDR_STORAGE *pSockAddr); + HRESULT GetSockaddr([out] SOCKADDR_STORAGE *pSockAddr); + HRESULT SetExclusive(BOOL fExclusive); + HRESULT GetExclusive(); + HRESULT SetMessageType([in] WSDUdpMessageType messageType); + HRESULT GetMessageType([out] WSDUdpMessageType* pMessageType); + HRESULT SetTTL([in] DWORD dwTTL); + HRESULT GetTTL([out] DWORD *pdwTTL); + HRESULT SetAlias([in] const GUID* pAlias); + HRESULT GetAlias([out] GUID *pAlias); +} + +[ uuid(1fafe8a2-e6fc-4b80-b6cf-b7d45c416d7c), object ]

1 0

Owen Rudge : wsdapi: Add stub implementation of IWSDUdpAddress.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: ac38f7fd938eaddfaaeb44cf7d9e66e5e31447a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac38f7fd938eaddfaaeb44cf7… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 30 23:06:14 2017 +0100 wsdapi: Add stub implementation of IWSDUdpAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/Makefile.in | 1 + dlls/wsdapi/address.c | 252 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/wsdapi.spec | 2 +- 3 files changed, 254 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index 82d0ca1..30862cc 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -3,6 +3,7 @@ IMPORTLIB = wsdapi IMPORTS = user32 C_SRCS = \ + address.c \ discovery.c \ main.c \ memory.c \ diff --git a/dlls/wsdapi/address.c b/dlls/wsdapi/address.c new file mode 100644 index 0000000..7efcac2 --- /dev/null +++ b/dlls/wsdapi/address.c @@ -0,0 +1,252 @@ +/* + * Web Services on Devices + * + * Copyright 2017 Owen Rudge 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> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" +#include "wsdapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); + +typedef struct IWSDUdpAddressImpl { + IWSDUdpAddress IWSDUdpAddress_iface; + LONG ref; +} IWSDUdpAddressImpl; + +static inline IWSDUdpAddressImpl *impl_from_IWSDUdpAddress(IWSDUdpAddress *iface) +{ + return CONTAINING_RECORD(iface, IWSDUdpAddressImpl, IWSDUdpAddress_iface); +} + +static HRESULT WINAPI IWSDUdpAddressImpl_QueryInterface(IWSDUdpAddress *iface, REFIID riid, void **ppv) +{ + IWSDUdpAddressImpl *This = impl_from_IWSDUdpAddress(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + { + WARN("Invalid parameter\n"); + return E_INVALIDARG; + } + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IWSDUdpAddress) || + IsEqualIID(riid, &IID_IWSDTransportAddress) || + IsEqualIID(riid, &IID_IWSDAddress)) + { + *ppv = &This->IWSDUdpAddress_iface; + } + else + { + WARN("Unknown IID %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI IWSDUdpAddressImpl_AddRef(IWSDUdpAddress *iface) +{ + IWSDUdpAddressImpl *This = impl_from_IWSDUdpAddress(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI IWSDUdpAddressImpl_Release(IWSDUdpAddress *iface) +{ + IWSDUdpAddressImpl *This = impl_from_IWSDUdpAddress(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_Serialize(IWSDUdpAddress *This, LPWSTR pszBuffer, DWORD cchLength, BOOL fSafe) +{ + FIXME("(%p, %p, %d, %d)\n", This, pszBuffer, cchLength, fSafe); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_Deserialize(IWSDUdpAddress *This, LPCWSTR pszBuffer) +{ + FIXME("(%p, %s)\n", This, debugstr_w(pszBuffer)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetPort(IWSDUdpAddress *This, WORD *pwPort) +{ + FIXME("(%p, %p)\n", This, pwPort); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetPort(IWSDUdpAddress *This, WORD wPort) +{ + FIXME("(%p, %d)\n", This, wPort); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddress(IWSDUdpAddress *This, LPCWSTR *ppszAddress) +{ + FIXME("(%p, %p)\n", This, ppszAddress); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddressEx(IWSDUdpAddress *This, BOOL fSafe, LPCWSTR *ppszAddress) +{ + FIXME("(%p, %d, %p)\n", This, fSafe, ppszAddress); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetTransportAddress(IWSDUdpAddress *This, LPCWSTR pszAddress) +{ + FIXME("(%p, %s)\n", This, debugstr_w(pszAddress)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetSockaddr(IWSDUdpAddress *This, const SOCKADDR_STORAGE *pSockAddr) +{ + FIXME("(%p, %p)\n", This, pSockAddr); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetSockaddr(IWSDUdpAddress *This, SOCKADDR_STORAGE *pSockAddr) +{ + FIXME("(%p, %p)\n", This, pSockAddr); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetExclusive(IWSDUdpAddress *This, BOOL fExclusive) +{ + FIXME("(%p, %d)\n", This, fExclusive); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetExclusive(IWSDUdpAddress *This) +{ + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetMessageType(IWSDUdpAddress *This, WSDUdpMessageType messageType) +{ + FIXME("(%p, %d)\n", This, messageType); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetMessageType(IWSDUdpAddress *This, WSDUdpMessageType *pMessageType) +{ + FIXME("(%p, %p)\n", This, pMessageType); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetTTL(IWSDUdpAddress *This, DWORD dwTTL) +{ + FIXME("(%p, %d)\n", This, dwTTL); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetTTL(IWSDUdpAddress *This, DWORD *pdwTTL) +{ + FIXME("(%p, %p)\n", This, pdwTTL); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetAlias(IWSDUdpAddress *This, const GUID *pAlias) +{ + FIXME("(%p, %s)\n", This, debugstr_guid(pAlias)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetAlias(IWSDUdpAddress *This, GUID *pAlias) +{ + FIXME("(%p, %p)\n", This, pAlias); + return E_NOTIMPL; +} + +static const IWSDUdpAddressVtbl udpAddressVtbl = +{ + IWSDUdpAddressImpl_QueryInterface, + IWSDUdpAddressImpl_AddRef, + IWSDUdpAddressImpl_Release, + IWSDUdpAddressImpl_Serialize, + IWSDUdpAddressImpl_Deserialize, + IWSDUdpAddressImpl_GetPort, + IWSDUdpAddressImpl_SetPort, + IWSDUdpAddressImpl_GetTransportAddress, + IWSDUdpAddressImpl_GetTransportAddressEx, + IWSDUdpAddressImpl_SetTransportAddress, + IWSDUdpAddressImpl_SetSockaddr, + IWSDUdpAddressImpl_GetSockaddr, + IWSDUdpAddressImpl_SetExclusive, + IWSDUdpAddressImpl_GetExclusive, + IWSDUdpAddressImpl_SetMessageType, + IWSDUdpAddressImpl_GetMessageType, + IWSDUdpAddressImpl_SetTTL, + IWSDUdpAddressImpl_GetTTL, + IWSDUdpAddressImpl_SetAlias, + IWSDUdpAddressImpl_GetAlias +}; + +HRESULT WINAPI WSDCreateUdpAddress(IWSDUdpAddress **ppAddress) +{ + IWSDUdpAddressImpl *obj; + + TRACE("(%p)\n", ppAddress); + + if (ppAddress == NULL) + { + WARN("Invalid parameter: ppAddress == NULL\n"); + return E_POINTER; + } + + *ppAddress = NULL; + + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); + + if (!obj) + { + WARN("Out of memory\n"); + return E_OUTOFMEMORY; + } + + obj->IWSDUdpAddress_iface.lpVtbl = &udpAddressVtbl; + obj->ref = 1; + + *ppAddress = &obj->IWSDUdpAddress_iface; + TRACE("Returning iface %p\n", *ppAddress); + + return S_OK; +} diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index 7954ede..a8f1aaa 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -23,7 +23,7 @@ @ stub WSDCreateHttpTransport @ stub WSDCreateMetadataAgent @ stub WSDCreateOutboundAttachment -@ stub WSDCreateUdpAddress +@ stdcall WSDCreateUdpAddress(ptr) @ stub WSDCreateUdpMessageParameters @ stub WSDCreateUdpTransport @ stdcall WSDDetachLinkedMemory(ptr)

1 0

Alistair Leslie-Hughes : include/mfapi.h: Add standard GUID defines.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: b437c8e9390927748013bf2271e003572bd4b6c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b437c8e9390927748013bf227… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 31 04:37:57 2017 +0000 include/mfapi.h: Add standard GUID defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfapi.h | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/include/mfapi.h b/include/mfapi.h index 35641dd..1652531 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -23,10 +23,44 @@ #include <mmreg.h> #include <avrt.h> +#if !defined(MF_VERSION) +/* Default to Windows XP */ +#define MF_SDK_VERSION 0x0001 +#define MF_API_VERSION 0x0070 +#define MF_VERSION (MF_SDK_VERSION << 16 | MF_API_VERSION) +#endif + #define MFSTARTUP_NOSOCKET 0x1 #define MFSTARTUP_LITE (MFSTARTUP_NOSOCKET) #define MFSTARTUP_FULL 0 +#ifndef MAKEFOURCC +#define MAKEFOURCC(ch0, ch1, ch2, ch3) \ + ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ + ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) +#endif + +#define DEFINE_MEDIATYPE_GUID(name, format) \ + DEFINE_GUID(name, format, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + +#ifndef DIRECT3D_VERSION +#define D3DFMT_X8R8G8B8 22 +#endif + +DEFINE_MEDIATYPE_GUID(MFVideoFormat_WMV3, MAKEFOURCC('W','M','V','3')); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_RGB32, D3DFMT_X8R8G8B8); + + +DEFINE_GUID(MF_MT_AVG_BITRATE, 0x20332624, 0xfb0d, 0x4d9e, 0xbd, 0x0d, 0xcb, 0xf6, 0x78, 0x6c, 0x10, 0x2e); +DEFINE_GUID(MF_MT_FRAME_RATE, 0xc459a2e8, 0x3d2c, 0x4e44, 0xb1, 0x32, 0xfe, 0xe5, 0x15, 0x6c, 0x7b, 0xb0); +DEFINE_GUID(MF_MT_FRAME_SIZE, 0x1652c33d, 0xd6b2, 0x4012, 0xb8, 0x34, 0x72, 0x03, 0x08, 0x49, 0xa3, 0x7d); +DEFINE_GUID(MF_MT_INTERLACE_MODE, 0xe2724bb8, 0xe676, 0x4806, 0xb4, 0xb2, 0xa8, 0xd6, 0xef, 0xb4, 0x4c, 0xcd); +DEFINE_GUID(MF_MT_MAJOR_TYPE, 0x48eba18e, 0xf8c9, 0x4687, 0xbf, 0x11, 0x0a, 0x74, 0xc9, 0xf9, 0x6a, 0x8f); +DEFINE_GUID(MF_MT_PIXEL_ASPECT_RATIO, 0xc6376a1e, 0x8d0a, 0x4027, 0xbe, 0x45, 0x6d, 0x9a, 0x0a, 0xd3, 0x9b, 0xb6); +DEFINE_GUID(MF_MT_SUBTYPE, 0xf7e34c9a, 0x42e8, 0x4714, 0xb7, 0x4b, 0xcb, 0x29, 0xd7, 0x2c, 0x35, 0xe5); + +DEFINE_GUID(MFMediaType_Video, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + typedef unsigned __int64 MFWORKITEM_KEY; HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key);

1 0

Austin English : acledit: Fix ordinal ordering.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 4534261fcc9139e1464918524010d5d64185a1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4534261fcc9139e1464918524… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 25 17:48:22 2017 -0500 acledit: Fix ordinal ordering. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/acledit/acledit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/acledit/acledit.spec b/dlls/acledit/acledit.spec index 7343290..8a9b634 100644 --- a/dlls/acledit/acledit.spec +++ b/dlls/acledit/acledit.spec @@ -1,8 +1,8 @@ 1 stub EditAuditInfo 2 stub EditOwnerInfo 3 stub EditPermissionInfo -4 stdcall -private DllMain(long long ptr) -5 stdcall FMExtensionProcW(long long long) +4 stdcall FMExtensionProcW(long long long) +5 stdcall -private DllMain(long long ptr) 6 stub SedDiscretionaryAclEditor 7 stub SedSystemAclEditor 8 stub SedTakeOwnership

1 0

Austin English : gameux: Label ordinals.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 1ebf6ca29ba114fd2485990c86f58848bea03a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebf6ca29ba114fd2485990c8… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 25 17:48:25 2017 -0500 gameux: Label ordinals. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/gameux.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gameux/gameux.spec b/dlls/gameux/gameux.spec index 1a9f44f..06637b6 100644 --- a/dlls/gameux/gameux.spec +++ b/dlls/gameux/gameux.spec @@ -1,4 +1,4 @@ -@ stub GameUxShimW +1 stub GameUxShimW @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer()

1 0

Austin English : jsproxy: Label ordinals.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: a79c6a8ab82069572234e638ecbe50a62d226d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a79c6a8ab82069572234e638e… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 25 17:48:26 2017 -0500 jsproxy: Label ordinals. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/jsproxy.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/jsproxy/jsproxy.spec b/dlls/jsproxy/jsproxy.spec index 4a80c4d..51366e7 100644 --- a/dlls/jsproxy/jsproxy.spec +++ b/dlls/jsproxy/jsproxy.spec @@ -1,5 +1,6 @@ -@ stdcall InternetInitializeAutoProxyDll(long str str ptr ptr) JSPROXY_InternetInitializeAutoProxyDll -@ stub InternetInitializeExAutoProxyDll -@ stdcall InternetDeInitializeAutoProxyDll(str long) -@ stub InternetDeInitializeExAutoProxyDll -@ stdcall InternetGetProxyInfo(str long str long ptr ptr) +101 stdcall InternetInitializeAutoProxyDll(long str str ptr ptr) JSPROXY_InternetInitializeAutoProxyDll +102 stdcall InternetDeInitializeAutoProxyDll(str long) +103 stdcall InternetGetProxyInfo(str long str long ptr ptr) +104 stub InternetInitializeAutoProxyDllEx +105 stub InternetDeInitializeAutoProxyDllEx +106 stub InternetGetProxyInfoEx

1 0

Austin English : msimg32: Label ordinals.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: f77bf35d11aee79d96c65ef3f6a012ebaf2edd3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f77bf35d11aee79d96c65ef3f… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 25 17:48:28 2017 -0500 msimg32: Label ordinals. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msimg32/msimg32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msimg32/msimg32.spec b/dlls/msimg32/msimg32.spec index 76b5075..a4a67ac 100644 --- a/dlls/msimg32/msimg32.spec +++ b/dlls/msimg32/msimg32.spec @@ -1,5 +1,5 @@ +1 stdcall vSetDdrawflag() @ stdcall AlphaBlend(long long long long long long long long long long long) gdi32.GdiAlphaBlend @ stdcall -private DllInitialize(long long ptr) DllMain @ stdcall GradientFill(long ptr long ptr long long) gdi32.GdiGradientFill @ stdcall TransparentBlt(long long long long long long long long long long long) gdi32.GdiTransparentBlt -@ stdcall vSetDdrawflag()

1 0

Austin English : wmp: Add some ordinals.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 496677404953bf2b976e19508c8ab29b06ae5b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=496677404953bf2b976e19508… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 25 17:48:29 2017 -0500 wmp: Add some ordinals. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/wmp.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wmp/wmp.spec b/dlls/wmp/wmp.spec index b16365d..377bbcc 100644 --- a/dlls/wmp/wmp.spec +++ b/dlls/wmp/wmp.spec @@ -1,3 +1,8 @@ +3000 stub @ +3002 stub @ +3003 stub @ +3004 stub @ + @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer()

1 0

Alistair Leslie-Hughes : wmvcore: Implement WMCreateWriterPriv.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 7381cecd55e7ba8b98a43ffae6410c1f653f47e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7381cecd55e7ba8b98a43ffae… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 31 01:22:25 2017 +0000 wmvcore: Implement WMCreateWriterPriv. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 18 ++++++++++++++++++ dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/writer.c | 5 +++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 4ceef77..51ff9dc 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -22,6 +22,8 @@ #include "wine/test.h" +HRESULT WINAPI WMCreateWriterPriv(IWMWriter **writer); + static void test_wmwriter_interfaces(void) { HRESULT hr; @@ -197,6 +199,21 @@ void test_profile_manager_interfaces(void) IWMProfileManager_Release(profile); } +static void test_WMCreateWriterPriv(void) +{ + IWMWriter *writer, *writer2; + HRESULT hr; + + hr = WMCreateWriterPriv(&writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IWMWriter_QueryInterface(writer, &IID_IWMWriter, (void**)&writer2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IWMWriter_Release(writer); + IWMWriter_Release(writer2); +} + START_TEST(wmvcore) { HRESULT hr; @@ -209,6 +226,7 @@ START_TEST(wmvcore) test_wmreader_interfaces(); test_wmwriter_interfaces(); test_profile_manager_interfaces(); + test_WMCreateWriterPriv(); CoUninitialize(); } diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index bb17683..c8f582b 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -15,6 +15,6 @@ @ stdcall WMCreateWriter(ptr ptr) @ stub WMCreateWriterFileSink @ stub WMCreateWriterNetworkSink -@ stub WMCreateWriterPriv +@ stdcall WMCreateWriterPriv(ptr) @ stub WMCreateWriterPushSink @ stub WMIsContentProtected diff --git a/dlls/wmvcore/writer.c b/dlls/wmvcore/writer.c index f570148..c1c30be 100644 --- a/dlls/wmvcore/writer.c +++ b/dlls/wmvcore/writer.c @@ -369,3 +369,8 @@ HRESULT WINAPI WMCreateWriter(IUnknown *reserved, IWMWriter **writer) *writer = &ret->IWMWriter_iface; return S_OK; } + +HRESULT WINAPI WMCreateWriterPriv(IWMWriter **writer) +{ + return WMCreateWriter(NULL, writer); +}

1 0

Alexandre Julliard : explorer: Don' t forward the system tray to the display driver in desktop mode.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 082e4981631189c5903f838a0bc23e137c1cce17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=082e4981631189c5903f838a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 17:20:33 2017 +0200 explorer: Don't forward the system tray to the display driver in desktop mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index ddfd67d..9e58ad4 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -565,7 +565,7 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) buffer, buffer + cbMaskBits); } - /* try forward to x11drv first */ + /* try forwarding to the display driver first */ if (cds->dwData == NIM_ADD || !(icon = get_icon( nid.hWnd, nid.uID ))) { if (wine_notify_icon && ((ret = wine_notify_icon( cds->dwData, &nid )) != -1)) @@ -901,7 +901,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab WNDCLASSEXW class; static const WCHAR classname[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; - wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); + if (using_root) wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2*ICON_BORDER; icon_cy = GetSystemMetrics( SM_CYSMICON ) + 2*ICON_BORDER;

1 0