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
31fcbb6b
Commit
31fcbb6b
authored
Jan 24, 2017
by
Henri Verbeet
Committed by
Alexandre Julliard
Jan 25, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Kill stray tabs.
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
1bd56b6c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
45 deletions
+36
-45
executebuffer.c
dlls/ddraw/executebuffer.c
+36
-39
main.c
dlls/ddraw/main.c
+0
-6
No files found.
dlls/ddraw/executebuffer.c
View file @
31fcbb6b
...
...
@@ -75,12 +75,12 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer,
for
(;;)
{
D3DINSTRUCTION
*
current
=
(
D3DINSTRUCTION
*
)
instr
;
BYTE
size
;
WORD
count
;
count
=
current
->
wCount
;
size
=
current
->
bSize
;
instr
+=
sizeof
(
D3DINSTRUCTION
);
BYTE
size
;
WORD
count
;
count
=
current
->
wCount
;
size
=
current
->
bSize
;
instr
+=
sizeof
(
*
current
);
primitive_size
=
0
;
switch
(
current
->
bOpcode
)
...
...
@@ -203,10 +203,10 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer,
break
;
}
case
D3DOP_MATRIXLOAD
:
WARN
(
"MATRIXLOAD-s (%d
)
\n
"
,
count
);
instr
+=
count
*
size
;
break
;
case
D3DOP_MATRIXLOAD
:
WARN
(
"MATRIXLOAD-s (%u
)
\n
"
,
count
);
instr
+=
count
*
size
;
break
;
case
D3DOP_MATRIXMULTIPLY
:
TRACE
(
"MATRIXMULTIPLY (%d)
\n
"
,
count
);
...
...
@@ -351,19 +351,15 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer,
}
break
;
case
D3DOP_TEXTURELOAD
:
{
WARN
(
"TEXTURELOAD-s (%d)
\n
"
,
count
);
instr
+=
count
*
size
;
}
break
;
case
D3DOP_TEXTURELOAD
:
WARN
(
"TEXTURELOAD-s (%u)
\n
"
,
count
);
instr
+=
count
*
size
;
break
;
case
D3DOP_EXIT
:
{
TRACE
(
"EXIT (%d)
\n
"
,
count
);
/* We did this instruction */
instr
+=
size
;
/* Exit this loop */
goto
end_of_buffer
;
}
break
;
case
D3DOP_EXIT
:
TRACE
(
"EXIT (%u)
\n
"
,
count
);
instr
+=
size
;
goto
end_of_buffer
;
case
D3DOP_BRANCHFORWARD
:
TRACE
(
"BRANCHFORWARD (%d)
\n
"
,
count
);
...
...
@@ -380,26 +376,28 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer,
instr
=
(
char
*
)
current
+
ci
->
dwOffset
;
break
;
}
}
}
else
{
if
(
ci
->
bNegate
)
{
}
}
else
{
if
(
ci
->
bNegate
)
{
TRACE
(
" Branch to %d
\n
"
,
ci
->
dwOffset
);
if
(
ci
->
dwOffset
)
{
instr
=
(
char
*
)
current
+
ci
->
dwOffset
;
break
;
}
}
}
}
}
instr
+=
size
;
instr
+=
size
;
}
break
;
case
D3DOP_SPAN
:
{
WARN
(
"SPAN-s (%d)
\n
"
,
count
);
instr
+=
count
*
size
;
}
break
;
case
D3DOP_SPAN
:
WARN
(
"SPAN-s (%u)
\n
"
,
count
);
instr
+=
count
*
size
;
break
;
case
D3DOP_SETSTATUS
:
TRACE
(
"SETSTATUS (%d)
\n
"
,
count
);
...
...
@@ -410,12 +408,11 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer,
}
break
;
default:
ERR
(
"Unhandled OpCode %d !!!
\n
"
,
current
->
bOpcode
);
/* Try to save ... */
instr
+=
count
*
size
;
break
;
}
default:
ERR
(
"Unhandled OpCode %#x.
\n
"
,
current
->
bOpcode
);
instr
+=
count
*
size
;
break
;
}
}
end_of_buffer:
...
...
dlls/ddraw/main.c
View file @
31fcbb6b
...
...
@@ -748,17 +748,11 @@ HRESULT WINAPI DllCanUnloadNow(void)
}
/***********************************************************************
* DllRegisterServer (DDRAW.@)
*/
HRESULT
WINAPI
DllRegisterServer
(
void
)
{
return
__wine_register_resources
(
instance
);
}
/***********************************************************************
* DllUnregisterServer (DDRAW.@)
*/
HRESULT
WINAPI
DllUnregisterServer
(
void
)
{
return
__wine_unregister_resources
(
instance
);
...
...
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