October 2008 - Wine-commits

Michael Stefaniuc : shdocvw: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: 689895702a0c46de4b4e582a1d16acfa81a010fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=689895702a0c46de4b4e582a1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:36:15 2008 +0200 shdocvw: Use FAILED instead of !SUCCEEDED. --- dlls/shdocvw/factory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index ec3e7a6..9111300 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -330,5 +330,5 @@ DWORD register_iexplore(BOOL doregister) return S_OK; } hres = reg_install(doregister ? "RegisterIE" : "UnregisterIE", NULL); - return !SUCCEEDED(hres); + return FAILED(hres); }

1 0

Michael Stefaniuc : comctl32: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: 15e5f6844a66b671433be045dde5dea0f2805e12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15e5f6844a66b671433be045d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:33:06 2008 +0200 comctl32: Use FAILED instead of !SUCCEEDED. --- dlls/comctl32/imagelist.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index f909155..ee9d83f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1908,13 +1908,13 @@ static BOOL _read_bitmap(HDC hdcIml, LPSTREAM pstm) int result = FALSE; LPBYTE bits = NULL; - if (!SUCCEEDED(IStream_Read ( pstm, &bmfh, sizeof(bmfh), NULL))) + if (FAILED(IStream_Read ( pstm, &bmfh, sizeof(bmfh), NULL))) return FALSE; if (bmfh.bfType != (('M'<<8)|'B')) return FALSE; - if (!SUCCEEDED(IStream_Read ( pstm, &bmi->bmiHeader, sizeof(bmi->bmiHeader), NULL))) + if (FAILED(IStream_Read ( pstm, &bmi->bmiHeader, sizeof(bmi->bmiHeader), NULL))) return FALSE; if ((bmi->bmiHeader.biSize != sizeof(bmi->bmiHeader))) @@ -1933,13 +1933,13 @@ static BOOL _read_bitmap(HDC hdcIml, LPSTREAM pstm) bmi->bmiHeader.biSizeImage = DIB_GetDIBImageBytes(bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, bitsperpixel); /* read the palette right after the end of the bitmapinfoheader */ - if (palspace && !SUCCEEDED(IStream_Read(pstm, bmi->bmiColors, palspace, NULL))) + if (palspace && FAILED(IStream_Read(pstm, bmi->bmiColors, palspace, NULL))) goto error; bits = Alloc(bmi->bmiHeader.biSizeImage); if (!bits) goto error; - if (!SUCCEEDED(IStream_Read(pstm, bits, bmi->bmiHeader.biSizeImage, NULL))) + if (FAILED(IStream_Read(pstm, bits, bmi->bmiHeader.biSizeImage, NULL))) goto error; if (!StretchDIBits(hdcIml, 0, 0, bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, @@ -1992,7 +1992,7 @@ HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm) TRACE("%p\n", pstm); - if (!SUCCEEDED(IStream_Read (pstm, &ilHead, sizeof(ILHEAD), NULL))) + if (FAILED(IStream_Read (pstm, &ilHead, sizeof(ILHEAD), NULL))) return NULL; if (ilHead.usMagic != (('L' << 8) | 'I')) return NULL; @@ -2740,7 +2740,7 @@ _write_bitmap(HBITMAP hBitmap, LPSTREAM pstm) inf->bmiColors[1].rgbRed = inf->bmiColors[1].rgbGreen = inf->bmiColors[1].rgbBlue = 0xff; } - if(!SUCCEEDED(IStream_Write(pstm, data, totalSize, NULL))) + if(FAILED(IStream_Write(pstm, data, totalSize, NULL))) goto failed; result = TRUE; @@ -2796,7 +2796,7 @@ ImageList_Write (HIMAGELIST himl, LPSTREAM pstm) TRACE("cx %u, cy %u, flags 0x04%x, cCurImage %u, cMaxImage %u\n", ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage); - if(!SUCCEEDED(IStream_Write(pstm, &ilHead, sizeof(ILHEAD), NULL))) + if(FAILED(IStream_Write(pstm, &ilHead, sizeof(ILHEAD), NULL))) return FALSE; /* write the bitmap */

1 0

