July 2012 - Wine-Commits - list.winehq.org

Nikolay Sivov : msxml3: Protect from null pointer in load().
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: 13d95525c3f6886f29df658b2d03a415abcbf5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13d95525c3f6886f29df658b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 14 22:52:35 2012 +0400 msxml3: Protect from null pointer in load(). --- dlls/msxml3/domdoc.c | 1 + dlls/msxml3/tests/domdoc.c | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index cbbebf2..0f3eb50 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2093,6 +2093,7 @@ static HRESULT WINAPI domdoc_load( } break; case VT_UNKNOWN: + if (!V_UNKNOWN(&source)) return E_INVALIDARG; hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_IXMLDOMDocument3, (void**)&pNewDoc); if(hr == S_OK) { diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 46b628f..dfa6126 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10749,6 +10749,13 @@ static void test_load(void) doc = create_document(&IID_IXMLDOMDocument); + /* null pointer as input */ + V_VT(&src) = VT_UNKNOWN; + V_UNKNOWN(&src) = NULL; + hr = IXMLDOMDocument_load(doc, src, &b); + EXPECT_HR(hr, E_INVALIDARG); + ok(b == VARIANT_FALSE, "got %d\n", b); + path = _bstr_("test.xml"); /* load from path: VT_BSTR */

1 0

Nozomi Kodama : d3dx9: Implementation of D3DXSHMultiply2.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: f757f3fb7d8a1cccecc496834d8d82516676792f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f757f3fb7d8a1cccecc496834… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Fri Jul 13 02:53:18 2012 +0200 d3dx9: Implementation of D3DXSHMultiply2. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 17 +++++++++++++++++ dlls/d3dx9_36/tests/math.c | 23 +++++++++++++++++++++++ include/d3dx9math.h | 1 + 4 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 58e8636..9230d55 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -279,7 +279,7 @@ @ stub D3DXSHEvalDirectionalLight(long ptr long long long long ptr ptr ptr) @ stub D3DXSHEvalHemisphereLight(long ptr long long ptr ptr ptr) @ stub D3DXSHEvalSphericalLight(long ptr long long long long ptr ptr ptr) -@ stub D3DXSHMultiply2(ptr ptr ptr) +@ stdcall D3DXSHMultiply2(ptr ptr ptr) @ stdcall D3DXSHMultiply3(ptr ptr ptr) @ stub D3DXSHMultiply4(ptr ptr ptr) @ stub D3DXSHMultiply5(ptr ptr ptr) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 2406929..79a0bca 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1995,6 +1995,23 @@ FLOAT WINAPI D3DXSHDot(UINT order, CONST FLOAT *a, CONST FLOAT *b) return s; } +FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b) +{ + FLOAT ta, tb; + + TRACE("(%p, %p, %p)\n", out, a, b); + + ta = 0.28209479f * a[0]; + tb = 0.28209479f * b[0]; + + out[0]= 0.28209479f * D3DXSHDot(2, a, b); + out[1] = ta * b[1] + tb * a[1]; + out[2] = ta * b[2] + tb * a[2]; + out[3] = ta * b[3] + tb * a[3]; + + return out; +} + FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b) { FLOAT t, ta, tb; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 018081c..66d4689 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2422,6 +2422,28 @@ static void test_D3DXSHDot(void) return; } +static void test_D3DXSHMultiply2(void) +{ + unsigned int i; + FLOAT a[20], b[20], c[20]; + /* D3DXSHMultiply2 only modifies the first 4 elements of the array */ + const FLOAT expected[20] = + { 3.418594f, 1.698211f, 1.703853f, 1.709494f, 4.0f, 5.0f, + 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, + 14.0f, 15.0f, 16.0f, 17.0f, 18.0f, 19.0f }; + + for (i = 0; i < 20; i++) + { + a[i] = 1.0f + i / 100.0f; + b[i] = 3.0f - i / 100.0f; + c[i] = i; + } + + D3DXSHMultiply2(c, a, b); + for (i = 0; i < 20; i++) + ok(relative_error(c[i], expected[i]) < admitted_error, "Expected[%d] = %f, received = %f\n", i, expected[i], c[i]); +} + static void test_D3DXSHMultiply3(void) { unsigned int i; @@ -2490,6 +2512,7 @@ START_TEST(math) test_D3DXFloat_Array(); test_D3DXSHAdd(); test_D3DXSHDot(); + test_D3DXSHMultiply2(); test_D3DXSHMultiply3(); test_D3DXSHScale(); } diff --git a/include/d3dx9math.h b/include/d3dx9math.h index e31d432..ab3e2b0 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -379,6 +379,7 @@ FLOAT *WINAPI D3DXFloat16To32Array(FLOAT *pout, CONST D3DXFLOAT16 *pin, UINT n); FLOAT* WINAPI D3DXSHAdd(FLOAT *out, UINT order, CONST FLOAT *a, CONST FLOAT *b); FLOAT WINAPI D3DXSHDot(UINT order, CONST FLOAT *a, CONST FLOAT *b); +FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b); FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b); FLOAT* WINAPI D3DXSHScale(FLOAT *out, UINT order, CONST FLOAT *a, CONST FLOAT scale);

