Module: wine Branch: master Commit: 07630a9eae94fc2d2a713c68a70652bfca6c1353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07630a9eae94fc2d2a713c68a7...
Author: Andrey Gusev andrey.goosev@gmail.com Date: Sun Mar 29 13:51:20 2015 +0300
d3dx9_36: Assorted spelling and typos fixes.
---
dlls/d3dx9_36/mesh.c | 14 +++++++------- dlls/d3dx9_36/surface.c | 4 ++-- dlls/d3dx9_36/texture.c | 8 ++++---- dlls/d3dx9_36/volume.c | 2 +- dlls/d3dx9_36/xfile.c | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index b1a1a76..746b479 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -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_weigths_info = 0; + DWORD nb_skin_weights_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 weigths found but skin mesh header not encountered yet\n"); + WARN("Skin weights found but skin mesh header not encountered yet\n"); hr = E_FAIL; goto end; } - hr = parse_skin_mesh_info(child, mesh_data, nb_skin_weigths_info); + hr = parse_skin_mesh_info(child, mesh_data, nb_skin_weights_info); if (FAILED(hr)) goto end; - nb_skin_weigths_info++; + nb_skin_weights_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_weigths_info != mesh_data->nb_bones)) { + if (mesh_data->skin_info && (nb_skin_weights_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_weigths_info, mesh_data->nb_bones); + nb_skin_weights_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; }
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index f187031..295ef63 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -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; }
diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index de42307..38349e2 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -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; }
diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 52683da..fae8542 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -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; } diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 7386ec9..eda0d7e 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -331,7 +331,7 @@ static HRESULT d3dx9_file_data_create(IDirectXFileObject *dxfile_object, ID3DXFi } else { - FIXME("Don't known 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; }