April 2006 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Add WINED3DBOX to wined3d_types.h.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: cf4b91f074bced8e4c2e5221d8b004c8cc7a3849 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cf4b91f074bced8e4c2e522… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Apr 7 13:12:22 2006 +0200 wined3d: Add WINED3DBOX to wined3d_types.h. --- dlls/d3d8/volume.c | 2 +- dlls/d3d8/volumetexture.c | 4 ++-- dlls/d3d9/volume.c | 2 +- dlls/d3d9/volumetexture.c | 4 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/volume.c | 4 ++-- dlls/wined3d/volumetexture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- include/wine/wined3d_interface.h | 8 ++++---- include/wine/wined3d_types.h | 9 +++++++++ 10 files changed, 26 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=cf4b91f074bced8e4c2…

1 0

Stefan Dösinger : wined3d: Rename return values from D3D* to WINED3D*.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 9d67b4287e599e3ad710f92174cc0eafb8ae61bc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d67b4287e599e3ad710f92… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Apr 7 12:51:12 2006 +0200 wined3d: Rename return values from D3D* to WINED3D*. --- dlls/wined3d/basetexture.c | 18 + dlls/wined3d/cubetexture.c | 20 +- dlls/wined3d/device.c | 490 +++++++++++++++++++------------------- dlls/wined3d/directx.c | 82 +++--- dlls/wined3d/indexbuffer.c | 8 - dlls/wined3d/pixelshader.c | 16 + dlls/wined3d/query.c | 10 - dlls/wined3d/resource.c | 20 +- dlls/wined3d/stateblock.c | 12 - dlls/wined3d/surface.c | 52 ++-- dlls/wined3d/swapchain.c | 28 +- dlls/wined3d/texture.c | 18 + dlls/wined3d/vertexbuffer.c | 10 - dlls/wined3d/vertexdeclaration.c | 32 +- dlls/wined3d/vertexshader.c | 40 ++- dlls/wined3d/volume.c | 20 +- dlls/wined3d/volumetexture.c | 12 - include/wine/wined3d_interface.h | 34 +++ 18 files changed, 478 insertions(+), 444 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=9d67b4287e599e3ad71…

1 0

