wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

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 : 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

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

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

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: Create default XML context in WSDCreateDiscoveryPublisher if required.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 9c9180f60677f05824e10f604952a95699dcf5cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9180f60677f05824e10f604… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 30 23:05:56 2017 +0100 wsdapi: Create default XML context in WSDCreateDiscoveryPublisher if required. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/discovery.c | 12 ++++++++-- dlls/wsdapi/tests/discovery.c | 51 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index ea0f34b..c9ef9c2 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -360,10 +360,18 @@ HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscover obj->IWSDiscoveryPublisher_iface.lpVtbl = &publisher_vtbl; obj->ref = 1; - obj->xmlContext = pContext; - if (pContext != NULL) + if (pContext == NULL) { + if (FAILED(WSDXMLCreateContext(&obj->xmlContext))) + { + WARN("Unable to create XML context\n"); + return E_OUTOFMEMORY; + } + } + else + { + obj->xmlContext = pContext; IWSDXMLContext_AddRef(pContext); } diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index ffe64b0..db5947d 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -162,6 +162,56 @@ static void CreateDiscoveryPublisher_tests(void) ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); } +static void CreateDiscoveryPublisher_XMLContext_tests(void) +{ + IWSDiscoveryPublisher *publisher = NULL; + IWSDXMLContext *xmlContext, *returnedContext; + HRESULT rc; + int ref; + + /* Test creating an XML context and supplying it to WSDCreateDiscoveryPublisher */ + rc = WSDXMLCreateContext(&xmlContext); + ok(rc == S_OK, "WSDXMLCreateContext failed: %08x\n", rc); + + rc = WSDCreateDiscoveryPublisher(xmlContext, &publisher); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(xmlContext, &publisher) failed: %08x\n", rc); + ok(publisher != NULL, "WSDCreateDiscoveryPublisher(xmlContext, &publisher) failed: publisher == NULL\n"); + + rc = IWSDiscoveryPublisher_GetXMLContext(publisher, NULL); + ok(rc == E_INVALIDARG, "GetXMLContext returned unexpected value with NULL argument: %08x\n", rc); + + rc = IWSDiscoveryPublisher_GetXMLContext(publisher, &returnedContext); + ok(rc == S_OK, "GetXMLContext failed: %08x\n", rc); + + ok(xmlContext == returnedContext, "GetXMLContext returned unexpected value: returnedContext == %p\n", returnedContext); + + ref = IWSDXMLContext_Release(returnedContext); + ok(ref == 2, "IWSDXMLContext_Release() has %d references, should have 2\n", ref); + + ref = IWSDiscoveryPublisher_Release(publisher); + ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); + + ref = IWSDXMLContext_Release(returnedContext); + ok(ref == 0, "IWSDXMLContext_Release() has %d references, should have 0\n", ref); + + /* Test using a default XML context */ + publisher = NULL; + returnedContext = NULL; + + rc = WSDCreateDiscoveryPublisher(NULL, &publisher); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); + ok(publisher != NULL, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: publisher == NULL\n"); + + rc = IWSDiscoveryPublisher_GetXMLContext(publisher, &returnedContext); + ok(rc == S_OK, "GetXMLContext failed: %08x\n", rc); + + ref = IWSDXMLContext_Release(returnedContext); + ok(ref == 1, "IWSDXMLContext_Release() has %d references, should have 1\n", ref); + + ref = IWSDiscoveryPublisher_Release(publisher); + ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); +} + static void Publish_tests(void) { IWSDiscoveryPublisher *publisher = NULL; @@ -231,6 +281,7 @@ START_TEST(discovery) CoInitialize(NULL); CreateDiscoveryPublisher_tests(); + CreateDiscoveryPublisher_XMLContext_tests(); Publish_tests(); CoUninitialize();

1 0

Owen Rudge : wsdapi: Implement AddNameToNamespace.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 9bf2f6b2afccd5342e7cc105f8a960e8eedb719e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf2f6b2afccd5342e7cc105f… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 30 23:05:50 2017 +0100 wsdapi: Implement AddNameToNamespace. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/xml.c | 20 ++++----- dlls/wsdapi/xml.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 121 insertions(+), 12 deletions(-) diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index 68742fe..c83f07b 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -413,24 +413,24 @@ static void XMLContext_AddNameToNamespace_tests(void) /* Test calling AddNameToNamespace with invalid arguments */ hr = IWSDXMLContext_AddNameToNamespace(context, NULL, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); hr = IWSDXMLContext_AddNameToNamespace(context, NULL, name1Text, NULL); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); /* Test calling AddNameToNamespace without the ppName parameter */ hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, name1Text, NULL); - todo_wine ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); /* Now retrieve the created name */ hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, name1Text, &name1); - todo_wine ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); /* Check the returned structure */ - todo_wine ok(name1 != NULL, "name1 == NULL\n"); + ok(name1 != NULL, "name1 == NULL\n"); if (name1 != NULL) { @@ -447,10 +447,10 @@ static void XMLContext_AddNameToNamespace_tests(void) /* Test calling AddNamespace with parameters that are too large */ hr = IWSDXMLContext_AddNameToNamespace(context, largeText, name1Text, &name2); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, largeText, &name2); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); /* Try creating a namespace explicitly */ hr = IWSDXMLContext_AddNamespace(context, ns2Uri, prefix2, &ns2); @@ -458,10 +458,10 @@ static void XMLContext_AddNameToNamespace_tests(void) /* Now add a name to it */ hr = IWSDXMLContext_AddNameToNamespace(context, ns2Uri, name2Text, &name2); - todo_wine ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); /* Check the returned structure */ - todo_wine ok(name2 != NULL, "name2 == NULL\n"); + ok(name2 != NULL, "name2 == NULL\n"); if (name2 != NULL) { diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 9fba638..a6d0b07 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -270,6 +270,64 @@ static WSDXML_NAMESPACE *find_namespace(struct list *namespaces, LPCWSTR uri) return NULL; } +static WSDXML_NAME *find_name(WSDXML_NAMESPACE *ns, LPCWSTR name) +{ + int i; + + for (i = 0; i < ns->NamesCount; i++) + { + if (lstrcmpW(ns->Names[i].LocalName, name) == 0) + { + return &ns->Names[i]; + } + } + + return NULL; +} + +static WSDXML_NAME *add_name(WSDXML_NAMESPACE *ns, LPCWSTR name) +{ + WSDXML_NAME *names; + WSDXML_NAME *newName; + int i; + + names = WSDAllocateLinkedMemory(ns, sizeof(WSDXML_NAME) * (ns->NamesCount + 1)); + + if (names == NULL) + { + return NULL; + } + + if (ns->NamesCount > 0) + { + /* Copy the existing names array over to the new allocation */ + memcpy(names, ns->Names, sizeof(WSDXML_NAME) * ns->NamesCount); + + for (i = 0; i < ns->NamesCount; i++) + { + /* Attach the local name memory to the new names allocation */ + WSDAttachLinkedMemory(names, names[i].LocalName); + } + + WSDFreeLinkedMemory(ns->Names); + } + + ns->Names = names; + + newName = &names[ns->NamesCount]; + + newName->LocalName = duplicate_string(names, name); + newName->Space = ns; + + if (newName->LocalName == NULL) + { + return NULL; + } + + ns->NamesCount++; + return newName; +} + static BOOL is_prefix_unique(struct list *namespaces, LPCWSTR prefix) { struct xmlNamespace *ns; @@ -461,8 +519,59 @@ static HRESULT WINAPI IWSDXMLContextImpl_AddNamespace(IWSDXMLContext *iface, LPC static HRESULT WINAPI IWSDXMLContextImpl_AddNameToNamespace(IWSDXMLContext *iface, LPCWSTR pszUri, LPCWSTR pszName, WSDXML_NAME **ppName) { - FIXME("(%p, %s, %s, %p)\n", iface, debugstr_w(pszUri), debugstr_w(pszName), ppName); - return E_NOTIMPL; + IWSDXMLContextImpl *This = impl_from_IWSDXMLContext(iface); + WSDXML_NAMESPACE *ns; + WSDXML_NAME *name; + + TRACE("(%p, %s, %s, %p)\n", This, debugstr_w(pszUri), debugstr_w(pszName), ppName); + + if ((pszUri == NULL) || (pszName == NULL) || (lstrlenW(pszUri) > WSD_MAX_TEXT_LENGTH) || (lstrlenW(pszName) > WSD_MAX_TEXT_LENGTH)) + { + return E_INVALIDARG; + } + + ns = find_namespace(This->namespaces, pszUri); + + if (ns == NULL) + { + /* The namespace doesn't exist, add it */ + ns = add_namespace(This->namespaces, pszUri); + + if (ns == NULL) + { + return E_OUTOFMEMORY; + } + + ns->PreferredPrefix = generate_namespace_prefix(This, ns, pszUri); + if (ns->PreferredPrefix == NULL) + { + return E_FAIL; + } + } + + name = find_name(ns, pszName); + + if (name == NULL) + { + name = add_name(ns, pszName); + + if (name == NULL) + { + return E_OUTOFMEMORY; + } + } + + if (ppName != NULL) + { + *ppName = duplicate_name(NULL, name); + + if (*ppName == NULL) + { + return E_OUTOFMEMORY; + } + } + + return S_OK; } static HRESULT WINAPI IWSDXMLContextImpl_SetNamespaces(IWSDXMLContext *iface, const PCWSDXML_NAMESPACE *pNamespaces, WORD wNamespacesCount, BYTE bLayerNumber)

1 0

Owen Rudge : wsdapi: Implement AddNamespace.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: bf2095326093da5bc91603c88a688cd7b0f5c68b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf2095326093da5bc91603c88… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 30 23:05:45 2017 +0100 wsdapi: Implement AddNamespace. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/Makefile.in | 2 +- dlls/wsdapi/tests/xml.c | 44 +++++------ dlls/wsdapi/xml.c | 189 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 209 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf2095326093da5bc9160…

1 0

Alexandre Julliard : wineandroid: Add a JNI callback to store the native window we got from the TextureView.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 9a134711e6598081d5af55a3f02df625f669a036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a134711e6598081d5af55a3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 11:37:16 2017 +0200 wineandroid: Add a JNI callback to store the native window we got from the TextureView. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 2 + dlls/wineandroid.drv/android.h | 14 +++++ dlls/wineandroid.drv/device.c | 95 ++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/init.c | 12 ++++- dlls/wineandroid.drv/window.c | 45 +++++++++++++++- 5 files changed, 166 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a134711e6598081d5af5…

1 0

Alexandre Julliard : wineandroid: Add a header for some of the Android native APIs and data structures.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 7124a7d90c0dc123da5a86229a7f64303bd32481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7124a7d90c0dc123da5a86229… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 11:46:21 2017 +0200 wineandroid: Add a header for some of the Android native APIs and data structures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 1 + dlls/wineandroid.drv/android_native.h | 233 ++++++++++++++++++++++++++++++++++ 2 files changed, 234 insertions(+) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 70a1e04..fb8b67d 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -32,6 +32,7 @@ #include "wingdi.h" #include "winuser.h" #include "wine/gdi_driver.h" +#include "android_native.h" /************************************************************************** diff --git a/dlls/wineandroid.drv/android_native.h b/dlls/wineandroid.drv/android_native.h new file mode 100644 index 0000000..5efd564 --- /dev/null +++ b/dlls/wineandroid.drv/android_native.h @@ -0,0 +1,233 @@ +/* + * Android native system definitions + * + * Copyright 2013 Alexandre Julliard + * + * 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 + */ + +/* Copy of some Android native structures to avoid depending on the Android source */ +/* Hopefully these won't change too frequently... */ + +#ifndef __WINE_ANDROID_NATIVE_H +#define __WINE_ANDROID_NATIVE_H + +/* Native window definitions */ + +typedef struct native_handle +{ + int version; + int numFds; + int numInts; + int data[0]; +} native_handle_t; + +typedef const native_handle_t *buffer_handle_t; + +struct android_native_base_t +{ + int magic; + int version; + void *reserved[4]; + void (*incRef)(struct android_native_base_t *base); + void (*decRef)(struct android_native_base_t *base); +}; + +typedef struct android_native_rect_t +{ + int32_t left; + int32_t top; + int32_t right; + int32_t bottom; +} android_native_rect_t; + +struct ANativeWindowBuffer +{ + struct android_native_base_t common; + int width; + int height; + int stride; + int format; + int usage; + void *reserved[2]; + buffer_handle_t handle; + void *reserved_proc[8]; +}; + +struct ANativeWindow +{ + struct android_native_base_t common; + uint32_t flags; + int minSwapInterval; + int maxSwapInterval; + float xdpi; + float ydpi; + intptr_t oem[4]; + int (*setSwapInterval)(struct ANativeWindow *window, int interval); + int (*dequeueBuffer_DEPRECATED)(struct ANativeWindow *window, struct ANativeWindowBuffer **buffer); + int (*lockBuffer_DEPRECATED)(struct ANativeWindow *window, struct ANativeWindowBuffer *buffer); + int (*queueBuffer_DEPRECATED)(struct ANativeWindow *window, struct ANativeWindowBuffer *buffer); + int (*query)(const struct ANativeWindow *window, int what, int *value); + int (*perform)(struct ANativeWindow *window, int operation, ... ); + int (*cancelBuffer_DEPRECATED)(struct ANativeWindow *window, struct ANativeWindowBuffer *buffer); + int (*dequeueBuffer)(struct ANativeWindow *window, struct ANativeWindowBuffer **buffer, int *fenceFd); + int (*queueBuffer)(struct ANativeWindow *window, struct ANativeWindowBuffer *buffer, int fenceFd); + int (*cancelBuffer)(struct ANativeWindow *window, struct ANativeWindowBuffer *buffer, int fenceFd); +}; + +enum native_window_query +{ + NATIVE_WINDOW_WIDTH = 0, + NATIVE_WINDOW_HEIGHT = 1, + NATIVE_WINDOW_FORMAT = 2, + NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS = 3, + NATIVE_WINDOW_QUEUES_TO_WINDOW_COMPOSER = 4, + NATIVE_WINDOW_CONCRETE_TYPE = 5, + NATIVE_WINDOW_DEFAULT_WIDTH = 6, + NATIVE_WINDOW_DEFAULT_HEIGHT = 7, + NATIVE_WINDOW_TRANSFORM_HINT = 8, + NATIVE_WINDOW_CONSUMER_RUNNING_BEHIND = 9 +}; + +enum native_window_perform +{ + NATIVE_WINDOW_SET_USAGE = 0, + NATIVE_WINDOW_CONNECT = 1, + NATIVE_WINDOW_DISCONNECT = 2, + NATIVE_WINDOW_SET_CROP = 3, + NATIVE_WINDOW_SET_BUFFER_COUNT = 4, + NATIVE_WINDOW_SET_BUFFERS_GEOMETRY = 5, + NATIVE_WINDOW_SET_BUFFERS_TRANSFORM = 6, + NATIVE_WINDOW_SET_BUFFERS_TIMESTAMP = 7, + NATIVE_WINDOW_SET_BUFFERS_DIMENSIONS = 8, + NATIVE_WINDOW_SET_BUFFERS_FORMAT = 9, + NATIVE_WINDOW_SET_SCALING_MODE = 10, + NATIVE_WINDOW_LOCK = 11, + NATIVE_WINDOW_UNLOCK_AND_POST = 12, + NATIVE_WINDOW_API_CONNECT = 13, + NATIVE_WINDOW_API_DISCONNECT = 14, + NATIVE_WINDOW_SET_BUFFERS_USER_DIMENSIONS = 15, + NATIVE_WINDOW_SET_POST_TRANSFORM_CROP = 16 +}; + +enum native_window_api +{ + NATIVE_WINDOW_API_EGL = 1, + NATIVE_WINDOW_API_CPU = 2, + NATIVE_WINDOW_API_MEDIA = 3, + NATIVE_WINDOW_API_CAMERA = 4 +}; + +enum android_pixel_format +{ + PF_RGBA_8888 = 1, + PF_RGBX_8888 = 2, + PF_RGB_888 = 3, + PF_RGB_565 = 4, + PF_BGRA_8888 = 5, + PF_RGBA_5551 = 6, + PF_RGBA_4444 = 7 +}; + + +/* Hardware module definitions */ + +struct hw_module_methods_t; +struct hw_device_t; +struct android_ycbcr; + +struct hw_module_t +{ + uint32_t tag; + uint16_t module_api_version; + uint16_t hal_api_version; + const char *id; + const char *name; + const char *author; + struct hw_module_methods_t *methods; + void *dso; + void *reserved[32-7]; +}; + +struct hw_module_methods_t +{ + int (*open)(const struct hw_module_t *module, const char *id, struct hw_device_t **device); +}; + +struct hw_device_t +{ + uint32_t tag; + uint32_t version; + struct hw_module_t *module; + void *reserved[12]; + int (*close)(struct hw_device_t *device); +}; + +struct gralloc_module_t +{ + struct hw_module_t common; + int (*registerBuffer)(struct gralloc_module_t const *module, buffer_handle_t handle); + int (*unregisterBuffer)(struct gralloc_module_t const *module, buffer_handle_t handle); + int (*lock)(struct gralloc_module_t const *module, buffer_handle_t handle, int usage, int l, int t, int w, int h, void **vaddr); + int (*unlock)(struct gralloc_module_t const *module, buffer_handle_t handle); + int (*perform)(struct gralloc_module_t const *module, int operation, ... ); + int (*lock_ycbcr)(struct gralloc_module_t const *module, buffer_handle_t handle, int usage, int l, int t, int w, int h, struct android_ycbcr *ycbcr); + void *reserved_proc[6]; +}; + +#define ANDROID_NATIVE_MAKE_CONSTANT(a,b,c,d) \ + (((unsigned)(a)<<24)|((unsigned)(b)<<16)|((unsigned)(c)<<8)|(unsigned)(d)) + +#define ANDROID_NATIVE_WINDOW_MAGIC \ + ANDROID_NATIVE_MAKE_CONSTANT('_','w','n','d') + +#define ANDROID_NATIVE_BUFFER_MAGIC \ + ANDROID_NATIVE_MAKE_CONSTANT('_','b','f','r') + +enum gralloc_usage +{ + GRALLOC_USAGE_SW_READ_NEVER = 0x00000000, + GRALLOC_USAGE_SW_READ_RARELY = 0x00000002, + GRALLOC_USAGE_SW_READ_OFTEN = 0x00000003, + GRALLOC_USAGE_SW_READ_MASK = 0x0000000F, + GRALLOC_USAGE_SW_WRITE_NEVER = 0x00000000, + GRALLOC_USAGE_SW_WRITE_RARELY = 0x00000020, + GRALLOC_USAGE_SW_WRITE_OFTEN = 0x00000030, + GRALLOC_USAGE_SW_WRITE_MASK = 0x000000F0, + GRALLOC_USAGE_HW_TEXTURE = 0x00000100, + GRALLOC_USAGE_HW_RENDER = 0x00000200, + GRALLOC_USAGE_HW_2D = 0x00000400, + GRALLOC_USAGE_HW_COMPOSER = 0x00000800, + GRALLOC_USAGE_HW_FB = 0x00001000, + GRALLOC_USAGE_HW_VIDEO_ENCODER = 0x00010000, + GRALLOC_USAGE_HW_CAMERA_WRITE = 0x00020000, + GRALLOC_USAGE_HW_CAMERA_READ = 0x00040000, + GRALLOC_USAGE_HW_CAMERA_ZSL = 0x00060000, + GRALLOC_USAGE_HW_CAMERA_MASK = 0x00060000, + GRALLOC_USAGE_HW_MASK = 0x00071F00, + GRALLOC_USAGE_EXTERNAL_DISP = 0x00002000, + GRALLOC_USAGE_PROTECTED = 0x00004000, + GRALLOC_USAGE_PRIVATE_0 = 0x10000000, + GRALLOC_USAGE_PRIVATE_1 = 0x20000000, + GRALLOC_USAGE_PRIVATE_2 = 0x40000000, + GRALLOC_USAGE_PRIVATE_3 = 0x80000000, + GRALLOC_USAGE_PRIVATE_MASK = 0xF0000000, +}; + +#define GRALLOC_HARDWARE_MODULE_ID "gralloc" + +extern int hw_get_module(const char *id, const struct hw_module_t **module); + +#endif /* __WINE_ANDROID_NATIVE_H */

1 0

← Newer
1
...
53
54
55
56
57
58
59
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017