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
a501ea73
Commit
a501ea73
authored
Mar 23, 2004
by
Christian Costa
Committed by
Alexandre Julliard
Mar 23, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not return an error when setting a material to NULL.
Fixed access to d3d private data.
parent
4a8f7b23
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
6 deletions
+5
-6
mesa.c
dlls/ddraw/d3ddevice/mesa.c
+1
-2
d3dexecutebuffer.c
dlls/ddraw/d3dexecutebuffer.c
+1
-1
d3dlight.c
dlls/ddraw/d3dlight.c
+1
-1
mesa.c
dlls/ddraw/direct3d/mesa.c
+2
-2
No files found.
dlls/ddraw/d3ddevice/mesa.c
View file @
a501ea73
...
...
@@ -787,8 +787,7 @@ GL_IDirect3DDeviceImpl_3_2T_SetLightState(LPDIRECT3DDEVICE3 iface,
TRACE
(
" activating material %p.
\n
"
,
mat
);
mat
->
activate
(
mat
);
}
else
{
ERR
(
" D3DLIGHTSTATE_MATERIAL called with NULL material !!!
\n
"
);
return
DDERR_INVALIDPARAMS
;
FIXME
(
" D3DLIGHTSTATE_MATERIAL called with NULL material !!!
\n
"
);
}
}
else
if
(
dwLightStateType
==
D3DLIGHTSTATE_COLORMODEL
/* 3 */
)
{
switch
(
dwLightState
)
{
...
...
dlls/ddraw/d3dexecutebuffer.c
View file @
a501ea73
...
...
@@ -197,7 +197,7 @@ static void execute(IDirect3DExecuteBufferImpl *This,
if
(
mat
!=
NULL
)
{
mat
->
activate
(
mat
);
}
else
{
ERR
(
" D3DLIGHTSTATE_MATERIAL called with NULL material !!!
\n
"
);
FIXME
(
" D3DLIGHTSTATE_MATERIAL called with NULL material !!!
\n
"
);
}
}
else
if
(
ci
->
u1
.
dlstLightStateType
==
D3DLIGHTSTATE_COLORMODEL
/* 3 */
)
{
...
...
dlls/ddraw/d3dlight.c
View file @
a501ea73
...
...
@@ -194,7 +194,7 @@ GL_IDirect3DLightImpl_1_Release(LPDIRECT3DLIGHT iface)
TRACE
(
"(%p/%p)->() decrementing from %lu.
\n
"
,
This
,
iface
,
This
->
ref
);
if
(
!--
(
This
->
ref
))
{
((
IDirect3DGLImpl
*
)
This
->
d3d
)
->
light_released
(
This
->
d3d
,
glThis
->
light_num
);
((
IDirect3DGLImpl
*
)
This
->
d3d
->
d3d_private
)
->
light_released
(
This
->
d3d
,
glThis
->
light_num
);
HeapFree
(
GetProcessHeap
(),
0
,
This
);
return
0
;
}
...
...
dlls/ddraw/direct3d/mesa.c
View file @
a501ea73
...
...
@@ -82,7 +82,7 @@ GL_IDirect3DImpl_3_2T_1T_CreateLight(LPDIRECT3D3 iface,
IUnknown
*
pUnkOuter
)
{
ICOM_THIS_FROM
(
IDirectDrawImpl
,
IDirect3D3
,
iface
);
IDirect3DGLImpl
*
glThis
=
(
IDirect3DGLImpl
*
)
This
;
IDirect3DGLImpl
*
glThis
=
(
IDirect3DGLImpl
*
)
This
->
d3d_private
;
int
fl
;
IDirect3DLightImpl
*
d3dlimpl
;
HRESULT
ret_value
;
...
...
@@ -292,7 +292,7 @@ GL_IDirect3DImpl_7_3T_CreateVertexBuffer(LPDIRECT3D7 iface,
static
void
light_released
(
IDirectDrawImpl
*
This
,
GLenum
light_num
)
{
IDirect3DGLImpl
*
glThis
=
(
IDirect3DGLImpl
*
)
This
;
IDirect3DGLImpl
*
glThis
=
(
IDirect3DGLImpl
*
)
This
->
d3d_private
;
glThis
->
free_lights
|=
(
light_num
-
GL_LIGHT0
);
}
...
...
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