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

Alexandre Julliard : Release 1.7.17.
by Alexandre Julliard April 18, 2014

April 18, 2014

Module: wine Branch: master Commit: c73bd869ec24e33d277c087b3836025e771fabc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c73bd869ec24e33d277c087b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 18 20:54:11 2014 +0200 Release 1.7.17. --- ANNOUNCE | 719 ++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 392 insertions(+), 348 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c73bd869ec24e33d277c0…

1 0

Piotr Caban : msvcr80: Remove remaining forwards to msvcrt.
by Alexandre Julliard April 18, 2014

April 18, 2014

Module: wine Branch: master Commit: bd92ead3f7923bae9b38b8dbfc3461f87d64d5ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd92ead3f7923bae9b38b8dbf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 18 19:30:41 2014 +0200 msvcr80: Remove remaining forwards to msvcrt. --- dlls/msvcr80/msvcr80.spec | 128 ++++++++++++++++++++++----------------------- tools/make_specfiles | 1 - 2 files changed, 64 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd92ead3f7923bae9b38b…

1 0

Tag wine-1.7.17 : Alexandre Julliard : Release 1.7.17
by Alexandre Julliard April 18, 2014

April 18, 2014

Module: wine Branch: refs/tags/wine-1.7.17 Tag: 818ae8899ac5c30ce0d926d3efbc91f497e09307 URL: http://source.winehq.org/git/wine.git/?a=tag;h=818ae8899ac5c30ce0d926d3efbc… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 18 20:54:11 2014 +0200 Release 1.7.17

1 0

Nikolay Sivov : atl: Simplify error handling in AtlAxAttachControl().
by Alexandre Julliard April 18, 2014

April 18, 2014

