[D3DXOF] Sync with Wine Staging 1.7.47. CORE-9924

[reactos.git] / reactos / dll / directx / wine / d3dxof / d3dxof.c

diff --git a/reactos/dll/directx/wine/d3dxof/d3dxof.c b/reactos/dll/directx/wine/d3dxof/d3dxof.c
index 4ae6628..205b401 100644 (file)
--- a/reactos/dll/directx/wine/d3dxof/d3dxof.c
+++ b/reactos/dll/directx/wine/d3dxof/d3dxof.c
@@ -45,10 +45,7 @@ HRESULT IDirectXFileImpl_Create(IUnknown* pUnkOuter, LPVOID* ppObj)
 
     object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileImpl));
     if (!object)
-    {
-        ERR("Out of memory\n");
         return DXFILEERR_BADALLOC;
-    }
 
     object->IDirectXFile_iface.lpVtbl = &IDirectXFile_Vtbl;
     object->ref = 1;
@@ -362,10 +359,7 @@ static HRESULT IDirectXFileBinaryImpl_Create(IDirectXFileBinaryImpl** ppObj)
 
     object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileBinaryImpl));
     if (!object)
-    {
-        ERR("Out of memory\n");
         return DXFILEERR_BADALLOC;
-    }
 
     object->IDirectXFileBinary_iface.lpVtbl = &IDirectXFileBinary_Vtbl;
     object->ref = 1;
@@ -495,10 +489,7 @@ static HRESULT IDirectXFileDataImpl_Create(IDirectXFileDataImpl** ppObj)
 
     object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileDataImpl));
     if (!object)
-    {
-        ERR("Out of memory\n");
         return DXFILEERR_BADALLOC;
-    }
 
     object->IDirectXFileData_iface.lpVtbl = &IDirectXFileData_Vtbl;
     object->ref = 1;
@@ -608,7 +599,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetId(IDirectXFileData* iface, LPGUID
   if (!pGuid)
     return DXFILEERR_BADVALUE;
 
-  memcpy(pGuid, &This->pobj->class_id, 16);
+  *pGuid = This->pobj->class_id;
 
   return DXFILE_OK;
 }
@@ -656,7 +647,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetType(IDirectXFileData* iface, cons
   if (!pguid)
     return DXFILEERR_BADVALUE;
 
-  memcpy(&guid, &This->pobj->type, 16);
+  guid = This->pobj->type;
   *pguid = &guid;
 
   return DXFILE_OK;
@@ -773,10 +764,7 @@ static HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImp
 
     object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileDataReferenceImpl));
     if (!object)
-    {
-        ERR("Out of memory\n");
         return DXFILEERR_BADALLOC;
-    }
 
     object->IDirectXFileDataReference_iface.lpVtbl = &IDirectXFileDataReference_Vtbl;
     object->ref = 1;
@@ -875,7 +863,7 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_GetId(IDirectXFileDataRefere
   if (!pGuid)
     return DXFILEERR_BADVALUE;
 
-  memcpy(pGuid, &This->ptarget->class_id, 16);
+  *pGuid = This->ptarget->class_id;
 
   return DXFILE_OK;
 }
@@ -924,10 +912,7 @@ static HRESULT IDirectXFileEnumObjectImpl_Create(IDirectXFileEnumObjectImpl** pp
 
     object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileEnumObjectImpl));
     if (!object)
-    {
-        ERR("Out of memory\n");
         return DXFILEERR_BADALLOC;
-    }
 
     object->IDirectXFileEnumObject_iface.lpVtbl = &IDirectXFileEnumObject_Vtbl;
     object->ref = 1;
@@ -1026,7 +1011,6 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE
   object->pobj = HeapAlloc(GetProcessHeap(), 0, sizeof(xobject)*MAX_SUBOBJECTS);
   if (!object->pobj)
   {
-    ERR("Out of memory\n");
     hr = DXFILEERR_BADALLOC;
     goto error;
   }
@@ -1034,7 +1018,6 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE
   object->pstrings = HeapAlloc(GetProcessHeap(), 0, MAX_STRINGS_BUFFER);
   if (!object->pstrings)
   {
-    ERR("Out of memory\n");
     hr = DXFILEERR_BADALLOC;
     goto error;
   }
@@ -1114,10 +1097,7 @@ static HRESULT IDirectXFileSaveObjectImpl_Create(IDirectXFileSaveObjectImpl** pp
 
     object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileSaveObjectImpl));
     if (!object)
-    {
-        ERR("Out of memory\n");
         return DXFILEERR_BADALLOC;
-    }
 
     object->IDirectXFileSaveObject_iface.lpVtbl = &IDirectXFileSaveObject_Vtbl;
     object->ref = 1;