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
24d6c0a9
Commit
24d6c0a9
authored
Dec 30, 2009
by
Christian Costa
Committed by
Alexandre Julliard
Dec 31, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dxof: Get rid of cur_subobject.
parent
b5290bde
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
8 deletions
+5
-8
d3dxof.c
dlls/d3dxof/d3dxof.c
+3
-5
d3dxof_private.h
dlls/d3dxof/d3dxof_private.h
+0
-1
parsing.c
dlls/d3dxof/parsing.c
+2
-2
No files found.
dlls/d3dxof/d3dxof.c
View file @
24d6c0a9
...
...
@@ -280,7 +280,6 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV
object
->
buf
.
pdxf
=
This
;
object
->
buf
.
txt
=
(
header
[
2
]
==
XOFFILE_FORMAT_TEXT
);
object
->
buf
.
token_present
=
FALSE
;
object
->
buf
.
cur_subobject
=
0
;
TRACE
(
"File size is %d bytes
\n
"
,
file_size
);
...
...
@@ -1044,7 +1043,6 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE
This
->
buf
.
pxo_globals
=
This
->
xobjects
;
This
->
buf
.
nb_pxo_globals
=
This
->
nb_xobjects
;
This
->
buf
.
cur_subobject
=
1
;
This
->
buf
.
level
=
0
;
This
->
buf
.
pxo_tab
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
xobject
)
*
MAX_SUBOBJECTS
);
...
...
@@ -1059,6 +1057,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE
This
->
buf
.
pxo
->
pdata
=
This
->
buf
.
pdata
=
NULL
;
This
->
buf
.
capacity
=
0
;
This
->
buf
.
cur_pos_data
=
0
;
This
->
buf
.
pxo
->
nb_subobjects
=
1
;
pstrings
=
HeapAlloc
(
GetProcessHeap
(),
0
,
MAX_STRINGS_BUFFER
);
if
(
!
pstrings
)
...
...
@@ -1076,10 +1075,9 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE
goto
error
;
}
This
->
buf
.
pxo
->
nb_subobjects
=
This
->
buf
.
cur_subobject
;
if
(
This
->
buf
.
cur_subobject
>
MAX_SUBOBJECTS
)
if
(
This
->
buf
.
pxo
->
nb_subobjects
>
MAX_SUBOBJECTS
)
{
FIXME
(
"Too many su
objects %d
\n
"
,
This
->
buf
.
cur_subobject
);
FIXME
(
"Too many su
bobjects %d
\n
"
,
This
->
buf
.
pxo
->
nb_subobjects
);
hr
=
DXFILEERR_BADALLOC
;
goto
error
;
}
...
...
dlls/d3dxof/d3dxof_private.h
View file @
24d6c0a9
...
...
@@ -128,7 +128,6 @@ typedef struct {
WORD
current_token
;
BOOL
token_present
;
BOOL
txt
;
ULONG
cur_subobject
;
ULONG
cur_pos_data
;
LPBYTE
cur_pstrings
;
BYTE
value
[
100
];
...
...
dlls/d3dxof/parsing.c
View file @
24d6c0a9
...
...
@@ -1212,14 +1212,14 @@ _exit:
ERR
(
"Reference to unknown object %s
\n
"
,
(
char
*
)
buf
->
value
);
return
FALSE
;
}
buf
->
pxo
->
childs
[
buf
->
pxo
->
nb_childs
]
=
&
buf
->
pxo_tab
[
buf
->
cur_subobject
++
];
buf
->
pxo
->
childs
[
buf
->
pxo
->
nb_childs
]
=
&
buf
->
pxo_tab
[
buf
->
pxo
->
root
->
nb_subobjects
++
];
buf
->
pxo
->
childs
[
buf
->
pxo
->
nb_childs
]
->
ptarget
=
&
(
buf
->
pxo_globals
[
i
])[
j
];
buf
->
pxo
->
nb_childs
++
;
}
else
if
(
check_TOKEN
(
buf
)
==
TOKEN_NAME
)
{
xobject
*
pxo
=
buf
->
pxo
;
buf
->
pxo
=
buf
->
pxo
->
childs
[
buf
->
pxo
->
nb_childs
]
=
&
buf
->
pxo_tab
[
buf
->
cur_subobject
++
];
buf
->
pxo
=
buf
->
pxo
->
childs
[
buf
->
pxo
->
nb_childs
]
=
&
buf
->
pxo_tab
[
buf
->
pxo
->
root
->
nb_subobjects
++
];
TRACE
(
"Enter optional %s
\n
"
,
(
char
*
)
buf
->
value
);
buf
->
level
++
;
...
...
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