1 0

Alexandre Julliard : wined3d: Remove unused variables.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: 30e0e3ffff998397ba8fb45f6b6e99ac58e92de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e0e3ffff998397ba8fb45f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 14:26:32 2012 +0200 wined3d: Remove unused variables. --- dlls/wined3d/surface.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f5cc3f5..21028ba 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2553,7 +2553,6 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P struct wined3d_format format; UINT update_w, update_h; UINT dst_w, dst_h; - UINT src_w, src_h; RECT r, dst_rect; UINT src_pitch; POINT p; @@ -2598,9 +2597,6 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P return WINED3DERR_INVALIDCALL; } - src_w = src_surface->resource.width; - src_h = src_surface->resource.height; - dst_w = dst_surface->resource.width; dst_h = dst_surface->resource.height;

1 0

Ken Thomases : secur32: On Mac, define modern ECDH cipher suites if the SDK doesn't.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: 98652ec1c6536d0cee00b99a592f0531285cd053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98652ec1c6536d0cee00b99a5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jul 13 15:19:38 2012 -0500 secur32: On Mac, define modern ECDH cipher suites if the SDK doesn't. --- dlls/secur32/schannel_macosx.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index d4576b9..75fe9a0 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -45,6 +45,37 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); #ifdef HAVE_SECURITY_SECURITY_H +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 +/* Defined in <Security/CipherSuite.h> in the 10.6 SDK or later. */ +enum { + TLS_ECDH_ECDSA_WITH_NULL_SHA = 0xC001, + TLS_ECDH_ECDSA_WITH_RC4_128_SHA = 0xC002, + TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA = 0xC003, + TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA = 0xC004, + TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA = 0xC005, + TLS_ECDHE_ECDSA_WITH_NULL_SHA = 0xC006, + TLS_ECDHE_ECDSA_WITH_RC4_128_SHA = 0xC007, + TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA = 0xC008, + TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA = 0xC009, + TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA = 0xC00A, + TLS_ECDH_RSA_WITH_NULL_SHA = 0xC00B, + TLS_ECDH_RSA_WITH_RC4_128_SHA = 0xC00C, + TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA = 0xC00D, + TLS_ECDH_RSA_WITH_AES_128_CBC_SHA = 0xC00E, + TLS_ECDH_RSA_WITH_AES_256_CBC_SHA = 0xC00F, + TLS_ECDHE_RSA_WITH_NULL_SHA = 0xC010, + TLS_ECDHE_RSA_WITH_RC4_128_SHA = 0xC011, + TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA = 0xC012, + TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA = 0xC013, + TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA = 0xC014, + TLS_ECDH_anon_WITH_NULL_SHA = 0xC015, + TLS_ECDH_anon_WITH_RC4_128_SHA = 0xC016, + TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA = 0xC017, + TLS_ECDH_anon_WITH_AES_128_CBC_SHA = 0xC018, + TLS_ECDH_anon_WITH_AES_256_CBC_SHA = 0xC019, +}; +#endif + struct mac_session { SSLContextRef context; struct schan_transport *transport; @@ -156,7 +187,6 @@ static const struct cipher_suite cipher_suites[] = { CIPHER_SUITE(TLS, DHE_RSA, AES_256_CBC, SHA), CIPHER_SUITE(TLS, DH_anon, AES_256_CBC, SHA), -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 CIPHER_SUITE(TLS, ECDH_ECDSA, NULL, SHA), CIPHER_SUITE(TLS, ECDH_ECDSA, RC4_128, SHA), CIPHER_SUITE(TLS, ECDH_ECDSA, 3DES_EDE_CBC, SHA), @@ -182,7 +212,6 @@ static const struct cipher_suite cipher_suites[] = { CIPHER_SUITE(TLS, ECDH_anon, 3DES_EDE_CBC, SHA), CIPHER_SUITE(TLS, ECDH_anon, AES_128_CBC, SHA), CIPHER_SUITE(TLS, ECDH_anon, AES_256_CBC, SHA), -#endif CIPHER_SUITE(SSL, RSA, RC2_CBC, MD5), CIPHER_SUITE(SSL, RSA, IDEA_CBC, MD5),

