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
07630a9e
Commit
07630a9e
authored
Mar 29, 2015
by
Andrey Gusev
Committed by
Alexandre Julliard
Mar 31, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9_36: Assorted spelling and typos fixes.
parent
ddd3d168
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
15 deletions
+15
-15
mesh.c
dlls/d3dx9_36/mesh.c
+7
-7
surface.c
dlls/d3dx9_36/surface.c
+2
-2
texture.c
dlls/d3dx9_36/texture.c
+4
-4
volume.c
dlls/d3dx9_36/volume.c
+1
-1
xfile.c
dlls/d3dx9_36/xfile.c
+1
-1
No files found.
dlls/d3dx9_36/mesh.c
View file @
07630a9e
...
...
@@ -3180,7 +3180,7 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data,
ID3DXFileData
*
child
=
NULL
;
DWORD
i
;
SIZE_T
nb_children
;
DWORD
nb_skin_weig
th
s_info
=
0
;
DWORD
nb_skin_weig
ht
s_info
=
0
;
/*
* template Mesh {
...
...
@@ -3310,14 +3310,14 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data,
goto
end
;
}
else
if
(
IsEqualGUID
(
&
type
,
&
DXFILEOBJ_SkinWeights
))
{
if
(
!
mesh_data
->
skin_info
)
{
WARN
(
"Skin weig
th
s found but skin mesh header not encountered yet
\n
"
);
WARN
(
"Skin weig
ht
s found but skin mesh header not encountered yet
\n
"
);
hr
=
E_FAIL
;
goto
end
;
}
hr
=
parse_skin_mesh_info
(
child
,
mesh_data
,
nb_skin_weig
th
s_info
);
hr
=
parse_skin_mesh_info
(
child
,
mesh_data
,
nb_skin_weig
ht
s_info
);
if
(
FAILED
(
hr
))
goto
end
;
nb_skin_weig
th
s_info
++
;
nb_skin_weig
ht
s_info
++
;
}
}
if
(
FAILED
(
hr
))
...
...
@@ -3327,9 +3327,9 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data,
child
=
NULL
;
}
if
(
mesh_data
->
skin_info
&&
(
nb_skin_weig
th
s_info
!=
mesh_data
->
nb_bones
))
{
if
(
mesh_data
->
skin_info
&&
(
nb_skin_weig
ht
s_info
!=
mesh_data
->
nb_bones
))
{
WARN
(
"Mismatch between nb skin weights info %u encountered and nb bones %u from skin mesh header
\n
"
,
nb_skin_weig
th
s_info
,
mesh_data
->
nb_bones
);
nb_skin_weig
ht
s_info
,
mesh_data
->
nb_bones
);
hr
=
E_FAIL
;
goto
end
;
}
...
...
@@ -7005,7 +7005,7 @@ HRESULT WINAPI D3DXWeldVertices(ID3DXMesh *mesh, DWORD flags, const D3DXWELDEPSI
if
(
flags
==
0
)
{
WARN
(
"No flags
is
undefined. Using D3DXWELDEPSILONS_WELDPARTIALMATCHES instead.
\n
"
);
WARN
(
"No flags
are
undefined. Using D3DXWELDEPSILONS_WELDPARTIALMATCHES instead.
\n
"
);
flags
=
D3DXWELDEPSILONS_WELDPARTIALMATCHES
;
}
...
...
dlls/d3dx9_36/surface.c
View file @
07630a9e
...
...
@@ -1758,7 +1758,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
D3DLOCKED_RECT
lockrect
;
struct
volume
src_size
,
dst_size
;
TRACE
(
"(%p, %p, %s, %p, %#x, %u, %p, %s %#x, 0x%08x)
\n
"
,
TRACE
(
"(%p, %p, %s, %p, %#x, %u, %p, %s
,
%#x, 0x%08x)
\n
"
,
dst_surface
,
dst_palette
,
wine_dbgstr_rect
(
dst_rect
),
src_memory
,
src_format
,
src_pitch
,
src_palette
,
wine_dbgstr_rect
(
src_rect
),
filter
,
color_key
);
...
...
@@ -2006,7 +2006,7 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
if
(
src_palette
)
{
FIXME
(
"Saving surfaces with palettized pixel formats not implemented yet
\n
"
);
FIXME
(
"Saving surfaces with palettized pixel formats
is
not implemented yet
\n
"
);
return
D3DERR_INVALIDCALL
;
}
...
...
dlls/d3dx9_36/texture.c
View file @
07630a9e
...
...
@@ -269,7 +269,7 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN
unsigned
int
channels
;
const
struct
pixel_format_desc
*
curfmt
,
*
bestfmt
=
NULL
;
TRACE
(
"Requested format not supported, looking for a fallback.
\n
"
);
TRACE
(
"Requested format
is
not supported, looking for a fallback.
\n
"
);
if
(
!
fmt
)
{
...
...
@@ -661,7 +661,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi
if
(
imginfo
.
MipLevels
<
miplevels
&&
(
D3DFMT_DXT1
<=
imginfo
.
Format
&&
imginfo
.
Format
<=
D3DFMT_DXT5
))
{
FIXME
(
"Generation of mipmaps for compressed pixel formats is not implemented yet
\n
"
);
FIXME
(
"Generation of mipmaps for compressed pixel formats is not implemented yet
.
\n
"
);
miplevels
=
imginfo
.
MipLevels
;
}
if
(
imginfo
.
ResourceType
==
D3DRTYPE_VOLUMETEXTURE
...
...
@@ -1219,7 +1219,7 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic
if
(
mip_levels
>
image_info
.
MipLevels
)
{
FIXME
(
"Generation of mipmaps for volume textures is not implemented yet
\n
"
);
FIXME
(
"Generation of mipmaps for volume textures is not implemented yet
.
\n
"
);
mip_levels
=
image_info
.
MipLevels
;
}
...
...
@@ -1460,7 +1460,7 @@ HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device,
if
(
mip_levels
>
img_info
.
MipLevels
&&
(
D3DFMT_DXT1
<=
img_info
.
Format
&&
img_info
.
Format
<=
D3DFMT_DXT5
))
{
FIXME
(
"Generation of mipmaps for compressed pixel formats
not supported yet
\n
"
);
FIXME
(
"Generation of mipmaps for compressed pixel formats
is not supported yet.
\n
"
);
mip_levels
=
img_info
.
MipLevels
;
}
...
...
dlls/d3dx9_36/volume.c
View file @
07630a9e
...
...
@@ -189,7 +189,7 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume,
if
(((
src_format_desc
->
type
!=
FORMAT_ARGB
)
&&
(
src_format_desc
->
type
!=
FORMAT_INDEX
))
||
(
dst_format_desc
->
type
!=
FORMAT_ARGB
))
{
FIXME
(
"Pixel format conversion not implemented %#x -> %#x
\n
"
,
FIXME
(
"Pixel format conversion
is
not implemented %#x -> %#x
\n
"
,
src_format_desc
->
format
,
dst_format_desc
->
format
);
return
E_NOTIMPL
;
}
...
...
dlls/d3dx9_36/xfile.c
View file @
07630a9e
...
...
@@ -331,7 +331,7 @@ static HRESULT d3dx9_file_data_create(IDirectXFileObject *dxfile_object, ID3DXFi
}
else
{
FIXME
(
"Don't know
n
what to do with binary object
\n
"
);
FIXME
(
"Don't know what to do with binary object
\n
"
);
HeapFree
(
GetProcessHeap
(),
0
,
object
);
return
E_FAIL
;
}
...
...
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