April 2014 - Wine-Commits - list.winehq.org

Vincent Povirk : shell32: Respect CMIC_MASK_NO_CONSOLE in ShellLink InvokeCommand.
by Alexandre Julliard April 25, 2014

April 25, 2014

Module: wine Branch: master Commit: 7eebbf3b076aaa9438f04959e02a94c44c419b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eebbf3b076aaa9438f04959e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 17 17:30:43 2014 -0500 shell32: Respect CMIC_MASK_NO_CONSOLE in ShellLink InvokeCommand. --- dlls/shell32/shelllink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 4000a1d..b9c9e75 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2500,7 +2500,7 @@ ShellLink_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici ) memset( &sei, 0, sizeof sei ); sei.cbSize = sizeof sei; - sei.fMask = SEE_MASK_UNICODE | (lpici->fMask & (SEE_MASK_NOASYNC|SEE_MASK_ASYNCOK|SEE_MASK_FLAG_NO_UI)); + sei.fMask = SEE_MASK_UNICODE | (lpici->fMask & (SEE_MASK_NOASYNC|SEE_MASK_NO_CONSOLE|SEE_MASK_ASYNCOK|SEE_MASK_FLAG_NO_UI)); sei.lpFile = path; sei.nShow = This->iShowCmd; sei.lpIDList = This->pPidl;

1 0

Vincent Povirk : shell32/tests: Use SEE_MASK_NO_CONSOLE with ShellExecuteExA.
by Alexandre Julliard April 25, 2014

April 25, 2014

Module: wine Branch: master Commit: 3d1cf168cfc517e71515bac04fa13fb2bbd4ab49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d1cf168cfc517e71515bac04… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 17 17:32:27 2014 -0500 shell32/tests: Use SEE_MASK_NO_CONSOLE with ShellExecuteExA. --- dlls/shell32/tests/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 9f4b1a3..e3169c8 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -183,7 +183,7 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR verb, LPCSTR file, trace("%s\n", shell_call); sei.cbSize=sizeof(sei); - sei.fMask=SEE_MASK_NOCLOSEPROCESS | mask; + sei.fMask=SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE | mask; sei.hwnd=NULL; sei.lpVerb=verb; sei.lpFile=file;

1 0

Vincent Povirk : start: Don't use SEE_MASK_NO_CONSOLE.
by Alexandre Julliard April 25, 2014

April 25, 2014

Module: wine Branch: master Commit: 9e0971e374c87472af00df50a57dc8de7fe74f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0971e374c87472af00df50a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 22 12:47:29 2014 -0500 start: Don't use SEE_MASK_NO_CONSOLE. --- programs/start/start.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index 7bf8ea8..9f2c3f7 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -216,8 +216,7 @@ int wmain (int argc, WCHAR *argv[]) sei.nShow = SW_SHOWNORMAL; /* Dunno what these mean, but it looks like winMe's start uses them */ sei.fMask = SEE_MASK_FLAG_DDEWAIT| - SEE_MASK_FLAG_NO_UI| - SEE_MASK_NO_CONSOLE; + SEE_MASK_FLAG_NO_UI; sei.lpDirectory = NULL; creation_flags = CREATE_NEW_CONSOLE;

1 0

Vincent Povirk : shell32: Use CREATE_NEW_CONSOLE when SEE_MASK_NOCONSOLE is omitted.
by Alexandre Julliard April 25, 2014

April 25, 2014

Module: wine Branch: master Commit: 2005be6dc92c0943ede01525cecad88f8e83c9c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2005be6dc92c0943ede01525c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 16 15:50:37 2014 -0500 shell32: Use CREATE_NEW_CONSOLE when SEE_MASK_NOCONSOLE is omitted. --- dlls/shell32/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 41c147d..a6bc5c8 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -338,7 +338,7 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = psei->nShow; dwCreationFlags = CREATE_UNICODE_ENVIRONMENT; - if (psei->fMask & SEE_MASK_NO_CONSOLE) + if (!(psei->fMask & SEE_MASK_NO_CONSOLE)) dwCreationFlags |= CREATE_NEW_CONSOLE; if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, dwCreationFlags, env, lpDirectory, &startup, &info))

1 0

Jacek Caban : ieframe: Improved debug traces.
by Alexandre Julliard April 24, 2014

April 24, 2014

