Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[D3DXOF] Sync with Wine Staging 1.9.16. CORE-11866

Browse source 
svn path=/trunk/; revision=72262
This commit is contained in:
Amine Khaldi 2016-08-18 09:40:45 +00:00
parent ebac637363
commit ab71e5511f
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -889,7 +889,7 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_Resolve(IDirectXFileDataRefe
object->level = 0;
object->from_ref = TRUE;
*ppDataObj = (LPDIRECTXFILEDATA)object;
*ppDataObj = &object->IDirectXFileData_iface;
return DXFILE_OK;
}
@ -1044,10 +1044,10 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE
goto error;
}
*ppDataObj = (LPDIRECTXFILEDATA)object;
*ppDataObj = &object->IDirectXFileData_iface;
/* Get a reference to created object */
This->pRefObjects[This->nb_xobjects] = (LPDIRECTXFILEDATA)object;
This->pRefObjects[This->nb_xobjects] = &object->IDirectXFileData_iface;
IDirectXFileData_AddRef(This->pRefObjects[This->nb_xobjects]);
This->nb_xobjects++;

4
reactos/dll/directx/wine/d3dxof/parsing.c
View file

@ -736,7 +736,7 @@ static WORD parse_TOKEN(parse_buffer * buf)
{
buf->list_nb_elements--;
buf->list_separator = FALSE;
/* Insert separarator between each values and since list does not accept separator at the end
/* Insert separator between each value, and since list does not accept separator at the end
use a comma so any extra separator will generate an error */
token = TOKEN_COMMA;
}
@ -749,7 +749,7 @@ static WORD parse_TOKEN(parse_buffer * buf)
*(DWORD*)buf->value = value;
buf->list_separator = TRUE;
/* Convert list into a serie of their basic type counterpart */
/* Convert list into a series of their basic type counterpart */
token = buf->list_type_float ? TOKEN_FLOAT : TOKEN_INTEGER;
}
dump_TOKEN(token);

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

@ -27,7 +27,7 @@ reactos/dll/directx/wine/d3d9 # Synced to WineStaging-1.9.4
reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.9.4
reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.9.16
reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.9.4
reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.11
reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.16
reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4
reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.11
reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.11