July 2010 - Wine-commits - list.winehq.org

David Hedberg : include: Add a few IFileDialog related interface declarations.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 215bd7d4c1365f1458178104514f7dedbd3aaadc URL: http://source.winehq.org/git/wine.git/?a=commit;h=215bd7d4c1365f14581781045… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Jul 20 16:39:11 2010 +0200 include: Add a few IFileDialog related interface declarations. --- dlls/actxprxy/usrmarshal.c | 16 ++ include/shobjidl.idl | 341 ++++++++++++++++++++++++++++++++++++++++++++ include/shtypes.idl | 6 + 3 files changed, 363 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=215bd7d4c1365f1458178…

1 0

Dylan Smith : user32: DefMDIChildProc sends WM_MDINEXT with active child handle.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: c51b1e6db67c4c89fb922a79fdc00bc2f3f19154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51b1e6db67c4c89fb922a79f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jul 20 17:54:15 2010 -0400 user32: DefMDIChildProc sends WM_MDINEXT with active child handle. --- dlls/user32/mdi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 631d477..d382eb7 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1494,10 +1494,10 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message, return SendMessageW( GetParent(client), message, wParam, lParam); break; case SC_NEXTWINDOW: - SendMessageW( client, WM_MDINEXT, 0, 0); + SendMessageW( client, WM_MDINEXT, (WPARAM)ci->hwndActiveChild, 0); return 0; case SC_PREVWINDOW: - SendMessageW( client, WM_MDINEXT, 0, 1); + SendMessageW( client, WM_MDINEXT, (WPARAM)ci->hwndActiveChild, 1); return 0; } break;

1 0

Alexandre Julliard : dlls: Remove explicit imports of kernel32 and ntdll.
by Alexandre Julliard 21 Jul '10

21 Jul '10

1 0

Alexandre Julliard : programs: Remove explicit imports of kernel32 and ntdll.
by Alexandre Julliard 21 Jul '10

21 Jul '10

1 0

