mirror of
https://github.com/reactos/reactos.git
synced 2024-07-02 02:34:53 +00:00
[D3DXOF] Sync with Wine Staging 1.9.16. CORE-11866
svn path=/trunk/; revision=72262
This commit is contained in:
parent
ebac637363
commit
ab71e5511f
|
@ -889,7 +889,7 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_Resolve(IDirectXFileDataRefe
|
||||||
object->level = 0;
|
object->level = 0;
|
||||||
object->from_ref = TRUE;
|
object->from_ref = TRUE;
|
||||||
|
|
||||||
*ppDataObj = (LPDIRECTXFILEDATA)object;
|
*ppDataObj = &object->IDirectXFileData_iface;
|
||||||
|
|
||||||
return DXFILE_OK;
|
return DXFILE_OK;
|
||||||
}
|
}
|
||||||
|
@ -1044,10 +1044,10 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
*ppDataObj = (LPDIRECTXFILEDATA)object;
|
*ppDataObj = &object->IDirectXFileData_iface;
|
||||||
|
|
||||||
/* Get a reference to created object */
|
/* 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]);
|
IDirectXFileData_AddRef(This->pRefObjects[This->nb_xobjects]);
|
||||||
|
|
||||||
This->nb_xobjects++;
|
This->nb_xobjects++;
|
||||||
|
|
|
@ -736,7 +736,7 @@ static WORD parse_TOKEN(parse_buffer * buf)
|
||||||
{
|
{
|
||||||
buf->list_nb_elements--;
|
buf->list_nb_elements--;
|
||||||
buf->list_separator = FALSE;
|
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 */
|
use a comma so any extra separator will generate an error */
|
||||||
token = TOKEN_COMMA;
|
token = TOKEN_COMMA;
|
||||||
}
|
}
|
||||||
|
@ -749,7 +749,7 @@ static WORD parse_TOKEN(parse_buffer * buf)
|
||||||
*(DWORD*)buf->value = value;
|
*(DWORD*)buf->value = value;
|
||||||
|
|
||||||
buf->list_separator = TRUE;
|
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;
|
token = buf->list_type_float ? TOKEN_FLOAT : TOKEN_INTEGER;
|
||||||
}
|
}
|
||||||
dump_TOKEN(token);
|
dump_TOKEN(token);
|
||||||
|
|
|
@ -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/d3dcompiler_43 # Synced to WineStaging-1.9.4
|
||||||
reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.9.16
|
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/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/ddraw # Synced to WineStaging-1.9.4
|
||||||
reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.11
|
reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.11
|
||||||
reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.11
|
reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.11
|
||||||
|
|
Loading…
Reference in a new issue