Module: wine Branch: master Commit: fba08e34c4478fdce5055c5c3ead7d8958875bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=fba08e34c4478fdce5055c5c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 13:28:44 2014 +0200 ieframe: Improved debug traces. --- dlls/ieframe/ieframe_main.c | 2 ++ dlls/ieframe/navigate.c | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index ffba1d7..4793ee3 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -49,6 +49,8 @@ const char *debugstr_variant(const VARIANT *v) return wine_dbg_sprintf("{VT_DISPATCH: %p}", V_DISPATCH(v)); case VT_BOOL: return wine_dbg_sprintf("{VT_BOOL: %x}", V_BOOL(v)); + case VT_ERROR: + return wine_dbg_sprintf("{VT_ERROR: %08x}", V_ERROR(v)); default: return wine_dbg_sprintf("{vt %d}", V_VT(v)); } diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 0c8c276..886fa01 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -928,11 +928,9 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, TRACE("navigating to %s\n", debugstr_w(url)); - if((Flags && V_VT(Flags) != VT_EMPTY) - || (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY)) - FIXME("Unsupported args (Flags %p:%d; TargetFrameName %p:%d)\n", - Flags, Flags ? V_VT(Flags) : -1, TargetFrameName, - TargetFrameName ? V_VT(TargetFrameName) : -1); + if((Flags && V_VT(Flags) != VT_EMPTY && V_VT(Flags) != VT_ERROR) + || (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY && V_VT(TargetFrameName) != VT_ERROR)) + FIXME("Unsupported args (Flags %s; TargetFrameName %s)\n", debugstr_variant(Flags), debugstr_variant(TargetFrameName)); if(PostData && V_VT(PostData) == (VT_ARRAY | VT_UI1) && V_ARRAY(PostData)) { SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data);

1 0

Alistair Leslie-Hughes : dpnet/tests: Use dxguid for tests.
by Alexandre Julliard April 24, 2014

April 24, 2014

Module: wine Branch: master Commit: daac5b1f41f8874ffcfd6892fec0efbae4a7b6af URL: http://source.winehq.org/git/wine.git/?a=commit;h=daac5b1f41f8874ffcfd6892f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 11 09:00:46 2014 +1000 dpnet/tests: Use dxguid for tests. --- dlls/dpnet/tests/Makefile.in | 2 +- dlls/dpnet/tests/peer.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dpnet/tests/Makefile.in b/dlls/dpnet/tests/Makefile.in index 9220121..890ef3b 100644 --- a/dlls/dpnet/tests/Makefile.in +++ b/dlls/dpnet/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dpnet.dll -IMPORTS = dpnet ole32 +IMPORTS = dpnet ole32 dxguid C_SRCS = \ peer.c \ diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index aea67c9..d1f3504 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define INITGUID #define WIN32_LEAN_AND_MEAN #include <stdio.h>

1 0

Jacek Caban : mshtml: Added IConnectionPoint:: EnumConnections implementation.
by Alexandre Julliard April 24, 2014

April 24, 2014

Module: wine Branch: master Commit: e9ac8e568bc9685cff16a69c2be392255912804d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ac8e568bc9685cff16a69c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 13:27:14 2014 +0200 mshtml: Added IConnectionPoint::EnumConnections implementation. --- dlls/mshtml/conpoint.c | 133 ++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/htmldoc.c | 21 +++++++ 2 files changed, 152 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index de501b4..8912eab 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -48,6 +48,120 @@ static const char *debugstr_cp_guid(REFIID riid) return debugstr_guid(riid); } +typedef struct { + IEnumConnections IEnumConnections_iface; + + LONG ref; + + unsigned iter; + ConnectionPoint *cp; +} EnumConnections; + +static inline EnumConnections *impl_from_IEnumConnections(IEnumConnections *iface) +{ + return CONTAINING_RECORD(iface, EnumConnections, IEnumConnections_iface); +} + +static HRESULT WINAPI EnumConnections_QueryInterface(IEnumConnections *iface, REFIID riid, void **ppv) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IEnumConnections_iface; + }else if(IsEqualGUID(riid, &IID_IEnumConnections)) { + TRACE("(%p)->(IID_IEnumConnections %p)\n", This, ppv); + *ppv = &This->IEnumConnections_iface; + }else { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI EnumConnections_AddRef(IEnumConnections *iface) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI EnumConnections_Release(IEnumConnections *iface) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + IConnectionPoint_Release(&This->cp->IConnectionPoint_iface); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConnections, CONNECTDATA *rgcd, ULONG *pcFetched) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + ULONG fetched = 0; + + TRACE("(%p)->(%d %p %p)\n", This, cConnections, rgcd, pcFetched); + + while(fetched < cConnections && This->iter < This->cp->sinks_size) { + if(!This->cp->sinks[This->iter].unk) { + This->iter++; + continue; + } + + rgcd[fetched].pUnk = This->cp->sinks[This->iter].unk; + rgcd[fetched].dwCookie = ++This->iter; + IUnknown_AddRef(rgcd[fetched].pUnk); + fetched++; + } + + if(pcFetched) + *pcFetched = fetched; + return fetched == cConnections ? S_OK : S_FALSE; +} + +static HRESULT WINAPI EnumConnections_Skip(IEnumConnections *iface, ULONG cConnections) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + FIXME("(%p)->(%d)\n", This, cConnections); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumConnections_Reset(IEnumConnections *iface) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumConnections_Clone(IEnumConnections *iface, IEnumConnections **ppEnum) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumConnectionsVtbl EnumConnectionsVtbl = { + EnumConnections_QueryInterface, + EnumConnections_AddRef, + EnumConnections_Release, + EnumConnections_Next, + EnumConnections_Skip, + EnumConnections_Reset, + EnumConnections_Clone +}; + static inline ConnectionPoint *impl_from_IConnectionPoint(IConnectionPoint *iface) { return CONTAINING_RECORD(iface, ConnectionPoint, IConnectionPoint_iface); @@ -175,8 +289,23 @@ static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, IEnumConnections **ppEnum) { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%p)\n", This, ppEnum); - return E_NOTIMPL; + EnumConnections *ret; + + TRACE("(%p)->(%p)\n", This, ppEnum); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumConnections_iface.lpVtbl = &EnumConnectionsVtbl; + ret->ref = 1; + ret->iter = 0; + + IConnectionPoint_AddRef(&This->IConnectionPoint_iface); + ret->cp = This; + + *ppEnum = &ret->IEnumConnections_iface; + return S_OK; } static const IConnectionPointVtbl ConnectionPointVtbl = diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index bad7291..24c6cac 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5453,8 +5453,29 @@ static void test_ConnectionPoint(IConnectionPointContainer *container, REFIID ri hres = IConnectionPoint_Advise(cp, (IUnknown*)&PropertyNotifySink, NULL); ok(hres == S_OK, "Advise failed: %08x\n", hres); } else if(IsEqualGUID(&IID_IDispatch, riid)) { + IEnumConnections *enum_conn; + CONNECTDATA conn_data; + ULONG fetched; + hres = IConnectionPoint_Advise(cp, (IUnknown*)&EventDispatch, &cookie); ok(hres == S_OK, "Advise failed: %08x\n", hres); + + hres = IConnectionPoint_EnumConnections(cp, &enum_conn); + ok(hres == S_OK, "EnumConnections failed: %08x\n", hres); + + fetched = 0; + hres = IEnumConnections_Next(enum_conn, 1, &conn_data, &fetched); + ok(hres == S_OK, "Next failed: %08x\n", hres); + ok(conn_data.pUnk == (IUnknown*)&EventDispatch, "conn_data.pUnk == EventDispatch\n"); + ok(conn_data.dwCookie == cookie, "conn_data.dwCookie != cookie\n"); + IUnknown_Release(conn_data.pUnk); + + fetched = 0xdeadbeef; + hres = IEnumConnections_Next(enum_conn, 1, &conn_data, &fetched); + ok(hres == S_FALSE, "Next failed: %08x\n", hres); + ok(!fetched, "fetched = %d\n", fetched); + + IEnumConnections_Release(enum_conn); } IConnectionPoint_Release(cp);

1 0

Alistair Leslie-Hughes : dpnet: Improve error checking in Get/Set SP.
by Alexandre Julliard April 24, 2014

April 24, 2014