Michael Stefaniuc : mshtml/tests: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: 05d397283aca8dd121ecceb92ffcb2f135419164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d397283aca8dd121ecceb92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:34:56 2008 +0200 mshtml/tests: Use FAILED instead of !SUCCEEDED. --- dlls/mshtml/tests/protocol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index b17028f..c63034d 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -305,7 +305,7 @@ static void test_res_protocol(void) hres = CoGetClassObject(&CLSID_ResProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); - if(!SUCCEEDED(hres)) + if(FAILED(hres)) return; hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&protocol_info); @@ -614,7 +614,7 @@ static void test_about_protocol(void) hres = CoGetClassObject(&CLSID_AboutProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); - if(!SUCCEEDED(hres)) + if(FAILED(hres)) return; hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&protocol_info);

1 0

Michael Stefaniuc : urlmon/tests: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: 10ebc51fa4eff905bf1c4dd3f0cc757eae5bd4a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ebc51fa4eff905bf1c4dd3f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:34:35 2008 +0200 urlmon/tests: Use FAILED instead of !SUCCEEDED. --- dlls/urlmon/tests/protocol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index f636226..6c933af 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1250,7 +1250,7 @@ static void test_file_protocol_url(LPCWSTR url) hres = CoGetClassObject(&CLSID_FileProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); - if(!SUCCEEDED(hres)) + if(FAILED(hres)) return; hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&protocol_info); @@ -1547,7 +1547,7 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_first) hres = CoGetClassObject(&CLSID_HttpProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); - if(!SUCCEEDED(hres)) + if(FAILED(hres)) return; hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&protocol_info);

1 0

Michael Stefaniuc : quartz: Use the right FAILED/ SUCCEEDED macro instead of negating the opposite.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: 56c6f7670b3fd4d79f4511752b283b5dff5335ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c6f7670b3fd4d79f4511752… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:33:43 2008 +0200 quartz: Use the right FAILED/SUCCEEDED macro instead of negating the opposite. --- dlls/quartz/filtergraph.c | 4 ++-- dlls/quartz/filtermapper.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index c9e4e56..5837a47 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1367,7 +1367,7 @@ error: IFilterGraph2_RemoveFilter(iface, pfilter); IBaseFilter_Release(pfilter); } - if (!FAILED(hr)) DebugBreak(); + if (SUCCEEDED(hr)) DebugBreak(); } IEnumMoniker_Release(pEnumMoniker); @@ -2140,7 +2140,7 @@ static HRESULT all_renderers_seek(IFilterGraphImpl *This, fnFoundSeek FoundSeek, IMediaSeeking_Release(seek); if (hr_return != E_NOTIMPL) allnotimpl = FALSE; - if (hr_return == S_OK || (FAILED(hr) && hr != E_NOTIMPL && !FAILED(hr_return))) + if (hr_return == S_OK || (FAILED(hr) && hr != E_NOTIMPL && SUCCEEDED(hr_return))) hr_return = hr; } } diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index a085b0a..5732755 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1297,7 +1297,7 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( NULL, &GUID_NULL); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) return hr; while(IEnumMoniker_Next(ppEnumMoniker, 1, &IMon, &nb) == S_OK)

1 0