Nikolay Sivov : ole32: Remove redundant variables.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 5185409144d2112be9c4816953a427dd3351cbd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5185409144d2112be9c481695… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 21 14:03:35 2010 +0400 ole32: Remove redundant variables. --- dlls/ole32/antimoniker.c | 19 ++++++------------- dlls/ole32/bindctx.c | 13 +++---------- dlls/ole32/classmoniker.c | 4 +--- dlls/ole32/datacache.c | 8 +++----- dlls/ole32/defaulthandler.c | 5 +---- dlls/ole32/filemoniker.c | 9 ++------- 6 files changed, 16 insertions(+), 42 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 69e0a90..92e2853 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -192,13 +192,9 @@ AntiMonikerImpl_Load(IMoniker* iface,IStream* pStm) static HRESULT WINAPI AntiMonikerImpl_Save(IMoniker* iface,IStream* pStm,BOOL fClearDirty) { - DWORD constant=1; - HRESULT res; - + static const DWORD constant = 1; /* data written by this function is only a DWORD constant set to 1 ! */ - res=IStream_Write(pStm,&constant,sizeof(constant),NULL); - - return res; + return IStream_Write(pStm,&constant,sizeof(constant),NULL); } /****************************************************************************** @@ -614,9 +610,8 @@ static HRESULT AntiMonikerImpl_Construct(AntiMonikerImpl* This) ******************************************************************************/ HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk) { - AntiMonikerImpl* newAntiMoniker = 0; - HRESULT hr = S_OK; - IID riid=IID_IMoniker; + AntiMonikerImpl* newAntiMoniker; + HRESULT hr; TRACE("(%p)\n",ppmk); @@ -632,9 +627,7 @@ HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk) return hr; } - hr = AntiMonikerImpl_QueryInterface((IMoniker*)newAntiMoniker,&riid,(void**)ppmk); - - return hr; + return AntiMonikerImpl_QueryInterface((IMoniker*)newAntiMoniker,&IID_IMoniker,(void**)ppmk); } static HRESULT WINAPI AntiMonikerCF_QueryInterface(LPCLASSFACTORY iface, @@ -677,7 +670,7 @@ static HRESULT WINAPI AntiMonikerCF_CreateInstance(LPCLASSFACTORY iface, if (FAILED(hr)) return hr; - hr = IMoniker_QueryInterface(pMoniker, riid, ppv); + hr = IMoniker_QueryInterface(pMoniker, riid, ppv); if (FAILED(hr)) IMoniker_Release(pMoniker); diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index f7561bd..1492393 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -285,8 +285,6 @@ BindCtxImpl_GetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) static HRESULT WINAPI BindCtxImpl_GetRunningObjectTable(IBindCtx* iface,IRunningObjectTable** pprot) { - HRESULT res; - BindCtxImpl *This = (BindCtxImpl *)iface; TRACE("(%p,%p)\n",This,pprot); @@ -294,9 +292,7 @@ BindCtxImpl_GetRunningObjectTable(IBindCtx* iface,IRunningObjectTable** pprot) if (pprot==NULL) return E_POINTER; - res=GetRunningObjectTable(0, pprot); - - return res; + return GetRunningObjectTable(0, pprot); } /****************************************************************************** @@ -555,9 +551,8 @@ static HRESULT BindCtxImpl_Construct(BindCtxImpl* This) */ HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC * ppbc) { - BindCtxImpl* newBindCtx = 0; + BindCtxImpl* newBindCtx; HRESULT hr; - IID riid=IID_IBindCtx; TRACE("(%d,%p)\n",reserved,ppbc); @@ -582,9 +577,7 @@ HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC * ppbc) return hr; } - hr = BindCtxImpl_QueryInterface((IBindCtx*)newBindCtx,&riid,(void**)ppbc); - - return hr; + return BindCtxImpl_QueryInterface((IBindCtx*)newBindCtx,&IID_IBindCtx,(void**)ppbc); } /****************************************************************************** diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index f67ae00..8b927f8 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -210,9 +210,7 @@ static HRESULT WINAPI ClassMoniker_Save(IMoniker* iface, hr = IStream_Write(pStm, &This->clsid, sizeof(This->clsid), NULL); if (FAILED(hr)) return hr; - hr = IStream_Write(pStm, &zero, sizeof(zero), NULL); - - return hr; + return IStream_Write(pStm, &zero, sizeof(zero), NULL); } /****************************************************************************** diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index ead53fe..919829e 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -655,17 +655,15 @@ static HRESULT DataCacheEntry_LoadData(DataCacheEntry *This) static HRESULT DataCacheEntry_CreateStream(DataCacheEntry *This, IStorage *storage, IStream **stream) { - HRESULT hr; WCHAR wszName[] = {2,'O','l','e','P','r','e','s', '0' + (This->stream_number / 100) % 10, '0' + (This->stream_number / 10) % 10, '0' + This->stream_number % 10, 0}; /* FIXME: cache the created stream in This? */ - hr = IStorage_CreateStream(storage, wszName, - STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, - 0, 0, stream); - return hr; + return IStorage_CreateStream(storage, wszName, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, + 0, 0, stream); } static HRESULT DataCacheEntry_Save(DataCacheEntry *This, IStorage *storage, diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index d0a871f..b509bee 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1146,14 +1146,11 @@ static HRESULT WINAPI DefaultHandler_EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** ppenumFormatEtc) { - HRESULT hres; DefaultHandler *This = impl_from_IDataObject(iface); TRACE("(%p, %x, %p)\n", iface, dwDirection, ppenumFormatEtc); - hres = OleRegEnumFormatEtc(&This->clsid, dwDirection, ppenumFormatEtc); - - return hres; + return OleRegEnumFormatEtc(&This->clsid, dwDirection, ppenumFormatEtc); } /************************************************************************ diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 72f5913..01ae5d1 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -421,10 +421,7 @@ FileMonikerImpl_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty) } if (!bWriteWide) - { - res=IStream_Write(pStm,&ZERO,sizeof(DWORD),NULL); - return res; - } + return IStream_Write(pStm,&ZERO,sizeof(DWORD),NULL); /* write bytes needed for the filepathW (without 0) + 6 */ bytesW = len*sizeof(WCHAR) + 6; @@ -441,9 +438,7 @@ FileMonikerImpl_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty) if (FAILED(res)) return res; /* write W string (no 0) */ - res=IStream_Write(pStm,filePathW,bytesW,NULL); - - return res; + return IStream_Write(pStm,filePathW,bytesW,NULL); } /******************************************************************************

1 0

Nikolay Sivov : ole32: Fix assumption about HRESULT failure code value.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 2f61e19156acc170ecd5ddb05132076eda9a859b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f61e19156acc170ecd5ddb05… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 21 14:07:03 2010 +0400 ole32: Fix assumption about HRESULT failure code value. --- dlls/ole32/git.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index e961f90..3800de0 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -187,9 +187,9 @@ StdGlobalInterfaceTable_RegisterInterfaceInGlobal( TRACE("About to marshal the interface\n"); hres = CreateStreamOnHGlobal(0, TRUE, &stream); - if (hres) return hres; + if (hres != S_OK) return hres; hres = CoMarshalInterface(stream, riid, pUnk, MSHCTX_INPROC, NULL, MSHLFLAGS_TABLESTRONG); - if (hres) + if (hres != S_OK) { IStream_Release(stream); return hres; @@ -281,7 +281,7 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( LeaveCriticalSection(&git_section); - if (hres) { + if (hres != S_OK) { WARN("Failed to clone stream with error 0x%08x\n", hres); return hres; }

1 0

Nikolay Sivov : ole32: No need to test for interface pointer being null.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 114510801f639f54a7f4a1553a7101f495887301 URL: http://source.winehq.org/git/wine.git/?a=commit;h=114510801f639f54a7f4a1553… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 21 14:15:10 2010 +0400 ole32: No need to test for interface pointer being null. --- dlls/ole32/antimoniker.c | 2 +- dlls/ole32/compositemoniker.c | 4 ++-- dlls/ole32/enumx.c | 2 +- dlls/ole32/filemoniker.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 92e2853..7f04036 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -67,7 +67,7 @@ AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) TRACE("(%p,%p,%p)\n",This,riid,ppvObject); /* Perform a sanity check on the parameters.*/ - if ( (This==0) || (ppvObject==0) ) + if ( ppvObject==0 ) return E_INVALIDARG; /* Initialize the return parameter */ diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 275d875..f7d6ee6 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -101,7 +101,7 @@ CompositeMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject TRACE("(%p,%p,%p)\n",This,riid,ppvObject); /* Perform a sanity check on the parameters.*/ - if ( (This==0) || (ppvObject==0) ) + if ( ppvObject==0 ) return E_INVALIDARG; /* Initialize the return parameter */ @@ -1504,7 +1504,7 @@ EnumMonikerImpl_QueryInterface(IEnumMoniker* iface,REFIID riid,void** ppvObject) TRACE("(%p,%p,%p)\n",This,riid,ppvObject); /* Perform a sanity check on the parameters.*/ - if ( (This==0) || (ppvObject==0) ) + if ( ppvObject==0 ) return E_INVALIDARG; /* Initialize the return parameter */ diff --git a/dlls/ole32/enumx.c b/dlls/ole32/enumx.c index 2665301..4279ca8 100644 --- a/dlls/ole32/enumx.c +++ b/dlls/ole32/enumx.c @@ -51,7 +51,7 @@ HRESULT WINAPI enumx_QueryInterface( REFIID riid, void** ppvObject) { - if ( (This==0) || (ppvObject==0) ) + if ( ppvObject==0 ) return E_INVALIDARG; *ppvObject = 0; diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 01ae5d1..0cbfc3a 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -77,7 +77,7 @@ FileMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* Perform a sanity check on the parameters.*/ - if ( (This==0) || (ppvObject==0) ) + if ( ppvObject==0 ) return E_INVALIDARG; /* Initialize the return parameter */ @@ -1450,7 +1450,7 @@ HRESULT WINAPI CreateFileMoniker(LPCOLESTR lpszPathName, LPMONIKER * ppmk) hr = FileMonikerImpl_Construct(newFileMoniker,lpszPathName); if (SUCCEEDED(hr)) - hr = FileMonikerImpl_QueryInterface((IMoniker*)newFileMoniker,&IID_IMoniker,(void**)ppmk); + hr = IMoniker_QueryInterface((IMoniker*)newFileMoniker,&IID_IMoniker,(void**)ppmk); else HeapFree(GetProcessHeap(),0,newFileMoniker); @@ -1600,7 +1600,7 @@ static HRESULT WINAPI FileMonikerCF_CreateInstance(LPCLASSFACTORY iface, hr = FileMonikerImpl_Construct(newFileMoniker, wszEmpty); if (SUCCEEDED(hr)) - hr = FileMonikerImpl_QueryInterface((IMoniker*)newFileMoniker, riid, ppv); + hr = IMoniker_QueryInterface((IMoniker*)newFileMoniker, riid, ppv); if (FAILED(hr)) HeapFree(GetProcessHeap(),0,newFileMoniker);

1 0

Nikolay Sivov : ole32: Use IsEqualIID() instead of memcmp().
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 1b0182f9bbbb904320110d91b904151073232414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b0182f9bbbb904320110d91b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 21 14:19:51 2010 +0400 ole32: Use IsEqualIID() instead of memcmp(). --- dlls/ole32/datacache.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 919829e..1c7be2b 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -879,7 +879,7 @@ static HRESULT WINAPI DataCache_NDIUnknown_QueryInterface( /* * Perform a sanity check on the parameters. */ - if ( (this==0) || (ppvObject==0) ) + if ( ppvObject==0 ) return E_INVALIDARG; /* @@ -890,30 +890,30 @@ static HRESULT WINAPI DataCache_NDIUnknown_QueryInterface( /* * Compare the riid with the interface IDs implemented by this object. */ - if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) + if (IsEqualIID(&IID_IUnknown, riid)) { *ppvObject = iface; } - else if (memcmp(&IID_IDataObject, riid, sizeof(IID_IDataObject)) == 0) + else if (IsEqualIID(&IID_IDataObject, riid)) { *ppvObject = &this->lpVtbl; } - else if ( (memcmp(&IID_IPersistStorage, riid, sizeof(IID_IPersistStorage)) == 0) || - (memcmp(&IID_IPersist, riid, sizeof(IID_IPersist)) == 0) ) + else if ( IsEqualIID(&IID_IPersistStorage, riid) || + IsEqualIID(&IID_IPersist, riid) ) { *ppvObject = &this->lpvtblIPersistStorage; } - else if ( (memcmp(&IID_IViewObject, riid, sizeof(IID_IViewObject)) == 0) || - (memcmp(&IID_IViewObject2, riid, sizeof(IID_IViewObject2)) == 0) ) + else if ( IsEqualIID(&IID_IViewObject, riid) || + IsEqualIID(&IID_IViewObject2, riid) ) { *ppvObject = &this->lpvtblIViewObject; } - else if ( (memcmp(&IID_IOleCache, riid, sizeof(IID_IOleCache)) == 0) || - (memcmp(&IID_IOleCache2, riid, sizeof(IID_IOleCache2)) == 0) ) + else if ( IsEqualIID(&IID_IOleCache, riid) || + IsEqualIID(&IID_IOleCache2, riid) ) { *ppvObject = &this->lpvtblIOleCache2; } - else if (memcmp(&IID_IOleCacheControl, riid, sizeof(IID_IOleCacheControl)) == 0) + else if ( IsEqualIID(&IID_IOleCacheControl, riid) ) { *ppvObject = &this->lpvtblIOleCacheControl; }

1 0

Alexander Nicolaysen Sørnes : shdocvw: Fix a buffer overflow in InternetShortcut's IPersistFile::Load.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: c345ca1a0f5b3e853a2e1c1f7a87324febef9fae URL: http://source.winehq.org/git/wine.git/?a=commit;h=c345ca1a0f5b3e853a2e1c1f7… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 14 15:15:47 2010 +0200 shdocvw: Fix a buffer overflow in InternetShortcut's IPersistFile::Load. --- dlls/shdocvw/intshcut.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index 32dab6d..8c17873 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -361,7 +361,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam { CoTaskMemFree(url); len *= 2; - url = CoTaskMemAlloc(len); + url = CoTaskMemAlloc(len*sizeof(WCHAR)); if (url == NULL) break; r = GetPrivateProfileStringW(str_header, str_URL, NULL, url, len, pszFileName);

1 0

Hans Leidekker : msi/tests: Double null-terminate a REG_MULTI_SZ string.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 409e2d7105b3f9f7b0813018b73cdfee9b739cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=409e2d7105b3f9f7b0813018b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 21 09:48:11 2010 +0200 msi/tests: Double null-terminate a REG_MULTI_SZ string. --- dlls/msi/tests/msi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index b377320..d31159d 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -8371,9 +8371,10 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds "Expected targetsid to be unchanged, got %s\n", targetsid); ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + patch_squashed[lstrlenA(patch_squashed) + 1] = 0; res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ, (const BYTE *)patch_squashed, - lstrlenA(patch_squashed) + 1); + lstrlenA(patch_squashed) + 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* Patches value exists */

1 0