November 2006 - Wine-Commits

Charles Blacklock : oleaut32: Add VarBstrCmp binary comparison for LCID==0.
by Alexandre Julliard Nov. 30, 2006

Nov. 30, 2006

Module: wine Branch: master Commit: 2b2ee9c7d1c8d1d1e79b06e8761b9e0a6e1e65bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2ee9c7d1c8d1d1e79b06e87… Author: Charles Blacklock <charles(a)diagnos.co.uk> Date: Thu Nov 30 15:55:14 2006 +0000 oleaut32: Add VarBstrCmp binary comparison for LCID==0. --- dlls/oleaut32/tests/vartype.c | 12 ++++++++++++ dlls/oleaut32/vartype.c | 26 ++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 666516f..57de5ce 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4911,6 +4911,8 @@ static void test_VarBstrCmp(void) static const WCHAR sz2[] = { 'A',0 }; static const WCHAR s1[] = { 'a',0 }; static const WCHAR s2[] = { 'a',0,'b' }; + static const char sb1[] = {1,0,1}; + static const char sb2[] = {1,0,2}; BSTR bstr, bstrempty, bstr2; CHECKPTR(VarBstrCmp); @@ -4948,6 +4950,16 @@ static void test_VarBstrCmp(void) SysFreeString(bstr2); SysFreeString(bstr); + + /* When (LCID == 0) it should be a binary comparison + * so these two strings could not match. + */ + bstr = SysAllocStringByteLen(sb1, sizeof(sb1)); + bstr2 = SysAllocStringByteLen(sb2, sizeof(sb2)); + lcid = 0; + VARBSTRCMP(bstr,bstr2,0,VARCMP_LT); + SysFreeString(bstr2); + SysFreeString(bstr); } /* Get the internal representation of a BSTR */ diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 57239a4..353a845 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6630,10 +6630,12 @@ HRESULT WINAPI VarBstrCat(BSTR pbstrLeft * NOTES * VARCMP_NULL is NOT returned if either string is NULL unlike MSDN * states. A NULL BSTR pointer is equivalent to an empty string. + * If LCID is equal to 0, a byte by byte comparison is performed. */ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFlags) { HRESULT hres; + int ret; TRACE("%s,%s,%d,%08x\n", debugstr_wn(pbstrLeft, SysStringLen(pbstrLeft)), @@ -6648,10 +6650,26 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft else if (!pbstrRight || !*pbstrRight) return VARCMP_GT; - hres = CompareStringW(lcid, dwFlags, pbstrLeft, SysStringLen(pbstrLeft), - pbstrRight, SysStringLen(pbstrRight)) - 1; - TRACE("%d\n", hres); - return hres; + if (lcid == 0) + { + ret = memcmp(pbstrLeft, pbstrRight, min(SysStringByteLen(pbstrLeft), SysStringByteLen(pbstrRight))); + if (ret < 0) + return VARCMP_LT; + if (ret > 0) + return VARCMP_GT; + if (SysStringByteLen(pbstrLeft) < SysStringByteLen(pbstrRight)) + return VARCMP_LT; + if (SysStringByteLen(pbstrLeft) > SysStringByteLen(pbstrRight)) + return VARCMP_GT; + return VARCMP_EQ; + } + else + { + hres = CompareStringW(lcid, dwFlags, pbstrLeft, SysStringLen(pbstrLeft), + pbstrRight, SysStringLen(pbstrRight)) - 1; + TRACE("%d\n", hres); + return hres; + } } /*

1 0

Paul Vriens : winetest: Make sure we can send larger files.
by Alexandre Julliard Nov. 30, 2006

Nov. 30, 2006

Module: wine Branch: master Commit: 70ce548566c864201c6327804a0a59d97844802e URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ce548566c864201c6327804… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Nov 30 19:01:02 2006 +0100 winetest: Make sure we can send larger files. --- programs/winetest/send.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winetest/send.c b/programs/winetest/send.c index ec54e15..4707d45 100644 --- a/programs/winetest/send.c +++ b/programs/winetest/send.c @@ -137,11 +137,11 @@ send_file (const char *name) } fseek (f, 0, SEEK_END); filesize = ftell (f); - if (filesize > 1024*1024) { + if (filesize > 1.5*1024*1024) { report (R_WARNING, - "File too big (%.1f MB > 1 MB); submitting partial report.", + "File too big (%.1f MB > 1.5 MB); submitting partial report.", filesize/1024.0/1024); - filesize = 1024*1024; + filesize = 1.5*1024*1024; } fseek (f, 0, SEEK_SET);

1 0

Dmitry Timoshkov : winedump: Restore the COFF library dumper functionality broken by the previous change .
by Alexandre Julliard Nov. 30, 2006

Nov. 30, 2006

Module: wine Branch: master Commit: 671a2261c090de57a3b52b6de636a961caa85b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=671a2261c090de57a3b52b6de… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Dec 1 00:11:01 2006 +0800 winedump: Restore the COFF library dumper functionality broken by the previous change. --- tools/winedump/dump.c | 2 ++ tools/winedump/lib.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 90ab149..6cd9c9e 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -187,6 +187,8 @@ int dump_analysis(const char *name, file if ((unsigned long)read( fd, dump_base, dump_total_len ) != dump_total_len) fatal( "Cannot read file" ); } + printf("Contents of %s: %ld bytes\n\n", name, dump_total_len); + for (dpr = dumpers; dpr->kind != SIG_UNKNOWN; dpr++) { if (dpr->get_kind() == dpr->kind && diff --git a/tools/winedump/lib.c b/tools/winedump/lib.c index bd03eb7..858c37b 100644 --- a/tools/winedump/lib.c +++ b/tools/winedump/lib.c @@ -125,7 +125,7 @@ void lib_dump(void) /* FIXME: only import library contents with the short format are * recognized. */ - if (!(ioh = PRD(cur_file_pos + sizeof(*iamh), sizeof(*ioh)))) break; + if (!(ioh = PRD(cur_file_pos, sizeof(*ioh)))) break; if (ioh->Sig1 == IMAGE_FILE_MACHINE_UNKNOWN && ioh->Sig2 == IMPORT_OBJECT_HDR_SIG2) { dump_import_object(ioh);

1 0

Lei Zhang : msxml3: Fix compiles for systems with libxml2 version 2.6. 14 and below.
by Alexandre Julliard Nov. 30, 2006

Nov. 30, 2006

Module: wine Branch: master Commit: 6a530aba76d4a47f8f5808a85ceed7c16d1b30cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a530aba76d4a47f8f5808a85… Author: Lei Zhang <thestig(a)google.com> Date: Wed Nov 29 15:59:03 2006 -0800 msxml3: Fix compiles for systems with libxml2 version 2.6.14 and below. --- configure | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 + dlls/msxml3/domdoc.c | 5 +++ include/config.h.in | 3 ++ 4 files changed, 95 insertions(+), 0 deletions(-) diff --git a/configure b/configure index fa9389b..7f1e588 100755 --- a/configure +++ b/configure @@ -10389,6 +10389,91 @@ _ACEOF fi + { echo "$as_me:$LINENO: checking for xmlNewDocPI in -lxml2" >&5 +echo $ECHO_N "checking for xmlNewDocPI in -lxml2... $ECHO_C" >&6; } +if test "${ac_cv_lib_xml2_xmlNewDocPI+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lxml2 $ac_xml_libs $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char xmlNewDocPI (); +int +main () +{ +return xmlNewDocPI (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_xml2_xmlNewDocPI=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_xml2_xmlNewDocPI=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlNewDocPI" >&5 +echo "${ECHO_T}$ac_cv_lib_xml2_xmlNewDocPI" >&6; } +if test $ac_cv_lib_xml2_xmlNewDocPI = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_XMLNEWDOCPI 1 +_ACEOF + +fi + fi diff --git a/configure.ac b/configure.ac index ab3556b..097c72d 100644 --- a/configure.ac +++ b/configure.ac @@ -486,6 +486,8 @@ then XML2INCL="$ac_xml_cflags"],,$ac_xml_libs) AC_CHECK_LIB(xml2, xmlReadMemory, [AC_DEFINE(HAVE_XMLREADMEMORY,1,[Define if libxml2 has the xmlReadMemory function])],,$ac_xml_libs) + AC_CHECK_LIB(xml2, xmlNewDocPI, + [AC_DEFINE(HAVE_XMLNEWDOCPI,1,[Define if libxml2 has the xmlNewDocPI function])],,$ac_xml_libs) ]) CPPFLAGS="$ac_save_CPPFLAGS" ac_xslt_libs="`$PKG_CONFIG --libs libxslt 2>/dev/null`" diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 459e234..c2fa232 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -761,6 +761,7 @@ static HRESULT WINAPI domdoc_createProce BSTR data, IXMLDOMProcessingInstruction** pi ) { +#ifdef HAVE_XMLNEWDOCPI xmlNodePtr xmlnode; domdoc *This = impl_from_IXMLDOMDocument( iface ); xmlChar *xml_target, *xml_content; @@ -778,6 +779,10 @@ static HRESULT WINAPI domdoc_createProce HeapFree(GetProcessHeap(), 0, xml_target); return S_OK; +#else + FIXME("Libxml 2.6.15 or greater required."); + return E_NOTIMPL; +#endif } diff --git a/include/config.h.in b/include/config.h.in index 69a0af9..24052dc 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -936,6 +936,9 @@ /* Define if you have the XKB extension */ #undef HAVE_XKB +/* Define if libxml2 has the xmlNewDocPI function */ +#undef HAVE_XMLNEWDOCPI + /* Define if libxml2 has the xmlReadMemory function */ #undef HAVE_XMLREADMEMORY

1 0

Detlef Riekenberg : winspool: Load the local monitor only once.
by Alexandre Julliard Nov. 30, 2006

Nov. 30, 2006

Module: wine Branch: master Commit: a7481a93c0def439ac8dd076750c03d3f0de4b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7481a93c0def439ac8dd0767… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 28 20:04:08 2006 +0100 winspool: Load the local monitor only once. --- dlls/winspool.drv/info.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index bf7015c..9234509 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -138,6 +138,7 @@ typedef struct { /* ############################### */ static struct list monitor_handles = LIST_INIT( monitor_handles ); +static monitor_t * pm_localport; static opened_printer_t **printer_handles; static int nb_printer_handles; @@ -1097,6 +1098,10 @@ static monitor_t * monitor_load(LPCWSTR } } cleanup: + if ((pm_localport == NULL) && (pm != NULL) && (lstrcmpW(pm->name, LocalPortW) == 0)) { + pm->refcount++; + pm_localport = pm; + } LeaveCriticalSection(&monitor_handles_cs); if (driver != dllname) HeapFree(GetProcessHeap(), 0, driver); HeapFree(GetProcessHeap(), 0, regroot);

1 0

Vitaliy Margolen : winemenubuilder: Look for supported color depths icons only.
by Alexandre Julliard Nov. 30, 2006

Nov. 30, 2006

Module: wine Branch: master Commit: 47a2e96accb7f6decc0b3648201ff3ae46cc3734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a2e96accb7f6decc0b36482… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Nov 29 17:54:06 2006 -0700 winemenubuilder: Look for supported color depths icons only. --- programs/winemenubuilder/winemenubuilder.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 8d56c85..078365c 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -363,7 +363,7 @@ static int ExtractFromICO(LPCWSTR szFile FILE *fICOFile; ICONDIR iconDir; ICONDIRENTRY *pIconDirEntry; - int nMax = 0; + int nMax = 0, nMaxBits = 0; int nIndex = 0; void *pIcon; int i; @@ -389,10 +389,12 @@ static int ExtractFromICO(LPCWSTR szFile goto error3; for (i = 0; i < iconDir.idCount; i++) - if ((pIconDirEntry[i].bHeight * pIconDirEntry[i].bWidth) > nMax) + if (pIconDirEntry[i].wBitCount <= 8 && pIconDirEntry[i].wBitCount >= nMaxBits && + (pIconDirEntry[i].bHeight * pIconDirEntry[i].bWidth) >= nMax) { nIndex = i; nMax = pIconDirEntry[i].bHeight * pIconDirEntry[i].bWidth; + nMaxBits = pIconDirEntry[i].wBitCount; } if ((pIcon = HeapAlloc(GetProcessHeap(), 0, pIconDirEntry[nIndex].dwBytesInRes)) == NULL) goto error3;

1 0

Markus Amsler : Revert "d3d: Remove AddRef from IWineD3DDevice_GetDirect3D. ".
by Alexandre Julliard Nov. 30, 2006

Nov. 30, 2006

Module: wine Branch: master Commit: bd072332e1d11f07b2116c30ddc87ab5a239ffd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd072332e1d11f07b2116c30d… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Thu Nov 30 13:34:01 2006 +0100 Revert "d3d: Remove AddRef from IWineD3DDevice_GetDirect3D.". This reverts commit 167b83c28af73803462e92ee4dcb1a95f194a74d. --- dlls/d3d8/device.c | 1 + dlls/d3d9/device.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e128930..68b0dff 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -139,6 +139,7 @@ static HRESULT WINAPI IDirect3DDevice8Im if (hr == D3D_OK && pWineD3D != NULL) { IWineD3DResource_GetParent((IWineD3DResource *)pWineD3D,(IUnknown **)ppD3D8); + IWineD3DResource_Release((IWineD3DResource *)pWineD3D); } else { FIXME("Call to IWineD3DDevice_GetDirect3D failed\n"); *ppD3D8 = NULL; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2ebb677..349356b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -101,6 +101,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Ge if (hr == D3D_OK && pWineD3D != NULL) { IWineD3DResource_GetParent((IWineD3DResource *)pWineD3D,(IUnknown **)ppD3D9); + IWineD3DResource_Release((IWineD3DResource *)pWineD3D); } else { FIXME("Call to IWineD3DDevice_GetDirect3D failed\n"); *ppD3D9 = NULL;

1 0

Markus Amsler : Revert "d3d: Remove AddRef from IWineD3DDevice_GetBackBuffer.".
by Alexandre Julliard Nov. 30, 2006

Nov. 30, 2006

Module: wine Branch: master Commit: f8e7ddd7980fdf949cceab3e936a284ccf1be3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e7ddd7980fdf949cceab3e9… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Thu Nov 30 13:33:52 2006 +0100 Revert "d3d: Remove AddRef from IWineD3DDevice_GetBackBuffer.". This reverts commit 478a414e5820c56fb7bb65d0c41c831932ca26e8. --- dlls/d3d8/device.c | 1 + dlls/d3d8/swapchain.c | 1 + dlls/d3d9/device.c | 1 + dlls/d3d9/swapchain.c | 1 + dlls/ddraw/ddraw.c | 3 +++ dlls/wined3d/swapchain.c | 2 ++ 6 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 429b918..e128930 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -295,6 +295,7 @@ static HRESULT WINAPI IDirect3DDevice8Im rc = IWineD3DDevice_GetBackBuffer(This->WineD3DDevice, 0, BackBuffer, (WINED3DBACKBUFFER_TYPE) Type, (IWineD3DSurface **)&retSurface); if (rc == D3D_OK && NULL != retSurface && NULL != ppBackBuffer) { IWineD3DSurface_GetParent(retSurface, (IUnknown **)ppBackBuffer); + IWineD3DSurface_Release(retSurface); } return rc; } diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 9012b35..f5b75d8 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -80,6 +80,7 @@ static HRESULT WINAPI IDirect3DSwapChain hrc = IWineD3DSwapChain_GetBackBuffer(This->wineD3DSwapChain, iBackBuffer, (WINED3DBACKBUFFER_TYPE )Type, &mySurface); if (hrc == D3D_OK && NULL != mySurface) { IWineD3DSurface_GetParent(mySurface, (IUnknown **)ppBackBuffer); + IWineD3DSurface_Release(mySurface); } return hrc; } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8ed7b8d..2ebb677 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -205,6 +205,7 @@ static HRESULT WINAPI IDirect3DDevice9 rc = IWineD3DDevice_GetBackBuffer(This->WineD3DDevice, iSwapChain, BackBuffer, (WINED3DBACKBUFFER_TYPE) Type, (IWineD3DSurface **)&retSurface); if (rc == D3D_OK && NULL != retSurface && NULL != ppBackBuffer) { IWineD3DSurface_GetParent(retSurface, (IUnknown **)ppBackBuffer); + IWineD3DSurface_Release(retSurface); } return rc; } diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index a4007ad..0b06049 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -88,6 +88,7 @@ static HRESULT WINAPI IDirect3DSwapChain hrc = IWineD3DSwapChain_GetBackBuffer(This->wineD3DSwapChain, iBackBuffer, (WINED3DBACKBUFFER_TYPE) Type, &mySurface); if (hrc == D3D_OK && NULL != mySurface) { IWineD3DSurface_GetParent(mySurface, (IUnknown **)ppBackBuffer); + IWineD3DSurface_Release(mySurface); } /* Do not touch the **ppBackBuffer pointer otherwise! (see device test) */ return hrc; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index de3c704..11de3ef 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1212,6 +1212,9 @@ IDirectDrawImpl_GetGDISurface(IDirectDra return DDERR_NOTFOUND; } + /* GetBackBuffer AddRef()ed the surface, release it */ + IWineD3DSurface_Release(Surf); + IWineD3DSurface_GetParent(Surf, (IUnknown **) &ddsurf); IDirectDrawSurface7_Release(ddsurf); /* For the GetParent */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4e8f97f..b9bf032 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -461,6 +461,8 @@ static HRESULT WINAPI IWineD3DSwapChainI *ppBackBuffer = This->backBuffer[iBackBuffer]; TRACE("(%p) : BackBuf %d Type %d returning %p\n", This, iBackBuffer, Type, *ppBackBuffer); + /* Note inc ref on returned surface */ + if(*ppBackBuffer) IWineD3DSurface_AddRef(*ppBackBuffer); return WINED3D_OK; }

1 0

Markus Amsler : Revert "d3d: Remove AddRef from IWineD3DDevice_GetRenderTarget.".
by Alexandre Julliard Nov. 30, 2006

Nov. 30, 2006

Module: wine Branch: master Commit: b657cd5f58022671229569cc705d3fad728f8b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b657cd5f58022671229569cc7… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Thu Nov 30 13:33:46 2006 +0100 Revert "d3d: Remove AddRef from IWineD3DDevice_GetRenderTarget.". This reverts commit a7518f6f5494558e80ad125d0b42a46b4744d448. --- dlls/d3d8/device.c | 1 + dlls/d3d9/device.c | 1 + dlls/wined3d/device.c | 4 +++- 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0baa5ac..429b918 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -677,6 +677,7 @@ static HRESULT WINAPI IDirect3DDevice8 if (hr == D3D_OK && pRenderTarget != NULL) { IWineD3DResource_GetParent((IWineD3DResource *)pRenderTarget,(IUnknown**)ppRenderTarget); + IWineD3DResource_Release((IWineD3DResource *)pRenderTarget); } else { FIXME("Call to IWineD3DDevice_GetRenderTarget failed\n"); *ppRenderTarget = NULL; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9b31289..8ed7b8d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -403,6 +403,7 @@ static HRESULT WINAPI IDirect3DDevice9 if (hr == D3D_OK && pRenderTarget != NULL) { IWineD3DResource_GetParent((IWineD3DResource *)pRenderTarget,(IUnknown**)ppRenderTarget); + IWineD3DResource_Release((IWineD3DResource *)pRenderTarget); } else { FIXME("Call to IWineD3DDevice_GetRenderTarget failed\n"); *ppRenderTarget = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4ae70a5..f1287bf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6898,7 +6898,9 @@ static HRESULT WINAPI IWineD3DDeviceIm *ppRenderTarget = This->renderTarget; TRACE("(%p) : RenderTarget %d Index returning %p\n", This, RenderTargetIndex, *ppRenderTarget); - + /* Note inc ref on returned surface */ + if(*ppRenderTarget != NULL) + IWineD3DSurface_AddRef(*ppRenderTarget); return WINED3D_OK; }

1 0

Markus Amsler : Revert "d3d: Remove AddRef from IWineD3DDevice_GetTexture." .
by Alexandre Julliard Nov. 30, 2006

Nov. 30, 2006

Module: wine Branch: master Commit: 5bec2f57a1d07b6ca0e47f95dea1c55bd3ddb20b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bec2f57a1d07b6ca0e47f95d… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Thu Nov 30 13:33:29 2006 +0100 Revert "d3d: Remove AddRef from IWineD3DDevice_GetTexture.". This reverts commit 274df6ef88fb16da6c61fc891db74042fec0bfc5. --- dlls/d3d8/device.c | 1 + dlls/d3d9/device.c | 1 + dlls/ddraw/device.c | 1 + dlls/wined3d/device.c | 2 ++ 4 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2da8063..2c9329f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -963,6 +963,7 @@ static HRESULT WINAPI IDirect3DDevice8Im rc = IWineD3DDevice_GetTexture(This->WineD3DDevice, Stage, (IWineD3DBaseTexture **)&retTexture); if (rc == D3D_OK && NULL != retTexture) { IWineD3DBaseTexture_GetParent(retTexture, (IUnknown **)ppTexture); + IWineD3DBaseTexture_Release(retTexture); } else { FIXME("Call to get texture (%d) failed (%p)\n", Stage, retTexture); *ppTexture = NULL; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 62c79c1..34a2e1c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -595,6 +595,7 @@ static HRESULT WINAPI IDirect3DDevice9 rc = IWineD3DDevice_GetTexture(This->WineD3DDevice, Stage, (IWineD3DBaseTexture **)&retTexture); if (rc == D3D_OK && NULL != retTexture) { IWineD3DBaseTexture_GetParent(retTexture, (IUnknown **)ppTexture); + IWineD3DBaseTexture_Release(retTexture); }else{ FIXME("Call to get texture (%d) failed (%p)\n", Stage, retTexture); *ppTexture = NULL; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 11435cf..cfbbba9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2130,6 +2130,7 @@ IDirect3DDeviceImpl_7_GetRenderState(IDi *Value = texImpl->Handle; IDirectDrawSurface7_Release(parent); } + IWineD3DBaseTexture_Release(tex); } return hr; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 616cf4c..26e24c6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5836,6 +5836,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } *ppTexture=This->stateBlock->textures[Stage]; + if (*ppTexture) + IWineD3DBaseTexture_AddRef(*ppTexture); return WINED3D_OK; }

1 0