1 0

Nikolay Sivov : ole32: Implement SetConvertStg().
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: 39562961283ccb7c838c5650b11873e69a8d8e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39562961283ccb7c838c5650b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 14 22:39:15 2012 +0400 ole32: Implement SetConvertStg(). --- dlls/ole32/ole2stubs.c | 9 ----- dlls/ole32/storage32.c | 78 +++++++++++++++++++++++++++++++++++++++--- dlls/ole32/tests/storage32.c | 5 ++- 3 files changed, 76 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index 6988dfe..5a90e2d 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -44,15 +44,6 @@ HRESULT WINAPI OleCreateLinkToFile(LPCOLESTR lpszFileName, REFIID riid, } /****************************************************************************** - * SetConvertStg [OLE32.@] - */ -HRESULT WINAPI SetConvertStg(LPSTORAGE pStg, BOOL fConvert) -{ - FIXME("(%p,%x), stub!\n", pStg, fConvert); - return E_NOTIMPL; -} - -/****************************************************************************** * OleCreateLink [OLE32.@] */ HRESULT WINAPI OleCreateLink(LPMONIKER pmkLinkSrc, REFIID riid, DWORD renderopt, LPFORMATETC lpFormatEtc, diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index c04675d..a1c925f 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -9383,7 +9383,7 @@ HRESULT WINAPI OleConvertIStorageToOLESTREAM ( enum stream_1ole_flags { OleStream_LinkedObject = 0x00000001, - OleStream_Convert = 0x00000100 + OleStream_Convert = 0x00000004 }; /*********************************************************************** @@ -9396,7 +9396,6 @@ HRESULT WINAPI GetConvertStg(IStorage *stg) DWORD header[2]; IStream *stream; HRESULT hr; - ULONG len; TRACE("%p\n", stg); @@ -9405,20 +9404,89 @@ HRESULT WINAPI GetConvertStg(IStorage *stg) hr = IStorage_OpenStream(stg, stream_1oleW, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream); if (FAILED(hr)) return hr; - len = 0; - hr = IStream_Read(stream, header, sizeof(header), &len); + hr = IStream_Read(stream, header, sizeof(header), NULL); IStream_Release(stream); if (FAILED(hr)) return hr; if (header[0] != version_magic) { - ERR("got wrong version magic for \1Ole stream, 0x%08x\n", header[0]); + ERR("got wrong version magic for 1Ole stream, 0x%08x\n", header[0]); return E_FAIL; } return header[1] & OleStream_Convert ? S_OK : S_FALSE; } +/*********************************************************************** + * SetConvertStg (OLE32.@) + */ +HRESULT WINAPI SetConvertStg(IStorage *storage, BOOL convert) +{ + static const WCHAR stream_1oleW[] = {1,'O','l','e',0}; + static const DWORD version_magic = 0x02000001; + DWORD flags = convert ? OleStream_Convert : 0; + IStream *stream; + HRESULT hr; + + TRACE("(%p, %d)\n", storage, convert); + + hr = IStorage_CreateStream(storage, stream_1oleW, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stream); + if (hr == S_OK) + { + struct empty_1ole_stream { + DWORD version_magic; + DWORD flags; + BYTE padding[12]; + }; + struct empty_1ole_stream stream_data; + + stream_data.version_magic = version_magic; + stream_data.flags = flags; + memset(stream_data.padding, 0, sizeof(stream_data.padding)); + + hr = IStream_Write(stream, &stream_data, sizeof(stream_data), NULL); + IStream_Release(stream); + } + else if (hr == STG_E_FILEALREADYEXISTS) + { + DWORD header[2]; + + hr = IStorage_OpenStream(storage, stream_1oleW, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stream); + if (FAILED(hr)) return hr; + + hr = IStream_Read(stream, header, sizeof(header), NULL); + if (FAILED(hr)) + { + IStream_Release(stream); + return hr; + } + + /* update flag if differs */ + if ((header[1] ^ flags) & OleStream_Convert) + { + LARGE_INTEGER pos; + + if (header[1] & OleStream_Convert) + flags = header[1] & ~OleStream_Convert; + else + flags = header[1] | OleStream_Convert; + + pos.QuadPart = sizeof(DWORD); + hr = IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) + { + IStream_Release(stream); + return hr; + } + + hr = IStream_Write(stream, &flags, sizeof(flags), NULL); + } + IStream_Release(stream); + } + + return hr; +} + /****************************************************************************** * StgIsStorageFile [OLE32.@] * Verify if the file contains a storage object diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 86b8d8e..c79b5d1 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3009,7 +3009,8 @@ static void test_convert(void) hr = GetConvertStg(stg); ok(hr == STG_E_FILENOTFOUND, "got 0x%08x\n", hr); hr = SetConvertStg(stg, TRUE); -todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = SetConvertStg(stg, TRUE); ok(hr == S_OK, "got 0x%08x\n", hr); hr = GetConvertStg(stg); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3017,7 +3018,7 @@ todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); hr = GetConvertStg(stg); ok(hr == S_FALSE, "got 0x%08x\n", hr); -} + IStorage_Release(stg); DeleteFileW(filename);

1 0

Nikolay Sivov : ole32: COM cleanup of IPropertySetStorage interface.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: ac032593c050ca0b6fb7234cbba458b39db25dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac032593c050ca0b6fb7234cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 14 20:42:48 2012 +0400 ole32: COM cleanup of IPropertySetStorage interface. --- dlls/ole32/stg_prop.c | 16 +++++++--------- dlls/ole32/stg_stream.c | 4 ++-- dlls/ole32/storage32.c | 13 ++++++------- dlls/ole32/storage32.h | 2 +- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 5e22a40..9e3df45 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -60,7 +60,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); static inline StorageImpl *impl_from_IPropertySetStorage( IPropertySetStorage *iface ) { - return (StorageImpl *)((char*)iface - FIELD_OFFSET(StorageImpl, base.pssVtbl)); + return CONTAINING_RECORD(iface, StorageImpl, base.IPropertySetStorage_iface); } /* These are documented in MSDN, @@ -2100,7 +2100,7 @@ static HRESULT WINAPI IPropertySetStorage_fnQueryInterface( void** ppvObject) { StorageImpl *This = impl_from_IPropertySetStorage(ppstg); - return IStorage_QueryInterface( (IStorage*)This, riid, ppvObject ); + return IStorage_QueryInterface( &This->base.IStorage_iface, riid, ppvObject ); } /************************************************************************ @@ -2112,7 +2112,7 @@ static ULONG WINAPI IPropertySetStorage_fnAddRef( IPropertySetStorage *ppstg) { StorageImpl *This = impl_from_IPropertySetStorage(ppstg); - return IStorage_AddRef( (IStorage*)This ); + return IStorage_AddRef( &This->base.IStorage_iface ); } /************************************************************************ @@ -2124,7 +2124,7 @@ static ULONG WINAPI IPropertySetStorage_fnRelease( IPropertySetStorage *ppstg) { StorageImpl *This = impl_from_IPropertySetStorage(ppstg); - return IStorage_Release( (IStorage*)This ); + return IStorage_Release( &This->base.IStorage_iface ); } /************************************************************************ @@ -2173,7 +2173,7 @@ static HRESULT WINAPI IPropertySetStorage_fnCreate( if (FAILED(r)) goto end; - r = IStorage_CreateStream( (IStorage*)This, name, grfMode, 0, 0, &stm ); + r = IStorage_CreateStream( &This->base.IStorage_iface, name, grfMode, 0, 0, &stm ); if (FAILED(r)) goto end; @@ -2218,7 +2218,7 @@ static HRESULT WINAPI IPropertySetStorage_fnOpen( if (FAILED(r)) goto end; - r = IStorage_OpenStream((IStorage*) This, name, 0, grfMode, 0, &stm ); + r = IStorage_OpenStream( &This->base.IStorage_iface, name, 0, grfMode, 0, &stm ); if (FAILED(r)) goto end; @@ -2237,7 +2237,6 @@ static HRESULT WINAPI IPropertySetStorage_fnDelete( REFFMTID rfmtid) { StorageImpl *This = impl_from_IPropertySetStorage(ppstg); - IStorage *stg = NULL; WCHAR name[CCH_MAX_PROPSTG_NAME]; HRESULT r; @@ -2250,8 +2249,7 @@ static HRESULT WINAPI IPropertySetStorage_fnDelete( if (FAILED(r)) return r; - stg = (IStorage*) This; - return IStorage_DestroyElement(stg, name); + return IStorage_DestroyElement(&This->base.IStorage_iface, name); } /************************************************************************ diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 019a789..6a39b94 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -57,7 +57,7 @@ static void StgStreamImpl_Destroy(StgStreamImpl* This) /* * Release the reference we are holding on the parent storage. - * IStorage_Release((IStorage*)This->parentStorage); + * IStorage_Release(&This->parentStorage->IStorage_iface); * * No, don't do this. Some apps call IStorage_Release without * calling IStream_Release first. If we grab a reference the @@ -719,7 +719,7 @@ StgStreamImpl* StgStreamImpl_Construct( * We want to nail-down the reference to the storage in case the * stream out-lives the storage in the client application. * - * -- IStorage_AddRef((IStorage*)newStream->parentStorage); + * -- IStorage_AddRef(&newStream->parentStorage->IStorage_iface); * * No, don't do this. Some apps call IStorage_Release without * calling IStream_Release first. If we grab a reference the diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 4e802f5..df84108 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -373,11 +373,11 @@ static HRESULT WINAPI StorageBaseImpl_QueryInterface( if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IStorage, riid)) { - *ppvObject = This; + *ppvObject = &This->IStorage_iface; } else if (IsEqualGUID(&IID_IPropertySetStorage, riid)) { - *ppvObject = &This->pssVtbl; + *ppvObject = &This->IPropertySetStorage_iface; } if ((*ppvObject)==0) @@ -2718,7 +2718,7 @@ static HRESULT StorageImpl_Construct( list_init(&This->base.storageHead); This->base.IStorage_iface.lpVtbl = &Storage32Impl_Vtbl; - This->base.pssVtbl = &IPropertySetStorage_Vtbl; + This->base.IPropertySetStorage_iface.lpVtbl = &IPropertySetStorage_Vtbl; This->base.baseVtbl = &StorageImpl_BaseVtbl; This->base.openFlags = (openFlags & ~STGM_CREATE); This->base.ref = 1; @@ -5095,8 +5095,7 @@ static HRESULT TransactedSnapshotImpl_Construct(StorageBaseImpl *parentStorage, (*result)->base.IStorage_iface.lpVtbl = &TransactedSnapshotImpl_Vtbl; /* This is OK because the property set storage functions use the IStorage functions. */ - (*result)->base.pssVtbl = parentStorage->pssVtbl; - + (*result)->base.IPropertySetStorage_iface.lpVtbl = parentStorage->IPropertySetStorage_iface.lpVtbl; (*result)->base.baseVtbl = &TransactedSnapshotImpl_BaseVtbl; list_init(&(*result)->base.strmHead); @@ -5693,7 +5692,7 @@ static StorageInternalImpl* StorageInternalImpl_Construct( * Initialize the virtual function table. */ newStorage->base.IStorage_iface.lpVtbl = &Storage32InternalImpl_Vtbl; - newStorage->base.pssVtbl = &IPropertySetStorage_Vtbl; + newStorage->base.IPropertySetStorage_iface.lpVtbl = &IPropertySetStorage_Vtbl; newStorage->base.baseVtbl = &StorageInternalImpl_BaseVtbl; newStorage->base.openFlags = (openFlags & ~STGM_CREATE); @@ -9519,7 +9518,7 @@ HRESULT WINAPI ReadClassStm(IStream *pStm,CLSID *pclsid) /* clear the output args */ *pclsid = CLSID_NULL; - res = IStream_Read(pStm,(void*)pclsid,sizeof(CLSID),&nbByte); + res = IStream_Read(pStm, pclsid, sizeof(CLSID), &nbByte); if (FAILED(res)) return res; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index d94740d..80fe01b 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -176,7 +176,7 @@ HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName struct StorageBaseImpl { IStorage IStorage_iface; - const IPropertySetStorageVtbl *pssVtbl; /* interface for adding a properties stream */ + IPropertySetStorage IPropertySetStorage_iface; /* interface for adding a properties stream */ LONG ref; /*

1 0

Ken Thomases : secur32: On Mac, recognize key exchange algorithm for cipher suites using ECDH.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: 4ccb8746fde08a21e533558a417816279e2c8620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ccb8746fde08a21e533558a4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jul 13 15:19:23 2012 -0500 secur32: On Mac, recognize key exchange algorithm for cipher suites using ECDH. --- dlls/secur32/schannel_macosx.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 01493b1..d4576b9 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -330,6 +330,11 @@ static ALG_ID schan_get_kx_algid(const struct cipher_suite* c) case schan_kx_DHE_DSS: case schan_kx_DHE_RSA_EXPORT: case schan_kx_DHE_RSA: return CALG_DH_EPHEM; + case schan_kx_ECDH_anon: + case schan_kx_ECDH_ECDSA: + case schan_kx_ECDH_RSA: + case schan_kx_ECDHE_ECDSA: + case schan_kx_ECDHE_RSA: return CALG_ECDH; case schan_kx_NULL: return 0; case schan_kx_RSA: return CALG_RSA_KEYX; @@ -339,11 +344,6 @@ static ALG_ID schan_get_kx_algid(const struct cipher_suite* c) case schan_kx_DH_DSS: case schan_kx_DH_RSA_EXPORT: case schan_kx_DH_RSA: - case schan_kx_ECDH_anon: - case schan_kx_ECDH_ECDSA: - case schan_kx_ECDH_RSA: - case schan_kx_ECDHE_ECDSA: - case schan_kx_ECDHE_RSA: case schan_kx_FORTEZZA_DMS: case schan_kx_RSA_EXPORT: FIXME("Don't know CALG for key exchange algorithm %d for cipher suite %#x, returning 0\n", c->kx_alg, (unsigned)c->suite);

1 0

Ken Thomases : include/wincrypt.h: Add identifiers for Elliptic curve Diffie-Hellman algorithm.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: ba12844f325704531f0ec5903a47f8a94b4beab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba12844f325704531f0ec5903… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jul 13 15:19:09 2012 -0500 include/wincrypt.h: Add identifiers for Elliptic curve Diffie-Hellman algorithm. --- include/wincrypt.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 1311f31..a14edab 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1578,6 +1578,7 @@ typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR; #define ALG_SID_DH_EPHEM 2 #define ALG_SID_AGREED_KEY_ANY 3 #define ALG_SID_KEA 4 +#define ALG_SID_ECDH 5 /* RC2 SIDs */ #define ALG_SID_RC4 1 #define ALG_SID_RC2 2 @@ -1627,6 +1628,7 @@ typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR; #define CALG_NO_SIGN (ALG_CLASS_SIGNATURE | ALG_TYPE_ANY | ALG_SID_ANY) #define CALG_DH_SF (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_DH_SANDF) #define CALG_DH_EPHEM (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_DH_EPHEM) +#define CALG_ECDH (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_ECDH) #define CALG_RSA_KEYX (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_RSA | ALG_SID_RSA_ANY) #define CALG_DES (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_DES) #define CALG_RC2 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_RC2)

1 0

Kyle Auble : Moved AppDB notes from contributing page to wiki (retry)
by Jeremy Newman July 16, 2012

July 16, 2012

Module: website Branch: master Commit: 8efce17cc58485e7ad94bff14e2a43850c585ef2 URL: http://source.winehq.org/git/website.git/?a=commit;h=8efce17cc58485e7ad94bf… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Fri Jul 13 14:51:59 2012 -0700 Moved AppDB notes from contributing page to wiki (retry) --- templates/en/contributing.template | 34 +--------------------------------- 1 files changed, 1 insertions(+), 33 deletions(-) diff --git a/templates/en/contributing.template b/templates/en/contributing.template index a2a0b18..0d019f3 100644 --- a/templates/en/contributing.template +++ b/templates/en/contributing.template @@ -20,7 +20,7 @@ <ol> <li><a href="http://wiki.winehq.org/CreateFonts">Creating fonts</a></li> <li><a href="http://wiki.winehq.org/CreateIcons">Drawing icons</a></li> - <li><a href="#app_owners">Application owners</a></li> + <li><a href="http://wiki.winehq.org/AppDB_Maintainers">Maintaining applications</a></li> <li><a href="#support">Bug hunting and support</a></li> </ol> </li> @@ -43,38 +43,6 @@ </li> </ol> -<h3 id="app_owners">Application database: application maintainers</h3> - -<p>Another very important aspect of Wine testing is to use or test real - applications regularly and report regressions as soon as possible to the Wine - developers. This way regressions are caught early, while the set of changes - to search through is still small and the Wine developer who made the change - still around. Another reason why <b>your</b> contribution is especially - valuable is that Wine developers probably do not have access to the - application (they cannot buy all the applications out there) or do not know - it well enough to test it properly.</p> -<p>You can help even further by becoming an 'application maintainer', that is by - maintaining that application entry in the <a href="http://appdb.winehq.org/">Application Database</a>. Many - applications can be made to run (or run better) by using just the right mix - of native (Windows) and built-in (Wine) libraries. By testing the application - with various library mix and then documenting your results in the - corresponding Application Database entry, you will help other Wine users be - productive with that application, thus making Wine useful to a greater number - of people.</p> -<p>Required skills:</p> -<ul> - <li>Good knowledge of a particular application</li> - <li>Being dedicated to using / testing this application with each new Wine - release or more often. It is more important to test one application - regularly than ten applications once a year.</li> - <li>Report all regressions to wine-devel, and cooperate with the developers - to diagnose the issue.</li> - <li>Create and maintain a HOWTO note on the application page summarizing - all actions required to get the application to run properly, e.g. - collected from the comments of visitors on the application/versions pages.</li> - <li>Coding skills are <strong>not necessary</strong>.</li> -</ul> - <h3 id="support">Bug hunting and support</h3> <p>Because there are so many Windows applications out there, and because very few of them work perfectly, we get a lot of questions from users,

1 0

Kyle Auble : Moved icon notes from contributing page to wiki (retry)
by Jeremy Newman July 16, 2012

July 16, 2012

Module: website Branch: master Commit: 85888b471e2459593326cc2e9284479acf29615a URL: http://source.winehq.org/git/website.git/?a=commit;h=85888b471e2459593326cc… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Fri Jul 13 14:51:44 2012 -0700 Moved icon notes from contributing page to wiki (retry) --- templates/en/contributing.template | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/templates/en/contributing.template b/templates/en/contributing.template index 84989e7..a2a0b18 100644 --- a/templates/en/contributing.template +++ b/templates/en/contributing.template @@ -19,7 +19,7 @@ <li><a href="#web_site">General maintenance</a> <ol> <li><a href="http://wiki.winehq.org/CreateFonts">Creating fonts</a></li> - <li><a href="#draw">Draw icons for Wine</a></li> + <li><a href="http://wiki.winehq.org/CreateIcons">Drawing icons</a></li> <li><a href="#app_owners">Application owners</a></li> <li><a href="#support">Bug hunting and support</a></li> </ol> @@ -43,17 +43,6 @@ </li> </ol> -<h3 id="draw">Draw icons for Wine</h3> - -<p>Wine cannot reuse the Windows icons verbatim because of copyright issues. So we have to redraw - them, keeping a similar design so that users are not completely lost, all while making them - different enough (and possibly nicer). You'll see this if you open a file selection dialog.</p> -<p>Required skills:</p> -<ul> - <li>Drawing skills</li> - <li>Vector graphic skills</li> -</ul> - <h3 id="app_owners">Application database: application maintainers</h3> <p>Another very important aspect of Wine testing is to use or test real

1 0