Robert Shearman : ole32: Fix typo in FileMonikerImpl_BindToObject.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: bff74c1763fd8b2c2257991a392a85f16cd76edb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bff74c1763fd8b2c2257991… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Apr 7 11:20:34 2006 +0100 ole32: Fix typo in FileMonikerImpl_BindToObject. Fix apparent typo in FileMonikerImpl_BindToObject, where ppf was incorrectly passed into IClassFactory_CreateInstance instead of &ppf (found by Coverity). --- dlls/ole32/filemoniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index d449436..0f3f1fe 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -530,7 +530,7 @@ FileMonikerImpl_BindToObject(IMoniker* i } if (pcf!=NULL){ - IClassFactory_CreateInstance(pcf,NULL,&IID_IPersistFile,(void**)ppf); + IClassFactory_CreateInstance(pcf,NULL,&IID_IPersistFile,(void**)&ppf); res=IPersistFile_Load(ppf,This->filePathName,STGM_READ);

1 0

Robert Shearman : ole32: Check for pcbSize parameter of CompositeMonikerImpl_GetSizeMax being NULL, rather than non-NULL.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 3a2e18c99c9cd6ecbe0fb9d012752ba1beac2587 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a2e18c99c9cd6ecbe0fb9d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Apr 7 11:20:09 2006 +0100 ole32: Check for pcbSize parameter of CompositeMonikerImpl_GetSizeMax being NULL, rather than non-NULL. --- dlls/ole32/compositemoniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 99dd27b..4e9d763 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -333,7 +333,7 @@ CompositeMonikerImpl_GetSizeMax(IMoniker TRACE("(%p,%p)\n",iface,pcbSize); - if (pcbSize!=NULL) + if (!pcbSize) return E_POINTER; pcbSize->u.LowPart =0;

1 0

Robert Shearman : ole32: Check for pcbSize in AntiMonikerImpl_GetSizeMax being for NULL, not for non-NULL.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: ff5efc2779a6c82724a2ee254b6cd09fcae8c4d8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ff5efc2779a6c82724a2ee2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Apr 7 11:19:04 2006 +0100 ole32: Check for pcbSize in AntiMonikerImpl_GetSizeMax being for NULL, not for non-NULL. --- dlls/ole32/antimoniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 3c25a75..9b233e1 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -202,7 +202,7 @@ AntiMonikerImpl_GetSizeMax(IMoniker* ifa { TRACE("(%p,%p)\n",iface,pcbSize); - if (pcbSize!=NULL) + if (!pcbSize) return E_POINTER; /* for more details see AntiMonikerImpl_Save coments */

1 0

Robert Shearman : ole32: Fix DefaultHandler_EnumAdvises.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 582e2f1ff84f1069a10f031e53236285d4f6c310 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=582e2f1ff84f1069a10f031… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Apr 7 11:18:05 2006 +0100 ole32: Fix DefaultHandler_EnumAdvises. As per MSDN, if the object has no connections then IOleObject::EnumAdvises should return a NULL enumerator and S_OK. This is the case when This->oleAdviseHolder is NULL, so do this and avert a potential NULL dereference of This->oleAdviseHolder (found by Coverity). --- dlls/ole32/defaulthandler.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index e2eaf58..e3a2e64 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -838,10 +838,9 @@ static HRESULT WINAPI DefaultHandler_Enu *ppenumAdvise = NULL; if (!This->oleAdviseHolder) - return IOleAdviseHolder_EnumAdvise(This->oleAdviseHolder, - ppenumAdvise); + return S_OK; - return S_OK; + return IOleAdviseHolder_EnumAdvise(This->oleAdviseHolder, ppenumAdvise); } /************************************************************************

1 0

Robert Shearman : oleaut32: Fix typo in LPSAFEARRAY_Unmarshal.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: cca69647a3ce7ac471431c22c17570519f213a94 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cca69647a3ce7ac471431c2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Apr 7 11:17:43 2006 +0100 oleaut32: Fix typo in LPSAFEARRAY_Unmarshal. Fix typo in LPSAFEARRAY_Unmarshal where the check for the failure of the SafeArrayCreateEx call was missing a dereference operator (found by Coverity). --- dlls/oleaut32/usrmarshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 242c3b1..961304f 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -852,7 +852,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserU Buffer += sizeof(wiresab[0]) * wiresa->cDims; *ppsa = SafeArrayCreateEx(vt, wiresa->cDims, wiresab, NULL); - if (!ppsa) + if (!*ppsa) RpcRaiseException(E_OUTOFMEMORY); /* be careful about which flags we set since they could be a security

1 0

Robert Shearman : oleaut32: Remove deadcode in SafeArrayPutElement.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: f74dfe31825a9a9d71da5aadd24211048d1ad116 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f74dfe31825a9a9d71da5aa… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Apr 7 11:17:29 2006 +0100 oleaut32: Remove deadcode in SafeArrayPutElement. Remove deadcode in SafeArrayPutElement, as lpBstr cannot be NULL because of the check at the top of the function on pvData (found by Coverity). --- dlls/oleaut32/safearray.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 4ff056a..a8a7063 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -894,14 +894,9 @@ HRESULT WINAPI SafeArrayPutElement(SAFEA if (*lpDest) SysFreeString(*lpDest); - if (lpBstr) - { - *lpDest = SysAllocStringByteLen((char*)lpBstr, SysStringByteLen(lpBstr)); - if (!*lpDest) - hRet = E_OUTOFMEMORY; - } - else - *lpDest = NULL; + *lpDest = SysAllocStringByteLen((char*)lpBstr, SysStringByteLen(lpBstr)); + if (!*lpDest) + hRet = E_OUTOFMEMORY; } else {

1 0

Robert Shearman : server: Free ptr in console_input_append_hist.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 7a3df4d097a2f9f2f2362196cc174b436a7cab0d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a3df4d097a2f9f2f236219… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Apr 7 11:17:12 2006 +0100 server: Free ptr in console_input_append_hist. Free ptr in console_input_append_hist before returning, otherwise it will be leaked (found by Coverity). Remove the setting of last error on mem_alloc failure, as it is already done in mem_alloc. --- server/console.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/server/console.c b/server/console.c index 57a5804..120633d 100644 --- a/server/console.c +++ b/server/console.c @@ -897,13 +897,12 @@ static void console_input_append_hist( s WCHAR* ptr = mem_alloc( (len + 1) * sizeof(WCHAR) ); if (!ptr) - { - set_error( STATUS_NO_MEMORY ); - return; - } + return; + if (!console || !console->history_size) { set_error( STATUS_INVALID_PARAMETER ); /* FIXME */ + free( ptr ); return; }

1 0

Robert Shearman : server: Handle failure of mem_alloc in duplicate_token.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 0bf1c22cad55d9305b654898decaf5098b9e1a31 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0bf1c22cad55d9305b65489… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Apr 7 11:16:50 2006 +0100 server: Handle failure of mem_alloc in duplicate_token. --- server/token.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/server/token.c b/server/token.c index a0df935..aedba6a 100644 --- a/server/token.c +++ b/server/token.c @@ -1031,6 +1031,12 @@ DECL_HANDLER(duplicate_token) { size_t size = FIELD_OFFSET( struct sid_and_attributes, sid.SubAuthority[group->sid.SubAuthorityCount] ); struct sid_and_attributes *newgroup = mem_alloc( size ); + if (!newgroup) + { + release_object( token ); + release_object( src_token ); + return; + } memcpy( newgroup, group, size ); list_add_tail( &token->groups, &newgroup->entry ); }

1 0