Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
19b8ba0c
Commit
19b8ba0c
authored
Aug 20, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 20, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3drm: Avoid LPDIRECTXFILEDATA.
parent
133bfe29
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
d3drm.c
dlls/d3drm/d3drm.c
+12
-12
No files found.
dlls/d3drm/d3drm.c
View file @
19b8ba0c
...
...
@@ -1355,7 +1355,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v
DXFILELOADOPTIONS
load_options
;
IDirectXFile
*
file
=
NULL
;
IDirectXFileEnumObject
*
enum_object
=
NULL
;
LPDIRECTXFILEDATA
pD
ata
=
NULL
;
IDirectXFileData
*
d
ata
=
NULL
;
HRESULT
hr
;
const
GUID
*
pGuid
;
DWORD
size
;
...
...
@@ -1399,11 +1399,11 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v
if
(
hr
!=
DXFILE_OK
)
goto
end
;
hr
=
IDirectXFileEnumObject_GetNextDataObject
(
enum_object
,
&
pD
ata
);
hr
=
IDirectXFileEnumObject_GetNextDataObject
(
enum_object
,
&
d
ata
);
if
(
hr
!=
DXFILE_OK
)
goto
end
;
hr
=
IDirectXFileData_GetType
(
pD
ata
,
&
pGuid
);
hr
=
IDirectXFileData_GetType
(
d
ata
,
&
pGuid
);
if
(
hr
!=
DXFILE_OK
)
goto
end
;
...
...
@@ -1415,7 +1415,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v
goto
end
;
}
hr
=
IDirectXFileData_GetData
(
pData
,
NULL
,
&
size
,
(
void
**
)
&
pHeader
);
hr
=
IDirectXFileData_GetData
(
data
,
NULL
,
&
size
,
(
void
**
)
&
pHeader
);
if
((
hr
!=
DXFILE_OK
)
||
(
size
!=
sizeof
(
Header
)))
goto
end
;
...
...
@@ -1428,12 +1428,12 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v
goto
end
;
}
IDirectXFileData_Release
(
pD
ata
);
pD
ata
=
NULL
;
IDirectXFileData_Release
(
d
ata
);
d
ata
=
NULL
;
while
(
1
)
{
hr
=
IDirectXFileEnumObject_GetNextDataObject
(
enum_object
,
&
pD
ata
);
hr
=
IDirectXFileEnumObject_GetNextDataObject
(
enum_object
,
&
d
ata
);
if
(
hr
==
DXFILEERR_NOMOREOBJECTS
)
{
TRACE
(
"No more object
\n
"
);
...
...
@@ -1445,19 +1445,19 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v
goto
end
;
}
ret
=
load_data
(
iface
,
pD
ata
,
iids
,
iid_count
,
load_cb
,
load_ctx
,
load_tex_cb
,
load_tex_ctx
,
parent_frame
);
ret
=
load_data
(
iface
,
d
ata
,
iids
,
iid_count
,
load_cb
,
load_ctx
,
load_tex_cb
,
load_tex_ctx
,
parent_frame
);
if
(
ret
!=
D3DRM_OK
)
goto
end
;
IDirectXFileData_Release
(
pD
ata
);
pD
ata
=
NULL
;
IDirectXFileData_Release
(
d
ata
);
d
ata
=
NULL
;
}
ret
=
D3DRM_OK
;
end:
if
(
pD
ata
)
IDirectXFileData_Release
(
pD
ata
);
if
(
d
ata
)
IDirectXFileData_Release
(
d
ata
);
if
(
enum_object
)
IDirectXFileEnumObject_Release
(
enum_object
);
if
(
file
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment