August 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : winex11: Bytes per line is signed so make it an int instead of a DWORD.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: 1fba2ee22db8437e52deca5fb1d60baab5f6d324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fba2ee22db8437e52deca5fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 29 21:43:51 2009 +0200 winex11: Bytes per line is signed so make it an int instead of a DWORD. --- dlls/winex11.drv/dib.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 09df53f..794029a 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -522,7 +522,7 @@ static inline int X11DRV_DIB_CheckMask(int red_mask, int green_mask, int blue_ma */ static void X11DRV_DIB_SetImageBits_1( int lines, const BYTE *srcbits, DWORD srcwidth, DWORD dstwidth, int left, - int *colors, XImage *bmpImage, DWORD linebytes) + int *colors, XImage *bmpImage, int linebytes) { int h, width; const BYTE* srcbyte; @@ -581,7 +581,7 @@ static void X11DRV_DIB_SetImageBits_1( int lines, const BYTE *srcbits, static void X11DRV_DIB_GetImageBits_1( int lines, BYTE *dstbits, DWORD dstwidth, DWORD srcwidth, RGBQUAD *colors, PALETTEENTRY *srccolors, - XImage *bmpImage, DWORD linebytes ) + XImage *bmpImage, int linebytes ) { DWORD x; int h, width = min(dstwidth, srcwidth); @@ -923,7 +923,7 @@ static void X11DRV_DIB_GetImageBits_1( int lines, BYTE *dstbits, */ static void X11DRV_DIB_SetImageBits_4( int lines, const BYTE *srcbits, DWORD srcwidth, DWORD dstwidth, int left, - int *colors, XImage *bmpImage, DWORD linebytes) + int *colors, XImage *bmpImage, int linebytes) { int h, width; const BYTE* srcbyte; @@ -966,7 +966,7 @@ static void X11DRV_DIB_SetImageBits_4( int lines, const BYTE *srcbits, static void X11DRV_DIB_GetImageBits_4( int lines, BYTE *dstbits, DWORD srcwidth, DWORD dstwidth, RGBQUAD *colors, PALETTEENTRY *srccolors, - XImage *bmpImage, DWORD linebytes ) + XImage *bmpImage, int linebytes ) { DWORD x; int h, width = min(srcwidth, dstwidth); @@ -1442,7 +1442,7 @@ static void X11DRV_DIB_SetImageBits_RLE4( int lines, const BYTE *bits, static void X11DRV_DIB_SetImageBits_8( int lines, const BYTE *srcbits, DWORD srcwidth, DWORD dstwidth, int left, const int *colors, XImage *bmpImage, - DWORD linebytes ) + int linebytes ) { DWORD x; int h, width = min(srcwidth, dstwidth); @@ -1565,7 +1565,7 @@ static void X11DRV_DIB_SetImageBits_8( int lines, const BYTE *srcbits, static void X11DRV_DIB_GetImageBits_8( int lines, BYTE *dstbits, DWORD srcwidth, DWORD dstwidth, RGBQUAD *colors, PALETTEENTRY *srccolors, - XImage *bmpImage, DWORD linebytes ) + XImage *bmpImage, int linebytes ) { DWORD x; int h, width = min(srcwidth, dstwidth); @@ -1938,9 +1938,9 @@ static void X11DRV_DIB_SetImageBits_RLE8( int lines, const BYTE *bits, * SetDIBits for a 16-bit deep DIB. */ static void X11DRV_DIB_SetImageBits_16( int lines, const BYTE *srcbits, - DWORD srcwidth, DWORD dstwidth, int left, - X11DRV_PDEVICE *physDev, DWORD rSrc, DWORD gSrc, DWORD bSrc, - XImage *bmpImage, DWORD linebytes ) + DWORD srcwidth, DWORD dstwidth, int left, + X11DRV_PDEVICE *physDev, DWORD rSrc, DWORD gSrc, DWORD bSrc, + XImage *bmpImage, int linebytes ) { DWORD x; int h, width = min(srcwidth, dstwidth); @@ -2205,14 +2205,12 @@ static void X11DRV_DIB_GetImageBits_16( int lines, BYTE *dstbits, DWORD dstwidth, DWORD srcwidth, PALETTEENTRY *srccolors, DWORD rDst, DWORD gDst, DWORD bDst, - XImage *bmpImage, DWORD dibpitch ) + XImage *bmpImage, int linebytes ) { DWORD x; int h, width = min(srcwidth, dstwidth); const dib_conversions *convs = (bmpImage->byte_order == LSBFirst) ? &dib_normal : &dib_src_byteswap; - DWORD linebytes = dibpitch; - if (lines < 0 ) { lines = -lines; @@ -3182,7 +3180,7 @@ static void X11DRV_DIB_GetImageBits_32( int lines, BYTE *dstbits, DWORD dstwidth, DWORD srcwidth, PALETTEENTRY *srccolors, DWORD rDst, DWORD gDst, DWORD bDst, - XImage *bmpImage, DWORD linebytes ) + XImage *bmpImage, int linebytes ) { DWORD x; int h, width = min(srcwidth, dstwidth);

1 0

Alexandre Julliard : configure: Fix remaining instances of mpg123_init check.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: fcd561b99a019ebe4f4c6395043179b204958d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd561b99a019ebe4f4c63950… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 29 21:11:41 2009 +0200 configure: Fix remaining instances of mpg123_init check. Spotted by Eric Pouech. --- configure | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index fa67fcb..052154b 100755 --- a/configure +++ b/configure @@ -11315,7 +11315,7 @@ if test "x$ac_cv_lib_mpg123_mpg123_feed" = x""yes; then : fi fi -if test "x$ac_cv_lib_mpg123_mpg123_init" != xyes; then : +if test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes; then : case "x$with_mpg123" in x) wine_notices="$wine_notices|libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported." ;; xno) ;; @@ -11323,7 +11323,7 @@ if test "x$ac_cv_lib_mpg123_mpg123_init" != xyes; then : This is an error since --with-mpg123 was requested." "$LINENO" 5 ;; esac fi -test "x$ac_cv_lib_mpg123_mpg123_init" = xyes || enable_winemp3_acm=${enable_winemp3_acm:-no} +test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes || enable_winemp3_acm=${enable_winemp3_acm:-no} if test "$ac_cv_header_kstat_h" = "yes" then diff --git a/configure.ac b/configure.ac index 1925035..1563876 100644 --- a/configure.ac +++ b/configure.ac @@ -1413,9 +1413,9 @@ if test "$ac_cv_header_mpg123_h" = "yes" then AC_CHECK_LIB(mpg123,mpg123_feed,[AC_SUBST(LIBMPG123,"-lmpg123")]) fi -WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_init" != xyes], +WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes], [libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported.]) -test "x$ac_cv_lib_mpg123_mpg123_init" = xyes || enable_winemp3_acm=${enable_winemp3_acm:-no} +test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes || enable_winemp3_acm=${enable_winemp3_acm:-no} dnl **** Check for libkstat **** if test "$ac_cv_header_kstat_h" = "yes"

1 0

Alexandre Julliard : tools: Copy 16-bit font definitions to avoid including 16-bit headers.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: 1f220db93e04eb2700f49168b1500e12b9dba4fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f220db93e04eb2700f49168b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 29 21:06:19 2009 +0200 tools: Copy 16-bit font definitions to avoid including 16-bit headers. --- tools/fnt2bdf.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++- tools/fnt2bdf.h | 56 ------------------------ tools/fnt2fon.c | 90 +++++++++++++++++++++++++++++++++++++- tools/sfnt2fnt.c | 86 ++++++++++++++++++++++++++++++++++++- 4 files changed, 296 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f220db93e04eb2700f49…

1 0

Jacek Caban : msxml3: Added more IDispatchEx tests.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: c4a9d1cfa2087ba3e9139bd20abfaa003835a704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4a9d1cfa2087ba3e9139bd20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 29 15:04:27 2009 +0200 msxml3: Added more IDispatchEx tests. --- dlls/msxml3/tests/domdoc.c | 90 +++++++++++++++++++++++++------------------ 1 files changed, 52 insertions(+), 38 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2d831dd..91e34f5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -323,6 +323,55 @@ static void get_str_for_type(DOMNodeType type, char *buf) } } +#define test_disp(u) _test_disp(__LINE__,u) +static void _test_disp(unsigned line, IUnknown *unk) +{ + DISPID dispid = DISPID_XMLDOM_NODELIST_RESET; + IDispatchEx *dispex; + DWORD dwProps = 0; + BSTR sName; + UINT ticnt; + IUnknown *pUnk; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IDispatchEx, (void**)&dispex); + ok_(__FILE__,line) (hres == S_OK, "Could not get IDispatch: %08x\n", hres); + if(FAILED(hres)) + return; + + ticnt = 0xdeadbeef; + hres = IDispatchEx_GetTypeInfoCount(dispex, &ticnt); + ok_(__FILE__,line) (hres == S_OK, "GetTypeInfoCount failed: %08x\n", hres); + ok_(__FILE__,line) (ticnt == 1, "ticnt=%u\n", ticnt); + + sName = SysAllocString( szstar ); + hres = IDispatchEx_DeleteMemberByName(dispex, sName, fdexNameCaseSensitive); + ok(hres == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", hres); + SysFreeString( sName ); + + hres = IDispatchEx_DeleteMemberByDispID(dispex, dispid); + ok(hres == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", hres); + + hres = IDispatchEx_GetMemberProperties(dispex, dispid, grfdexPropCanAll, &dwProps); + ok(hres == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", hres); + ok(dwProps == 0, "expected 0 got %d\n", dwProps); + + hres = IDispatchEx_GetMemberName(dispex, dispid, &sName); + ok(hres == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", hres); + if(SUCCEEDED(hres)) + SysFreeString(sName); + + hres = IDispatchEx_GetNextDispID(dispex, fdexEnumDefault, DISPID_XMLDOM_NODELIST_RESET, &dispid); + ok(hres == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", hres); + + hres = IDispatchEx_GetNameSpaceParent(dispex, &pUnk); + ok(hres == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", hres); + if(hres == S_OK && pUnk) + IUnknown_Release(pUnk); + + IDispatchEx_Release(dispex); +} + static int get_node_position(IXMLDOMNode *node) { HRESULT r; @@ -457,6 +506,8 @@ static void test_domdoc( void ) if( r != S_OK ) return; + test_disp((IUnknown*)doc); + /* try some stupid things */ r = IXMLDOMDocument_loadXML( doc, NULL, NULL ); ok( r == S_FALSE, "loadXML failed\n"); @@ -1660,7 +1711,6 @@ static void test_getElementsByTagName(void) VARIANT_BOOL b; IXMLDOMDocument *doc; IXMLDOMNodeList *node_list; - IDispatchEx *dispex; LONG len; r = CoCreateInstance( &CLSID_DOMDocument, NULL, @@ -1681,43 +1731,7 @@ static void test_getElementsByTagName(void) ok( r == S_OK, "ret %08x\n", r ); ok( len == 6, "len %d\n", len ); - r = IXMLDOMNodeList_QueryInterface( node_list, &IID_IDispatchEx, (void**)&dispex ); - ok( r == S_OK, "rets %08x\n", r); - if( r == S_OK ) - { - DISPID dispid = DISPID_XMLDOM_NODELIST_RESET; - DWORD dwProps = 0; - BSTR sName; - IUnknown *pUnk; - - sName = SysAllocString( szstar ); - r = IDispatchEx_DeleteMemberByName(dispex, sName, fdexNameCaseSensitive); - ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); - SysFreeString( sName ); - - r = IDispatchEx_DeleteMemberByDispID(dispex, dispid); - ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); - - r = IDispatchEx_GetMemberProperties(dispex, dispid, grfdexPropCanAll, &dwProps); - ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); - ok(dwProps == 0, "expected 0 got %d\n", dwProps); - - r = IDispatchEx_GetMemberName(dispex, dispid, &sName); - ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); - if( SUCCEEDED(r) ) - SysFreeString(sName); - - r = IDispatchEx_GetNextDispID(dispex, fdexEnumDefault, DISPID_XMLDOM_NODELIST_RESET, &dispid); - ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); - - r = IDispatchEx_GetNameSpaceParent(dispex, &pUnk); - ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); - if(r == S_OK) - IUnknown_Release(pUnk); - - IDispatchEx_Release( dispex ); - } - + test_disp((IUnknown*)node_list); IXMLDOMNodeList_Release( node_list ); SysFreeString( str );

1 0

Jacek Caban : msxml3: Use IXMLDOMSelection as a main queryresult interface.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: cdc8e02f5bb7af6b5c1958b2954e6e458ef0705b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc8e02f5bb7af6b5c1958b29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 29 15:02:19 2009 +0200 msxml3: Use IXMLDOMSelection as a main queryresult interface. --- dlls/msxml3/dispex.c | 1 + dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/queryresult.c | 2 +- 3 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 59d8878..529f9a4 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -91,6 +91,7 @@ static REFIID tid_ids[] = { &IID_IXMLDOMParseError, &IID_IXMLDOMProcessingInstruction, &IID_IXMLDOMSchemaCollection, + &IID_IXMLDOMSelection, &IID_IXMLDOMText, &IID_IXMLElement, &IID_IXMLDOMDocument, diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index d74d7ae..08a324a 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -85,6 +85,7 @@ typedef enum tid_t { IXMLDOMParseError_tid, IXMLDOMProcessingInstruction_tid, IXMLDOMSchemaCollection_tid, + IXMLDOMSelection_tid, IXMLDOMText_tid, IXMLElement_tid, IXMLDocument_tid, diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c index 1cdd9f6..50e8b79 100644 --- a/dlls/msxml3/queryresult.c +++ b/dlls/msxml3/queryresult.c @@ -366,7 +366,7 @@ static const tid_t queryresult_iface_tids[] = { }; static dispex_static_data_t queryresult_dispex = { &queryresult_dispex_vtbl, - IXMLDOMNodeList_tid, + IXMLDOMSelection_tid, NULL, queryresult_iface_tids };

1 0

Jacek Caban : msxml3: Moved IDispatchEx implementation from domdoc to xmlnode.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: 7b30c79cfdf5829a2b2a5fc4d0be0e510a33af25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b30c79cfdf5829a2b2a5fc4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 29 15:01:37 2009 +0200 msxml3: Moved IDispatchEx implementation from domdoc to xmlnode. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/domdoc.c | 9 +-- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/msxml_private.h | 143 ++++++++++++++++++++++--------------------- dlls/msxml3/node.c | 7 ++- dlls/msxml3/pi.c | 2 +- dlls/msxml3/text.c | 2 +- 11 files changed, 87 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b30c79cfdf5829a2b2a5…

1 0

Eric Pouech : shell32: In shell view, use the expected value for the effect in Drag & Drop operation.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: 881bea26a49be53a4273aff36261522a3aee08ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=881bea26a49be53a4273aff36… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Aug 29 14:23:30 2009 +0200 shell32: In shell view, use the expected value for the effect in Drag & Drop operation. --- dlls/shell32/shlview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index fc057ed..47167a7 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1428,8 +1428,8 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn if (pds) { - DWORD dwEffect; - DoDragDrop(pda, pds, dwEffect, &dwEffect); + DWORD dwEffect2; + DoDragDrop(pda, pds, dwEffect, &dwEffect2); } IDataObject_Release(pda); }

1 0

Eric Pouech : kernel32: Handle the case where wineconsole isn' t properly started.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: e0319b82c9e1d476e1fad2d30280ae812fe64198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0319b82c9e1d476e1fad2d30… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Aug 29 14:42:13 2009 +0200 kernel32: Handle the case where wineconsole isn't properly started. --- dlls/kernel32/console.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 34994af..48bcfa4 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1162,10 +1162,17 @@ static BOOL start_console_renderer_helper(const char* appname, STARTUPINFOA* CreateProcessA(NULL, buffer, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, si, &pi)) { + HANDLE wh[2]; + DWORD ret; + + wh[0] = hEvent; + wh[1] = pi.hProcess; + ret = WaitForMultipleObjects(2, wh, FALSE, INFINITE); + CloseHandle(pi.hThread); CloseHandle(pi.hProcess); - if (WaitForSingleObject(hEvent, INFINITE) != WAIT_OBJECT_0) return FALSE; + if (ret != WAIT_OBJECT_0) return FALSE; TRACE("Started wineconsole pid=%08x tid=%08x\n", pi.dwProcessId, pi.dwThreadId);

1 0

Eric Pouech : ole32: Fix various missing Release calls on monikers.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: 09adcee2635cb8094893933e09bd5de116494cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09adcee2635cb8094893933e0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Aug 29 14:23:48 2009 +0200 ole32: Fix various missing Release calls on monikers. --- dlls/ole32/compositemoniker.c | 28 ++++++++++------------------ 1 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 57fb4e6..5535a97 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -552,6 +552,7 @@ CompositeMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) IEnumMoniker *enumMoniker1,*enumMoniker2; IMoniker *tempMk1,*tempMk2; HRESULT res1,res2,res; + BOOL done; TRACE("(%p,%p)\n",iface,pmkOtherMoniker); @@ -567,27 +568,18 @@ CompositeMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) IMoniker_Enum(iface,TRUE,&enumMoniker2); - while(1){ + do { res1=IEnumMoniker_Next(enumMoniker1,1,&tempMk1,NULL); res2=IEnumMoniker_Next(enumMoniker2,1,&tempMk2,NULL); if((res1==S_OK)&&(res2==S_OK)){ - - if(IMoniker_IsEqual(tempMk1,tempMk2)==S_FALSE){ - res= S_FALSE; - break; - } - else - continue; + done = (res = IMoniker_IsEqual(tempMk1,tempMk2)) == S_FALSE; } - else if ( (res1==S_FALSE) && (res2==S_FALSE) ){ - res = S_OK; - break; - } - else{ - res = S_FALSE; - break; + else + { + res = (res1==S_FALSE) && (res2==S_FALSE); + done = TRUE; } if (res1==S_OK) @@ -595,7 +587,7 @@ CompositeMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) if (res2==S_OK) IMoniker_Release(tempMk2); - } + } while (!done); IEnumMoniker_Release(enumMoniker1); IEnumMoniker_Release(enumMoniker2); @@ -989,12 +981,12 @@ static VOID GetAfterCommonPrefix(IMoniker* pGenMk,IMoniker* commonMk,IMoniker** nbRestMk++; IMoniker_Release(tempMk1); - IMoniker_Release(tempMk1); + IMoniker_Release(tempMk2); break; } IMoniker_Release(tempMk1); - IMoniker_Release(tempMk1); + IMoniker_Release(tempMk2); } } else{

1 0

Eric Pouech : Remove a couple of superfluous casts.
by Alexandre Julliard 29 Aug '09

29 Aug '09

Module: wine Branch: master Commit: 35d6217def8c2bf0b65c2ef9fbdf71667f7f8187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d6217def8c2bf0b65c2ef9f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Aug 29 14:23:42 2009 +0200 Remove a couple of superfluous casts. --- dlls/ole32/storage32.c | 8 ++++---- dlls/shell32/brsfolder.c | 2 +- dlls/shell32/shlmenu.c | 2 +- dlls/shell32/shlview.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index ac53510..6e3e1e1 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5918,7 +5918,7 @@ HRESULT WINAPI StgCreateDocfile( */ hr = StorageBaseImpl_QueryInterface( (IStorage*)newStorage, - (REFIID)&IID_IStorage, + &IID_IStorage, (void**)ppstgOpen); end: TRACE("<-- %p r = %08x\n", *ppstgOpen, hr); @@ -6222,7 +6222,7 @@ HRESULT WINAPI StgOpenStorage( */ hr = StorageBaseImpl_QueryInterface( (IStorage*)newStorage, - (REFIID)&IID_IStorage, + &IID_IStorage, (void**)ppstgOpen); end: @@ -6276,7 +6276,7 @@ HRESULT WINAPI StgCreateDocfileOnILockBytes( */ hr = StorageBaseImpl_QueryInterface( (IStorage*)newStorage, - (REFIID)&IID_IStorage, + &IID_IStorage, (void**)ppstgOpen); return hr; @@ -6341,7 +6341,7 @@ HRESULT WINAPI StgOpenStorageOnILockBytes( */ hr = StorageBaseImpl_QueryInterface( (IStorage*)newStorage, - (REFIID)&IID_IStorage, + &IID_IStorage, (void**)ppstgOpen); return hr; diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 925d439..44103ab 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -521,7 +521,7 @@ static LRESULT BrsFolder_Treeview_Expand( browse_info *info, NMTREEVIEWW *pnmtv if (lptvid->lpi && lptvid->lpi->mkid.cb) { r = IShellFolder_BindToObject( lptvid->lpsfParent, lptvid->lpi, 0, - (REFIID)&IID_IShellFolder, (LPVOID *)&lpsf2 ); + &IID_IShellFolder, (LPVOID *)&lpsf2 ); } else { lpsf2 = lptvid->lpsfParent; r = IShellFolder_AddRef(lpsf2); diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index da5e300..efdd6b5 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -172,7 +172,7 @@ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl) if (SUCCEEDED (SHGetDesktopFolder(&lpsf))) { - if (SUCCEEDED(IShellFolder_BindToObject(lpsf, pidl,0,(REFIID)&IID_IShellFolder,(LPVOID *)&lpsf2))) + if (SUCCEEDED(IShellFolder_BindToObject(lpsf, pidl,0,&IID_IShellFolder,(LPVOID *)&lpsf2))) { IEnumIDList *lpe = NULL; diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 318b15b..fc057ed 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -976,7 +976,7 @@ static void ShellView_DoContextMenu(IShellViewImpl * This, WORD x, WORD y, BOOL if( ShellView_GetSelections(This) ) { IShellFolder_GetUIObjectOf( This->pSFParent, This->hWndParent, This->cidl, (LPCITEMIDLIST*)This->apidl, - (REFIID)&IID_IContextMenu, NULL, (LPVOID *)&pContextMenu); + &IID_IContextMenu, NULL, (LPVOID *)&pContextMenu); if(pContextMenu) {

1 0