Module: wine Branch: master Commit: c41d275079cfa247e93c7e53e7e3b03a6e2a1152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41d275079cfa247e93c7e53e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 11 09:52:20 2014 +1000 dpnet: Improve error checking in Get/Set SP. --- dlls/dpnet/address.c | 26 +++++++++----- dlls/dpnet/dpnet_private.h | 2 +- dlls/dpnet/tests/Makefile.in | 3 +- dlls/dpnet/tests/address.c | 82 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 103 insertions(+), 10 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 78c8350..796e8a4 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -166,12 +166,18 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface static HRESULT WINAPI IDirectPlay8AddressImpl_GetSP(IDirectPlay8Address *iface, GUID *pguidSP) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p, %p)\n", iface, pguidSP); + TRACE("(%p, %p)\n", iface, pguidSP); - *pguidSP = This->SP_guid; - return DPN_OK; + if(!pguidSP) + return DPNERR_INVALIDPOINTER; + + if(!This->init) + return DPNERR_DOESNOTEXIST; + + *pguidSP = This->SP_guid; + return DPN_OK; } static HRESULT WINAPI IDirectPlay8AddressImpl_GetUserData(IDirectPlay8Address *iface, @@ -185,12 +191,16 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetUserData(IDirectPlay8Address *i static HRESULT WINAPI IDirectPlay8AddressImpl_SetSP(IDirectPlay8Address *iface, const GUID *const pguidSP) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p, %s)\n", iface, debugstr_SP(pguidSP)); + TRACE("(%p, %s)\n", iface, debugstr_SP(pguidSP)); - This->SP_guid = *pguidSP; - return DPN_OK; + if(!pguidSP) + return DPNERR_INVALIDPOINTER; + + This->init = TRUE; + This->SP_guid = *pguidSP; + return DPN_OK; } static HRESULT WINAPI IDirectPlay8AddressImpl_SetUserData(IDirectPlay8Address *iface, diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 4a42eae..00ea94b 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -64,7 +64,7 @@ struct IDirectPlay8AddressImpl LONG ref; /* IDirectPlay8Address fields */ GUID SP_guid; - const WCHAR *url; + BOOL init; }; /***************************************************************************** diff --git a/dlls/dpnet/tests/Makefile.in b/dlls/dpnet/tests/Makefile.in index 890ef3b..69339dc 100644 --- a/dlls/dpnet/tests/Makefile.in +++ b/dlls/dpnet/tests/Makefile.in @@ -1,6 +1,7 @@ TESTDLL = dpnet.dll -IMPORTS = dpnet ole32 dxguid +IMPORTS = dxguid uuid dpnet ole32 C_SRCS = \ + address.c \ peer.c \ server.c diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c new file mode 100644 index 0000000..dad5a8e --- /dev/null +++ b/dlls/dpnet/tests/address.c @@ -0,0 +1,82 @@ +/* + * Copyright 2014 Alistair Leslie-Hughes + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN +#include <stdio.h> + +#include <dplay8.h> +#include "wine/test.h" + +/* {6733C6E8-A0D6-450E-8C18-CEACF331DC27} */ +static const GUID IID_Random = {0x6733c6e8, 0xa0d6, 0x450e, { 0x8c, 0x18, 0xce, 0xac, 0xf3, 0x31, 0xdc, 0x27 } }; + +static void create_directplay_address(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object"); + if(SUCCEEDED(hr)) + { + GUID guidsp; + + hr = IDirectPlay8Address_GetSP(localaddr, NULL); + ok(hr == DPNERR_INVALIDPOINTER, "GetSP failed 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetSP(localaddr, &guidsp); + ok(hr == DPNERR_DOESNOTEXIST, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_SetSP(localaddr, &GUID_NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetSP(localaddr, &guidsp); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&guidsp, &GUID_NULL), "wrong guid: %s\n", wine_dbgstr_guid(&guidsp)); + + hr = IDirectPlay8Address_SetSP(localaddr, &IID_Random); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetSP(localaddr, &guidsp); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&guidsp, &IID_Random), "wrong guid: %s\n", wine_dbgstr_guid(&guidsp)); + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetSP(localaddr, &guidsp); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&guidsp, &CLSID_DP8SP_TCPIP), "wrong guid: %s\n", wine_dbgstr_guid(&guidsp)); + + IDirectPlay8Address_Release(localaddr); + } +} + +START_TEST(address) +{ + HRESULT hr; + + hr = CoInitialize(0); + ok(hr == S_OK, "failed to init com\n"); + if(hr != S_OK) + return; + + create_directplay_address(); + + CoUninitialize(); +}

1 0

Alistair Leslie-Hughes : include: Add dvoice.h.
by Alexandre Julliard April 24, 2014

April 24, 2014

Module: wine Branch: master Commit: 2d7848b0eeda3f2ec9049c7332f12c3f8f4ea706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7848b0eeda3f2ec9049c733… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 11 16:04:54 2014 +1000 include: Add dvoice.h. --- include/Makefile.in | 1 + include/dvoice.h | 501 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 502 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d7848b0eeda3f2ec9049…

1 0

Patrick Rudolph : user32/tests: Add tests for valid cbSize in GetMonitorInfoW.
by Alexandre Julliard April 24, 2014

April 24, 2014

