Module: wine Branch: master Commit: 5ef8a8b2f29d34118e7c1389d2c3b7ec2f50e57d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef8a8b2f29d34118e7c1389d2...
Author: Michael Stefaniuc mstefani@redhat.de Date: Fri Feb 8 10:27:49 2013 +0100
d3drm: Remove ERR() on HeapAlloc failure for small sizes known at compile time.
---
dlls/d3drm/d3drm.c | 3 --- dlls/d3drm/device.c | 3 --- dlls/d3drm/frame.c | 12 ------------ dlls/d3drm/light.c | 3 --- dlls/d3drm/material.c | 3 --- dlls/d3drm/meshbuilder.c | 6 ------ dlls/d3drm/texture.c | 3 --- dlls/d3drm/viewport.c | 3 --- 8 files changed, 0 insertions(+), 36 deletions(-)
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 48b362d..a18eb11 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1686,10 +1686,7 @@ HRESULT Direct3DRM_create(IUnknown** ppObj)
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - }
object->IDirect3DRM_iface.lpVtbl = &Direct3DRM_Vtbl; object->IDirect3DRM2_iface.lpVtbl = &Direct3DRM2_Vtbl; diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 6d72d92..e6e0d71 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -1161,10 +1161,7 @@ HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj)
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMDeviceImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - }
object->IDirect3DRMDevice2_iface.lpVtbl = &Direct3DRMDevice2_Vtbl; object->IDirect3DRMDevice3_iface.lpVtbl = &Direct3DRMDevice3_Vtbl; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 525a3fa..b0bbaa6 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -203,10 +203,7 @@ static HRESULT Direct3DRMFrameArray_create(IDirect3DRMFrameArray** obj)
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMFrameArrayImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - }
object->IDirect3DRMFrameArray_iface.lpVtbl = &Direct3DRMFrameArray_Vtbl; object->ref = 1; @@ -319,10 +316,7 @@ static HRESULT Direct3DRMVisualArray_create(IDirect3DRMVisualArray** ret_iface)
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMVisualArrayImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - }
object->IDirect3DRMVisualArray_iface.lpVtbl = &Direct3DRMVisualArray_Vtbl; object->ref = 1; @@ -439,10 +433,7 @@ static HRESULT Direct3DRMLightArray_create(IDirect3DRMLightArray** obj)
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMLightArrayImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - }
object->IDirect3DRMLightArray_iface.lpVtbl = &Direct3DRMLightArray_Vtbl; object->ref = 1; @@ -2665,10 +2656,7 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent, IUnknown** ret_ifa
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMFrameImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - }
object->IDirect3DRMFrame2_iface.lpVtbl = &Direct3DRMFrame2_Vtbl; object->IDirect3DRMFrame3_iface.lpVtbl = &Direct3DRMFrame3_Vtbl; diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 558d836..32500bf 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -426,10 +426,7 @@ HRESULT Direct3DRMLight_create(IUnknown** ppObj)
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMLightImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - }
object->IDirect3DRMLight_iface.lpVtbl = &Direct3DRMLight_Vtbl; object->ref = 1; diff --git a/dlls/d3drm/material.c b/dlls/d3drm/material.c index 0c1fa8c..2adb20f 100644 --- a/dlls/d3drm/material.c +++ b/dlls/d3drm/material.c @@ -312,10 +312,7 @@ HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface)
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMMaterialImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - }
object->IDirect3DRMMaterial2_iface.lpVtbl = &Direct3DRMMaterial2_Vtbl; object->ref = 1; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 59266de..51f981a 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2522,10 +2522,7 @@ HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj)
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMMeshBuilderImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - }
object->IDirect3DRMMeshBuilder2_iface.lpVtbl = &Direct3DRMMeshBuilder2_Vtbl; object->IDirect3DRMMeshBuilder3_iface.lpVtbl = &Direct3DRMMeshBuilder3_Vtbl; @@ -3086,10 +3083,7 @@ HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj)
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMMeshImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - }
object->IDirect3DRMMesh_iface.lpVtbl = &Direct3DRMMesh_Vtbl; object->ref = 1; diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 6ff4345..cbaaf63 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -849,10 +849,7 @@ HRESULT Direct3DRMTexture_create(REFIID riid, IUnknown** ret_iface)
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMTextureImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - }
object->IDirect3DRMTexture2_iface.lpVtbl = &Direct3DRMTexture2_Vtbl; object->IDirect3DRMTexture3_iface.lpVtbl = &Direct3DRMTexture3_Vtbl; diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index e134bf2..729db03 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -971,10 +971,7 @@ HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown** ppObj)
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMViewportImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - }
object->IDirect3DRMViewport_iface.lpVtbl = &Direct3DRMViewport_Vtbl; object->IDirect3DRMViewport2_iface.lpVtbl = &Direct3DRMViewport2_Vtbl;