Michael Stefaniuc : ddraw/tests: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: ff5a860c0c4fa5020e0e4661dd37c67c7db7dbfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff5a860c0c4fa5020e0e4661d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:34:11 2008 +0200 ddraw/tests: Use FAILED instead of !SUCCEEDED. --- dlls/ddraw/tests/d3d.c | 6 +++--- dlls/ddraw/tests/overlay.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 221a95b..9bb5552 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -102,7 +102,7 @@ static BOOL CreateDirect3D(void) ddsd.dwWidth = 256; ddsd.dwHeight = 256; rc = IDirectDraw7_CreateSurface(lpDD, &ddsd, &lpDDS, NULL); - if (!SUCCEEDED(rc)) + if (FAILED(rc)) return FALSE; memset(&ddsd, 0, sizeof(ddsd)); @@ -117,12 +117,12 @@ static BOOL CreateDirect3D(void) ddsd.dwHeight = 256; rc = IDirectDraw7_CreateSurface(lpDD, &ddsd, &lpDDSdepth, NULL); ok(rc==DD_OK, "CreateSurface returned: %x\n", rc); - if (!SUCCEEDED(rc)) { + if (FAILED(rc)) { lpDDSdepth = NULL; } else { rc = IDirectDrawSurface_AddAttachedSurface(lpDDS, lpDDSdepth); ok(rc == DD_OK, "IDirectDrawSurface_AddAttachedSurface returned %x\n", rc); - if (!SUCCEEDED(rc)) + if (FAILED(rc)) return FALSE; } diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index b99d228..b5fcdc7 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -76,7 +76,7 @@ static BOOL CreateDirectDraw(void) ddsd.dwFlags = DDSD_CAPS; ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &primary, NULL); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { IDirectDraw7_Release(ddraw); trace("IDirectDraw7_CreateSurface() failed with an error %x\n", hr); return FALSE;

1 0

Michael Stefaniuc : qmgr: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: dd843b87b61b606010a0b382dba844368faf5880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd843b87b61b606010a0b382d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:33:25 2008 +0200 qmgr: Use FAILED instead of !SUCCEEDED. --- dlls/qmgr/file.c | 2 +- dlls/qmgr/job.c | 2 +- dlls/qmgr/service.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 622f7a2..4129887 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -425,7 +425,7 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) return FALSE; } } - else if (!SUCCEEDED(hr)) + else if (FAILED(hr)) { ERR("URLDownload failed: eh 0x%08x\n", hr); transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_ERROR); diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index e344027..871f14c 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -83,7 +83,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_AddFileSet( { HRESULT hr = IBackgroundCopyJob_AddFile(iface, pFileSet[i].RemoteName, pFileSet[i].LocalName); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) return hr; } return S_OK; diff --git a/dlls/qmgr/service.c b/dlls/qmgr/service.c index b00a922..1e0a545 100644 --- a/dlls/qmgr/service.c +++ b/dlls/qmgr/service.c @@ -85,20 +85,20 @@ StartCount(void) TRACE("\n"); hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) return FALSE; hr = CoInitializeSecurity(NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_NONE, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, NULL); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) return FALSE; hr = CoRegisterClassObject(&CLSID_BackgroundCopyManager, (IUnknown *) &BITS_ClassFactory, CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE, &dwReg); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) return FALSE; return TRUE;

1 0