Module: wine Branch: master Commit: 66316964a9a7062ef46c244a90b84b295796ad5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=66316964a9a7062ef46c244a9… Author: Patrick Rudolph <siro(a)das-labor.org> Date: Wed Apr 23 17:35:43 2014 +0200 user32/tests: Add tests for valid cbSize in GetMonitorInfoW. --- dlls/user32/tests/monitor.c | 51 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 786edf3..42ae883 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -30,6 +30,7 @@ static LONG (WINAPI *pChangeDisplaySettingsExW)(LPCWSTR, LPDEVMODEW, HWND, DWORD static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,LPDISPLAY_DEVICEA,DWORD); static BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); +static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static HMONITOR (WINAPI *pMonitorFromRect)(LPCRECT,DWORD); static HMONITOR (WINAPI *pMonitorFromWindow)(HWND,DWORD); @@ -48,6 +49,7 @@ static void init_function_pointers(void) GET_PROC(EnumDisplayDevicesA) GET_PROC(EnumDisplayMonitors) GET_PROC(GetMonitorInfoA) + GET_PROC(GetMonitorInfoW) GET_PROC(MonitorFromPoint) GET_PROC(MonitorFromRect) GET_PROC(MonitorFromWindow) @@ -297,7 +299,8 @@ static void test_monitors(void) POINT pt; RECT rc; MONITORINFO mi; - MONITORINFOEXA miex; + MONITORINFOEXA miexa; + MONITORINFOEXW miexw; BOOL ret; DWORD i; @@ -313,13 +316,21 @@ static void test_monitors(void) {-1, FALSE}, {0xdeadbeef, FALSE}, }, - testdatamiex[] = { + testdatamiexa[] = { {0, FALSE}, {sizeof(MONITORINFOEXA)+1, FALSE}, {sizeof(MONITORINFOEXA)-1, FALSE}, {sizeof(MONITORINFOEXA), TRUE}, {-1, FALSE}, {0xdeadbeef, FALSE}, + }, + testdatamiexw[] = { + {0, FALSE}, + {sizeof(MONITORINFOEXW)+1, FALSE}, + {sizeof(MONITORINFOEXW)-1, FALSE}, + {sizeof(MONITORINFOEXW), TRUE}, + {-1, FALSE}, + {0xdeadbeef, FALSE}, }; if (!pMonitorFromPoint || !pMonitorFromWindow || !pMonitorFromRect) @@ -397,19 +408,41 @@ static void test_monitors(void) ok( (mi.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); else ok( !(mi.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag is set\n" ); + + memset( &miexw, 0, sizeof(miexw) ); + miexw.cbSize = testdatamiexw[i].cbSize; + ret = pGetMonitorInfoW( monitor, (LPMONITORINFO)&miexw ); + ok( ret == testdatamiexw[i].ret, "GetMonitorInfo returned wrong value\n" ); + if (ret) + ok( (miexw.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); + else + ok( !(miexw.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag is set\n" ); } /* tests for cbSize in MONITORINFOEXA */ - for (i = 0; i < (sizeof(testdatamiex) / sizeof(testdatamiex[0])); i++) + for (i = 0; i < (sizeof(testdatamiexa) / sizeof(testdatamiexa[0])); i++) + { + memset( &miexa, 0, sizeof(miexa) ); + miexa.cbSize = testdatamiexa[i].cbSize; + ret = pGetMonitorInfoA( monitor, (LPMONITORINFO)&miexa ); + ok( ret == testdatamiexa[i].ret, "GetMonitorInfo returned wrong value\n" ); + if (ret) + ok( (miexa.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); + else + ok( !(miexa.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag is set\n" ); + } + + /* tests for cbSize in MONITORINFOEXW */ + for (i = 0; i < (sizeof(testdatamiexw) / sizeof(testdatamiexw[0])); i++) { - memset( &miex, 0, sizeof(miex) ); - miex.cbSize = testdatamiex[i].cbSize; - ret = pGetMonitorInfoA( monitor, (LPMONITORINFO)&miex ); - ok( ret == testdatamiex[i].ret, "GetMonitorInfo returned wrong value\n" ); + memset( &miexw, 0, sizeof(miexw) ); + miexw.cbSize = testdatamiexw[i].cbSize; + ret = pGetMonitorInfoW( monitor, (LPMONITORINFO)&miexw ); + ok( ret == testdatamiexw[i].ret, "GetMonitorInfo returned wrong value\n" ); if (ret) - ok( (miex.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); + ok( (miexw.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); else - ok( !(miex.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag is set\n" ); + ok( !(miexw.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag is set\n" ); } SetRect( &rc, rc.left+1, rc.top+1, rc.left+2, rc.top+2 );

1 0