Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 09:53:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
svn path=/trunk/; revision=68517
This commit is contained in:
Amine Khaldi 2015-07-21 23:19:30 +00:00
parent 00eb27264a
commit 7b16137177
3 changed files with 5 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

26
reactos/dll/directx/wine/d3dxof/d3dxof.c
View file

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

3
reactos/dll/directx/wine/d3dxof/main.c
View file

@ -25,7 +25,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
static HINSTANCE instance; static HINSTANCE instance;
static LONG dll_ref = 0;
/* For the moment, do nothing here. */ /* For the moment, do nothing here. */
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
@ -209,7 +208,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/ */
HRESULT WINAPI DllCanUnloadNow(void) HRESULT WINAPI DllCanUnloadNow(void)
{ {
return dll_ref != 0 ? S_FALSE : S_OK; return S_FALSE;
} }
/*********************************************************************** /***********************************************************************

2
reactos/media/doc/README.WINE
View file

@ -27,7 +27,7 @@ reactos/dll/directx/wine/d3d9 # Synced to WineStaging-1.7.37
reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.37 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/d3drm # Synced to WineStaging-1.7.37
reactos/dll/directx/wine/d3dx9_24 => 43 # 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/ddraw # Synced to WineStaging-1.7.37
reactos/dll/directx/wine/devenum # 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 reactos/dll/directx/wine/dinput # Synced to WineStaging-1.7.37