Module: wine Branch: master Commit: 2b390f01edafbf0efd1f6cd053b780b13e80a360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b390f01edafbf0efd1f6cd05… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 18 16:09:32 2014 +0400 atl: Simplify error handling in AtlAxAttachControl(). --- dlls/atl/atl_ax.c | 28 +++++++++++----------------- dlls/atl/tests/atl_ax.c | 10 +++------- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 0a16010..764c46e 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -949,12 +949,15 @@ static HRESULT IOCS_Init( IOCS *This ) /********************************************************************** * Create new instance of Atl host component and attach it to window * */ -static HRESULT IOCS_Create( HWND hWnd, IUnknown *pUnkControl, IOCS **ppSite ) +static HRESULT IOCS_Create( HWND hWnd, IUnknown *pUnkControl, IUnknown **container ) { HRESULT hr; IOCS *This; - *ppSite = NULL; + if (!container) + return S_OK; + + *container = NULL; This = HeapAlloc(GetProcessHeap(), 0, sizeof(IOCS)); if (!This) @@ -975,7 +978,7 @@ static HRESULT IOCS_Create( HWND hWnd, IUnknown *pUnkControl, IOCS **ppSite ) if ( SUCCEEDED( hr ) ) hr = IOCS_Init( This ); if ( SUCCEEDED( hr ) ) - *ppSite = This; + *container = (IUnknown*)&This->IOleClientSite_iface; else IOCS_Release( This ); @@ -1102,26 +1105,17 @@ HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR lpszName, HWND hWnd, /*********************************************************************** * AtlAxAttachControl [atl100.@] */ -HRESULT WINAPI AtlAxAttachControl(IUnknown* pControl, HWND hWnd, IUnknown** ppUnkContainer) +HRESULT WINAPI AtlAxAttachControl(IUnknown *control, HWND hWnd, IUnknown **container) { - IOCS *pUnkContainer; HRESULT hr; - TRACE( "%p %p %p\n", pControl, hWnd, ppUnkContainer ); + TRACE("(%p %p %p)\n", control, hWnd, container); - if (!pControl) + if (!control) return E_INVALIDARG; - hr = IOCS_Create( hWnd, pControl, &pUnkContainer ); - if ( SUCCEEDED( hr ) && ppUnkContainer) - { - *ppUnkContainer = (IUnknown*) pUnkContainer; - } - - if(!hWnd) - return S_FALSE; - - return hr; + hr = IOCS_Create( hWnd, control, container ); + return hWnd ? hr : S_FALSE; } /********************************************************************** diff --git a/dlls/atl/tests/atl_ax.c b/dlls/atl/tests/atl_ax.c index f2dad74..6b944d1 100644 --- a/dlls/atl/tests/atl_ax.c +++ b/dlls/atl/tests/atl_ax.c @@ -97,15 +97,11 @@ static void test_AtlAxAttachControl(void) hr = pAtlAxAttachControl(pObj, NULL, NULL); ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); - pContainer = (IUnknown *)0xdeadbeef; + pContainer = NULL; hr = pAtlAxAttachControl(pObj, NULL, &pContainer); ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); - ok(pContainer != (IUnknown *)0xdeadbeef && - pContainer != NULL, - "Expected the output container pointer to be initialized to non-NULL, got %p\n", pContainer); - - if (pContainer != (IUnknown *)0xdeadbeef && pContainer != NULL) - IUnknown_Release(pContainer); + ok(pContainer != NULL, "got %p\n", pContainer); + IUnknown_Release(pContainer); hr = pAtlAxAttachControl(pObj, hwnd, NULL); ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr);

1 0

Nikolay Sivov : wscript: Ignore 'nologo' switch.
by Alexandre Julliard April 18, 2014

April 18, 2014

Module: wine Branch: master Commit: 389992fdfa2361cd24a18722b4aa9542a9fe6ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=389992fdfa2361cd24a18722b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 18 10:29:52 2014 +0400 wscript: Ignore 'nologo' switch. --- programs/wscript/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index cebabed..b232949 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -339,6 +339,7 @@ static void run_script(const WCHAR *filename, IActiveScript *script, IActiveScri static BOOL set_host_properties(const WCHAR *prop) { + static const WCHAR nologoW[] = {'n','o','l','o','g','o',0}; static const WCHAR iactive[] = {'i',0}; static const WCHAR batch[] = {'b',0}; @@ -354,6 +355,8 @@ static BOOL set_host_properties(const WCHAR *prop) wshInteractive = VARIANT_TRUE; else if(strcmpiW(prop, batch) == 0) wshInteractive = VARIANT_FALSE; + else if(strcmpiW(prop, nologoW) == 0) + WINE_FIXME("ignored %s switch\n", debugstr_w(nologoW)); else return FALSE; return TRUE;

1 0

Bruno Jesus : ws2_32: Convert the magic loopback address back to 127.0.0.1 in gethostbyaddr.
by Alexandre Julliard April 18, 2014

April 18, 2014

Module: wine Branch: master Commit: 3fe0a31d148f257c6877739ed409c915f80e1521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe0a31d148f257c6877739ed… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Apr 17 20:45:47 2014 -0300 ws2_32: Convert the magic loopback address back to 127.0.0.1 in gethostbyaddr. --- dlls/ws2_32/socket.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 54e7e2f..630e463 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5085,31 +5085,40 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type) struct WS_hostent *retval = NULL; struct hostent* host; int unixtype = convert_af_w2u(type); - + const char *paddr = addr; + unsigned long loopback; #ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 char *extrabuf; - int ebufsize=1024; + int ebufsize = 1024; struct hostent hostentry; - int locerr=ENOBUFS; + int locerr = ENOBUFS; +#endif + + /* convert back the magic loopback address if necessary */ + if (unixtype == AF_INET && len == 4 && !memcmp(addr, magic_loopback_addr, 4)) + { + loopback = htonl(INADDR_LOOPBACK); + paddr = (char*) &loopback; + } + +#ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 host = NULL; extrabuf=HeapAlloc(GetProcessHeap(),0,ebufsize) ; while(extrabuf) { - int res = gethostbyaddr_r(addr, len, unixtype, + int res = gethostbyaddr_r(paddr, len, unixtype, &hostentry, extrabuf, ebufsize, &host, &locerr); - if( res != ERANGE) break; + if (res != ERANGE) break; ebufsize *=2; extrabuf=HeapReAlloc(GetProcessHeap(),0,extrabuf,ebufsize) ; } - if (!host) SetLastError((locerr < 0) ? wsaErrno() : wsaHerrno(locerr)); -#else - EnterCriticalSection( &csWSgetXXXbyYYY ); - host = gethostbyaddr(addr, len, unixtype); - if (!host) SetLastError((h_errno < 0) ? wsaErrno() : wsaHerrno(h_errno)); -#endif - if( host != NULL ) retval = WS_dup_he(host); -#ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 + if (host) retval = WS_dup_he(host); + else SetLastError((locerr < 0) ? wsaErrno() : wsaHerrno(locerr)); HeapFree(GetProcessHeap(),0,extrabuf); #else + EnterCriticalSection( &csWSgetXXXbyYYY ); + host = gethostbyaddr(paddr, len, unixtype); + if (host) retval = WS_dup_he(host); + else SetLastError((h_errno < 0) ? wsaErrno() : wsaHerrno(h_errno)); LeaveCriticalSection( &csWSgetXXXbyYYY ); #endif TRACE("ptr %p, len %d, type %d ret %p\n", addr, len, type, retval);

1 0

Dmitry Timoshkov : ole32/tests: Add some tests for PropVariantCopy.
by Alexandre Julliard April 18, 2014

April 18, 2014

Module: wine Branch: master Commit: d68c13a8941e4e4c298c7dd0d1e26f683c083583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d68c13a8941e4e4c298c7dd0d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 18 18:10:25 2014 +0900 ole32/tests: Add some tests for PropVariantCopy. --- dlls/ole32/ole2.c | 21 +++++++---- dlls/ole32/tests/propvariant.c | 77 +++++++++++++++++++++++++++++++++++----- 2 files changed, 83 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 1228138..3849bad 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -3062,21 +3062,28 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, /* [out] */ case VT_STREAMED_OBJECT: case VT_STORAGE: case VT_STORED_OBJECT: - IUnknown_AddRef((LPUNKNOWN)pvarDest->u.pStream); + if (pvarDest->u.pStream) + IStream_AddRef(pvarDest->u.pStream); break; case VT_CLSID: pvarDest->u.puuid = CoTaskMemAlloc(sizeof(CLSID)); *pvarDest->u.puuid = *pvarSrc->u.puuid; break; case VT_LPSTR: - len = strlen(pvarSrc->u.pszVal); - pvarDest->u.pszVal = CoTaskMemAlloc((len+1)*sizeof(CHAR)); - CopyMemory(pvarDest->u.pszVal, pvarSrc->u.pszVal, (len+1)*sizeof(CHAR)); + if (pvarSrc->u.pszVal) + { + len = strlen(pvarSrc->u.pszVal); + pvarDest->u.pszVal = CoTaskMemAlloc((len+1)*sizeof(CHAR)); + CopyMemory(pvarDest->u.pszVal, pvarSrc->u.pszVal, (len+1)*sizeof(CHAR)); + } break; case VT_LPWSTR: - len = lstrlenW(pvarSrc->u.pwszVal); - pvarDest->u.pwszVal = CoTaskMemAlloc((len+1)*sizeof(WCHAR)); - CopyMemory(pvarDest->u.pwszVal, pvarSrc->u.pwszVal, (len+1)*sizeof(WCHAR)); + if (pvarSrc->u.pwszVal) + { + len = lstrlenW(pvarSrc->u.pwszVal); + pvarDest->u.pwszVal = CoTaskMemAlloc((len+1)*sizeof(WCHAR)); + CopyMemory(pvarDest->u.pwszVal, pvarSrc->u.pwszVal, (len+1)*sizeof(WCHAR)); + } break; case VT_BLOB: case VT_BLOB_OBJECT: diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 9863ced..390a4e1 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -130,7 +130,7 @@ static const char* wine_vtypes[VT_CLSID+1] = }; -static void expect(HRESULT hr, VARTYPE vt) +static void expect(HRESULT hr, VARTYPE vt, BOOL copy) { int idx = vt & VT_TYPEMASK; BYTE flags; @@ -158,7 +158,7 @@ static void expect(HRESULT hr, VARTYPE vt) } if(flags == PROP_INV) - ok(hr == STG_E_INVALIDPARAMETER, "%s (%s): got %08x\n", wine_vtypes[idx], modifier, hr); + ok(hr == copy ? DISP_E_BADVARTYPE : STG_E_INVALIDPARAMETER, "%s (%s): got %08x\n", wine_vtypes[idx], modifier, hr); else if(flags == PROP_V0) ok(hr == S_OK, "%s (%s): got %08x\n", wine_vtypes[idx], modifier, hr); else if(flags & PROP_TODO) @@ -180,9 +180,11 @@ static void expect(HRESULT hr, VARTYPE vt) static void test_validtypes(void) { - PROPVARIANT propvar; + PROPVARIANT propvar, copy, uninit; HRESULT hr; - unsigned int i; + unsigned int i, ret; + + memset(&uninit, 0x77, sizeof(uninit)); memset(&propvar, 0x55, sizeof(propvar)); hr = PropVariantClear(&propvar); @@ -206,8 +208,23 @@ static void test_validtypes(void) else U(propvar).pszVal = NULL; vt = propvar.vt = i; + memset(&copy, 0x77, sizeof(copy)); + hr = PropVariantCopy(&copy, &propvar); + expect(hr, vt, TRUE); + if (hr == S_OK) + { + ok(copy.vt == propvar.vt, "expected %d, got %d\n", propvar.vt, copy.vt); + ok(U(copy).uhVal.QuadPart == U(propvar).uhVal.QuadPart, "%u: expected %#x/%#x, got %#x/%#x\n", + i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart, + U(copy).uhVal.u.LowPart, U(copy).uhVal.u.HighPart); + } + else + { + ret = memcmp(&copy, &uninit, sizeof(copy)); + ok(!ret || broken(ret) /* win2000 */, "%d: copy should stay unchanged\n", i); + } hr = PropVariantClear(&propvar); - expect(hr, vt); + expect(hr, vt, FALSE); ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); @@ -215,8 +232,22 @@ static void test_validtypes(void) memset(&propvar, 0x55, sizeof(propvar)); U(propvar).pszVal = NULL; vt = propvar.vt = i | VT_ARRAY; + memset(&copy, 0x77, sizeof(copy)); + hr = PropVariantCopy(&copy, &propvar); + expect(hr, vt, TRUE); + if (hr == S_OK) + { + ok(copy.vt == propvar.vt, "expected %d, got %d\n", propvar.vt, copy.vt); + ok(U(copy).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", + i, U(copy).uhVal.u.LowPart, U(copy).uhVal.u.HighPart); + } + else + { + ret = memcmp(&copy, &uninit, sizeof(copy)); + ok(!ret || broken(ret) /* win2000 */, "%d: copy should stay unchanged\n", i); + } hr = PropVariantClear(&propvar); - expect(hr, vt); + expect(hr, vt, FALSE); ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); @@ -225,8 +256,23 @@ static void test_validtypes(void) U(propvar).caub.cElems = 0; U(propvar).caub.pElems = NULL; vt = propvar.vt = i | VT_VECTOR; + memset(&copy, 0x77, sizeof(copy)); + hr = PropVariantCopy(&copy, &propvar); + expect(hr, vt, TRUE); + if (hr == S_OK) + { + ok(copy.vt == propvar.vt, "expected %d, got %d\n", propvar.vt, copy.vt); + ok(!U(copy).caub.cElems, "%u: expected 0, got %d\n", i, U(copy).caub.cElems); +todo_wine + ok(!U(copy).caub.pElems, "%u: expected NULL, got %p\n", i, U(copy).caub.pElems); + } + else + { + ret = memcmp(&copy, &uninit, sizeof(copy)); + ok(!ret || broken(ret) /* win2000 */, "%d: copy should stay unchanged\n", i); + } hr = PropVariantClear(&propvar); - expect(hr, vt); + expect(hr, vt, FALSE); ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); @@ -234,8 +280,23 @@ static void test_validtypes(void) memset(&propvar, 0x55, sizeof(propvar)); U(propvar).pszVal = NULL; vt = propvar.vt = i | VT_BYREF; + memset(&copy, 0x77, sizeof(copy)); + hr = PropVariantCopy(&copy, &propvar); + expect(hr, vt, TRUE); + if (hr == S_OK) + { + ok(copy.vt == propvar.vt, "expected %d, got %d\n", propvar.vt, copy.vt); + ok(U(copy).uhVal.QuadPart == U(propvar).uhVal.QuadPart, "%u: expected %#x/%#x, got %#x/%#x\n", + i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart, + U(copy).uhVal.u.LowPart, U(copy).uhVal.u.HighPart); + } + else + { + ret = memcmp(&copy, &uninit, sizeof(copy)); + ok(!ret || broken(ret) /* win2000 */, "%d: copy should stay unchanged\n", i); + } hr = PropVariantClear(&propvar); - expect(hr, vt); + expect(hr, vt, FALSE); ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart);

1 0

Dmitry Timoshkov : ole32: If number of VT_VECTOR elements is 0 there is no need to allocate memory.
by Alexandre Julliard April 18, 2014

April 18, 2014

Module: wine Branch: master Commit: f9c40c37cdf6b52a25680fdbcade3bd8d9f1dee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c40c37cdf6b52a25680fdbc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 18 18:10:19 2014 +0900 ole32: If number of VT_VECTOR elements is 0 there is no need to allocate memory. --- dlls/ole32/ole2.c | 2 +- dlls/ole32/tests/propvariant.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 3849bad..98d00de 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -3143,7 +3143,7 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, /* [out] */ return E_INVALIDARG; } len = pvarSrc->u.capropvar.cElems; - pvarDest->u.capropvar.pElems = CoTaskMemAlloc(len * elemSize); + pvarDest->u.capropvar.pElems = len ? CoTaskMemAlloc(len * elemSize) : NULL; if (pvarSrc->vt == (VT_VECTOR | VT_VARIANT)) { for (i = 0; i < len; i++) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 390a4e1..891c425 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -263,7 +263,6 @@ static void test_validtypes(void) { ok(copy.vt == propvar.vt, "expected %d, got %d\n", propvar.vt, copy.vt); ok(!U(copy).caub.cElems, "%u: expected 0, got %d\n", i, U(copy).caub.cElems); -todo_wine ok(!U(copy).caub.pElems, "%u: expected NULL, got %p\n", i, U(copy).caub.pElems); } else

1 0

Dmitry Timoshkov : ole32: Revert part of 3cb0c81336.
by Alexandre Julliard April 18, 2014

April 18, 2014

Module: wine Branch: master Commit: 5e7251b9377d37c17968b82147b1b2eb3e7b3a7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e7251b9377d37c17968b8214… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 18 18:10:11 2014 +0900 ole32: Revert part of 3cb0c81336. VT_INT|VT_VECTOR and VT_UINT|VT_VECTOR are not supposed to be supported by PropVariantClear and PropVariantCopy. --- dlls/ole32/ole2.c | 4 ---- dlls/ole32/tests/propvariant.c | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index ed454cd..1228138 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2892,8 +2892,6 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) case VT_UI2|VT_VECTOR: case VT_UI4|VT_VECTOR: case VT_UI8|VT_VECTOR: - case VT_INT|VT_VECTOR: - case VT_UINT|VT_VECTOR: case VT_LPSTR|VT_VECTOR: case VT_LPWSTR|VT_VECTOR: case VT_FILETIME|VT_VECTOR: @@ -3123,8 +3121,6 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, /* [out] */ case VT_ERROR: elemSize = sizeof(pvarSrc->u.scode); break; case VT_I8: elemSize = sizeof(pvarSrc->u.hVal); break; case VT_UI8: elemSize = sizeof(pvarSrc->u.uhVal); break; - case VT_INT: elemSize = sizeof(pvarSrc->u.lVal); break; - case VT_UINT: elemSize = sizeof(pvarSrc->u.ulVal); break; case VT_CY: elemSize = sizeof(pvarSrc->u.cyVal); break; case VT_DATE: elemSize = sizeof(pvarSrc->u.date); break; case VT_FILETIME: elemSize = sizeof(pvarSrc->u.filetime); break; diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 78c1ad0..9863ced 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -64,8 +64,8 @@ static const struct valid_mapping { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI4 */ { PROP_V0 , PROP_V1A | PROP_TODO, PROP_V0 , PROP_V1A | PROP_TODO }, /* VT_I8 */ { PROP_V0 , PROP_V1A | PROP_TODO, PROP_V0 , PROP_V1A | PROP_TODO }, /* VT_UI8 */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_V1 , PROP_V1 | PROP_TODO }, /* VT_INT */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_V1 , PROP_V1 | PROP_TODO }, /* VT_UINT */ + { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_INT */ + { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UINT */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_VOID */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_HRESULT */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_PTR */

1 0

Vincent Povirk : user32: Allow EndMenu() calls from WM_ENTERMENULOOP.
by Alexandre Julliard April 18, 2014

April 18, 2014

Module: wine Branch: master Commit: 68f2b878d27f9ea9065ad3b96f16fa408d8b85e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f2b878d27f9ea9065ad3b96… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 16 12:56:09 2014 -0500 user32: Allow EndMenu() calls from WM_ENTERMENULOOP. --- dlls/user32/menu.c | 13 ++++++++++--- dlls/user32/tests/menu.c | 15 +++------------ 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 4a49ce6..6b0cf2f 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3015,7 +3015,6 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, TRACE("hmenu=%p flags=0x%08x (%d,%d) hwnd=%p %s\n", hmenu, wFlags, x, y, hwnd, wine_dbgstr_rect( lprect)); - fEndMenu = FALSE; if (!(menu = MENU_GetMenu( hmenu ))) { WARN("Invalid menu handle %p\n", hmenu); @@ -3306,12 +3305,20 @@ static BOOL MENU_InitTracking(HWND hWnd, HMENU hMenu, BOOL bPopup, UINT wFlags) HideCaret(0); + if (!(menu = MENU_GetMenu( hMenu ))) return FALSE; + /* This makes the menus of applications built with Delphi work. * It also enables menus to be displayed in more than one window, * but there are some bugs left that need to be fixed in this case. */ - if (!bPopup && (menu = MENU_GetMenu( hMenu ))) menu->hWnd = hWnd; - if (!top_popup) top_popup_hmenu = hMenu; + if (!bPopup) menu->hWnd = hWnd; + if (!top_popup) + { + top_popup = menu->hWnd; + top_popup_hmenu = hMenu; + } + + fEndMenu = FALSE; /* Send WM_ENTERMENULOOP and WM_INITMENU message only if TPM_NONOTIFY flag is not specified */ if (!(wFlags & TPM_NONOTIFY)) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 5fbe317..dc91c6a 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -3324,17 +3324,11 @@ static void test_menu_cancelmode(void) /* menu owner is top level window */ g_hwndtosend = hwnd; TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwnd, NULL); - todo_wine { - ok( g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle); - } - ok( g_got_enteridle < 2, "received %d WM_ENTERIDLE messages, should be less than 2\n", g_got_enteridle); + ok( g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle); /* menu owner is child window */ g_hwndtosend = hwndchild; TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwndchild, NULL); - todo_wine { - ok(g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle); - } - ok(g_got_enteridle < 2, "received %d WM_ENTERIDLE messages, should be less than 2\n", g_got_enteridle); + ok(g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle); /* now send the WM_CANCELMODE messages to the WRONG window */ /* those should fail ( to have any effect) */ g_hwndtosend = hwnd; @@ -3354,10 +3348,7 @@ static void test_menu_cancelmode(void) ok( ret == 0, "Sending WM_SYSCOMMAND/SC_KEYMENU failed lasterror is %u\n", GetLastError()); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - todo_wine { - ok(g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle); - } - ok(g_got_enteridle < 2, "received %d WM_ENTERIDLE messages, should be less than 2\n", g_got_enteridle); + ok(g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle); /* cleanup */ DestroyMenu( menubar );

1 0