[ros-diffs] [akhaldi] 68517: [D3DXOF] Sync with Wine Staging 1.7.47. CORE-9924

Author: akhaldi
Date: Tue Jul 21 23:19:30 2015
New Revision: 68517

URL: http://svn.reactos.org/svn/reactos?rev=68517&view=rev
Log:
[D3DXOF] Sync with Wine Staging 1.7.47. CORE-9924

Modified:
    trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c
    trunk/reactos/dll/directx/wine/d3dxof/main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/d3…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c	[iso-8859-1] Tue Jul 21 23:19:30 2015
@@ -45,10 +45,7 @@
 
     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 @@
 
     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 @@
 
     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 @@
   if (!pGuid)
     return DXFILEERR_BADVALUE;
 
-  memcpy(pGuid, &This->pobj->class_id, 16);
+  *pGuid = This->pobj->class_id;
 
   return DXFILE_OK;
 }
@@ -656,7 +647,7 @@
   if (!pguid)
     return DXFILEERR_BADVALUE;
 
-  memcpy(&guid, &This->pobj->type, 16);
+  guid = This->pobj->type;
   *pguid = &guid;
 
   return DXFILE_OK;
@@ -773,10 +764,7 @@
 
     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 @@
   if (!pGuid)
     return DXFILEERR_BADVALUE;
 
-  memcpy(pGuid, &This->ptarget->class_id, 16);
+  *pGuid = This->ptarget->class_id;
 
   return DXFILE_OK;
 }
@@ -924,10 +912,7 @@
 
     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 @@
   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 @@
   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 @@
 
     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;

Modified: trunk/reactos/dll/directx/wine/d3dxof/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/ma…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dxof/main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dxof/main.c	[iso-8859-1] Tue Jul 21 23:19:30 2015
@@ -25,7 +25,6 @@
 WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
 
 static HINSTANCE instance;
-static LONG dll_ref = 0;
 
 /* For the moment, do nothing here. */
 BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
@@ -209,7 +208,7 @@
  */
 HRESULT WINAPI DllCanUnloadNow(void)
 {
-    return dll_ref != 0 ? S_FALSE : S_OK;
+    return S_FALSE;
 }
 
 /***********************************************************************

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Tue Jul 21 23:19:30 2015
@@ -27,7 +27,7 @@
 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.37
 reactos/dll/directx/wine/d3drm          # Synced to WineStaging-1.7.37
 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.7.37
-reactos/dll/directx/wine/d3dxof         # Synced to WineStaging-1.7.37
+reactos/dll/directx/wine/d3dxof         # Synced to WineStaging-1.7.47
 reactos/dll/directx/wine/ddraw          # Synced to WineStaging-1.7.37
 reactos/dll/directx/wine/devenum        # Synced to WineStaging-1.7.37
 reactos/dll/directx/wine/dinput         # Synced to WineStaging-1.7.37