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

Nikolay Sivov : include: Added some ATL interfaces.
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: wine Branch: master Commit: 76cd4d63953c31f1bfda04ca2a16454f28104979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76cd4d63953c31f1bfda04ca2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 17 16:47:22 2014 +0400 include: Added some ATL interfaces. --- include/atliface.idl | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/include/atliface.idl b/include/atliface.idl index 78d8518..ce47f10 100644 --- a/include/atliface.idl +++ b/include/atliface.idl @@ -76,6 +76,133 @@ interface IRegistrar : IRegistrarBase [in] LPCOLESTR szType); } +[ + object, + uuid(425b5af0-65f1-11d1-9611-0000f81e0d0d) +] +interface IDocHostUIHandlerDispatch : IDispatch +{ + HRESULT ShowContextMenu([in] DWORD id, + [in] LONG x, + [in] LONG y, + [in] IUnknown *unkreserved, + [in] IDispatch *dispreserved, + [out, retval] HRESULT *retval); + HRESULT GetHostInfo([in, out] DWORD *flags, + [in, out] DWORD *doubleclick); + HRESULT ShowUI([in] DWORD id, + [in] IUnknown *activeobject, + [in] IUnknown *cmdtarget, + [in] IUnknown *frame, + [in] IUnknown *doc, + [out, retval] HRESULT *retval); + HRESULT HideUI(); + HRESULT UpdateUI(); + HRESULT EnableModeless([in] VARIANT_BOOL enable); + HRESULT OnDocWindowActivate([in] VARIANT_BOOL activate); + HRESULT OnFrameWindowActivate([in] VARIANT_BOOL activate); + HRESULT ResizeBorder([in] LONG left, + [in] LONG top, + [in] LONG right, + [in] LONG bottom, + [in] IUnknown *window, + [in] VARIANT_BOOL framewindow); + HRESULT TranslateAccelerator([in] HWND hwnd, + [in] UINT msg, + [in] WPARAM wparam, + [in] LPARAM lparam, + [in] BSTR guid_cmd_group, + [out, retval] HRESULT *retval); + HRESULT GetOptionKeyPath([out] BSTR *key, + [in] DWORD reserved); + HRESULT GetDropTarget([in] IUnknown *droptarget, + [out] IUnknown **ret_droptarget); + HRESULT GetExternal([out] IDispatch **disp); + HRESULT TranslateUrl([in] DWORD reserved, + [in] BSTR url, + [out] BSTR *translated_url); + HRESULT FilterDataObject([in] IUnknown *dataobject, + [out] IUnknown **dataobject_ret); +} + +[ + dual, + object, + oleautomation, + uuid(b6ea2051-048a-11d1-82b9-00c04fb9942e) +] +interface IAxWinAmbientDispatch : IDispatch +{ + [propput] + HRESULT AllowWindowlessActivation([in] VARIANT_BOOL allow); + [propget] + HRESULT AllowWindowlessActivation([out, retval] VARIANT_BOOL *allowed); + [propput, id(-701)] + HRESULT BackColor([in] OLE_COLOR color); + [propget, id(-701)] + HRESULT BackColor([out, retval] OLE_COLOR *color); + [propput, id(-704)] + HRESULT ForeColor([in] OLE_COLOR color); + [propget, id(-704)] + HRESULT ForeColor([out, retval] OLE_COLOR *color); + [propput, id(-705)] + HRESULT LocaleID([in] LCID lcid); + [propget, id(-705)] + HRESULT LocaleID([out, retval] LCID *lcid); + [propput, id(-709)] + HRESULT UserMode([in] VARIANT_BOOL mode); + [propget, id(-709)] + HRESULT UserMode([out, retval] VARIANT_BOOL *mode); + [propput, id(-713)] + HRESULT DisplayAsDefault([in] VARIANT_BOOL display); + [propget, id(-713)] + HRESULT DisplayAsDefault([out, retval] VARIANT_BOOL *display); + [propput, id(-703)] + HRESULT Font([in] IFontDisp *font); + [propget, id(-703)] + HRESULT Font([out, retval] IFontDisp **font); + [propput, id(-706)] + HRESULT MessageReflect([in] VARIANT_BOOL reflect); + [propget, id(-706)] + HRESULT MessageReflect([out, retval] VARIANT_BOOL *reflect); + [propget, id(-711)] + HRESULT ShowGrabHandles([out, retval] VARIANT_BOOL *show); + [propget, id(-712)] + HRESULT ShowHatching([out, retval] VARIANT_BOOL *show); + [propput] + HRESULT DocHostFlags([in] DWORD flags); + [propget] + HRESULT DocHostFlags([out, retval] DWORD *flags); + [propput] + HRESULT DocHostDoubleClickFlags([in] DWORD flags); + [propget] + HRESULT DocHostDoubleClickFlags([out, retval] DWORD *flags); + [propput] + HRESULT AllowContextMenu([in] VARIANT_BOOL allow); + [propget] + HRESULT AllowContextMenu([out, retval] VARIANT_BOOL *allow); + [propput] + HRESULT AllowShowUI([in] VARIANT_BOOL allow); + [propget] + HRESULT AllowShowUI([out, retval] VARIANT_BOOL *allow); + [propput] + HRESULT OptionKeyPath([in] BSTR path); + [propget] + HRESULT OptionKeyPath([out, retval] BSTR *path); +} + +[ + dual, + object, + oleautomation, + uuid(b2d0778b-ac99-4c58-a5c8-e7724e5316b5) +] +interface IAxWinAmbientDispatchEx : IAxWinAmbientDispatch +{ + [id(100)] + HRESULT SetAmbientDispatch([in] IDispatch *disp); +} + cpp_quote("DEFINE_GUID(CLSID_Registrar,0x44ec053a,0x400f,0x11d0,0x9d,0xcd,0x00,0xa0,0xc9,0x03,0x91,0xd3);") cpp_quote("HRESULT WINAPI AtlAxCreateControl(LPCOLESTR,HWND,IStream*,IUnknown**);")