Michael Stefaniuc : ole32: Use the right FAILED/ SUCCEEDED macro instead of negating the opposite.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: 3ed8ffcc99e46269a9d0b6b7a2a9e9bfd36d2eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ed8ffcc99e46269a9d0b6b7a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:32:53 2008 +0200 ole32: Use the right FAILED/SUCCEEDED macro instead of negating the opposite. --- dlls/ole32/clipboard.c | 2 +- dlls/ole32/filemoniker.c | 16 ++++++++-------- dlls/ole32/storage32.c | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 909b215..0e9d55c 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -956,7 +956,7 @@ static HRESULT OLEClipbrd_RenderFormat(IDataObject *pIDataObject, LPFORMATETC pF /* Get the metafile picture out of it */ - if (!FAILED(hr = IDataObject_GetData(theOleClipboard->pIDataObjectSrc, &fmt2, &std2))) + if (SUCCEEDED(hr = IDataObject_GetData(theOleClipboard->pIDataObjectSrc, &fmt2, &std2))) { mfp = (METAFILEPICT *)GlobalLock(std2.u.hGlobal); } diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 74c867a..3dae139 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -358,12 +358,12 @@ FileMonikerImpl_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty) /* write a 0 WORD */ res=IStream_Write(pStm,&ZERO,sizeof(WORD),NULL); - if (!SUCCEEDED(res)) return res; + if (FAILED(res)) return res; /* write length of filePath string ( 0 included )*/ bytesA = WideCharToMultiByte( CP_ACP, 0, filePathW, -1, NULL, 0, NULL, NULL ); res=IStream_Write(pStm,&bytesA,sizeof(DWORD),NULL); - if (!SUCCEEDED(res)) return res; + if (FAILED(res)) return res; /* write A string (with '\0') */ filePathA=HeapAlloc(GetProcessHeap(),0,bytesA); @@ -372,17 +372,17 @@ FileMonikerImpl_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty) WideCharToMultiByte( CP_ACP, 0, filePathW, -1, filePathA, bytesA, NULL, &bUsedDefault); res=IStream_Write(pStm,filePathA,bytesA,NULL); HeapFree(GetProcessHeap(),0,filePathA); - if (!SUCCEEDED(res)) return res; + if (FAILED(res)) return res; /* write a DWORD 0xDEADFFFF */ res=IStream_Write(pStm,&DEADFFFF,sizeof(DWORD),NULL); - if (!SUCCEEDED(res)) return res; + if (FAILED(res)) return res; /* write 5 zero DWORDs */ for(i=0;i<5;i++) { res=IStream_Write(pStm,&ZERO,sizeof(DWORD),NULL); - if (!SUCCEEDED(res)) return res; + if (FAILED(res)) return res; } /* Write the wide version if: @@ -414,16 +414,16 @@ FileMonikerImpl_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty) /* write bytes needed for the filepathW (without 0) + 6 */ bytesW = len*sizeof(WCHAR) + 6; res=IStream_Write(pStm,&bytesW,sizeof(DWORD),NULL); - if (!SUCCEEDED(res)) return res; + if (FAILED(res)) return res; /* try again, without the extra 6 */ bytesW -= 6; res=IStream_Write(pStm,&bytesW,sizeof(DWORD),NULL); - if (!SUCCEEDED(res)) return res; + if (FAILED(res)) return res; /* write a WORD 3 */ res=IStream_Write(pStm,&THREE,sizeof(WORD),NULL); - if (!SUCCEEDED(res)) return res; + if (FAILED(res)) return res; /* write W string (no 0) */ res=IStream_Write(pStm,filePathW,bytesW,NULL); diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 705585b..180619a 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1906,7 +1906,7 @@ static HRESULT WINAPI StorageImpl_Stat( IStorage* iface, StorageImpl* const This = (StorageImpl*)iface; HRESULT result = StorageBaseImpl_Stat( iface, pstatstg, grfStatFlag ); - if ( !FAILED(result) && ((grfStatFlag & STATFLAG_NONAME) == 0) && This->pwcsName ) + if ( SUCCEEDED(result) && ((grfStatFlag & STATFLAG_NONAME) == 0) && This->pwcsName ) { CoTaskMemFree(pstatstg->pwcsName); pstatstg->pwcsName = CoTaskMemAlloc((lstrlenW(This->pwcsName)+1)*sizeof(WCHAR)); @@ -6335,13 +6335,13 @@ HRESULT WINAPI OleLoadFromStream(IStream *pStm,REFIID iidInterface,void** ppvOb TRACE("(%p,%s,%p)\n",pStm,debugstr_guid(iidInterface),ppvObj); res=ReadClassStm(pStm,&clsid); - if (!SUCCEEDED(res)) + if (FAILED(res)) return res; res=CoCreateInstance(&clsid,NULL,CLSCTX_INPROC_SERVER,iidInterface,ppvObj); - if (!SUCCEEDED(res)) + if (FAILED(res)) return res; res=IUnknown_QueryInterface((IUnknown*)*ppvObj,&IID_IPersistStream,(LPVOID*)&xstm); - if (!SUCCEEDED(res)) { + if (FAILED(res)) { IUnknown_Release((IUnknown*)*ppvObj); return res; }

1 0

Michael Stefaniuc : shell32: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: f6baf9762978c737af1cf5a4781dbfbfdd61b3fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6baf9762978c737af1cf5a47… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:32:38 2008 +0200 shell32: Use FAILED instead of !SUCCEEDED. --- dlls/shell32/autocomplete.c | 4 ++-- dlls/shell32/brsfolder.c | 12 ++++++------ dlls/shell32/cpanelfolder.c | 2 +- dlls/shell32/dragdrophelper.c | 2 +- dlls/shell32/pidl.c | 6 +++--- dlls/shell32/shellole.c | 2 +- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shfldr_mycomp.c | 2 +- dlls/shell32/shfldr_netplaces.c | 2 +- dlls/shell32/shfldr_unixfs.c | 8 ++++---- dlls/shell32/shlview.c | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index f64dbec..c20dec3 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -140,7 +140,7 @@ HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVO lpac->txtbackup = NULL; lpac->quickComplete = NULL; - if (!SUCCEEDED (IUnknown_QueryInterface (_IUnknown_ (lpac), riid, ppv))) { + if (FAILED (IUnknown_QueryInterface (_IUnknown_ (lpac), riid, ppv))) { IUnknown_Release (_IUnknown_ (lpac)); return E_NOINTERFACE; } @@ -262,7 +262,7 @@ static HRESULT WINAPI IAutoComplete2_fnInit( This->hwndEdit = hwndEdit; - if (!SUCCEEDED (IUnknown_QueryInterface (punkACL, &IID_IEnumString, (LPVOID*)&This->enumstr))) { + if (FAILED (IUnknown_QueryInterface (punkACL, &IID_IEnumString, (LPVOID*)&This->enumstr))) { TRACE("No IEnumString interface\n"); return E_NOINTERFACE; } diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 91e8cc3..da72e06 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -225,15 +225,15 @@ static void InitializeTreeView( browse_info *info ) } else { IShellFolder *lpsfDesktop; hr = SHGetDesktopFolder(&lpsfDesktop); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { WARN("SHGetDesktopFolder failed! hr = %08x\n", hr); return; } hr = IShellFolder_BindToObject(lpsfDesktop, pidlParent, 0, &IID_IShellFolder, (LPVOID*)&lpsfParent); IShellFolder_Release(lpsfDesktop); } - - if (!SUCCEEDED(hr)) { + + if (FAILED(hr)) { WARN("Could not bind to parent shell folder! hr = %08x\n", hr); return; } @@ -244,8 +244,8 @@ static void InitializeTreeView( browse_info *info ) lpsfRoot = lpsfParent; hr = IShellFolder_AddRef(lpsfParent); } - - if (!SUCCEEDED(hr)) { + + if (FAILED(hr)) { WARN("Could not bind to root shell folder! hr = %08x\n", hr); IShellFolder_Release(lpsfParent); return; @@ -253,7 +253,7 @@ static void InitializeTreeView( browse_info *info ) flags = BrowseFlagsToSHCONTF( info->lpBrowseInfo->ulFlags ); hr = IShellFolder_EnumObjects( lpsfRoot, info->hWnd, flags, &pEnumChildren ); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { WARN("Could not get child iterator! hr = %08x\n", hr); IShellFolder_Release(lpsfParent); IShellFolder_Release(lpsfRoot); diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 10d2c9d..aec19f1 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -143,7 +143,7 @@ HRESULT WINAPI IControlPanel_Constructor(IUnknown* pUnkOuter, REFIID riid, LPVOI sf->pidlRoot = _ILCreateControlPanel(); /* my qualified pidl */ sf->pUnkOuter = pUnkOuter ? pUnkOuter : _IUnknown_ (sf); - if (!SUCCEEDED(IUnknown_QueryInterface(_IUnknown_(sf), riid, ppv))) { + if (FAILED(IUnknown_QueryInterface(_IUnknown_(sf), riid, ppv))) { IUnknown_Release(_IUnknown_(sf)); return E_NOINTERFACE; } diff --git a/dlls/shell32/dragdrophelper.c b/dlls/shell32/dragdrophelper.c index 9c3f236..d101457 100644 --- a/dlls/shell32/dragdrophelper.c +++ b/dlls/shell32/dragdrophelper.c @@ -77,7 +77,7 @@ HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, dth->ref = 0; dth->lpVtbl = &vt_IDropTargetHelper; - if (!SUCCEEDED (IUnknown_QueryInterface (_IUnknown_ (dth), riid, ppv))) { + if (FAILED (IUnknown_QueryInterface (_IUnknown_ (dth), riid, ppv))) { IUnknown_Release (_IUnknown_ (dth)); return E_NOINTERFACE; } diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 9a9218e..564b103 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1016,7 +1016,7 @@ static HRESULT WINAPI _ILParsePathW(LPCWSTR path, LPWIN32_FIND_DATAW lpFindFile, IShellFolder_Release(pSF); - if (!SUCCEEDED(ret) && ppidl) + if (FAILED(ret) && ppidl) *ppidl = NULL; TRACE("%s %p 0x%x\n", debugstr_w(path), ppidl ? *ppidl : NULL, prgfInOut ? *prgfInOut : 0); @@ -1461,7 +1461,7 @@ LPITEMIDLIST _ILCreateGuidFromStrA(LPCSTR szGUID) { IID iid; - if (!SUCCEEDED(SHCLSIDFromStringA(szGUID, &iid))) + if (FAILED(SHCLSIDFromStringA(szGUID, &iid))) { ERR("%s is not a GUID\n", szGUID); return NULL; @@ -1473,7 +1473,7 @@ LPITEMIDLIST _ILCreateGuidFromStrW(LPCWSTR szGUID) { IID iid; - if (!SUCCEEDED(SHCLSIDFromStringW(szGUID, &iid))) + if (FAILED(SHCLSIDFromStringW(szGUID, &iid))) { ERR("%s is not a GUID\n", debugstr_w(szGUID)); return NULL; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index bec9996..a4f191a 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -181,7 +181,7 @@ HRESULT WINAPI SHCoCreateInstance( FreeLibrary( hLibrary ); hres = E_ACCESSDENIED; goto end; - } else if (! SUCCEEDED(hres = DllGetClassObject(myclsid, &IID_IClassFactory, (LPVOID*)&pcf))) { + } else if (FAILED(hres = DllGetClassObject(myclsid, &IID_IClassFactory, (LPVOID*)&pcf))) { TRACE("GetClassObject failed 0x%08x\n", hres); goto end; } diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index df68feb..cc30b1f 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -248,7 +248,7 @@ IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; sf->pUnkOuter = pUnkOuter ? pUnkOuter : _IUnknown_ (sf); - if (!SUCCEEDED (IUnknown_QueryInterface (_IUnknown_ (sf), riid, ppv))) { + if (FAILED (IUnknown_QueryInterface (_IUnknown_ (sf), riid, ppv))) { IUnknown_Release (_IUnknown_ (sf)); return E_NOINTERFACE; } diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 213b5d4..c6ff06e 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -119,7 +119,7 @@ HRESULT WINAPI ISF_MyComputer_Constructor (IUnknown * pUnkOuter, REFIID riid, LP sf->lpVtblPersistFolder2 = &vt_PersistFolder2; sf->pidlRoot = _ILCreateMyComputer (); /* my qualified pidl */ - if (!SUCCEEDED (IUnknown_QueryInterface (_IUnknown_ (sf), riid, ppv))) + if (FAILED (IUnknown_QueryInterface (_IUnknown_ (sf), riid, ppv))) { IUnknown_Release (_IUnknown_ (sf)); return E_NOINTERFACE; diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index fd6b235..d0e9833 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -103,7 +103,7 @@ HRESULT WINAPI ISF_NetworkPlaces_Constructor (IUnknown * pUnkOuter, REFIID riid, sf->lpVtblPersistFolder2 = &vt_NP_PersistFolder2; sf->pidlRoot = _ILCreateNetHood(); /* my qualified pidl */ - if (!SUCCEEDED (IUnknown_QueryInterface (_IUnknown_ (sf), riid, ppv))) + if (FAILED (IUnknown_QueryInterface (_IUnknown_ (sf), riid, ppv))) { IUnknown_Release (_IUnknown_ (sf)); return E_NOINTERFACE; diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 87975f1..6672692 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -949,7 +949,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_BindToObject(IShellFolder2* iface } hr = CreateUnixFolder(NULL, &IID_IPersistFolder3, (void**)&persistFolder, clsidChild); - if (!SUCCEEDED(hr)) return hr; + if (FAILED(hr)) return hr; hr = IPersistFolder_QueryInterface(persistFolder, riid, ppvOut); if (SUCCEEDED(hr)) { @@ -1170,8 +1170,8 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_GetDisplayNameOf(IShellFolder2* i SHITEMID emptyIDL = { 0, { 0 } }; hr = IShellFolder_BindToObject(iface, pidl, NULL, &IID_IShellFolder, (void**)&pSubFolder); - if (!SUCCEEDED(hr)) return hr; - + if (FAILED(hr)) return hr; + hr = IShellFolder_GetDisplayNameOf(pSubFolder, (LPITEMIDLIST)&emptyIDL, uFlags, lpName); IShellFolder_Release(pSubFolder); } @@ -2081,7 +2081,7 @@ static HRESULT WINAPI UnixFolder_IDropTarget_Drop(IDropTarget *iface, IDataObjec InitFormatEtc(format, cfShellIDList, TYMED_HGLOBAL); hr = IDataObject_GetData(pDataObject, &format, &medium); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) return hr; if (medium.tymed == TYMED_HGLOBAL) { diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 832d497..c890e0d 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -384,7 +384,7 @@ static BOOL ShellView_InitList(IShellViewImpl * This) { for (i=0; 1; i++) { - if (!SUCCEEDED(IShellFolder2_GetDetailsOf(This->pSF2Parent, NULL, i, &sd))) + if (FAILED(IShellFolder2_GetDetailsOf(This->pSF2Parent, NULL, i, &sd))) break; lvColumn.fmt = sd.fmt; lvColumn.cx = sd.cxChar*8; /* chars->pixel */

1 0

Jacek Caban : mshtml: Added IHTMLStyle::[get|put]_filter implementation.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: master Commit: 7918196ee8a73023f79ef89fc22e4b6ed203fec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7918196ee8a73023f79ef89fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 7 14:45:46 2008 -0500 mshtml: Added IHTMLStyle::[get|put]_filter implementation. --- dlls/mshtml/htmlstyle.c | 17 +++++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 10 ++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index b315f55..48ae2fe 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -50,6 +50,8 @@ static const WCHAR attrCursor[] = {'c','u','r','s','o','r',0}; static const WCHAR attrDisplay[] = {'d','i','s','p','l','a','y',0}; +static const WCHAR attrFilter[] = + {'f','i','l','e','t','e','r',0}; static const WCHAR attrFontFamily[] = {'f','o','n','t','-','f','a','m','i','l','y',0}; static const WCHAR attrFontSize[] = @@ -99,6 +101,7 @@ static const struct{ {attrColor, DISPID_IHTMLSTYLE_COLOR}, {attrCursor, DISPID_IHTMLSTYLE_CURSOR}, {attrDisplay, DISPID_IHTMLSTYLE_DISPLAY}, + {attrFilter, DISPID_IHTMLSTYLE_FILTER}, {attrFontFamily, DISPID_IHTMLSTYLE_FONTFAMILY}, {attrFontSize, DISPID_IHTMLSTYLE_FONTSIZE}, {attrFontStyle, DISPID_IHTMLSTYLE_FONTSTYLE}, @@ -1873,15 +1876,21 @@ static HRESULT WINAPI HTMLStyle_get_clip(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_filter(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + WARN("(%p)->(%s)\n", This, debugstr_w(v)); + + /* FIXME: Handle MS-style filters */ + return set_style_attr(This, STYLEID_FILTER, v, 0); } static HRESULT WINAPI HTMLStyle_get_filter(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + WARN("(%p)->(%p)\n", This, p); + + /* FIXME: Handle MS-style filters */ + return get_style_attr(This, STYLEID_FILTER, p); } static HRESULT WINAPI HTMLStyle_setAttribute(IHTMLStyle *iface, BSTR strAttributeName, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 0ed7d6d..5c1dfe3 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -39,6 +39,7 @@ typedef enum { STYLEID_COLOR, STYLEID_CURSOR, STYLEID_DISPLAY, + STYLEID_FILTER, STYLEID_FONT_FAMILY, STYLEID_FONT_SIZE, STYLEID_FONT_STYLE, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c23a6fb..82dd655 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2266,6 +2266,16 @@ static void test_default_style(IHTMLStyle *style) ok(!strcmp_wa(str, "center"), "textAlign = %s\n", dbgstr_w(V_BSTR(&v))); SysFreeString(str); + str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_filter(style, &str); + ok(hres == S_OK, "get_filter failed: %08x\n", hres); + ok(!str, "filter != NULL\n"); + + str = a2bstr("alpha(opacity=100)"); + hres = IHTMLStyle_put_filter(style, str); + ok(hres == S_OK, "put_filter failed: %08x\n", hres); + SysFreeString(str); + V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_zIndex(style, &v); ok(hres == S_OK, "get_zIndex failed: %08x\n", hres);

1 0