1 0

Bruno Jesus : ws2_32: Convert the magic loopback address back to 127.0.0.1 in gethostbyaddr.
by Alexandre Julliard 18 Apr '14

18 Apr '14

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: Fix crashes in PropVariantClear tests under win64.
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: wine Branch: master Commit: f35078ee400b4a4361e2c816530610a4471c7be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f35078ee400b4a4361e2c8165… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 18 18:09:59 2014 +0900 ole32/tests: Fix crashes in PropVariantClear tests under win64. --- dlls/ole32/tests/propvariant.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index bef0881..78c1ad0 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -196,8 +196,13 @@ static void test_validtypes(void) VARTYPE vt; memset(&propvar, 0x55, sizeof(propvar)); - if (i == VT_RECORD || i == VT_BLOB || i == VT_BLOB_OBJECT) - U(propvar).uhVal.QuadPart = 0; + if (i == VT_RECORD) + memset(&propvar, 0, sizeof(propvar)); + else if (i == VT_BLOB || i == VT_BLOB_OBJECT) + { + U(propvar).blob.cbSize = 0; + U(propvar).blob.pBlobData = NULL; + } else U(propvar).pszVal = NULL; vt = propvar.vt = i;

1 0

Dmitry Timoshkov : ole32: Revert part of 3cb0c81336.
by Alexandre Julliard 18 Apr '14

18 Apr '14

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

Dmitry Timoshkov : ole32/tests: Add some tests for PropVariantCopy.
by Alexandre Julliard 18 Apr '14

18 Apr '14

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 18 Apr '14

18 Apr '14

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

Piotr Caban : msvcr70: Share the source code with msvcrt.
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: wine Branch: master Commit: 3a7bf4a34b82f1857f40f482890e148d7dd9e30a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7bf4a34b82f1857f40f4828… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 18 12:33:37 2014 +0200 msvcr70: Share the source code with msvcrt. --- dlls/msvcr70/Makefile.in | 32 +- dlls/msvcr70/msvcr70.c | 37 - dlls/msvcr70/msvcr70.spec | 1712 ++++++++++++++++++++++----------------------- tools/make_specfiles | 1 - 4 files changed, 886 insertions(+), 896 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a7bf4a34b82f1857f40f…

1 0

Piotr Caban : msvcr71: Share the source code with msvcrt.
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: wine Branch: master Commit: e57a4e94909eede1d7e84bb092d5cc93fc8b9b22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e57a4e94909eede1d7e84bb09… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 18 12:33:53 2014 +0200 msvcr71: Share the source code with msvcrt. --- dlls/msvcr71/Makefile.in | 32 +- dlls/msvcr71/msvcr71.c | 37 - dlls/msvcr71/msvcr71.spec | 1708 ++++++++++++++++++++++----------------------- tools/make_specfiles | 1 - 4 files changed, 884 insertions(+), 894 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e57a4e94909eede1d7e84…

1 0

Piotr Caban : msvcr80: Share the source code with msvcrt.
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: wine Branch: master Commit: 09721acaea4bf6b95b72c49540aa6cdc667c684d URL: http://source.winehq.org/git/wine.git/?a=commit;h=09721acaea4bf6b95b72c4954… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 18 12:47:52 2014 +0200 msvcr80: Share the source code with msvcrt. --- dlls/msvcr80/Makefile.in | 32 +- dlls/msvcr80/msvcr80.c | 201 ---- dlls/msvcr80/msvcr80.spec | 2310 ++++++++++++++++++++++----------------------- 3 files changed, 1185 insertions(+), 1358 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09721acaea4bf6b95b72c…

1 0

Vincent Povirk : user32: Allow EndMenu() calls from WM_ENTERMENULOOP.
by Alexandre Julliard 18 Apr '14

18 Apr '14

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